Przeglądaj źródła

fix:时间参数优化,分页增加全部数量统计

刘恒 2 lat temu
rodzic
commit
c1f7763f4c

+ 7 - 1
src/pages/business/index.vue

@@ -128,7 +128,7 @@ export default {
         countyId: undefined,
         countyId: undefined,
         houseId: undefined,
         houseId: undefined,
         provinceId: undefined,
         provinceId: undefined,
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         createtimeEnd: undefined,
         createtimeEnd: undefined,
         createtimeStart: undefined,
         createtimeStart: undefined,
@@ -145,6 +145,7 @@ export default {
         showQuickJumper: true, //
         showQuickJumper: true, //
         showSizeChanger: true, //是否可以改变pagesize
         showSizeChanger: true, //是否可以改变pagesize
         selectedRows: [],
         selectedRows: [],
+        showTotal: (total) => `共 ${total} 条数据`,
       },
       },
       process: process.env.VUE_APP_API_BASE_URL,
       process: process.env.VUE_APP_API_BASE_URL,
 
 
@@ -249,6 +250,8 @@ export default {
     flex: 1;
     flex: 1;
     padding: 15px;
     padding: 15px;
     box-sizing: border-box;
     box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
     .back-line-header-title {
     .back-line-header-title {
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
@@ -273,6 +276,9 @@ export default {
         width: 300px;
         width: 300px;
       }
       }
     }
     }
+    .table {
+      flex: 1;
+    }
   }
   }
   > .list-details {
   > .list-details {
     margin-left: 15px;
     margin-left: 15px;

+ 36 - 7
src/pages/financial/verification.vue

@@ -17,9 +17,36 @@
             button-style="solid"
             button-style="solid"
             v-model="formState.days"
             v-model="formState.days"
           >
           >
-            <a-radio-button value="1"> 当天 </a-radio-button>
-            <a-radio-button value="7"> 近7天 </a-radio-button>
-            <a-radio-button value="30"> 近30天 </a-radio-button>
+            <a-radio-button
+              value="1"
+              @click="
+                (formState.time = []),
+                  (formState.beginDate = ''),
+                  (formState.endDate = '')
+              "
+            >
+              当天
+            </a-radio-button>
+            <a-radio-button
+              value="7"
+              @click="
+                (formState.time = []),
+                  (formState.beginDate = ''),
+                  (formState.endDate = '')
+              "
+            >
+              近7天
+            </a-radio-button>
+            <a-radio-button
+              value="30"
+              @click="
+                (formState.time = []),
+                  (formState.beginDate = ''),
+                  (formState.endDate = '')
+              "
+            >
+              近30天
+            </a-radio-button>
           </a-radio-group>
           </a-radio-group>
         </div>
         </div>
       </div>
       </div>
@@ -91,6 +118,7 @@ const columns = [
     scopedSlots: { customRender: "qutationCount" },
     scopedSlots: { customRender: "qutationCount" },
   },
   },
 ];
 ];
+import moment from "moment";
 
 
 export default {
 export default {
   components: {
   components: {
@@ -105,11 +133,11 @@ export default {
         countyId: "",
         countyId: "",
         houseId: "",
         houseId: "",
         provinceId: "",
         provinceId: "",
-        days: "",
-        time: "",
+        days: undefined,
+        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         riskCode: "",
         riskCode: "",
-        endDate: undefined,
-        beginDate: undefined,
+        endDate: moment().format("YYYY-MM-DD"),
+        beginDate: moment().format("YYYY-MM-DD"),
       },
       },
       backLinePersonnel: {},
       backLinePersonnel: {},
       columns: columns,
       columns: columns,
@@ -189,6 +217,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.days = undefined;
       this.getVerification();
       this.getVerification();
     },
     },
     onChange(pagination, filters, sorter, { currentDataSource }) {
     onChange(pagination, filters, sorter, { currentDataSource }) {

+ 26 - 5
src/pages/personnelManage/channel.vue

@@ -18,13 +18,34 @@
             button-style="solid"
             button-style="solid"
             v-model="formState.days"
             v-model="formState.days"
           >
           >
-            <a-radio-button :value="1" @click="formState.time = []">
+            <a-radio-button
+              :value="1"
+              @click="
+                (formState.time = []),
+                  (formState.createtimeStart = ''),
+                  (formState.createtimeEnd = '')
+              "
+            >
               当天
               当天
             </a-radio-button>
             </a-radio-button>
-            <a-radio-button :value="2" @click="formState.time = []">
+            <a-radio-button
+              :value="2"
+              @click="
+                (formState.time = []),
+                  (formState.createtimeStart = ''),
+                  (formState.createtimeEnd = '')
+              "
+            >
               近7天
               近7天
             </a-radio-button>
             </a-radio-button>
-            <a-radio-button :value="3" @click="formState.time = []">
+            <a-radio-button
+              :value="3"
+              @click="
+                (formState.time = []),
+                  (formState.createtimeStart = ''),
+                  (formState.createtimeEnd = '')
+              "
+            >
               近30天
               近30天
             </a-radio-button>
             </a-radio-button>
           </a-radio-group>
           </a-radio-group>
@@ -145,7 +166,7 @@ export default {
         countyId: undefined,
         countyId: undefined,
         houseId: undefined,
         houseId: undefined,
         provinceId: undefined,
         provinceId: undefined,
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         name: undefined,
         name: undefined,
         userCode: undefined,
         userCode: undefined,
@@ -183,7 +204,7 @@ export default {
     timeChange(val) {
     timeChange(val) {
       this.formState.createtimeStart = val[0];
       this.formState.createtimeStart = val[0];
       this.formState.createtimeEnd = val[1];
       this.formState.createtimeEnd = val[1];
-      this.formState.days = 0;
+      this.formState.days = undefined;
 
 
       this.getList();
       this.getList();
     },
     },

+ 4 - 3
src/pages/personnelManage/channel/message.vue

@@ -126,7 +126,8 @@
           :total="pageInfo.total"
           :total="pageInfo.total"
           show-less-items
           show-less-items
           show-size-changer
           show-size-changer
-          show-quick-jumper
+         show-quick-jumper
+          :show-total="(total) => `共 ${total} 条数据`"
           @change="pageChange"
           @change="pageChange"
           :page-size.sync="pageInfo.pageSize"
           :page-size.sync="pageInfo.pageSize"
           :pageSizeOptions="['12', '24', '36', '48']"
           :pageSizeOptions="['12', '24', '36', '48']"
@@ -188,7 +189,7 @@ export default {
         // name: "",
         // name: "",
         // userCode: "",
         // userCode: "",
         time: "",
         time: "",
-        days: "",
+        days: undefined,
         createtimeEnd: undefined,
         createtimeEnd: undefined,
         createtimeStart: undefined,
         createtimeStart: undefined,
       },
       },
@@ -253,7 +254,7 @@ export default {
     timeChange(val) {
     timeChange(val) {
       this.formState.createtimeStart = val[0];
       this.formState.createtimeStart = val[0];
       this.formState.createtimeEnd = val[1];
       this.formState.createtimeEnd = val[1];
-      this.formState.days = 0;
+      this.formState.days = undefined;
       this.getList();
       this.getList();
     },
     },
     getList() {
     getList() {

+ 1 - 0
src/pages/personnelManage/front/personnel.vue

@@ -79,6 +79,7 @@
           show-less-items
           show-less-items
           show-size-changer
           show-size-changer
           show-quick-jumper
           show-quick-jumper
+          :show-total="(total) => `共 ${total} 条数据`"
           @change="pageChange"
           @change="pageChange"
           :page-size.sync="pageInfo.pageSize"
           :page-size.sync="pageInfo.pageSize"
           :pageSizeOptions="['9', '18', '27', '36']"
           :pageSizeOptions="['9', '18', '27', '36']"

+ 40 - 5
src/pages/personnelManage/front/resources.vue

@@ -17,9 +17,36 @@
             button-style="solid"
             button-style="solid"
             v-model="formState.days"
             v-model="formState.days"
           >
           >
-            <a-radio-button :value="1"> 当天 </a-radio-button>
-            <a-radio-button :value="7"> 近7天 </a-radio-button>
-            <a-radio-button :value="30"> 近30天 </a-radio-button>
+            <a-radio-button
+              :value="1"
+              @click="
+                (formState.time = []),
+                  (formState.createtimeStart = ''),
+                  (formState.createtimeEnd = '')
+              "
+            >
+              当天
+            </a-radio-button>
+            <a-radio-button
+              :value="7"
+              @click="
+                (formState.time = []),
+                  (formState.createtimeStart = ''),
+                  (formState.createtimeEnd = '')
+              "
+            >
+              近7天
+            </a-radio-button>
+            <a-radio-button
+              :value="30"
+              @click="
+                (formState.time = []),
+                  (formState.createtimeStart = ''),
+                  (formState.createtimeEnd = '')
+              "
+            >
+              近30天
+            </a-radio-button>
           </a-radio-group>
           </a-radio-group>
         </div>
         </div>
       </div>
       </div>
@@ -107,6 +134,7 @@
           show-less-items
           show-less-items
           show-size-changer
           show-size-changer
           show-quick-jumper
           show-quick-jumper
+          :show-total="(total) => `共 ${total} 条数据`"
           @change="pageChange"
           @change="pageChange"
           :page-size.sync="pageInfo.pageSize"
           :page-size.sync="pageInfo.pageSize"
           :pageSizeOptions="['9', '18', '27', '36']"
           :pageSizeOptions="['9', '18', '27', '36']"
@@ -132,7 +160,7 @@ export default {
         countyId: undefined,
         countyId: undefined,
         houseId: undefined,
         houseId: undefined,
         provinceId: undefined,
         provinceId: undefined,
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         name: undefined,
         name: undefined,
         userCode: undefined,
         userCode: undefined,
@@ -153,6 +181,12 @@ export default {
       loading: false,
       loading: false,
     };
     };
   },
   },
+  watch: {
+    "formState.days"() {
+      this.getList();
+      // this.formState.time = [];
+    },
+  },
   mounted() {
   mounted() {
     this.getList();
     this.getList();
     // setTimeout(() => {
     // setTimeout(() => {
@@ -165,7 +199,8 @@ export default {
     timeChange(val) {
     timeChange(val) {
       this.formState.createtimeStart = val[0];
       this.formState.createtimeStart = val[0];
       this.formState.createtimeEnd = val[1];
       this.formState.createtimeEnd = val[1];
-      // this.getList();
+      this.formState.days = undefined;
+      this.getList();
     },
     },
 
 
     //获取成员列表
     //获取成员列表

+ 1 - 0
src/pages/personnelManage/front/teammanage.vue

@@ -112,6 +112,7 @@
           show-less-items
           show-less-items
           show-size-changer
           show-size-changer
           show-quick-jumper
           show-quick-jumper
+          :show-total="(total) => `共 ${total} 条数据`"
           @change="pageChange"
           @change="pageChange"
           :page-size.sync="pageInfo.pageSize"
           :page-size.sync="pageInfo.pageSize"
           :pageSizeOptions="['12', '24', '36', '48']"
           :pageSizeOptions="['12', '24', '36', '48']"

+ 38 - 7
src/pages/quote/quote.vue

@@ -62,9 +62,36 @@
               @change="getVerification()"
               @change="getVerification()"
               style="margin-left: 10px"
               style="margin-left: 10px"
             >
             >
-              <a-radio-button value="1"> 近1月 </a-radio-button>
-              <a-radio-button value="2"> 近3月 </a-radio-button>
-              <a-radio-button value="3"> 近半年 </a-radio-button>
+              <a-radio-button
+                value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近1月
+              </a-radio-button>
+              <a-radio-button
+                value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近3月
+              </a-radio-button>
+              <a-radio-button
+                value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近半年
+              </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
         </div>
         </div>
@@ -153,6 +180,8 @@
 import StandardTable from "@/components/table/StandardTable";
 import StandardTable from "@/components/table/StandardTable";
 // import mixin from "../../minins/mixin";
 // import mixin from "../../minins/mixin";
 import tree from "@/components/tree/tree";
 import tree from "@/components/tree/tree";
+import moment from "moment";
+
 const columns = [
 const columns = [
   {
   {
     title: "车牌号",
     title: "车牌号",
@@ -189,10 +218,10 @@ export default {
   data() {
   data() {
     return {
     return {
       formState: {
       formState: {
-        dateType: "",
-        time: "",
-        beginDate: undefined,
-        endDate: undefined,
+        dateType: undefined,
+        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
+        beginDate: moment().format("YYYY-MM-DD"),
+        endDate: moment().format("YYYY-MM-DD"),
         licenseno: "",
         licenseno: "",
         userName: "",
         userName: "",
         mobile: "",
         mobile: "",
@@ -211,6 +240,7 @@ export default {
         hideOnSinglePage: false,
         hideOnSinglePage: false,
         showQuickJumper: true, //
         showQuickJumper: true, //
         showSizeChanger: true, //是否可以改变pagesize
         showSizeChanger: true, //是否可以改变pagesize
+        showTotal: (total) => `共 ${total} 条数据`,
       },
       },
       loading: false,
       loading: false,
       wholeList: [],
       wholeList: [],
@@ -241,6 +271,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.dateType = undefined;
       this.getVerification();
       this.getVerification();
     },
     },
     handleFinish() {
     handleFinish() {

+ 38 - 7
src/pages/quote/smallorders/agent.vue

@@ -26,14 +26,41 @@
               v-model="formState.dateType"
               v-model="formState.dateType"
               @change="getVerification()"
               @change="getVerification()"
             >
             >
-              <a-radio-button value="1"> 近1月 </a-radio-button>
-              <a-radio-button value="2"> 近3月 </a-radio-button>
-              <a-radio-button value="3"> 近半年 </a-radio-button>
+              <a-radio-button
+                value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近1月
+              </a-radio-button>
+              <a-radio-button
+                value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近3月
+              </a-radio-button>
+              <a-radio-button
+                value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近半年
+              </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <div style="display: flex">
+      <div style="display: flex; flex: 1">
         <!-- <div style="width: 300px; height: 900px; overflow-y: auto">
         <!-- <div style="width: 300px; height: 900px; overflow-y: auto">
           <a-tree :tree-data="treeData" :replaceFields="replaceFields"></a-tree>
           <a-tree :tree-data="treeData" :replaceFields="replaceFields"></a-tree>
         </div> -->
         </div> -->
@@ -63,6 +90,8 @@
 import StandardTable from "@/components/table/StandardTable";
 import StandardTable from "@/components/table/StandardTable";
 // import mixin from "../../minins/mixin";
 // import mixin from "../../minins/mixin";
 import tree from "@/components/tree/tree";
 import tree from "@/components/tree/tree";
+import moment from "moment";
+
 const columns = [
 const columns = [
   {
   {
     title: "保险公司",
     title: "保险公司",
@@ -153,9 +182,9 @@ export default {
         houseId: "",
         houseId: "",
         provinceId: "",
         provinceId: "",
         dateType: "",
         dateType: "",
-        time: "",
-        beginDate: undefined,
-        endDate: undefined,
+        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
+        beginDate: moment().format("YYYY-MM-DD"),
+        endDate: moment().format("YYYY-MM-DD"),
       },
       },
       backLinePersonnel: {},
       backLinePersonnel: {},
       columns: columns,
       columns: columns,
@@ -169,6 +198,7 @@ export default {
         hideOnSinglePage: false,
         hideOnSinglePage: false,
         showQuickJumper: true, //
         showQuickJumper: true, //
         showSizeChanger: true, //是否可以改变pagesize
         showSizeChanger: true, //是否可以改变pagesize
+        showTotal: (total) => `共 ${total} 条数据`,
       },
       },
       loading: false,
       loading: false,
       wholeList: [],
       wholeList: [],
@@ -211,6 +241,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.dateType = undefined;
       this.getVerification();
       this.getVerification();
     },
     },
     handleFinish() {
     handleFinish() {

+ 37 - 6
src/pages/quote/smallorders/channel.vue

@@ -26,9 +26,36 @@
               v-model="formState.dateType"
               v-model="formState.dateType"
               @change="getVerification()"
               @change="getVerification()"
             >
             >
-              <a-radio-button value="1"> 近1月 </a-radio-button>
-              <a-radio-button value="2"> 近3月 </a-radio-button>
-              <a-radio-button value="3"> 近半年 </a-radio-button>
+              <a-radio-button
+                value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近1月
+              </a-radio-button>
+              <a-radio-button
+                value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近3月
+              </a-radio-button>
+              <a-radio-button
+                value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近半年
+              </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
         </div>
         </div>
@@ -63,6 +90,8 @@
 import StandardTable from "@/components/table/StandardTable";
 import StandardTable from "@/components/table/StandardTable";
 // import mixin from "../../minins/mixin";
 // import mixin from "../../minins/mixin";
 import tree from "@/components/tree/tree";
 import tree from "@/components/tree/tree";
+import moment from "moment";
+
 const columns = [
 const columns = [
   {
   {
     title: "保险公司",
     title: "保险公司",
@@ -153,9 +182,9 @@ export default {
         houseId: "",
         houseId: "",
         provinceId: "",
         provinceId: "",
         dateType: "",
         dateType: "",
-        time: "",
-        beginDate: undefined,
-        endDate: undefined,
+        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
+        beginDate: moment().format("YYYY-MM-DD"),
+        endDate: moment().format("YYYY-MM-DD"),
       },
       },
       backLinePersonnel: {},
       backLinePersonnel: {},
       columns: columns,
       columns: columns,
@@ -169,6 +198,7 @@ export default {
         hideOnSinglePage: false,
         hideOnSinglePage: false,
         showQuickJumper: true, //
         showQuickJumper: true, //
         showSizeChanger: true, //是否可以改变pagesize
         showSizeChanger: true, //是否可以改变pagesize
+        showTotal: (total) => `共 ${total} 条数据`,
       },
       },
       loading: false,
       loading: false,
       wholeList: [],
       wholeList: [],
@@ -212,6 +242,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.dateType = undefined;
       this.getVerification();
       this.getVerification();
     },
     },
     handleFinish() {
     handleFinish() {

+ 37 - 6
src/pages/quote/smallorders/quote.vue

@@ -26,9 +26,36 @@
               v-model="formState.dateType"
               v-model="formState.dateType"
               @change="getVerification()"
               @change="getVerification()"
             >
             >
-              <a-radio-button value="1"> 近1月 </a-radio-button>
-              <a-radio-button value="2"> 近3月 </a-radio-button>
-              <a-radio-button value="3"> 近半年 </a-radio-button>
+              <a-radio-button
+                value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近1月
+              </a-radio-button>
+              <a-radio-button
+                value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近3月
+              </a-radio-button>
+              <a-radio-button
+                value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近半年
+              </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
         </div>
         </div>
@@ -57,6 +84,8 @@
 import StandardTable from "@/components/table/StandardTable";
 import StandardTable from "@/components/table/StandardTable";
 // import mixin from "../../minins/mixin";
 // import mixin from "../../minins/mixin";
 import tree from "@/components/tree/tree";
 import tree from "@/components/tree/tree";
+import moment from "moment";
+
 const columns = [
 const columns = [
   {
   {
     title: "保险公司",
     title: "保险公司",
@@ -147,9 +176,9 @@ export default {
         houseId: "",
         houseId: "",
         provinceId: "",
         provinceId: "",
         dateType: "",
         dateType: "",
-        time: "",
-        beginDate: undefined,
-        endDate: undefined,
+        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
+        beginDate: moment().format("YYYY-MM-DD"),
+        endDate: moment().format("YYYY-MM-DD"),
       },
       },
       backLinePersonnel: {},
       backLinePersonnel: {},
       columns: columns,
       columns: columns,
@@ -163,6 +192,7 @@ export default {
         hideOnSinglePage: false,
         hideOnSinglePage: false,
         showQuickJumper: true, //
         showQuickJumper: true, //
         showSizeChanger: true, //是否可以改变pagesize
         showSizeChanger: true, //是否可以改变pagesize
+        showTotal: (total) => `共 ${total} 条数据`,
       },
       },
       loading: false,
       loading: false,
       wholeList: [],
       wholeList: [],
@@ -203,6 +233,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.dateType = undefined;
       this.getVerification();
       this.getVerification();
     },
     },
     handleFinish() {
     handleFinish() {

+ 2 - 2
src/pages/task/agent.vue

@@ -151,7 +151,7 @@ export default {
         countyId: undefined,
         countyId: undefined,
         houseId: undefined,
         houseId: undefined,
         provinceId: undefined,
         provinceId: undefined,
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         endDate: moment().format("YYYY-MM-DD"),
         endDate: moment().format("YYYY-MM-DD"),
         beginDate: moment().format("YYYY-MM-DD"),
         beginDate: moment().format("YYYY-MM-DD"),
@@ -194,7 +194,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
-      this.formState.days = 0;
+      this.formState.days = undefined;
       this.getBackLinePersonnel();
       this.getBackLinePersonnel();
     },
     },
     handleFinish() {
     handleFinish() {

+ 2 - 2
src/pages/task/channel.vue

@@ -150,7 +150,7 @@ export default {
         countyId: undefined,
         countyId: undefined,
         houseId: undefined,
         houseId: undefined,
         provinceId: undefined,
         provinceId: undefined,
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         endDate: moment().format("YYYY-MM-DD"),
         endDate: moment().format("YYYY-MM-DD"),
         beginDate: moment().format("YYYY-MM-DD"),
         beginDate: moment().format("YYYY-MM-DD"),
@@ -221,7 +221,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
-      this.formState.days = 0;
+      this.formState.days = undefined;
       this.getList();
       this.getList();
     },
     },
 
 

+ 2 - 2
src/pages/task/insurance.vue

@@ -171,7 +171,7 @@ export default {
         countyId: undefined,
         countyId: undefined,
         houseId: undefined,
         houseId: undefined,
         provinceId: undefined,
         provinceId: undefined,
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         endDate: moment().format("YYYY-MM-DD"),
         endDate: moment().format("YYYY-MM-DD"),
         beginDate: moment().format("YYYY-MM-DD"),
         beginDate: moment().format("YYYY-MM-DD"),
@@ -239,7 +239,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
-      this.formState.days = 0;
+      this.formState.days = undefined;
       this.getBackLinePersonnel();
       this.getBackLinePersonnel();
     },
     },
     getCompanyList() {
     getCompanyList() {

+ 33 - 4
src/pages/wallet/agency.vue

@@ -30,9 +30,36 @@
               button-style="solid"
               button-style="solid"
               v-model="formState.days"
               v-model="formState.days"
             >
             >
-              <a-radio-button :value="1"> 当天 </a-radio-button>
-              <a-radio-button :value="2"> 近7天 </a-radio-button>
-              <a-radio-button :value="3"> 近30天 </a-radio-button>
+              <a-radio-button
+                :value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                当天
+              </a-radio-button>
+              <a-radio-button
+                :value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近7天
+              </a-radio-button>
+              <a-radio-button
+                :value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近30天
+              </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
         </div>
         </div>
@@ -70,6 +97,7 @@
             show-less-items
             show-less-items
             show-size-changer
             show-size-changer
             show-quick-jumper
             show-quick-jumper
+            :show-total="(total) => `共 ${total} 条数据`"
             @change="pageChange"
             @change="pageChange"
             :page-size.sync="pageInfo.pageSize"
             :page-size.sync="pageInfo.pageSize"
             :pageSizeOptions="['12', '24', '36', '48']"
             :pageSizeOptions="['12', '24', '36', '48']"
@@ -92,7 +120,7 @@ export default {
   data() {
   data() {
     return {
     return {
       formState: {
       formState: {
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         name: undefined,
         name: undefined,
         userCode: undefined,
         userCode: undefined,
@@ -202,6 +230,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.days = undefined;
       this.getAgencyList();
       this.getAgencyList();
     },
     },
     handleFinish() {
     handleFinish() {

+ 33 - 4
src/pages/wallet/agent.vue

@@ -30,9 +30,36 @@
               button-style="solid"
               button-style="solid"
               v-model="formState.days"
               v-model="formState.days"
             >
             >
-              <a-radio-button :value="1"> 当天 </a-radio-button>
-              <a-radio-button :value="2"> 近7天 </a-radio-button>
-              <a-radio-button :value="3"> 近30天 </a-radio-button>
+              <a-radio-button
+                :value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                当天
+              </a-radio-button>
+              <a-radio-button
+                :value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近7天
+              </a-radio-button>
+              <a-radio-button
+                :value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近30天
+              </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
         </div>
         </div>
@@ -132,6 +159,7 @@
             show-less-items
             show-less-items
             show-size-changer
             show-size-changer
             show-quick-jumper
             show-quick-jumper
+            :show-total="(total) => `共 ${total} 条数据`"
             @change="pageChange"
             @change="pageChange"
             :page-size.sync="pageInfo.pageSize"
             :page-size.sync="pageInfo.pageSize"
             :pageSizeOptions="['12', '24', '36', '48']"
             :pageSizeOptions="['12', '24', '36', '48']"
@@ -197,7 +225,7 @@ export default {
   data() {
   data() {
     return {
     return {
       formState: {
       formState: {
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         name: undefined,
         name: undefined,
         userCode: undefined,
         userCode: undefined,
@@ -308,6 +336,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.days = undefined;
       this.getList();
       this.getList();
     },
     },
     handleFinish() {
     handleFinish() {

+ 33 - 4
src/pages/wallet/channel.vue

@@ -30,9 +30,36 @@
               button-style="solid"
               button-style="solid"
               v-model="formState.days"
               v-model="formState.days"
             >
             >
-              <a-radio-button :value="1"> 当天 </a-radio-button>
-              <a-radio-button :value="2"> 近7天 </a-radio-button>
-              <a-radio-button :value="3"> 近30天 </a-radio-button>
+              <a-radio-button
+                :value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                当天
+              </a-radio-button>
+              <a-radio-button
+                :value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近7天
+              </a-radio-button>
+              <a-radio-button
+                :value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近30天
+              </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
         </div>
         </div>
@@ -122,6 +149,7 @@
             show-less-items
             show-less-items
             show-size-changer
             show-size-changer
             show-quick-jumper
             show-quick-jumper
+            :show-total="(total) => `共 ${total} 条数据`"
             @change="pageChange"
             @change="pageChange"
             :page-size.sync="pageInfo.pageSize"
             :page-size.sync="pageInfo.pageSize"
             :pageSizeOptions="['12', '24', '36', '48']"
             :pageSizeOptions="['12', '24', '36', '48']"
@@ -144,7 +172,7 @@ export default {
   data() {
   data() {
     return {
     return {
       formState: {
       formState: {
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         name: undefined,
         name: undefined,
         userCode: undefined,
         userCode: undefined,
@@ -230,6 +258,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.days = undefined;
       this.getList();
       this.getList();
     },
     },
     handleFinish() {
     handleFinish() {

+ 33 - 4
src/pages/wallet/partner.vue

@@ -29,9 +29,36 @@
               button-style="solid"
               button-style="solid"
               v-model="formState.days"
               v-model="formState.days"
             >
             >
-              <a-radio-button :value="1"> 当天 </a-radio-button>
-              <a-radio-button :value="2"> 近7天 </a-radio-button>
-              <a-radio-button :value="3"> 近30天 </a-radio-button>
+              <a-radio-button
+                :value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                当天
+              </a-radio-button>
+              <a-radio-button
+                :value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近7天
+              </a-radio-button>
+              <a-radio-button
+                :value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.beginDate = ''),
+                    (formState.endDate = '')
+                "
+              >
+                近30天
+              </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
         </div>
         </div>
@@ -124,6 +151,7 @@
             show-less-items
             show-less-items
             show-size-changer
             show-size-changer
             show-quick-jumper
             show-quick-jumper
+            :show-total="(total) => `共 ${total} 条数据`"
             @change="pageChange"
             @change="pageChange"
             :page-size.sync="pageInfo.pageSize"
             :page-size.sync="pageInfo.pageSize"
             :pageSizeOptions="['12', '24', '36', '48']"
             :pageSizeOptions="['12', '24', '36', '48']"
@@ -146,7 +174,7 @@ export default {
   data() {
   data() {
     return {
     return {
       formState: {
       formState: {
-        days: "",
+        days: undefined,
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         name: undefined,
         name: undefined,
         userCode: undefined,
         userCode: undefined,
@@ -233,6 +261,7 @@ export default {
       // console.log(val);
       // console.log(val);
       this.formState.beginDate = val[0];
       this.formState.beginDate = val[0];
       this.formState.endDate = val[1];
       this.formState.endDate = val[1];
+      this.formState.days = undefined;
       this.getList();
       this.getList();
     },
     },
     handleFinish() {
     handleFinish() {