ソースを参照

Merge branch 'develop_yh36_2' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh37

# Conflicts:
#	public/version.json
lilei 1 年間 前
コミット
13ff04d92a

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1710312136479
+  "version": 1710385301874
 }

+ 5 - 5
src/views/allocationManagement/chainTransferOut/list.vue

@@ -433,8 +433,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -442,10 +442,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/allocationManagement/storeTransferOut/list.vue

@@ -424,8 +424,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -433,10 +433,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -350,8 +350,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -359,10 +359,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -383,8 +383,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -392,10 +392,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -384,8 +384,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -393,10 +393,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 2 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -478,10 +478,10 @@ export default {
     console.log(this.getIsHomeNav(), isHomeNav, this.$route.name)
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {
-      this.curBizType = isHomeNav.pageParams.bizType
       this.resetData()
+      this.curBizType = isHomeNav.pageParams.bizType
+      this.$refs.createDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-      this.$refs.createDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.pageInit()
     } else {
       // 如果是新页签打开,则重置当前页面

+ 2 - 2
src/views/financialManagement/financialPayment/list.vue

@@ -482,10 +482,10 @@ export default {
     console.log(this.getIsHomeNav(), isHomeNav, this.$route.name)
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {
-      this.curBizType = isHomeNav.pageParams.bizType
       this.resetData()
+      this.curBizType = isHomeNav.pageParams.bizType
+      this.$refs.createDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-      this.$refs.createDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.pageInit()
     } else {
       // 如果是新页签打开,则重置当前页面

+ 1 - 1
src/views/financialManagement/warehousingAudit/list.vue

@@ -271,8 +271,8 @@ export default {
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {
       this.resetData(true)
+      this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-      this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.$refs.table.refresh(true)
     } else {
       // 如果是新页签打开

+ 1 - 1
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -393,8 +393,8 @@ export default {
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {
       this.resetData(true)
+      this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-	    this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.$refs.table.refresh(true)
     } else {
       // 如果是新页签打开

+ 5 - 5
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -364,8 +364,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetSearchForm(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -373,10 +373,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -362,8 +362,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetSearchForm(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -371,10 +371,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -359,8 +359,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -368,10 +368,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -373,8 +373,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -382,10 +382,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -356,8 +356,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -365,10 +365,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 7 - 10
src/views/salesManagement/salesQuery/list.vue

@@ -573,7 +573,7 @@ export default {
       const b = this.$store.state.app.updateList
       // 是否从首页点击进入
       const isHomeNav = this.getIsHomeNav()[this.$route.name]
-      console.log(a, b)
+      console.log(a, b,'++++++++++++')
       console.log(isHomeNav)
       // 从首页进入,判断式新建还式待办查询
       if (isHomeNav) {
@@ -584,22 +584,19 @@ export default {
         }
         // 待办
         if (isHomeNav.type == 'todo') {
-          this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
-          setTimeout(() => {
-            this.$refs.table.refresh(true)
-          }, 100)
+          this.$refs.table.refresh(true)
         }
       } else {
         // 如果是新页签打开,则重置当前页面
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     }
   },

+ 6 - 5
src/views/salesManagement/salesQueryNew/list.vue

@@ -586,8 +586,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -595,11 +595,12 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
-      }
+      
     }
   },
   watch: {

+ 5 - 5
src/views/salesManagement/salesReturn/list.vue

@@ -322,8 +322,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -331,10 +331,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {