1

src/components/DirectCustomer/components/directCustomerList.vue

@@ -283,8 +283,8 @@
         <li>
           <span>
             <em>{{$t('objFill.v101.zhuceshij')}}</em>
-            <el-date-picker class="h34 w250" v-model="missionDate" @change="timeAdd()" type="daterange"
-                    value-format="yyyy-MM-dd">
+            <el-date-picker class="h34 w250" v-model="EnterTime" @change="timeAdd()" type="daterange"
+                    value-format="yyyy/MM/dd">
             </el-date-picker>
           </span>
         </li>
@@ -393,6 +393,7 @@
         loading: true,
         EmployeeList: [],
         missionDate: [],
+        EnterTime :[],
         // defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
         msg: {
           pageIndex: 1,
@@ -419,16 +420,23 @@
       },
         pagesTitle(val, oldval) {
       },
+      $route:{
+        handler(val, oldVal) {
+          console.log(val,'-----')
+        },
+        deep: true,
+        immediate:true,
+      }
     },
     methods: {
           timeAdd(t) { // 日期格式
-          if (!this.missionDate) {
+          if (!this.EnterTime ) {
             this.msg.CStartTime = '';
             this.msg.CEndDate = '';
             return
           }
-          this.msg.CStartTime = this.missionDate[0];
-          this.msg.CEndDate = this.missionDate[1];
+          this.msg.CStartTime = this.EnterTime [0];
+          this.msg.CEndDate = this.EnterTime [1];
         
       },
       handleCurrentChange(val) {
@@ -615,13 +623,26 @@
       if (id) {
         this.msg.ID = id;
       }
+       this.EnterTime=[];
        if (this.$route.query.EnterTime) {
         this.EnterTime = this.$route.query.EnterTime
         this.msg.CStartTime = this.EnterTime[0];
         this.msg.CEndDate = this.EnterTime[1];
       }
-      this.selectResource();
-      this.getCompanyList();
+        this.msg.CStartTime = this.$route.query.CStartTime?this.$route.query.CStartTime:'';
+        this.msg.CEndDate = this.$route.query.CEndDate?this.$route.query.CEndDate:'';
+        this.EnterTime=[this.msg.CStartTime,this.msg.CEndDate];
+      if (this.$route.query.BranchId) {
+        if(this.$route.query.BranchId!="-1"){
+            this.msg.BranchId = this.$route.query.BranchId+"";
+        }
+      }
+      if (this.$route.query.EnterID) {
+        this.msg.EnterID = this.$route.query.EnterID;
+      }
+        this.getCompanyList();
+       this.selectResource();
+    
     }
   };