朱鑫波 4 lat temu
rodzic
commit
2692e343fb

+ 12 - 12
src/views/modules/Statistics/yicheStatistics/timeStatistics.vue

@@ -125,7 +125,7 @@ th div {
             :dataSource="data"
             bordered
             id="outTable"
-            :pagination="ipagination"
+            :pagination="false"
             :scroll="{ x: true }"
             :loading="loading"
           >
@@ -148,7 +148,7 @@ import lifting from '../components/lifting'
 import timeCheck from '../components/timeCheck'
 import Treeselect from '../components/Treeselect.vue'
 import { mapGetters } from 'vuex'
-import { JeecgListMixin } from '@/mixins/ipagination'
+// import { JeecgListMixin } from '@/mixins/ipagination'
 
 var length = 0
 var active = 1
@@ -181,12 +181,12 @@ const columns = [
     align: 'center',
     scopedSlots: { customRender: 'activationCost' }
   },
-  {
-    title: '预估成本',
-    dataIndex: 'estimatedCost',
-    align: 'center',
-    scopedSlots: { customRender: 'estimatedCost' }
-  }
+  // {
+  //   title: '预估成本',
+  //   dataIndex: 'estimatedCost',
+  //   align: 'center',
+  //   scopedSlots: { customRender: 'estimatedCost' }
+  // }
 ]
 
 const columnsGroup = columns
@@ -201,7 +201,7 @@ export default {
     timeCheck,
     Treeselect
   },
-  mixins: [JeecgListMixin],
+  // mixins: [JeecgListMixin],
   data: function() {
     return {
       statDate: moment(new Date()),
@@ -298,8 +298,8 @@ export default {
           }
         })
       }
-      this.ipagination.total = this.data.length
-      this.ipagination.current = 1
+      // this.ipagination.total = this.data.length
+      // this.ipagination.current = 1
     },
     disabledDate(current) {
       return current && current > moment().subtract(1, 'day')
@@ -350,7 +350,7 @@ export default {
               this.data = []
             }
           }
-          this.ipagination.total = this.data.length
+          // this.ipagination.total = this.data.length
         }
       })
     },

+ 25 - 5
src/views/modules/kuaishouapp/batchCreation/creat/creatUnit.vue

@@ -178,7 +178,14 @@
           <a-checkbox value="smartisan">锤子</a-checkbox>
         </a-checkbox-group>
       </a-form-item>
-
+      <a-form-item label="投放范围" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
+        :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }"
+        v-if="allianceAccount">
+        <a-radio-group buttonStyle="solid" v-model="allForm.allianceAccount">
+          <a-radio-button value="1">默认</a-radio-button>
+          <a-radio-button value="2">联盟广告</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
       <a-form-item
         label="创建数量"
         :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
@@ -216,7 +223,9 @@
             {{ appModel.templateName }}
           </a-select-option>
         </a-select>
-        <a style="margin: 0 10px" @click="addTemplate(null)">新增模板</a>
+        <a-button type="primary" @click="getTemplate(null)" :loading="templateLoading"> 刷新模板</a-button>
+        <br>
+        <a style="margin: 0 10px 0 0" @click="addTemplate(null)">新增模板</a>
         <a
           @click="lookTemplate(null, getData('templateId'))"
           :disabled="getData('templateId') == '' || getData('templateId') == null"
@@ -1067,6 +1076,7 @@ export default {
 
   data() {
     return {
+      templateLoading: false,
       dataOne: [],
       actionBarTextList: [],
       trackName: '',
@@ -1733,11 +1743,18 @@ export default {
       this.$refs.templateModal.create(localStorage.getItem('campaignAccountId'), 'add')
     },
     getTemplate(accountId) {
+      var data = null
+      if (accountId) {
+        data = accountId
+      } else {
+        this.templateLoading = true
+        data = localStorage.getItem('campaignAccountId')
+      }
       getAction('/batch/kuaishouTemplate/getTemplateByAccountId', {
-        accountId: accountId,
+        accountId: data,
       }).then((res) => {
         if (res.success) {
-          this.getTemplateList(accountId)
+          this.getTemplateList(data)
         }
       })
     },
@@ -1755,6 +1772,9 @@ export default {
               key: index,
             }
           })
+          this.templateLoading = false
+        } else {
+          this.templateLoading = false
         }
       })
     },
@@ -2044,7 +2064,7 @@ export default {
               description: this.allForm.description,
               appStore: values.useAppMarket == true ? this.allForm.appStore : null,
               useAppMarket: values.useAppMarket ? 1 : 0,
-              sceneId: this.allForm.sceneId,
+              sceneId: this.allForm.allianceAccount == '1' ? this.allForm.sceneId : [5],
               scheduleTime:
                 this.allForm.scheduleTime == '2'
                   ? this.allForm.scheduleTimeData

+ 10 - 8
src/views/modules/kuaishouapp/batchCreation/unitList.vue

@@ -75,15 +75,17 @@
 
               <span slot="putStatus" slot-scope="text">{{ text | putStatus }}</span>
               <span slot="reviewDetail" slot-scope="text">
-                <span
-                  v-if="text"
-                  :title="text"
-                  style="margin: 0; display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                >
-                  {{ text }}</span
-                >
+                <div style="display: flex; justify-content: center" v-if="text">
+                  <a :title="text" style="color: rgba(0, 0, 0, 0.65);"> {{ text }}</a>
+                </div>
                 <span v-else>无</span>
               </span>
+              <span slot="creativeReviewDetail" slot-scope="text">
+                <div style="display: flex; justify-content: center">
+                  <a :title="text" style="color: rgba(0, 0, 0, 0.65);"> {{ text }}</a>
+                </div>
+              </span>
+
               <span slot="sceneId" slot-scope="text"
                 ><span v-for="item of text" :key="item">{{ item | sceneId }}</span></span
               >
@@ -817,7 +819,7 @@ export default {
       // 点击改行时要做的事情
       localStorage.setItem('originalityKeyElse', record.unitId)
       localStorage.setItem('campaignList', record.campaignId)
-      
+
       if (localStorage.getItem('originalityElse')) {
         var dataElse = JSON.parse(localStorage.getItem('originalityElse'))
         // for (let i = 0; i < dataElse.length; i++) {