Prechádzať zdrojové kódy

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

朱鑫波 3 rokov pred
rodič
commit
264d0ddca7

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

@@ -320,6 +320,9 @@ export default {
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     },
   },
+  created() {
+    this.queryParam.userId = this.userInfo().id;
+  },
   methods: {
     onChange(text,record) {
       this.spinning=true;
@@ -341,6 +344,7 @@ export default {
         }
       })
     },
+   
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     getList() {
       var params = {}
@@ -358,6 +362,10 @@ export default {
         })
         .finally(() => {})
     },
+    searchQuery(){
+      this.queryParam.userId = this.userInfo().id;
+      this.getList();
+    },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },

+ 14 - 8
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -423,14 +423,20 @@
           var params = { ...record }
           params.bidType = record.bidType == null || record.bidType == '' ? [] : JSON.parse(record.bidType)
           // this.maxBidShow = params.bidType.findIndex((item) => item == 2)
-          params.bidType.findIndex(item => {
-            if (item == 2) {
-              this.maxBidShow = true;
-            } else {
-              this.maxBidShow = false;
-
-            }
-          })
+          let odx =  params.bidType.indexOf(2)
+          if (odx > -1) {
+            this.maxBidShow = true;
+          }else{
+            this.maxBidShow = false;
+          }
+          // params.bidType.findIndex(item => {
+          //   if (item == 2) {
+          //     this.maxBidShow = true;
+          //   } else {
+          //     this.maxBidShow = false;
+
+          //   }
+          // })
 
           let newArray = [];
           newArray = record.ocpxActionType == null || record.ocpxActionType == '' ? [] : JSON.parse(record.ocpxActionType)

+ 14 - 8
src/views/modules/advertiser/modules/projectListModal.vue

@@ -416,14 +416,20 @@
         if (record.mediaId == '2' || record.mediaId == '4') {
           var params = { ...record }
           params.bidType = record.bidType == null || record.bidType == '' ? [] : JSON.parse(record.bidType)
-          params.bidType.findIndex(item => {
-            if (item == 2) {
-              this.maxBidShow = true;
-            } else {
-              this.maxBidShow = false;
-
-            }
-          })
+          let odx =  params.bidType.indexOf(2)
+          if (odx > -1) {
+            this.maxBidShow = true;
+          }else{
+            this.maxBidShow = false;
+          }
+          // params.bidType.findIndex(item => {
+          //   if (item == 2) {
+          //     this.maxBidShow = true;
+          //   } else {
+          //     this.maxBidShow = false;
+
+          //   }
+          // })
           // params.ocpxActionType =
           //   record.ocpxActionType == null || record.ocpxActionType == '' ? [] : JSON.parse(record.ocpxActionType)
           let newArray = [];