魏志佳 пре 4 година
родитељ
комит
c32bdd64ec

+ 28 - 43
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -41,13 +41,13 @@
                     <a-select-option value=" " >
                         不限
                     </a-select-option>
-                    <a-select-option value="CAMPAIGN_STATUS_ENABLE" >
+                    <a-select-option value="ENABLE" >
                         启用
                     </a-select-option>
-                    <a-select-option value="CAMPAIGN_STATUS_DISABLE" >
+                    <a-select-option value="DISABLE" >
                         暂停
                     </a-select-option>
-                    <a-select-option value="CAMPAIGN_STATUS_DELETE">
+                    <a-select-option value="DELETE">
                         删除
                     </a-select-option>
                 </a-select>
@@ -146,13 +146,13 @@
                        <editableCell :text="text" slotName='bid' @change="onCellChange(record.key, 'bid', $event)" />
                     </span>
                     <span slot="campaignStatus" slot-scope="text,record">
-                        <a-switch size="default" :checked=text  @change="switchChange(text,record)"/>
+                        <a-switch size="default" :checked=text  @change.stop="switchChange(text,record)"/>
                     </span>
                     <span slot="createStatus" slot-scope="text,record">
-                        <a-switch size="default" :checked=text  @change="switchChange(text,record)"/>
+                        <a-switch size="default" :checked=text  @change.stop="switchChange(text,record)"/>
                     </span>
                     <span slot="status" slot-scope="text,record">
-                        <a-switch size="default" :checked=text  @change="switchChange(text,record)"/>
+                        <a-switch size="default" :checked=text  @change.stop="switchChange(text,record)"/>
                     </span>
                     <!-- <span slot="options" slot-scope="record">
                         <a href="javascript:;" style="margin-right:10px">编辑</a>
@@ -455,8 +455,8 @@ const ideaColumns = [
   },
   {
     title: '账户',
-    dataIndex: 'accountName',
-    key: 'promotionPurpose',
+    dataIndex: 'accountId_dictText',
+    key: 'accountId_dictText',
     align: 'center',
   },
   {
@@ -568,6 +568,10 @@ export default {
         },
     },
     methods: {
+        // 点击跳转
+        goNextPage(){
+
+        },
         // table里的函数
         
         // table里的函数在上
@@ -609,7 +613,6 @@ export default {
             if(this.accountID){
                 this.tabkey=key;
                 this.loading=true
-                this.columns=[];
                 if(key=='group'){         
                     let params = {};
                     this.refreshCampaignList({
@@ -632,7 +635,14 @@ export default {
    
                 }else if(key=='idea'){
                     let params = {};
-                      this.refreshCreativeList();
+                      this.refreshCreativeList({
+                        accountId:this.accountID,
+                        name:this.optionId,
+                        status:this.statusValue,
+                        startDate:this.dateString[0],
+                        endDate:this.dateString[1],
+                        pageNo:this.ipagination.current
+                      });
                 }
             }
             
@@ -760,33 +770,8 @@ export default {
                 }else{
                     recordData.toutiaoStatus='AD_STATUS_DELIVERY_OK'
                 }
-                // console.log(recordData)
-                // postAction('/ctop/byteDanceAdvertisePlan/edit',recordData).then((res)=>{
-                //     console.log(res);
-                //     if(res.success){
-                //         record.status=!text;                   
-                //     }
-                // })
                 this.batchEditHttp('status',[recordData])
-            //     postAction(`/ctop/byteDanceAdvertisePlan/batchEdit/${type}`,params).then((res)=>{
-            //     console.log(res);
-            //     if(res.success){
-            //         if(res.result.length>0){
-            //             this.modifyTableData=[]
-            //             this.modifyTableData=res.result
-            //             this.getplanList({
-            //                 accountId:this.accountID,
-            //                 name:this.optionId,
-            //                 status:this.statusValue,
-            //                 startDate:this.dateString[0],
-            //                 endDate:this.dateString[1],
-            //                 pageNo:this.ipagination.current
-            //             })
-            //         }
-            //         this.optValue=undefined;
-            //         this.selectedRowKeys=[]
-            //     }
-            // })
+           
            }else if(this.tabkey=='idea'){
                let ids=record.id;
                let status=text?'disable':'enable';
@@ -806,6 +791,8 @@ export default {
                             endDate:this.dateString[1],
                             pageNo:this.ipagination.current
                         })
+                   }else{
+                       this.$message.error(res.message)
                    }
                })
            }
@@ -1078,7 +1065,7 @@ export default {
             const dataSource = [...this.data];
             const target = dataSource.find(item => item.key === key);
             if (target) {
-                
+                target[dataIndex] = value;
                 console.log(target)
                 //单独修改预算
                 if(this.tabkey=='group'){
@@ -1090,8 +1077,7 @@ export default {
                         }).then((res)=>{
                             console.log(res);
                             if(res.success){
-                                // this.data = dataSource;
-                                target[dataIndex] = value;
+                                this.data=dataSource
                                 this.$message.success({
                                    content:res.message,
                                     duration:2
@@ -1101,7 +1087,7 @@ export default {
                                     content:res.message,
                                     duration:2
                                 })
-                                 this.data=[];
+                                this.data=[];
                                 this.refreshCampaignList({
                                         accountId:this.accountID,
                                         name:this.optionId,
@@ -1135,12 +1121,11 @@ export default {
                         })
                     }
                     
-                }else if(this.tabkey=='plan'){
+                }else if(this.tabkey=='plan'){                   
                     postAction('/ctop/byteDanceAdvertisePlan/edit',target).then((res)=>{
                         console.log(res);
                         if(res.success){
-                            // this.data = dataSource;
-                            target[dataIndex] = value;
+                            this.data = dataSource;                      
                             this.$message.success({
                                 content:'修改成功!',
                                 duration:2

+ 0 - 9
src/views/modules/BatchCreate/components/material.vue

@@ -57,25 +57,16 @@
                       </div>
                     </a-form-item>
 
-<<<<<<< HEAD
-                    <a-form-item label="封面上传" :labelCol="labelCol" :wrapperCol="wrapperCol"
-=======
                     <a-form-item label="选择封面" :labelCol="labelCol" :wrapperCol="wrapperCol"
->>>>>>> 8ccaf7354dc64fe0bbf705099e1993a7c3904270
                       v-if="(materialType=='CREATIVE_IMAGE_MODE_VIDEO_VERTICAL'||materialType=='CREATIVE_IMAGE_MODE_VIDEO')">
                       <!-- <upload-to-ali v-model="item.imageUrl" :customDomain="customDomain" preview :region="region"
                         :bucket="bucket" :accept="acceptImage" :size="102400" :accessKeyId="accessKeyId"
                         :accessKeySecret="accessKeySecret"></upload-to-ali> -->
-<<<<<<< HEAD
-                      <a @click="getImageList(item)" v-if="item.imageUrl==''">选择图片</a>
-                      <img :src="item.imageUrl" alt="" v-else>
-=======
                       <a @click="getImageList(item)">选择图片</a>
                       <div>
                         <!-- <img :src="item.imageUrl" style="width:300px" v-show="materialType=='CREATIVE_IMAGE_MODE_VIDEO'&&item.videoUrl" />
                         <img :src="item.videoUrl" style="width:120px"  v-show="materialType=='CREATIVE_IMAGE_MODE_VIDEO_VERTICAL'&&item.videoUrl" /> -->
                       </div>
->>>>>>> 8ccaf7354dc64fe0bbf705099e1993a7c3904270
                     </a-form-item>
 
                     <a-form-item label="创意标题" :labelCol="labelCol" :wrapperCol="wrapperCol"

+ 6 - 2
src/views/modules/BatchCreate/newPlan.vue

@@ -528,7 +528,7 @@
             <div class="input-item">
               <a-form-item>
                 <a-radio-group v-decorator="['scheduleTime', { initialValue:'' }]">
-                  <a-radio-button value>不限</a-radio-button>
+                  <a-radio-button value=''>不限</a-radio-button>
                   <a-radio-button value="SpecifiedTImePeriod">指定时间段</a-radio-button>
                 </a-radio-group>
                 <div
@@ -750,7 +750,7 @@
 import moment from 'moment'
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
 import qs from 'qs'
-import selectCheckAll from '@/views/modules/kuaishouapp/account/stepForm/stepModule/test.vue'
+import selectCheckAll from './toutiaoTime'
 import newDirectedPackage from './newDirectedPackage'
 var str = ""
 for (let i = 0; i < 7*48; i++) {
@@ -1108,6 +1108,10 @@ export default {
               values.externalAction=this.externalAction
               values.startTime=this.dateRange[0].format('YYYY-MM-DD HH:mm');
               values.endTime= this.dateRange[1].format('YYYY-MM-DD HH:mm');
+              if(this.getFormData('scheduleTime')!=''){
+                  values.scheduleTime=this.scheduleTimeData
+              }
+
               postAction('/ctop/byteDanceAdvertisePlan/add', {
                 names: this.names,
                 landingType: this.groupInfo.landingType,

+ 3 - 3
vue.config.js

@@ -57,15 +57,15 @@ module.exports = {
     proxy: {
       '/jeecg-boot': {
         // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8804', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.0.230:8088', //请求本地 需要jeecg-boot后台项目  孙震
-        target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        // target: 'http://192.168.1.51:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.165:8848', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
-        target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目 
+        // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目