Browse Source

bug 修复

lilei 3 years ago
parent
commit
8939fee37a

+ 1 - 1
public/version.json

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

+ 1 - 0
src/layouts/BasicLayout.vue

@@ -234,6 +234,7 @@ export default {
         description: `临到月底了,请尽快处理系统中没有完结的单据!`
       })
     }
+    this.$store.state.app.isNewTab = true
     // 打印设置
     this.$store.commit('SET_pdfPrintList', [])
     this.$store.commit('SET_showPdfPrint', false)

+ 3 - 2
src/views/allocationManagement/chainTransferOut/list.vue

@@ -271,11 +271,13 @@ export default {
       this.queryParam.allocationType = undefined
       this.queryParam.state = undefined
       this.queryParam.settleState = undefined
+	    if (!flag) {
+	      this.setIsHomeNav(this.$route.name, null)
+	    }
     },
     //  基本信息  保存
     handleOk (data) {
       this.resetData()
-      this.setIsHomeNav(this.$route.name, null)
       this.$router.push({ path: `/allocationManagement/chainTransferOut/add/${data.id}/${data.allocationLinkageOutSn}` })
     },
     //  删除
@@ -386,7 +388,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

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

@@ -242,7 +242,6 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      console.log('resetSearchForm')
       this.resetData()
       this.$refs.table.refresh(true)
     },
@@ -262,11 +261,13 @@ export default {
       this.queryParam.callOutType = undefined
       this.queryParam.state = undefined
       this.queryParam.settleState = undefined
+      if (!flag) {
+        this.setIsHomeNav(this.$route.name, null)
+      }
     },
     //  基本信息  保存
     handleOk (data) {
       this.resetData()
-      this.setIsHomeNav(this.$route.name, null)
       this.$router.push({ path: `/allocationManagement/storeTransferOut/add/${data.id}/${data.storeCallOutSn}` })
     },
     //  删除
@@ -372,7 +373,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

+ 3 - 2
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -213,6 +213,9 @@ export default {
       this.queryParam.outWarehouseSn = undefined
       this.queryParam.putWarehouseSn = undefined
       this.queryParam.state = undefined
+      if (!flag) {
+        this.setIsHomeNav(this.$route.name, null)
+      }
     },
     //  删除
     handleDel (row) {
@@ -264,7 +267,6 @@ export default {
     handleEdit (row, flag) {
       if (!flag) {
         this.resetData()
-        this.setIsHomeNav(this.$route.name, null)
       }
       this.$router.push({ path: `/allocationManagement/warehouseAllocation/edit/${row.id}/${row.allocationWarehouseSn}` })
     },
@@ -289,7 +291,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

+ 3 - 2
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -264,11 +264,13 @@ export default {
       this.queryParam.isGrab = undefined
       this.queryParam.settleState = undefined
       this.queryParam.state = undefined
+      if (!flag) {
+        this.setIsHomeNav(this.$route.name, null)
+      }
     },
     //  基本信息  保存
     handleOk (data) {
       this.resetData()
-      this.setIsHomeNav(this.$route.name, null)
       this.handleEdit(data)
     },
     //  新增
@@ -376,7 +378,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

+ 3 - 2
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -255,7 +255,6 @@ export default {
     //  基本信息  保存
     handleOk (row) {
       this.resetData()
-      this.setIsHomeNav(this.$route.name, null)
       this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/add/${row.id}/${row.sparePartsPurchaseSn}/${row.supplierSn}` })
     },
     //  编辑
@@ -325,6 +324,9 @@ export default {
       this.queryParam.supplierSn = undefined
       this.queryParam.state = undefined
       this.queryParam.settleState = undefined
+      if (!flag) {
+        this.setIsHomeNav(this.$route.name, null)
+      }
     },
     filterOption (input, option) {
       return (
@@ -377,7 +379,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

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

@@ -314,6 +314,7 @@ export default {
       this.queryParam.purchaseBillSource = undefined
       if (!flag) {
         this.$refs.table.refresh(true)
+        this.setIsHomeNav(this.$route.name, null)
       }
     },
     filterOption (input, option) {
@@ -353,7 +354,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

+ 3 - 2
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -215,6 +215,9 @@ export default {
       this.queryParam.purchaseReturnNo = ''
       this.queryParam.state = undefined
       this.queryParam.settleState = undefined
+      if (!flag) {
+        this.setIsHomeNav(this.$route.name, null)
+      }
     },
     //  删除
     handleDel (row) {
@@ -270,7 +273,6 @@ export default {
                 _this.spinning = false
                 // 重置查询条件
                 _this.resetData()
-                _this.setIsHomeNav(_this.$route.name, null)
                 _this.$router.push({ path: `/purchasingManagement/purchaseReturn/add/${data.id}/${data.purchaseReturnSn}/${data.returnTargetName}` })
               } else {
                 _this.spinning = false
@@ -352,7 +354,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

+ 3 - 2
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -245,6 +245,9 @@ export default {
       this.queryParam.settleState = undefined
       this.queryParam.returnTargetSn = undefined
       this.queryParam.grabFlag = undefined
+      if (!flag) {
+        this.setIsHomeNav(this.$route.name, null)
+      }
     },
     // 获取供应商数据
     setPurchaseTragetType (data) {
@@ -276,7 +279,6 @@ export default {
       // 新增后跳转到编辑页,非列表点击的编辑,重置查询条件
       if (!flag) {
         this.resetData()
-        this.setIsHomeNav(this.$route.name, null)
       }
       this.$router.push({ name: row.grabFlag == 1 ? 'purchaseReturnOutSyncGrapEdit' : 'purchaseReturnOutSyncEdit', params: { sn: row.purchaseReturnSn, returnTargetType: row.returnTargetType } })
     },
@@ -347,7 +349,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

+ 3 - 2
src/views/salesManagement/salesQuery/list.vue

@@ -389,7 +389,6 @@ export default {
     // 选择客户成功
     chooseCustomOk (data) {
       this.resetData()
-      this.setIsHomeNav(this.$route.name, null)
       this.$router.push({ name: 'salesAdd', params: { id: data.id, sn: data.salesBillSn, priceType: data.priceType } })
     },
     // 删除
@@ -448,6 +447,9 @@ export default {
       this.queryParam.financialStatus = undefined
       this.queryParam.salesBillSource = undefined
       this.$refs.custList.resetForm()
+      if (!flag) {
+        this.setIsHomeNav(this.$route.name, null)
+      }
     },
     //  导出
     handleExport () {
@@ -496,7 +498,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {

+ 3 - 2
src/views/salesManagement/salesReturn/list.vue

@@ -225,7 +225,6 @@ export default {
       // 新增后跳转到编辑页,非列表点击的编辑,重置查询条件
       if (!flag) {
         this.resetData()
-        this.setIsHomeNav(this.$route.name, null)
       }
       this.$router.push({ name: row.grabFlag == 1 ? 'salesReturnGrabEdit' : 'salesReturnEdit', params: { id: row.id, sn: row.salesReturnSn, buyerSn: row.buyerSn } })
     },
@@ -293,6 +292,9 @@ export default {
       this.queryParam.salesReturnNo = ''
       this.queryParam.state = undefined
       this.$refs.custList.resetForm()
+      if (!flag) {
+        this.setIsHomeNav(this.$route.name, null)
+      }
     },
     // 客户 change
     custChange (obj) {
@@ -318,7 +320,6 @@ export default {
         if (isHomeNav.type == 'new') {
           this.resetSearchForm()
           this.openModal = true
-          this.setIsHomeNav(this.$route.name, null)
         }
         // 待办
         if (isHomeNav.type == 'todo') {