Browse Source

Merge branch 'master' of qk:zhuishuyun/precise_delivery_distribution_front

ringcode 3 years ago
parent
commit
36515d714e

+ 1 - 1
src/views/_pageOptions/table-put.ts

@@ -436,7 +436,7 @@ export const TableColumnOfMoreStat = [
 export const TableColumnOfPutAdPlan = [
   {
     fixed: "left",
-    title: "",
+    title: "计划状态",
     dataIndex: "check",
     width: 80,
     slots: {

+ 3 - 2
src/views/put/ad-countdata.vue

@@ -265,8 +265,9 @@ const Adgroup = defineComponent({
       router.push({ path: "/put/datas/group", query: { advertiser_id: id } });
     };
     const changeTime = (monent: any, string: string[]) => {
-      console.log(string);
-      store.commit(MutationType.setSelectTime, string);
+      if(Array.isArray(string) && string.join('')){
+         store.commit(MutationType.setSelectTime, string);
+      }
     };
     onMounted(getData);
     return {

+ 4 - 2
src/views/put/ad-group.vue

@@ -359,8 +359,10 @@ const Adgroup = defineComponent({
     };
 
     const changeTime = (monent: any, string: string[]) => {
-      console.log(string);
-      store.commit(MutationType.setSelectTime, string);
+      if(Array.isArray(string) && string.join('')){
+        store.commit(MutationType.setSelectTime, string);
+      }
+      
     };
 
     return {

+ 4 - 1
src/views/put/put-ad-count.vue

@@ -97,7 +97,10 @@ const PutCount = defineComponent({
       line: ref<any>(),
     });
     const switchDate = (date: any, dateString: any[]) => {
-      store.commit(MutationType.setSelectTime, dateString);
+      if(Array.isArray(dateString) && dateString.join('')){
+        store.commit(MutationType.setSelectTime, dateString);
+      }
+      
       //getData();
     };
     //监听原始数据重新创建视图

+ 2 - 2
src/views/put/put-ad-plan.vue

@@ -9,7 +9,7 @@
       @confirm="onSearch"
     >
       <div class="tool-bar-item" v-if="optionList.length > 0">
-        <p class="label">计划状态</p>
+        <p class="label">投放状态</p>
         <a-select class="full-width" v-model:value="currentSelect">
           <a-select-option
             v-for="item in optionList"
@@ -21,7 +21,7 @@
       </div>
 
       <div class="tool-bar-item">
-        <p class="label">投放状态</p>
+        <p class="label">计划状态</p>
         <a-select class="full-width" v-model:value="currentSelectStatus">
           <a-select-option :value="null" key="3">
             不限

+ 4 - 2
src/views/put/put-data.vue

@@ -15,7 +15,7 @@
           v-model:value="pickered"
           @change="changeTime"
         />
-      </template>   
+      </template>
       <template v-if="!!is_admin">
         <div class="tool-bar-item">
           <p class="label">推广员</p>
@@ -224,7 +224,9 @@ const PutData = defineComponent({
       getList(data);
     };
     const changeTime = (monent: any, string: string[]) => {
-      store.commit(MutationType.setSelectTime, string);
+      if (Array.isArray(string) && string.join("")) {
+        store.commit(MutationType.setSelectTime, string);
+      }
     };
 
     onMounted(() => {