朱鑫波 4 gadi atpakaļ
vecāks
revīzija
72a22e8679

+ 39 - 10
src/views/modules/advertiser/AdvertiserList.vue

@@ -8,13 +8,15 @@
             <a-form-item label="广告主开户主体名称">
               <!-- <a-input placeholder="请输入广告主开户主体名称" v-model="queryParam.name"></a-input> -->
               <a-select
-                optionFilterProp="children"
-                showSearch
                 labelInValue
-                :filterOption="filterOption"
                 v-model="allIdUser"
                 placeholder="请选择广告主开户主体名称"
                 @keyup.enter.native="searchQueryOne"
+                @focus="getList"
+                showSearch
+                optionFilterProp="children"
+                :filterOption="filterOption"
+                @search="getList"
               >
                 <a-select-option :value="item.id" v-for="(item, index) of list" :key="index">
                   {{
@@ -48,6 +50,16 @@
           {{advertiserName}}
           <a-icon type="close" @click="clear('advertiserId')" />
         </a-tag>
+        <a-row :gutter="24" style="margin-bottom:20px">
+          <a-col :md="8" :sm="8">
+            <a-input placeholder="请输入产品名称" v-model="queryParam.productName"></a-input>
+          </a-col>
+          <a-col :md="8" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQueryOne" icon="search">查询</a-button>
+            </span>
+          </a-col>
+        </a-row>
       </a-tab-pane>
       <a-tab-pane key="project" tab="项目列表">
         <a-tag
@@ -58,6 +70,16 @@
           {{advertiserName?advertiserName+' / '+productName:productName}}
           <a-icon type="close" @click="clear('productId')" />
         </a-tag>
+        <a-row :gutter="24" style="margin-bottom:20px">
+          <a-col :md="8" :sm="8">
+            <a-input placeholder="请输入项目名称" v-model="queryParam.projectName"></a-input>
+          </a-col>
+          <a-col :md="8" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQueryOne" icon="search">查询</a-button>
+            </span>
+          </a-col>
+        </a-row>
       </a-tab-pane>
       <a-button type="primary" slot="tabBarExtraContent" @click="addNew">新增</a-button>
     </a-tabs>
@@ -333,17 +355,18 @@ export default {
   },
   created() {
     // this.queryParam.userId = this.userInfo().id
-    this.getList()
+    this.getList(null)
   },
   methods: {
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    getList() {
+    getList(value) {
       var params = {}
       // params.userId = this.userInfo().id
-      params.pageSize = 1000
+      params.pageSize = 50
       params.pageNo = 1
+      params.name = value
       console.log(params)
       getAction('/ctop/advertiser/list', params)
         .then((res) => {
@@ -368,11 +391,13 @@ export default {
       }
     },
     clear(type) {
+      this.queryParam.name = null
       this.queryParam.advertiserId = null
-      this.advertiserName = ''
-
       this.queryParam.productId = null
-      this.productName = ''
+      this.queryParam.id = null
+      this.queryParam.productName = null
+      this.queryParam.projectName = null
+      this.allIdUser = {}
       this.loadData(1)
     },
     addNew() {
@@ -395,7 +420,7 @@ export default {
             : this.advertiserId
             ? this.advertiserId
             : undefined,
-          productId: this.queryParam.productId?this.queryParam.productId:undefined,
+          productId: this.queryParam.productId ? this.queryParam.productId : undefined,
         })
         this.$refs.modalFormThree.title = '新增'
         this.$refs.modalFormThree.disableSubmit = false
@@ -407,11 +432,13 @@ export default {
         this.advertiserName = item.name
         this.queryParam.productId = null
         this.productName = null
+        this.queryParam.productName = null
         this.callbackTwo('product')
       } else if (key == 'project') {
         this.queryParam.productId = item.id
         this.productName = item.productName
         this.advertiserId = item.advertiserId
+        this.queryParam.projectName = null
         this.callbackTwo('project')
       }
     },
@@ -438,6 +465,8 @@ export default {
       this.queryParam.advertiserId = null
       this.queryParam.productId = null
       this.queryParam.id = null
+      this.queryParam.productName = null
+      this.queryParam.projectName = null
       this.allIdUser = {}
       this.callbackTwo('advertiser')
     },

+ 0 - 5
src/views/modules/advertiser/ProjectList.vue

@@ -175,11 +175,6 @@ export default {
           dataIndex: 'advertiserId_dictText',
         },
         {
-          title: '行业类型',
-          align: 'center',
-          dataIndex: 'industryId_dictText',
-        },
-        {
           title: '最高出价',
           align: 'center',
           dataIndex: 'maxBid',

+ 1 - 2
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -130,7 +130,7 @@
             @focus="handleFocus"
             @blur="handleBlur"
             :filterOption="filterOption"
-            v-decorator="['designResponsibleId', { rules: [{ required: true, message: '请选择运营负责人' }] }]"
+            v-decorator="['designResponsibleId', { rules: [{ required: true, message: '请选择设计负责人' }] }]"
           >
             <a-select-option
               v-for="appModel in options"
@@ -261,7 +261,6 @@ export default {
     add(item) {
       this.editAll = false
       this.edit({
-        responsibleId: this.userInfo().id, //用户Id
         mediaId: '2',
         ...item,
       })

+ 1 - 1
src/views/modules/advertiser/modules/projectListModal.vue

@@ -133,7 +133,7 @@
             @focus="handleFocus"
             @blur="handleBlur"
             :filterOption="filterOption"
-            v-decorator="['designResponsibleId', { rules: [{ required: true, message: '请选择运营负责人' }] }]"
+            v-decorator="['designResponsibleId', { rules: [{ required: true, message: '请选择设计负责人' }] }]"
           >
             <a-select-option
               v-for="appModel in options"

+ 14 - 9
src/views/modules/kuaishouapp/account/stepForm/stepModule/newModulePop.vue

@@ -391,13 +391,14 @@ li:hover {
                 :checked="checkAll"
               ></a-checkbox>全选
             </li>
-            <a-checkbox-group v-model="checkArr" @change="onChange" class="home-card" style="width:100%">
+            <a-checkbox-group
+              v-model="checkArr"
+              @change="onChange"
+              class="home-card"
+              style="width:100%"
+            >
               <li style="padding:0 10px;width:100%;" v-for="item of optionsApp" :key="item.appId">
-                <a-checkbox
-                  :value="item.appId"
-                  style="float:left;margin:0 5px"
-                  
-                ></a-checkbox>
+                <a-checkbox :value="item.appId" style="float:left;margin:0 5px"></a-checkbox>
                 {{ item.appName }}
               </li>
             </a-checkbox-group>
@@ -412,7 +413,7 @@ li:hover {
             :key="item"
             closable
             :afterClose="() => log(item)"
-          >{{ showAppName(item) }}</a-tag>
+          >{{ showAppName(item)?showAppName(item):item }}</a-tag>
         </div>
       </div>
     </a-form-item>
@@ -745,7 +746,7 @@ export default {
           this.allForm.noAreaBreak = n.noAreaBreak == '0' ? false : true
           this.selectedRowKeys = n.population ? n.population : []
           this.selectedRowKeysNo = n.excludePopulation ? n.excludePopulation : []
-
+          this.optionsAll = n.appIds?(typeof n.appIds)=='string'? JSON.parse(n.appIds):n.appIds:[]
           this.targeted = n.excludePopulation ? (n.population ? '4' : '3') : '2'
           this.people = n.excludePopulation ? '3' : n.population ? '3' : '2'
           this.getPeople().then((res) => {
@@ -1028,7 +1029,11 @@ export default {
       var data = this.checkOptions.filter((item) => {
         return item.appId == appId
       })
-      return data[0].appName
+      if (data.length > 0) {
+        return data[0].appName
+      }else{
+        return null
+      }
     },
     log(appId) {
       var index = this.optionsAll.findIndex((item) => item === appId)

+ 1 - 1
src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue

@@ -720,7 +720,7 @@ export default {
           this.allForm.noAreaBreak = n.noAreaBreak == '0' ? false : true
           this.selectedRowKeys = n.population ? n.population : []
           this.selectedRowKeysNo = n.excludePopulation ? n.excludePopulation : []
-          this.optionsAll = n.appIds
+          this.optionsAll = n.appIds?(typeof n.appIds)=='string'? JSON.parse(n.appIds):n.appIds:[]
           this.targeted = n.excludePopulation ? (n.population ? '4' : '3') : '2'
           this.people = n.excludePopulation ? '3' : n.population ? '3' : '2'
           this.getPeople().then(res => {