Selaa lähdekoodia

Merge branch 'V1.1.5' of http://git.tjyourong.com.cn/ctop/adsp-vue into V1.1.5

朱鑫波 4 vuotta sitten
vanhempi
commit
baee1dde74

+ 27 - 15
src/views/modules/Statistics/videoStatics/KSvideoStatics.vue

@@ -10,6 +10,15 @@
         <span  @click="opendate">
           <DatePicker :openOptions='openOptions'  :parentDate='dateValue' left='-100px'></DatePicker>
         </span> 
+        <span style="margin-left:15px">设计负责人:</span> 
+        <span  >
+            <!-- <a-input placeholder="请输入剪辑的名字" v-model="clip" style="width:140px"  /> -->
+            <a-select v-model="leaderId" style="width: 140px" allowClear  show-search :filter-option="filterOption">
+              <a-select-option v-for="item in designList" :key="item.userId" :value='item.userId'>
+                {{item.companyName +'_'+item.userName  }}
+              </a-select-option>
+            </a-select>
+        </span>         
         <span style="margin-left:15px">剪辑:</span> 
         <span  >
             <!-- <a-input placeholder="请输入剪辑的名字" v-model="clip" style="width:140px"  /> -->
@@ -239,6 +248,7 @@
                 <!-- <span slot="nextDayOpenRate" slot-scope="nextDayOpenRate">{{ nextDayOpenRate | toPercentage }}</span> -->
                 <span slot="relativePeople" slot-scope="text,record">
                     <!-- <a href="javascript:;" @click.stop="showRelevantPeople(record)">查看相关人员</a> -->
+                    <p>负责人:{{record.designLeader || '无'}}</p>
                     <p>剪辑:{{record.clip || '无'}}</p>
                     <p>拍摄:{{record.shot || '无'}}</p>
                     <p>编导:{{record.plan || '无'}}</p>
@@ -326,7 +336,7 @@ const columnsFixd = [
     key:'relativePeople',
     scopedSlots: { customRender: 'relativePeople' },
     align: 'center',
-    width:120,
+    width:150,
     fixed: 'left'
   },
   // {
@@ -501,6 +511,7 @@ export default {
       clip:undefined,
       shot:undefined,
       plan:undefined,
+      leaderId:undefined,
       //明细数据
       visibleDetail:false,
       detailColumn,
@@ -733,6 +744,7 @@ export default {
         clipId:this.clip?this.clip:'',
         shotId:this.shot?this.shot:'',
         planId:this.plan?this.plan:'',
+        leaderId:this.leaderId?this.leaderId:''
       }).then(res => {
         let resArr = []
         this.data=[];
@@ -777,10 +789,10 @@ export default {
         accountIds:this.appId,
         exportType,
         signature: this.signature,
-        signature: this.signature,
-        clip:this.clip?this.clip:'',
-        shot:this.shot?this.shot:'',
-        plan:this.plan?this.plan:'',
+        clipId:this.clip?this.clip:'',
+        shotId:this.shot?this.shot:'',
+        planId:this.plan?this.plan:'',
+        leaderId:this.leaderId?this.leaderId:''
       }).then(res => {
         this.exportLoading=false;
         let blob = new Blob([res], {
@@ -934,16 +946,16 @@ export default {
     })
     
   },
-  deactivated() {
-    let arr = JSON.stringify(this.columns)
-    console.log(arr)
-    postAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
-      json: arr,
-      columnType: 4
-    }).then(res => {
-      // console.log(res)
-    })
-  },
+  // deactivated() {
+  //   let arr = JSON.stringify(this.columns)
+  //   console.log(arr)
+  //   postAction('/toutiao/videoReportDaily/saveOrUpdateColumnJson', {
+  //     json: arr,
+  //     columnType: 4
+  //   }).then(res => {
+  //     // console.log(res)
+  //   })
+  // },
   beforeDestroy() {
     let arr = JSON.stringify(this.columns)
     console.log(arr)

+ 2 - 2
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -1671,7 +1671,7 @@ export default {
                 }
             }
             
-           if(val!=undefined || val.length>0){
+           if(val!=undefined && val.length>0){
                 if(this.getFormData('campaignType')==2){
                     
                     if(this.getFormData('singleAppid')==1){
@@ -1935,7 +1935,7 @@ export default {
                     values.appIdArray=values.appId instanceof Array?JSON.stringify(values.appId):JSON.stringify([values.appId])
                     values.appId=undefined;
                     values.agesRange=JSON.stringify(this.agesRange)
-                    values.region=this.region.length?JSON.stringify(this.region):undefined;
+                    values.region=JSON.stringify(this.region);
                     
                     values.convertId=this.convertId==''?undefined:this.convertId;