提交

src/views/ReceivingRecords/index.vue

@@ -3,11 +3,7 @@
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" v-if="orgType != 3">
-        <div
-          class="label"
-        >
-          项目选择：
-        </div>
+        <div class="label">项目选择：</div>
         <div style="margin-left: 8px">
           <el-select
             v-model="searchForm.projectId"
@@ -26,11 +22,7 @@
         </div>
       </div>
       <div class="app-titel">
-        <div
-          class="label"
-        >
-          筛选时间：
-        </div>
+        <div class="label">筛选时间：</div>
         <div class="toptimeqhuan">
           <el-button
             class="btn"
@@ -304,8 +296,7 @@
           style="margin-left: auto; margin-right: 10px"
           v-if="rec_index_downLoad"
         >
-          <el-button @click="downLoad" icon="el-icon-download">
-            导出</el-button>
+          <el-button @click="downLoad" icon="el-icon-download"> 导出</el-button>
         </div>
       </div>
     </div>
@@ -412,7 +403,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="currentPage"
-          :page-sizes="[10, 20,30,40, 50,100]"
+          :page-sizes="[10, 20, 30, 40, 50, 100]"
           :page-size="size"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"
@@ -612,7 +603,7 @@ export default {
       this.searchForm.endDate = this.time[1];
       console.log("时间");
     }
-    
+
     if (this.$route.query.validInvalid) {
       this.searchForm.validInvalid = this.$route.query.validInvalid;
     }
@@ -623,17 +614,24 @@ export default {
       this.searchForm.dateType = this.$route.query.dateType;
     }
     if (this.$route.query.staDate) {
-      // this.searchForm.dateType = this.$route.query.dateType;
       this.searchForm.staDate = this.$route.query.staDate;
     }
     if (this.$route.query.endDate) {
-      // this.searchForm.dateType = this.$route.query.dateType;
       this.searchForm.endDate = this.$route.query.endDate;
     }
     if (this.$route.query.houseId) {
       this.searchForm.projectId = this.$route.query.houseId;
     }
 
+    if (
+      this.$route.query.endDate &&
+      this.$route.query.staDate &&
+      this.time.length == 0
+    ) {
+      this.searchForm.dateType = null;
+      this.time = [this.$route.query.staDate, this.$route.query.endDate];
+    }
+
     // 获取项目列表
     this.zkhousePage();
   },
@@ -658,7 +656,7 @@ export default {
       this.searchForm.endDate = this.time[1];
       console.log("时间");
     }
-    
+
     if (this.$route.query.validInvalid) {
       this.searchForm.validInvalid = this.$route.query.validInvalid;
     }
@@ -669,17 +667,24 @@ export default {
       this.searchForm.dateType = this.$route.query.dateType;
     }
     if (this.$route.query.staDate) {
-      // this.searchForm.dateType = this.$route.query.dateType;
       this.searchForm.staDate = this.$route.query.staDate;
     }
     if (this.$route.query.endDate) {
-      // this.searchForm.dateType = this.$route.query.dateType;
       this.searchForm.endDate = this.$route.query.endDate;
     }
     if (this.$route.query.houseId) {
       this.searchForm.projectId = this.$route.query.houseId;
     }
 
+    if (
+      this.$route.query.endDate &&
+      this.$route.query.staDate &&
+      this.time.length == 0
+    ) {
+      this.searchForm.dateType = null;
+      this.time = [this.$route.query.staDate, this.$route.query.endDate];
+    }
+
     this.rec_index_show = this.permissions["rec_index_show"];
     this.rec_index_text = this.permissions["rec_index_text"];
     this.rec_index_voice = this.permissions["rec_index_voice"];

src/views/Statistics/index.vue

@@ -258,7 +258,7 @@ export default {
       if (i == 1) {
         if (this.TimetoAhoose == 6) {
           Router.push(
-            `/ReceivingRecords/index?validInvalid=0&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime} 23:59:59&houseId=${this.houseId}`
+            `/ReceivingRecords/index?validInvalid=0&staDate=${this.customtime[0]}&endDate=${this.customtime[1]} 23:59:59&houseId=${this.houseId}`
           );
         } else {
           if (this.TimetoAhoose == 0) {
@@ -278,7 +278,7 @@ export default {
       } else if (i == 2) {
         if (this.TimetoAhoose == 6) {
           Router.push(
-            `/ReceivingRecords/index?validInvalid=0&markAdvisor=1&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime} 23:59:59&houseId=${this.houseId}`
+            `/ReceivingRecords/index?validInvalid=0&markAdvisor=1&staDate=${this.customtime[0]}&endDate=${this.customtime[1]} 23:59:59&houseId=${this.houseId}`
           );
         } else {
           if (this.TimetoAhoose == 0) {