From 0a1f18cff91b3c545ba6a167d2793060eab896da Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Wed, 14 May 2025 11:41:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8D=95=E6=8D=AE=E4=B8=AD?= =?UTF-8?q?=E8=BD=AC=E4=B8=8B=E4=B8=80=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=B9=B6=E5=AE=A1=E6=A0=B8=E7=9A=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/bill/PurchaseApplyList.vue | 2 +- jshERP-web/src/views/bill/PurchaseInList.vue | 2 +- .../src/views/bill/PurchaseOrderList.vue | 2 +- jshERP-web/src/views/bill/RetailOutList.vue | 2 +- jshERP-web/src/views/bill/SaleOrderList.vue | 4 +-- jshERP-web/src/views/bill/SaleOutList.vue | 2 +- .../src/views/bill/mixins/BillListMixin.js | 34 +++++++++++-------- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/jshERP-web/src/views/bill/PurchaseApplyList.vue b/jshERP-web/src/views/bill/PurchaseApplyList.vue index e8254bb6..0a1096bf 100644 --- a/jshERP-web/src/views/bill/PurchaseApplyList.vue +++ b/jshERP-web/src/views/bill/PurchaseApplyList.vue @@ -75,7 +75,7 @@
新增 删除 - 转采购订单 + 转采购订单 强制结单 diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 2772c743..5964a411 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -115,7 +115,7 @@
新增 删除 - 转采购退货 + 转采购退货 强制结单 diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index cd248588..09889228 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -94,7 +94,7 @@
新增 删除 - 转采购入库 + 转采购入库 强制结单 diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 90b02c7a..2237581e 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -100,7 +100,7 @@
新增 删除 - 转零售退货 + 转零售退货 审核 反审核 导出 diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 2b3d30a6..6300411b 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -85,8 +85,8 @@
新增 删除 - 转销售出库 - 转采购订单-以销定购 + 转销售出库 + 转采购订单-以销定购 强制结单 diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 8edd53a8..257cf6d2 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -116,7 +116,7 @@
新增 删除 - 转销售退货 + 转销售退货 强制结单 diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js index 22d3b0ea..368aa81e 100644 --- a/jshERP-web/src/views/bill/mixins/BillListMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js @@ -399,12 +399,12 @@ export const BillListMixin = { { title: '备注', dataIndex: 'remark'} ], quickBtn: { - retailBack: false, - purchaseOrder: false, - purchaseIn: false, - purchaseBack: false, - saleOut: false, - saleBack: false + retailBack: '', + purchaseOrder: '', + purchaseIn: '', + purchaseBack: '', + saleOut: '', + saleBack: '' }, queryParam: { beginTime: getPrevMonthFormatDate(3), @@ -699,12 +699,12 @@ export const BillListMixin = { if (btnStrList) { for (let i = 0; i < btnStrList.length; i++) { if (btnStrList[i].btnStr) { - this.quickBtn.retailBack = btnStrList[i].url === '/bill/retail_back'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.retailBack - this.quickBtn.purchaseOrder = btnStrList[i].url === '/bill/purchase_order'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.purchaseOrder - this.quickBtn.purchaseIn = btnStrList[i].url === '/bill/purchase_in'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.purchaseIn - this.quickBtn.purchaseBack = btnStrList[i].url === '/bill/purchase_back'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.purchaseBack - this.quickBtn.saleOut = btnStrList[i].url === '/bill/sale_out'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.saleOut - this.quickBtn.saleBack = btnStrList[i].url === '/bill/sale_back'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.saleBack + this.quickBtn.retailBack = btnStrList[i].url === '/bill/retail_back'?btnStrList[i].btnStr:this.quickBtn.retailBack + this.quickBtn.purchaseOrder = btnStrList[i].url === '/bill/purchase_order'?btnStrList[i].btnStr:this.quickBtn.purchaseOrder + this.quickBtn.purchaseIn = btnStrList[i].url === '/bill/purchase_in'?btnStrList[i].btnStr:this.quickBtn.purchaseIn + this.quickBtn.purchaseBack = btnStrList[i].url === '/bill/purchase_back'?btnStrList[i].btnStr:this.quickBtn.purchaseBack + this.quickBtn.saleOut = btnStrList[i].url === '/bill/sale_out'?btnStrList[i].btnStr:this.quickBtn.saleOut + this.quickBtn.saleBack = btnStrList[i].url === '/bill/sale_back'?btnStrList[i].btnStr:this.quickBtn.saleBack } } } @@ -725,7 +725,7 @@ export const BillListMixin = { }) }, //跳转到下一个单据页面 - transferBill(type) { + transferBill(type, quickBtnStr) { if (this.selectedRowKeys.length <= 0) { this.$message.warning('请选择一条记录！') } else if (this.selectedRowKeys.length > 1) { @@ -758,18 +758,22 @@ export const BillListMixin = { } if(type === '转采购订单-以销定购') { this.$refs.transferPurchaseModalForm.action = "add" - this.$refs.transferPurchaseModalForm.isCanCheck = false this.$refs.transferPurchaseModalForm.transferParam = transferParam this.$refs.transferPurchaseModalForm.defaultDepotId = this.defaultDepotId this.$refs.transferPurchaseModalForm.add() this.$refs.transferPurchaseModalForm.title = type + if(quickBtnStr.indexOf(2)===-1) { + this.$refs.transferPurchaseModalForm.isCanCheck = false + } } else { this.$refs.transferModalForm.action = "add" - this.$refs.transferModalForm.isCanCheck = false this.$refs.transferModalForm.transferParam = transferParam this.$refs.transferModalForm.defaultDepotId = this.defaultDepotId this.$refs.transferModalForm.add() this.$refs.transferModalForm.title = type + if(quickBtnStr.indexOf(2)===-1) { + this.$refs.transferModalForm.isCanCheck = false + } } } })