fix:业务数据优化

src/components/datePicker/index.vue

@@ -70,10 +70,22 @@ export default {
   },
   created() {},
   mounted() {
+    console.log(this.$props.form)
+    if(this.$props.form!=undefined){
+      this.timeType=this.$props.form?.timeType
+      this.dateType=this.$props.form?.dateType
+      if(this.$props.form?.timeType=='1'){
+        this.signingTime=[...this.$props.form?.time]
+      }else{
+        this.enterTime=[...this.$props.form?.time]
+      }
+    }
+   
     this.$emit("getList", {
       dateType: this.dateType,
       signingTimeStart: this.signingTime[0],
       signingTimeEnd: this.signingTime[1],
+      timeType:this.timeType
     });
   },
   methods: {
@@ -90,6 +102,7 @@ export default {
         signingTimeEnd: "",
         enterTimeStart: "",
         enterTimeEnd: "",
+        timeType:this.timeType
       });
     },
     onChangeTime(type) {
@@ -100,13 +113,16 @@ export default {
           dateType: undefined,
           signingTimeStart: this.signingTime[0],
           signingTimeEnd: this.signingTime[1],
+          timeType:this.timeType
+
         });
       } else {
         this.$emit("getList", {
           dateType: undefined,
-
           enterTimeStart: this.enterTime[0],
           enterTimeEnd: this.enterTime[1],
+          timeType:this.timeType
+
         });
       }
     },

src/pages/business/agent.vue

@@ -319,7 +319,9 @@ export default {
       treeType: 1,
       userId: "",
       agencyId: "",
-      treeUserId:""
+      treeUserId:"",
+      dateType:"",
+      timeType:""
     };
   },
   created() {},
@@ -354,6 +356,8 @@ export default {
       this.getList();
     },
     timeChange(val) {
+      this.dateType=val.dateType
+      this.timeType=val.timeType
       this.formState = { ...val };
       this.formState.treeUserId =  this.treeUserId;
       this.getList();
@@ -394,10 +398,15 @@ export default {
             treeType: this.treeType,
             treeUserId: this.formState.treeUserId,
           },
+          dateType:this.dateType,
+          timeType:this.timeType,
           time: {
-            createtimeStart: this.formState.createtimeStart,
-            createtimeEnd: this.formState.createtimeEnd,
+            signingTimeEnd: this.formState.signingTimeEnd,
+            signingTimeStart: this.formState.signingTimeStart,
+            enterTimeEnd: this.formState.enterTimeEnd,
+            enterTimeStart: this.formState.enterTimeStart,
           },
+          isEnter:this.formState.signingTimeEnd ? false : true
         },
       });
     },

src/pages/business/channel.vue

@@ -332,8 +332,9 @@ export default {
       treeType: "",
       radio: "a",
       disabled: false,
-      treeUserId:""
-
+      treeUserId:"",
+      dateType:"",
+      timeType:""
     };
   },
   created() {},
@@ -345,6 +346,8 @@ export default {
   methods: {
     timeChange(val) {
       // console.log(val);
+      this.dateType=val.dateType
+      this.timeType=val.timeType
       this.formState = { ...val };
       this.formState.treeUserId =  this.treeUserId;
 
@@ -399,10 +402,15 @@ export default {
             treeType: this.treeType,
             treeUserId: this.formState.treeUserId,
           },
+          dateType:this.dateType,
+          timeType:this.timeType,
           time: {
-            createtimeStart: this.formState.createtimeStart,
-            createtimeEnd: this.formState.createtimeEnd,
+            signingTimeEnd: this.formState.signingTimeEnd,
+            signingTimeStart: this.formState.signingTimeStart,
+            enterTimeEnd: this.formState.enterTimeEnd,
+            enterTimeStart: this.formState.enterTimeStart,
           },
+          isEnter:this.formState.signingTimeEnd ? false : true
         },
       });
     },

src/pages/business/message.vue

@@ -32,7 +32,7 @@
               <dt><span>交强险保费</span></dt>
               <dd>
                 <span>
-                  {{ amount.jqpremium }}
+                  {{ amount.jqpremium || 0}}
                 </span>
               </dd>
             </dl>
@@ -40,7 +40,7 @@
               <dt><span>车船税</span></dt>
               <dd>
                 <span>
-                  {{ amount.taxamount }}
+                  {{ amount.taxamount || 0}}
                 </span>
               </dd>
             </dl>
@@ -67,7 +67,12 @@
         <div class="table-title">
           <h2>保费详情</h2>
           <div>
-            <datePicker @getList="timeChange"></datePicker>
+            <datePicker @getList="timeChange" 
+            :form="{
+             time:time,
+             dateType:formState.dateType,
+             timeType:timeType,
+            }"></datePicker>
             <!-- <span>时间筛选</span>
             <a-range-picker
               @change="onChangeTime"
@@ -197,8 +202,7 @@ export default {
       formState: {
         dateType: undefined,
         time: ["", ""],
-        createtimeStart: "",
-        createtimeEnd: "",
+        
       },
       backLinePersonnel: {},
       columns: columns,
@@ -227,25 +231,46 @@ export default {
       ],
       amount: {},
       process: process.env.VUE_APP_API_BASE_URL,
+      timeType:"",
+      time:[]
     };
   },
   created() {
-    this.formState.time = [
-      this.$route.query.time.createtimeStart,
-      this.$route.query.time.createtimeEnd,
-    ];
+ 
+    if(this.$route.query.isEnter!='false'){
+      this.time = [
+        this.$route.query.time.enterTimeStart,
+        this.$route.query.time.enterTimeEnd,
+      ];
+    }else{
+      this.time = [
+        this.$route.query.time.signingTimeStart,
+        this.$route.query.time.signingTimeEnd,
+      ];
+    }
+  
+    this.formState.dateType=this.$route.query.dateType
+    this.timeType=this.$route.query.timeType
+    this.formState.signingTimeEnd = this.$route.query.time.signingTimeEnd;
+    this.formState.signingTimeStart = this.$route.query.time.signingTimeStart;
+    this.formState.enterTimeEnd = this.$route.query.time.enterTimeEnd;
+    this.formState.enterTimeStart = this.$route.query.time.enterTimeStart;
 
-    this.formState.createtimeStart = this.$route.query.time.createtimeStart;
-    this.formState.createtimeEnd = this.$route.query.time.createtimeEnd;
     // this.getList();
   },
   watch: {
-    "formState.createtimeStart"(val) {
-      this.formState.createtimeStart = val;
-    },
-    "formState.createtimeEnd"(val) {
-      this.formState.createtimeEnd = val;
-    },
+    // "formState.signingTimeEnd"(val) {
+    //   this.formState.signingTimeEnd = val;
+    // },
+    // "formState.signingTimeStart"(val) {
+    //   this.formState.signingTimeStart = val;
+    // },
+    // "formState.enterTimeEnd"(val) {
+    //   this.formState.enterTimeEnd = val;
+    // },
+    // "formState.enterTimeStart"(val) {
+    //   this.formState.enterTimeStart = val;
+    // },
   },
   mounted() {
     // setTimeout(() => {

src/pages/business/orderMessage.vue

@@ -32,7 +32,7 @@
               <dt><span>交强险保费</span></dt>
               <dd>
                 <span>
-                  {{ amount.jqPremium }}
+                  {{ amount.jqPremium || 0}}
                 </span>
               </dd>
             </dl>
@@ -40,7 +40,7 @@
               <dt><span>车船税</span></dt>
               <dd>
                 <span>
-                  {{ amount.taxAmount }}
+                  {{ amount.taxAmount || 0}}
                 </span>
               </dd>
             </dl>
@@ -67,7 +67,12 @@
         <div class="table-title">
           <h2>保费详情</h2>
           <div>
-            <datePicker @getList="timeChange"></datePicker>
+            <datePicker @getList="timeChange" 
+            :form="{
+             time:time,
+             dateType:formState.dateType,
+             timeType:timeType,
+            }"></datePicker>
             <!-- <span>时间筛选</span>
             <a-range-picker
               @change="onChangeTime"
@@ -241,16 +246,29 @@ export default {
       ],
       amount: {},
       process: process.env.VUE_APP_API_BASE_URL,
+      timeType:"",
+      time:[]
     };
   },
   created() {
-    this.formState.time = [
-      this.$route.query.time.createtimeStart,
-      this.$route.query.time.createtimeEnd,
-    ];
-
-    this.formState.createtimeStart = this.$route.query.time.createtimeStart;
-    this.formState.createtimeEnd = this.$route.query.time.createtimeEnd;
+    if(this.$route.query.isEnter!='false'){
+      this.time = [
+        this.$route.query.time.enterTimeStart,
+        this.$route.query.time.enterTimeEnd,
+      ];
+    }else{
+      this.time = [
+        this.$route.query.time.signingTimeStart,
+        this.$route.query.time.signingTimeEnd,
+      ];
+    }
+  
+    this.formState.dateType=this.$route.query.dateType
+    this.timeType=this.$route.query.timeType
+    this.formState.signingTimeEnd = this.$route.query.time.signingTimeEnd;
+    this.formState.signingTimeStart = this.$route.query.time.signingTimeStart;
+    this.formState.enterTimeEnd = this.$route.query.time.enterTimeEnd;
+    this.formState.enterTimeStart = this.$route.query.time.enterTimeStart;
     // this.getList();
   },
   watch: {

src/pages/business/sales.vue

@@ -282,7 +282,9 @@ export default {
         { title: "Tree Node", key: "2", isLeaf: true },
       ],
       amount: {},
-      treeUserId:""
+      treeUserId:"",
+      dateType:"",
+      timeType:""
     };
   },
   mounted() {
@@ -292,7 +294,9 @@ export default {
   },
   methods: {
     timeChange(val) {
-      // console.log(val);
+   
+      this.dateType=val.dateType
+      this.timeType=val.timeType
       this.formState = { ...val };
       this.formState.treeUserId =  this.treeUserId;
 
@@ -308,25 +312,25 @@ export default {
       this.pagination.defaultPageSize = 10;
       this.getVerification();
     },
-    onChangeTime(val) {
-      this.formState.createtimeStart = val[0];
-      this.formState.createtimeEnd = val[1];
-      this.formState.dateType = undefined;
-      this.pagination.current = 1;
-      this.pagination.defaultPageSize = 10;
-      this.getVerification();
-    },
+   
     watchMessage(item) {
       //
       item;
       this.$router.push({
         path: "/business/sales/message",
         query: {
-          user: { ...item },
+          user: { 
+            ...item ,
+          },
+          dateType:this.dateType,
+          timeType:this.timeType,
           time: {
-            createtimeStart: this.formState.createtimeStart,
-            createtimeEnd: this.formState.createtimeEnd,
+            signingTimeEnd: this.formState.signingTimeEnd,
+            signingTimeStart: this.formState.signingTimeStart,
+            enterTimeEnd: this.formState.enterTimeEnd,
+            enterTimeStart: this.formState.enterTimeStart,
           },
+          isEnter:this.formState.signingTimeEnd ? false : true
         },
       });
     },
@@ -337,10 +341,16 @@ export default {
         path: "/business/sales/orderMessage",
         query: {
           user: { ...item },
+          dateType:this.dateType,
+          timeType:this.timeType,
           time: {
-            createtimeStart: this.formState.createtimeStart,
-            createtimeEnd: this.formState.createtimeEnd,
+            signingTimeEnd: this.formState.signingTimeEnd,
+            signingTimeStart: this.formState.signingTimeStart,
+            enterTimeEnd: this.formState.enterTimeEnd,
+            enterTimeStart: this.formState.enterTimeStart,
           },
+          isEnter:this.formState.signingTimeEnd ? false : true
+          
         },
       });
     },

src/router/config.js

@@ -259,7 +259,7 @@ const router = new Router({
           name: '订单详情',
           hidden: true,
           meta: { requiresAuth: true },
-
+          
           component: () => import('@/pages/business/orderMessage'),
         },