Merge branch 'master_year' of https://gogs.zfire.top/linwenxin/jsm-mall-front

src/layout/components/Navbar.vue

@@ -37,11 +37,20 @@
           <el-autocomplete
             v-model="pathurl"
             :fetch-suggestions="querySearchAsync"
-            s
             placeholder="搜索菜单"
             @select="handleSelect"
           ></el-autocomplete>
         </div>
+        <div class="right-menu-item">
+          <el-date-picker
+            v-model="orderYear"
+            @change="orderYearChange"
+            value-format="yyyy"
+            type="year"
+            placeholder="选择年"
+          >
+          </el-date-picker>
+        </div>
         <div
           style="margin-right: 20px; cursor: pointer"
           @click="
@@ -333,6 +342,7 @@ export default {
   },
   data() {
     return {
+      orderYear: localStorage.getItem('orderYearVal') || `${new Date().getFullYear()}`,
       Vue_Translation_Of_Text_Type: window?.Vue_Translation_Of_Text_Type || 'zh',
       pathurl: '',
       visible: false,
@@ -469,6 +479,12 @@ export default {
     this.$store.commit('app/SET_L1_PATH', this.path)
   },
   methods: {
+    orderYearChange(v) {
+      localStorage.setItem('orderYearVal', v)
+      setTimeout(() => {
+        location.reload()
+      }, 300)
+    },
     tizhuanyemian(item) {
       if (item.type == 4) {
         this.$router.push({ name: item.name })

src/utils/request.js

@@ -30,6 +30,7 @@ service.interceptors.request.use(
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
       config.headers['x-token'] = store.getters.token
+      config.headers['orderYear'] = localStorage.getItem('orderYearVal') || new Date().getFullYear()
     }
     return config
   },

src/views/workOrder/orderHome/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="dashboard_container">
     <div class="refresh">
-      <el-date-picker
+      <!-- <el-date-picker
         style="width: 130px"
         v-model="value1"
         format="yyyy"
@@ -9,7 +9,7 @@
         type="year"
         placeholder="选择日期"
       >
-      </el-date-picker>
+      </el-date-picker> -->
       <span style="color: #1d82ff; margin-left: 20px" @click="refreshData">刷新数据</span>
       <i class="el-icon-refresh-left" style="color: #1d82ff" @click="refreshData"></i>
     </div>
@@ -65,7 +65,7 @@ export default {
       qtsm: [],
       qtddqs: {},
       wglxfb: {},
-      value1: new Date()
+      value1: localStorage.getItem('orderYearVal') || new Date().getFullYear()
     }
   },
   watch: {
@@ -151,12 +151,13 @@ export default {
     },
     getCount() {
       getCount(
-        this.value1
-          ? {
-              startTime: `${new Date(this.value1).getFullYear()}-01-01 00:00:00`,
-              endTime: `${new Date(this.value1).getFullYear()}-12-31 23:59:59`
-            }
-          : {}
+        {}
+        // this.value1
+        //   ? {
+        //       startTime: `${new Date(this.value1).getFullYear()}-01-01 00:00:00`,
+        //       endTime: `${new Date(this.value1).getFullYear()}-12-31 23:59:59`
+        //     }
+        //   : {}
       ).then(res => {
         this.tabs[0].num = res.data.dpg || 0
         this.tabs[1].num = res.data.dyy || 0

src/views/workOrder/workOrderPool/index.vue

@@ -17,7 +17,7 @@
       :replaceOrNotMap="true"
       :defaultSearchData="defaultSearchData"
     >
-      <div slot="moreSearch">
+      <!-- <div slot="moreSearch">
         <div style="margin-bottom: 10px">
           <span
             style="
@@ -40,7 +40,7 @@
           >
           </el-date-picker>
         </div>
-      </div>
+      </div> -->
       <!-- 创建工单 -->
       <div class="cartographer_big" v-if="!(!!~['detail'].indexOf(pageType) && pageCode != '')">
         <el-dialog
@@ -205,7 +205,7 @@ export default {
       defaultSearchData: [],
       workOrderType: 1,
       cloneWorkOrder: null,
-      value1: new Date(),
+      // value1: new Date(),
       showTableBool: true,
       fuhezhuangtai: {
         DSHPG: [
@@ -230,12 +230,12 @@ export default {
     }
   },
   watch: {
-    value1() {
-      this.showTableBool = false
-      this.$nextTick(() => {
-        this.showTableBool = true
-      })
-    }
+    // value1() {
+    //   this.showTableBool = false
+    //   this.$nextTick(() => {
+    //     this.showTableBool = true
+    //   })
+    // }
   },
   computed: {
     moreParameters() {
@@ -636,28 +636,28 @@ export default {
         if (pam.orderSmallTypeText) {
           pam.params.push({ param: 'a.order_small_type_text', compare: '=', value: pam.orderSmallTypeText })
         }
-        if (this.value1) {
-          pam.params.push(
-            { param: 'a.create_time', compare: '>=', value: `${new Date(this.value1).getFullYear()}-01-01 00:00:00` },
-            { param: 'a.create_time', compare: '<=', value: `${new Date(this.value1).getFullYear()}-12-31 23:59:59` }
-          )
-        }
+        // if (this.value1) {
+        //   pam.params.push(
+        //     { param: 'a.create_time', compare: '>=', value: `${new Date(this.value1).getFullYear()}-01-01 00:00:00` },
+        //     { param: 'a.create_time', compare: '<=', value: `${new Date(this.value1).getFullYear()}-12-31 23:59:59` }
+        //   )
+        // }
         cb && cb(pam)
         return orderBaseList(pam)
       } catch (err) {
       } finally {
         this.$nextTick(() => {
           this.getOrderBaseStatusCount({
-            orderSmallTypeText: pam.orderSmallTypeText || '',
-            ...(() => {
-              if (this.value1) {
-                return {
-                  startTime: `${new Date(this.value1).getFullYear()}-01-01 00:00:00`,
-                  endTime: `${new Date(this.value1).getFullYear()}-12-31 23:59:59`
-                }
-              }
-              return {}
-            })()
+            orderSmallTypeText: pam.orderSmallTypeText || ''
+            // ...(() => {
+            //   if (this.value1) {
+            //     return {
+            //       startTime: `${new Date(this.value1).getFullYear()}-01-01 00:00:00`,
+            //       endTime: `${new Date(this.value1).getFullYear()}-12-31 23:59:59`
+            //     }
+            //   }
+            //   return {}
+            // })()
           })
         })
       }

src/views/workOrder/workOrderPool2/index.vue

@@ -17,7 +17,7 @@
       :replaceOrNotMap="true"
       :defaultSearchData="defaultSearchData"
     >
-      <div slot="moreSearch">
+      <!-- <div slot="moreSearch">
         <div style="margin-bottom: 10px">
           <span
             style="
@@ -40,7 +40,7 @@
           >
           </el-date-picker>
         </div>
-      </div>
+      </div> -->
       <!-- 创建工单 -->
       <div class="cartographer_big" v-if="!(!!~['detail'].indexOf(pageType) && pageCode != '')">
         <el-dialog
@@ -208,7 +208,7 @@ export default {
       defaultSearchData: [],
       workOrderType: 1,
       cloneWorkOrder: null,
-      value1: new Date(),
+      // value1: new Date(),
       showTableBool: true,
       fuhezhuangtai: {
         DSHPG: [
@@ -233,12 +233,12 @@ export default {
     }
   },
   watch: {
-    value1() {
-      this.showTableBool = false
-      this.$nextTick(() => {
-        this.showTableBool = true
-      })
-    }
+    // value1() {
+    //   this.showTableBool = false
+    //   this.$nextTick(() => {
+    //     this.showTableBool = true
+    //   })
+    // }
   },
   computed: {
     moreParameters() {
@@ -639,28 +639,28 @@ export default {
         if (pam.orderSmallTypeText) {
           pam.params.push({ param: 'a.order_small_type_text', compare: '=', value: pam.orderSmallTypeText })
         }
-        if (this.value1) {
-          pam.params.push(
-            { param: 'a.create_time', compare: '>=', value: `${new Date(this.value1).getFullYear()}-01-01 00:00:00` },
-            { param: 'a.create_time', compare: '<=', value: `${new Date(this.value1).getFullYear()}-12-31 23:59:59` }
-          )
-        }
+        // if (this.value1) {
+        //   pam.params.push(
+        //     { param: 'a.create_time', compare: '>=', value: `${new Date(this.value1).getFullYear()}-01-01 00:00:00` },
+        //     { param: 'a.create_time', compare: '<=', value: `${new Date(this.value1).getFullYear()}-12-31 23:59:59` }
+        //   )
+        // }
         cb && cb(pam)
         return orderEsBaseListEs(pam)
       } catch (err) {
       } finally {
         this.$nextTick(() => {
           this.getOrderBaseStatusCount({
-            orderSmallTypeText: pam.orderSmallTypeText || '',
-            ...(() => {
-              if (this.value1) {
-                return {
-                  startTime: `${new Date(this.value1).getFullYear()}-01-01 00:00:00`,
-                  endTime: `${new Date(this.value1).getFullYear()}-12-31 23:59:59`
-                }
-              }
-              return {}
-            })()
+            orderSmallTypeText: pam.orderSmallTypeText || ''
+            // ...(() => {
+            //   if (this.value1) {
+            //     return {
+            //       startTime: `${new Date(this.value1).getFullYear()}-01-01 00:00:00`,
+            //       endTime: `${new Date(this.value1).getFullYear()}-12-31 23:59:59`
+            //     }
+            //   }
+            //   return {}
+            // })()
           })
         })
       }