RING:财务页面分页FIX&广告计划数据携带参数FIX

src/views/financial/index.vue

@@ -25,6 +25,7 @@
       @change="handleTableChange"
       rowKey="id"
       bordered
+      :pagination="tablePageOptions"
     >
       <template #advertiser="{ record }">
         <p class="small-font single-line">{{ record.advertiser_name }}</p>
@@ -125,6 +126,7 @@ const Finance = defineComponent({
         state.columns = newlist;
         state.list = data.list as Array<FinanceData>;
         meta.value = data.meta;
+        console.log("TABLE", tablePageOptions);
       } catch (error) {
         console.log("on get books list error");
       } finally {

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

@@ -1,9 +1,14 @@
 <template>
   <div class="page-wrap page-wrap-account page-adplan">
     <tool-bar
-      :text="['ad_id', 'advertiser_id', 'campaign_id','channel_id']"
-      :label="['计划名称', '所属账号', '所属广告组','所属公众号']"
-      :placeholder="['请输入计划名称或ID', '请输入账户名称或ID', '请输入广告组名称或ID','所属公众号']"
+      :text="['ad_id', 'advertiser_id', 'campaign_id', 'channel_id']"
+      :label="['计划名称', '所属账号', '所属广告组', '所属公众号']"
+      :placeholder="[
+        '请输入计划名称或ID',
+        '请输入账户名称或ID',
+        '请输入广告组名称或ID',
+        '所属公众号',
+      ]"
       :defaultVal="defaultToolvalue"
       v-model:loading="inSearching"
       @confirm="onSearch"
@@ -23,15 +28,9 @@
       <div class="tool-bar-item">
         <p class="label">计划状态</p>
         <a-select class="full-width" v-model:value="currentSelectStatus">
-          <a-select-option :value="null" key="3">
-            不限
-          </a-select-option>
-          <a-select-option value="1" key="1">
-            启用
-          </a-select-option>
-          <a-select-option value="0" key="0">
-            不启用
-          </a-select-option>
+          <a-select-option :value="null" key="3"> 不限 </a-select-option>
+          <a-select-option value="1" key="1"> 启用 </a-select-option>
+          <a-select-option value="0" key="0"> 不启用 </a-select-option>
         </a-select>
       </div>
 
@@ -474,10 +473,12 @@ const PutAdPlan = defineComponent({
       state.currentSelect = "";
     }
     if (route.query && route.query.begin_date && route.query.end_date) {
-      state.pickerFilter = [
-        moment(route.query.begin_date as any),
-        moment(route.query.end_date as any),
-      ];
+      // state.pickerFilter = [
+      //   moment("route.query.begin_date" as any),
+      //   moment("route.query.end_date" as any),
+      // ];
+      state.pickerFilter[0] = moment(route.query.begin_date as any);
+      state.pickerFilter[1] = moment(route.query.end_date as any);
     }
 
     getAddStatus().then((res) => {
@@ -507,11 +508,10 @@ const PutAdPlan = defineComponent({
     };
 
     const switchDate = (date: any, dateString: any[]) => {
-      if(Array.isArray(dateString) && dateString.join('')){
-         store.commit(MutationType.setSelectTime, dateString);
-         onSearch(state.fields);
+      if (Array.isArray(dateString) && dateString.join("")) {
+        store.commit(MutationType.setSelectTime, dateString);
+        onSearch(state.fields);
       }
-     
     };
 
     const getData = async (query?: any) => {
@@ -770,9 +770,8 @@ const PutAdPlan = defineComponent({
       this.temData = record;
     },
     confirmEdit() {
-      let { id, back_on, rate, condition, price, float_rate } = this.popForm[
-        this.currentTbs
-      ];
+      let { id, back_on, rate, condition, price, float_rate } =
+        this.popForm[this.currentTbs];
       if (float_rate && float_rate >= rate) {
         this.$message.error("浮动比例必须小于固定回传比例");
         return;