xia 4 年之前
父节点
当前提交
58204e977a
共有 4 个文件被更改,包括 45 次插入31 次删除
  1. 1 0
      src/types/api.d.ts
  2. 4 4
      src/views/_pageOptions/table-put.ts
  3. 3 3
      src/views/put/put-ad-count.vue
  4. 37 24
      src/views/put/put-ad-plan.vue

+ 1 - 0
src/types/api.d.ts

@@ -101,6 +101,7 @@ export interface ADPlanItem {
   start_time: string;
   start_time: string;
   end_time: string;
   end_time: string;
   budget: string;
   budget: string;
+  id:string;
   aim: string;
   aim: string;
   is_enable:number;
   is_enable:number;
   enable: boolean;
   enable: boolean;

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

@@ -50,8 +50,8 @@ export const TableColumnOfPutAdAccount = [
   },
   },
   {
   {
     title: "用户名",
     title: "用户名",
-    dataIndex: "user_name",
-    key: "user_name",
+    dataIndex: "account_name",
+    key: "account_name",
   },
   },
   {
   {
     title: "平台",
     title: "平台",
@@ -60,8 +60,8 @@ export const TableColumnOfPutAdAccount = [
   },
   },
   {
   {
     title: "推广员",
     title: "推广员",
-    dataIndex: "account_name",
-    key: "account_name",
+    dataIndex: "user_name",
+    key: "user_name",
   },
   },
   {
   {
     title: "状态",
     title: "状态",

+ 3 - 3
src/views/put/put-ad-count.vue

@@ -7,7 +7,7 @@
       :pagination="tablePageOptions"
       :pagination="tablePageOptions"
       :loading="loading.value"
       :loading="loading.value"
       @change="handleTableChange"
       @change="handleTableChange"
-      :scroll="{ x: true }"
+      :scroll="{ x: 1500 }"
     >
     >
     </a-table>
     </a-table>
   </div>
   </div>
@@ -98,9 +98,9 @@ const PutCount = defineComponent({
         if (item.name == "ad_id") {
         if (item.name == "ad_id") {
           lolumnItem.width = 200;
           lolumnItem.width = 200;
         }
         }
-        if (fixedList.includes(item.name)) {
+        /* if (fixedList.includes(item.name)) {
           lolumnItem.fixed = "left";
           lolumnItem.fixed = "left";
-        }
+        } */
         columns.push(lolumnItem);
         columns.push(lolumnItem);
       });
       });
       state.columns = [];
       state.columns = [];

+ 37 - 24
src/views/put/put-ad-plan.vue

@@ -92,10 +92,12 @@
                 size="small"
                 size="small"
                 v-model:value="popForm[currentTbs].condition"
                 v-model:value="popForm[currentTbs].condition"
               >
               >
-                <a-select-option :value="item.name" v-for="item in popForm[currentTbs].report_conditions">
-                  {{item.desc}}
+                <a-select-option
+                  :value="item.name"
+                  v-for="item in popForm[currentTbs].report_conditions"
+                >
+                  {{ item.desc }}
                 </a-select-option>
                 </a-select-option>
-                
               </a-select>
               </a-select>
             </div>
             </div>
             <div class="hover-content">
             <div class="hover-content">
@@ -131,7 +133,10 @@
                 style="width: 150px"
                 style="width: 150px"
               />
               />
             </div>
             </div>
-            <div class="hover-content" v-if="popForm[currentTbs].report_type=='recharge'">
+            <div
+              class="hover-content"
+              v-if="popForm[currentTbs].report_type == 'recharge'"
+            >
               <span class="label">回传付费最低金额</span
               <span class="label">回传付费最低金额</span
               ><a-input
               ><a-input
                 v-model:value="popForm[currentTbs].price"
                 v-model:value="popForm[currentTbs].price"
@@ -197,7 +202,12 @@
       :closable="false"
       :closable="false"
       v-model:visible="visible1"
       v-model:visible="visible1"
     >
     >
-      <put-count :ids="backData.ids" :begin_date="backData.begin_date" :end_date="backData.end_date" :field="backData.field"></put-count>
+      <put-count
+        :ids="backData.ids"
+        :begin_date="backData.begin_date"
+        :end_date="backData.end_date"
+        :field="backData.field"
+      ></put-count>
     </a-drawer>
     </a-drawer>
     <a-drawer
     <a-drawer
       title="注册用户"
       title="注册用户"
@@ -205,7 +215,10 @@
       :closable="false"
       :closable="false"
       v-model:visible="registerVisable"
       v-model:visible="registerVisable"
     >
     >
-      <register-datad :ad_lid="register.ad_lid" :back_platform="register.back_platform"></register-datad>
+      <register-datad
+        :ad_lid="register.ad_lid"
+        :back_platform="register.back_platform"
+      ></register-datad>
     </a-drawer>
     </a-drawer>
   </div>
   </div>
 </template>
 </template>
@@ -253,8 +266,8 @@ const PutAdPlan = defineComponent({
     let { loading, meta, tablePageOptions } = usePagination();
     let { loading, meta, tablePageOptions } = usePagination();
     let list: any[] = [],
     let list: any[] = [],
       opList: any[] = [],
       opList: any[] = [],
-      stList :any = [];
-      
+      stList: any = [];
+
     const state = reactive({
     const state = reactive({
       platform: "platform1",
       platform: "platform1",
       list: ref<ADPlanItem[]>([]),
       list: ref<ADPlanItem[]>([]),
@@ -276,13 +289,13 @@ const PutAdPlan = defineComponent({
       pickerFilter: [moment(), moment()],
       pickerFilter: [moment(), moment()],
       tablePageOptions,
       tablePageOptions,
       columns: list,
       columns: list,
-      backData:{
+      backData: {
         ids: "",
         ids: "",
-        begin_date:'',
-        end_date:'',
-        field:''
+        begin_date: "",
+        end_date: "",
+        field: "",
       },
       },
-      
+
       currentTbs: 0,
       currentTbs: 0,
       hasPopFormData: false,
       hasPopFormData: false,
       popForm: [
       popForm: [
@@ -295,8 +308,8 @@ const PutAdPlan = defineComponent({
         },
         },
       ],
       ],
       optionList: opList,
       optionList: opList,
-      statsList:stList,
-      currentStats:'paid_order_amount',
+      statsList: stList,
+      currentStats: "paid_order_amount",
       defaultColumns: TableColumnOfPutAdPlan,
       defaultColumns: TableColumnOfPutAdPlan,
       fields: {},
       fields: {},
       rangePick: picker,
       rangePick: picker,
@@ -353,9 +366,9 @@ const PutAdPlan = defineComponent({
         state.inSearching = false;
         state.inSearching = false;
       });
       });
     };
     };
-    getAdStatus().then(res=>{
+    getAdStatus().then((res) => {
       state.statsList = res.data;
       state.statsList = res.data;
-    })
+    });
     getCustomColumn().then((res) => {
     getCustomColumn().then((res) => {
       let columns: any[] = [];
       let columns: any[] = [];
       let blackList = [
       let blackList = [
@@ -445,10 +458,10 @@ const PutAdPlan = defineComponent({
         this.$message.success("修改成功!");
         this.$message.success("修改成功!");
       });
       });
     },
     },
-    getregister(record:any) {
-      console.log(record)
+    getregister(record: any) {
+      console.log(record);
       this.register.ad_lid = record.id;
       this.register.ad_lid = record.id;
-      this.register.back_platform =record.delivery_platform;
+      this.register.back_platform = record.delivery_platform;
       this.registerVisable = true;
       this.registerVisable = true;
     },
     },
     onCellChange(record: any, dataIndex: string, value: string) {
     onCellChange(record: any, dataIndex: string, value: string) {
@@ -489,7 +502,7 @@ const PutAdPlan = defineComponent({
     openBackDrawer() {
     openBackDrawer() {
       let ids = "";
       let ids = "";
       this.list.map((item: ADPlanItem) => {
       this.list.map((item: ADPlanItem) => {
-        ids = ids + `,${item.ad_id}`;
+        ids = ids + `,${item.id}`;
       });
       });
       let [begin_dates, end_dates] = this.pickerFilter;
       let [begin_dates, end_dates] = this.pickerFilter;
       let begin_date = moment(begin_dates).format("YYYY-MM-DD");
       let begin_date = moment(begin_dates).format("YYYY-MM-DD");
@@ -539,12 +552,12 @@ export default PutAdPlan;
   margin-right: 10px;
   margin-right: 10px;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  .ant-select{
+  .ant-select {
     width: 100px;
     width: 100px;
   }
   }
-  .label{
+  .label {
     display: inline-block;
     display: inline-block;
-    min-width:80px;
+    min-width: 80px;
   }
   }
 }
 }
 .hover-content {
 .hover-content {