Ver Fonte

脚本视频封板;头条监测链接;账户管理项目列表接口更换;批量2.0上下划

朱鑫波 há 3 anos atrás
pai
commit
1b9a27d7a3

+ 6 - 1
src/mixins/JeecgListMixin.js

@@ -146,7 +146,12 @@ export const JeecgListMixin = {
       // if(params.endDate){
       //   params.endDate = moment(params.endDate).format('YYYY-MM-DD')
       // }
-      params.userId = this.userInfo().id
+      if(params.userId){
+
+      }else{
+        params.userId = this.userInfo().id
+      }
+      
       this.loading = true;
       await getAction(this.url.list, params).then((res) => {
         if (res.success) {

+ 2 - 1
src/views/modules/account-config/components/link-configuration.vue

@@ -291,7 +291,8 @@
                 this.controlLoading = true;
                 let params = {
                     accountId:data.accountId,
-                    warningFlag:checked?1:2
+                    warningFlag:checked?1:2,
+                    createUserId:this.userInfo().id
                 }
                 postAction(urlAcount+'/bytedance-api/ad/bytedancePlanJobController/updAccountActionTrackUrl',params).then(res=>{
                     if (res.code == 0) {

+ 53 - 36
src/views/modules/advertiser/UserAllocationList.vue

@@ -49,6 +49,8 @@
                 showSearch
                 optionFilterProp="children"
                 :filterOption="filterOption"
+                @focus="getParticipateList"
+                @search="getParticipateList"
               >
                 <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
                   {{
@@ -229,35 +231,14 @@
           :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
           :wrapperCol="{ xs: { span: 24 }, sm: { span: 16 } }"
         >
-          <a-select
-            v-decorator="[
-              'projectId', // 给表单赋值或拉取表单时,该input对应的key
-              { rules: [{ required: true, message: '请选择项目!' }] },
-            ]"
-            showSearch
-            optionFilterProp="children"
-            :filterOption="filterOption"
-            disabled
-          >
-            <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
-              {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-                item.mediaId == '1'
-                  ? '头条'
-                  : item.mediaId == '2'
-                  ? '快手'
-                  : item.mediaId == '3'
-                  ? '头条内广'
-                  : '快手内广'
-              }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
-            </a-select-option>
-          </a-select>
+          {{projectName}}
         </a-form-item>
         <a-form-item
           label="转移项目"
           :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
           :wrapperCol="{ xs: { span: 24 }, sm: { span: 16 } }"
         >
-          <a-select
+          <!-- <a-select
             v-decorator="[
               'projectNewId', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请选择项目!' }] },
@@ -277,6 +258,29 @@
                   : '快手内广'
               }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
+          </a-select> -->
+          <a-select
+            v-decorator="[
+                'projectNewId', // 给表单赋值或拉取表单时,该input对应的key
+                { rules: [{ required: true, message: '请选择项目!' }] },
+            ]"
+            @focus="getParticipateList"
+            showSearch
+            optionFilterProp="children"
+            :filterOption="filterOption"
+            @search="getParticipateList"
+          >
+              <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
+                  {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
+                      item.mediaId == '1'
+                      ? '头条'
+                      : item.mediaId == '2'
+                      ? '快手'
+                      : item.mediaId == '3'
+                      ? '头条内广'
+                      : '快手内广'
+                  }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
+              </a-select-option>
           </a-select>
         </a-form-item>
         <!-- 
@@ -415,6 +419,7 @@ export default {
       confirmLoading: false,
       accountLoading: false,
       projectId: '',
+      projectName:'',
       accountId: '',
       mediaId: '',
       form: this.$form.createForm(this),
@@ -429,7 +434,7 @@ export default {
     },
   },
   mounted() {
-    this.getParticipateList()
+    this.getParticipateList(null)
   },
   methods: {
     renew(item) {
@@ -490,14 +495,25 @@ export default {
         }
       })
     },
-    getParticipateList() {
-      getAction('/ctop/projectMember/participateList', {
+    getParticipateList(value) {
+      // getAction('/ctop/projectMember/participateList', {
+      //   userId: this.userInfo().id,
+      // }).then((res) => {
+      //   if (res.code == 0) {
+      //     this.dataElse = res.result
+      //   }
+      // })
+      getAction('/ctop/projectMember/participateListV2', {
         userId: this.userInfo().id,
-      }).then((res) => {
-        if (res.code == 0) {
-          this.dataElse = res.result
-        }
-      })
+        pageSize: 100,
+        pageNo: 1,
+        projectName: value,
+      }).then(res => {
+          if (res.code == 0) {
+              let defaultData = res.result.records;
+              this.dataElse = defaultData;
+          }
+      });
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -528,12 +544,13 @@ export default {
       this.visibleAccount = true
       this.accountId = item.accountId
       this.projectId = item.projectId
+      this.projectName = item.projectId_dictText
       this.accountLoading = false
-      setTimeout(() => {
-        this.formAccount.setFieldsValue({
-          projectId: item.projectId,
-        })
-      }, 0)
+      // setTimeout(() => {
+      //   this.formAccount.setFieldsValue({
+      //     projectId: item.projectId,
+      //   })
+      // }, 0)
     },
     handleOkAccount(e) {
       this.formAccount.validateFieldsAndScroll((err, values) => {

+ 4 - 4
src/views/modules/advertiser/modules/UserAllocationModal.vue

@@ -29,10 +29,10 @@
           <a-input placeholder="请输入账户id --授权" v-decorator="['accountId', {}]" disabled />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="广告主名称">
-          <a-input placeholder="请输入广告主名称" v-decorator="['advertiserName', {}]" disabled />
+          <a-input placeholder="请输入广告主名称" v-decorator="['advertiserId_dictText', {}]" disabled />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="项目名称">
-          <a-input placeholder="请输入项目名称" v-decorator="['projectName', {}]" disabled />
+          <a-input placeholder="请输入项目名称" v-decorator="['projectId_dictText', {}]" disabled />
         </a-form-item>
         <!-- <a-form-item
           :labelCol="labelCol"
@@ -154,9 +154,9 @@ export default {
             'userName',
             'accountId',
             'advertiserId',
-            'advertiserName',
+            'advertiserId_dictText',
             'projectId',
-            'projectName',
+            'projectId_dictText',
             'accountName',
             'authName',
             'mediaId',

+ 45 - 2
src/views/modules/autoLaunch/trusteeship/creatMaterialTest.vue

@@ -55,6 +55,35 @@
                                 </a-row>
                                 <a-row :gutter="16">
                                     <a-col :span="16">
+                                        <a-form-item label="投放媒体">
+                                            <!-- { label: '视频播放页广告', value: 3 }, -->
+                                            <checkBoxGroup
+                                                :options="[
+                                                    { label: '优选广告位', value: 1 },
+                                                    { label: '上下滑大屏广告', value: 6 },
+
+                                                    { label: '快手联盟优选', value: 10 }
+                                                ]"
+                                                v-decorator="[
+                                                    'sceneIds',
+                                                    {
+                                                        rules: [
+                                                            {
+                                                                required: true,
+                                                                message: '投放媒体必选'
+                                                            }
+                                                        ],
+                                                        initialValue: [1]
+                                                    }
+                                                ]"
+                                                @change="changeData"
+                                            />
+                                        </a-form-item>
+                                    </a-col>
+                                </a-row>
+
+                                <a-row :gutter="16">
+                                    <a-col :span="16">
                                         <a-form-item label="营销目标">
                                             <a-radio-group
                                                 button-style="solid"
@@ -518,7 +547,7 @@
                                                         initialValue: 3
                                                     }
                                                 ]"
-                                                :disabled="getFormData('formProject', 'campaignType')!=5"
+                                                :disabled="getFormData('formProject', 'campaignType') != 5"
                                             >
                                                 <a-radio-button :value="3">不限</a-radio-button>
                                                 <a-radio-button :value="1">android</a-radio-button>
@@ -1517,6 +1546,18 @@ export default {
     methods: {
         ...mapGetters(['userInfo']),
         moment,
+        changeData(data) {
+            if (data.length > 1 && data.findIndex(item => item == 1) == 0) {
+                data.splice(
+                    data.findIndex(item => item == 1),
+                    1
+                )
+            } else if (data.length > 1 && data.findIndex(item => item == 1) == data.length - 1) {
+                data.splice(0, data.length - 1)
+            } else if (data.length == 0) {
+                data.push(1)
+            } 
+        },
         changeCampaign(e) {
             console.log(e.target.value)
             this.getActionBarText()
@@ -1704,7 +1745,8 @@ export default {
                     this.$nextTick(() => {
                         let data = res.result
                         this.accountIds = data.accountId
-                        this.formProject.setFieldsValue(pick(data, 'campaignType'))
+                        data.sceneIds = data.sceneIds ? data.sceneIds : [1]
+                        this.formProject.setFieldsValue(pick(data, 'campaignType', 'sceneIds'))
                         this.$nextTick(() => {
                             this.getActionBarText()
                         })
@@ -2007,6 +2049,7 @@ export default {
                         params.userId = this.userInfo().id
                         params.useAppMarket = params.useAppMarket ? 1 : 2
                         params.appStore = params.appStore ? JSON.stringify(params.appStore) : '[]'
+                        params.sceneIds = params.sceneIds ? JSON.stringify(params.sceneIds) : '[]'
                         params.regionIds =
                             this.district == 'NONE'
                                 ? JSON.stringify([])

+ 8 - 5
src/views/modules/autoLaunchRevision/createLaunch.vue

@@ -1519,7 +1519,7 @@ li.chouzhen.first:before {
                     <a-col :span="16">
                         <a-form-item label="系统平台">
                             <a-radio-group
-                                v-decorator="['platformOs', { initialValue: 2 }]"
+                                v-decorator="['platformOs', { initialValue: 1 }]"
                                 button-style="solid"
                                 @change="changeType"
                             >
@@ -1760,7 +1760,7 @@ li.chouzhen.first:before {
                                         />
                                     </template>
                                 </a-table-column>
-                                <a-table-column
+                                <!-- <a-table-column
                                     v-if="!useChannel"
                                     width="20%"
                                     key="impressionUrl"
@@ -1775,7 +1775,7 @@ li.chouzhen.first:before {
                                             @change="onCellChange(record.id, 'impressionUrl', $event)"
                                         />
                                     </template>
-                                </a-table-column>
+                                </a-table-column> -->
                                 <a-table-column
                                     v-if="!useChannel"
                                     width="20%"
@@ -1792,7 +1792,7 @@ li.chouzhen.first:before {
                                         />
                                     </template>
                                 </a-table-column>
-                                <a-table-column
+                                <!-- <a-table-column
                                     v-if="!useChannel"
                                     width="20%"
                                     key="adPhotoPlayedT3sUrl"
@@ -1807,7 +1807,7 @@ li.chouzhen.first:before {
                                             @change="onCellChange(record.id, 'adPhotoPlayedT3sUrl', $event)"
                                         />
                                     </template>
-                                </a-table-column>
+                                </a-table-column> -->
                                 <a-table-column
                                     v-if="useChannel"
                                     width="10%"
@@ -3810,6 +3810,9 @@ export default {
                             params.sceneId = JSON.stringify(params.sceneId)
                             params.autoTargetArray = JSON.stringify(params.autoTargetArray)
                             params.useAppMarket = params.useAppMarket ? 1 : 0
+                            params.clickTrackUrl = this.multipleBidData[0].clickTrackUrl
+                            params.actionbarClickUrl = this.multipleBidData[0].actionbarClickUrl
+
                             if (this.$route.query.id) {
                                 params.id = this.$route.query.id
                                 this.postDataAction('/auto/aiKuaishouAccountAutoStrategy/edit', params).then(res => {

+ 1 - 1
src/views/modules/script/components/keyWord.vue

@@ -294,7 +294,7 @@ export default {
             if (!!this.keyValue) {
                 this.topMiddle = true
                 this.ipagination.current = 1
-                postAction(process.env.VUE_APP_BASE_SCRIPT_URL + '/related_words?word=' + this.keyValue).then(res => {
+                postAction(process.env.VUE_APP_BASE_SCRIPT_URL + '/related_words/?word=' + this.keyValue).then(res => {
                     if (res.code == 0) {
                         this.data = res.result.map((item, index) => {
                             return {

+ 34 - 25
src/views/modules/script/index.vue

@@ -261,7 +261,7 @@
                                 <a-range-picker
                                     v-decorator="[
                                         'timeRange',
-                                        { initialValue: [moment().subtract(6, 'days'), moment()] }
+                                        { initialValue: [moment().subtract(1, 'months'), moment()] }
                                     ]"
                                     :ranges="dateRanges"
                                     :disabled-date="disabledDate"
@@ -347,6 +347,7 @@
                         style="word-break: break-all;font-size:16px;font-weight:600"
                         id="outTable"
                         ref="accountTable"
+                        rowKey="number"
                         :customRow="rowClick"
                         :rowSelection="tabKey == 1 ? null : { selectedRowKeys, onChange: onSelectChange }"
                     >
@@ -441,8 +442,7 @@ let TTcolumns = [
         dataIndex: 'query_word',
         scopedSlots: { customRender: 'query_word' },
         align: 'center',
-        key: 'query_word',
-        width: 600
+        key: 'query_word'
     },
     {
         title: '推荐词',
@@ -528,7 +528,9 @@ export default {
             scriptLabel: [],
             creativeTag: [],
             selectedRowKeys: [],
+            selectedRowKeysAll: [],
             selectionRows: [],
+            selectionRowsAll: [],
             downLoading: false,
             config_id: null,
             appIds: [],
@@ -607,7 +609,7 @@ export default {
             SHOW_PARENT,
 
             type: 3,
-            dateValue: [moment().subtract(7, 'days'), moment()],
+            dateValue: [moment().subtract(30, 'days'), moment()],
 
             operate: '',
             designList: [],
@@ -637,7 +639,7 @@ export default {
             projectId: undefined,
             projectIdAll: undefined,
             dataLoading: false,
-            url: process.env.VUE_APP_BASE_SCRIPT_URL + '/get_script_config_lst',
+            url: process.env.VUE_APP_BASE_SCRIPT_URL + '/get_script_config_lst/',
             modifyPriceVisible: false,
             modifyPriceLoading: false,
             modifyPriceDetail: null,
@@ -658,10 +660,10 @@ export default {
                 content: '',
                 onOk() {
                     var params = {}
-                    params.id = item.id
+                    params.config_id = item.config_id
                     params.user_id = item.user_id
                     params.operator = item.operator
-                    that.postDataAction(process.env.VUE_APP_BASE_SCRIPT_URL + '/delete_script_config', params).then(
+                    that.postDataAction(process.env.VUE_APP_BASE_SCRIPT_URL + '/delete_script_config/', params).then(
                         res => {
                             if (res.success) {
                                 const paramsData = that.form.getFieldsValue()
@@ -674,6 +676,7 @@ export default {
             })
         },
         handleOkDownLoad() {
+            this.selectionRows = tqFun(this.selectionRowsAll)
             if (this.selectionRows.length > 0) {
                 this.downLoading = true
                 let params = this.selectionRows.map(item => {
@@ -684,7 +687,7 @@ export default {
                     }
                 })
 
-                downFilePost(process.env.VUE_APP_BASE_SCRIPT_URL + '/export_script_file', params).then(res => {
+                downFilePost(process.env.VUE_APP_BASE_SCRIPT_URL + '/export_script_file/', params).then(res => {
                     this.downLoading = false
                     let blob = new Blob([res], {
                         type: 'application/vnd.openxmlformats-officedocument.spre1adsheetml.sheet'
@@ -743,7 +746,7 @@ export default {
                 params.query_word_pair = this.creativeTag
                 params.operator = this.userInfo().realname
                 params.user_id = this.userInfo().id
-                this.postDataAction(process.env.VUE_APP_BASE_SCRIPT_URL + '/add_script_config', params).then(res => {
+                this.postDataAction(process.env.VUE_APP_BASE_SCRIPT_URL + '/add_script_config/', params).then(res => {
                     if (res.success) {
                         this.handleCancelAll()
                         this.creativeTag = []
@@ -767,6 +770,14 @@ export default {
         onSelectChange(selectedRowKeys, selectionRows) {
             this.selectedRowKeys = selectedRowKeys
             this.selectionRows = selectionRows
+
+            for (let i = 0; i < this.ipagination.current; i++) {
+                this.selectedRowKeysAll.push([])
+                this.selectionRowsAll.push([])
+            }
+            this.selectedRowKeysAll[this.ipagination.current - 1] = selectedRowKeys
+            this.selectionRowsAll[this.ipagination.current - 1] = selectionRows
+            console.log(this.selectedRowKeysAll,this.selectionRowsAll)
         },
         getDataSource(current, pageSize) {
             console.log(pageSize)
@@ -775,8 +786,12 @@ export default {
             this.$nextTick(() => {
                 this.ipagination.current = current
                 this.ipagination.pageSize = pageSize
-                this.selectedRowKeys = []
-                this.selectionRows = []
+                for (let i = 0; i < this.ipagination.current; i++) {
+                    this.selectedRowKeysAll.push([])
+                    this.selectionRowsAll.push([])
+                }
+                this.selectedRowKeys = this.selectedRowKeysAll[current - 1]
+                this.selectionRows = this.selectionRowsAll[current - 1]
                 const paramsData = this.form.getFieldsValue()
                 this.handleGetTableList(paramsData)
             })
@@ -785,6 +800,8 @@ export default {
             this.ipagination.current = 1
             this.selectedRowKeys = []
             this.selectionRows = []
+            this.selectedRowKeysAll = []
+            this.selectionRowsAll = []
             event.preventDefault()
             const paramsData = this.form.getFieldsValue()
             this.handleGetTableList(paramsData)
@@ -798,6 +815,8 @@ export default {
             this.ipagination.current = 1
             this.selectedRowKeys = []
             this.selectionRows = []
+            this.selectedRowKeysAll = []
+            this.selectionRowsAll = []
             this.form.resetFields()
             if (this.tabKey == 1) {
                 this.projectId = undefined
@@ -836,6 +855,7 @@ export default {
                         // }
 
                         this.ipagination.total = result.total_num || 0
+
                         // result.result.total
                     } else {
                         this.$message.error(result.message)
@@ -868,13 +888,14 @@ export default {
             this.columns = this.tabKey == 1 ? [...TTcolumns] : [...KScolumns]
             this.url =
                 this.tabKey == 1
-                    ? process.env.VUE_APP_BASE_SCRIPT_URL + '/get_script_config_lst'
-                    : process.env.VUE_APP_BASE_SCRIPT_URL + '/get_query_word_task_info_lst'
+                    ? process.env.VUE_APP_BASE_SCRIPT_URL + '/get_script_config_lst/'
+                    : process.env.VUE_APP_BASE_SCRIPT_URL + '/get_query_word_task_info_lst/'
             if (this.tabKey == 1) {
                 this.config_id = null
             }
             this.selectedRowKeys = []
             this.selectionRows = []
+            this.form.resetFields()
             const paramsData = this.form.getFieldsValue()
             this.handleGetTableList(paramsData)
         },
@@ -888,18 +909,6 @@ export default {
             }
         },
 
-        tableChange(pagination, filters, sorter, { currentDataSource }) {
-            console.log(pagination)
-            this.ipagination.current = pagination.current
-            this.ipagination.pageSize = pagination.pageSize
-            // if (sorter.order) {
-            //     this.order = sorter.order ? sorter.order : 'descend'
-            //     this.target = sorter.columnKey
-            // }
-            const paramsData = this.form.getFieldsValue()
-            this.handleGetTableList(paramsData)
-        },
-
         // table区域的tab切换
         tableTabChange(key) {
             if (key == 1) {