From 24ee142f5569f894291be48334e60afaacf16d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 18 May 2022 23:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/views/bill/mixins/BillListMixin.js | 9 +++++++++ jshERP-web/src/views/bill/mixins/BillModalMixin.js | 9 ++++++++- jshERP-web/src/views/bill/modules/AllocationOutModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/AssembleModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/DisassembleModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/OtherInModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/OtherOutModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/PurchaseBackModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/PurchaseInModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/RetailBackModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/RetailOutModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/SaleBackModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/SaleOrderModal.vue | 8 +++++++- jshERP-web/src/views/bill/modules/SaleOutModal.vue | 8 +++++++- .../src/views/financial/mixins/FinancialListMixin.js | 6 ++++++ .../src/views/financial/mixins/FinancialModalMixin.js | 9 ++++++++- .../src/views/financial/modules/AdvanceInModal.vue | 8 +++++++- jshERP-web/src/views/financial/modules/GiroModal.vue | 8 +++++++- jshERP-web/src/views/financial/modules/ItemInModal.vue | 8 +++++++- jshERP-web/src/views/financial/modules/ItemOutModal.vue | 8 +++++++- jshERP-web/src/views/financial/modules/MoneyInModal.vue | 8 +++++++- jshERP-web/src/views/financial/modules/MoneyOutModal.vue | 8 +++++++- 23 files changed, 164 insertions(+), 21 deletions(-) diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js index 05ac0dc5..e3f749da 100644 --- a/jshERP-web/src/views/bill/mixins/BillListMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js @@ -32,10 +32,16 @@ export const BillListMixin = { methods: { myHandleAdd() { this.$refs.modalForm.action = "add"; + if(this.btnEnableList.indexOf(2)===-1) { + this.$refs.modalForm.isCanCheck = false + } this.handleAdd(); }, myHandleCopyAdd(record) { this.$refs.modalForm.action = "copyAdd"; + if(this.btnEnableList.indexOf(2)===-1) { + this.$refs.modalForm.isCanCheck = false + } this.$refs.modalForm.edit(record); this.$refs.modalForm.title = "复制新增"; this.$refs.modalForm.disableSubmit = false; @@ -43,6 +49,9 @@ export const BillListMixin = { myHandleEdit(record) { if(record.status === '0') { this.$refs.modalForm.action = "edit"; + if(this.btnEnableList.indexOf(2)===-1) { + this.$refs.modalForm.isCanCheck = false + } this.handleEdit(record); } else { this.$message.warning("抱歉，只有未审核的单据才能编辑！") diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 04e439bc..534fb5c6 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -25,6 +25,8 @@ export const BillModalMixin = { billUnitPirce: '', scanBarCode: '', scanStatus: true, + billStatus: '0', + isCanCheck: true, isTenant: false, spans: { labelCol1: {span: 2}, @@ -710,6 +712,11 @@ export const BillModalMixin = { stopScan() { this.scanStatus = true this.scanBarCode = '' - } + }, + //保存并审核 + handleOkAndCheck() { + this.billStatus = '1' + this.handleOk() + }, } } \ No newline at end of file diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 05115058..5cf88572 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -180,6 +184,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) @@ -227,6 +232,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index 7d168fb4..4014136d 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -180,6 +184,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) @@ -228,6 +233,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index f59d8e42..9c076f9f 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -180,6 +184,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) @@ -227,6 +232,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index 18a768a4..50c9602a 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -206,6 +210,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) @@ -257,6 +262,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index 07c6cbdb..2f52ea14 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -204,6 +208,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) @@ -255,6 +260,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 888a50f1..a38db35d 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -281,6 +285,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) @@ -347,6 +352,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 8857cbbd..e1373eb2 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -10,11 +10,15 @@ v-bind:prefixNo="prefixNo" switchHelp switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -301,6 +305,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.rowCanEdit = true this.materialTable.columns[1].type = FormTypes.popupJsh this.changeColumnHide() @@ -376,6 +381,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 7ed51135..b2439b7c 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -10,11 +10,15 @@ v-bind:prefixNo="prefixNo" switchHelp switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -226,6 +230,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.rowCanEdit = true this.materialTable.columns[1].type = FormTypes.popupJsh this.getSystemConfig() @@ -280,6 +285,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index d08bd999..4dc15756 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -264,6 +268,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) @@ -325,6 +330,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 1a7c24f8..88800491 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -10,11 +10,15 @@ v-bind:prefixNo="prefixNo" switchHelp switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -276,6 +280,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) @@ -344,6 +349,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index c3500a05..a035f396 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -288,6 +292,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() this.changeFormTypes(this.materialTable.columns, 'snList', 0) this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0) @@ -360,6 +365,7 @@ billMain.id = this.model.id } billMain.salesMan = this.personList.value + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index f1e1b520..f69a379d 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -10,11 +10,15 @@ v-bind:prefixNo="prefixNo" switchHelp switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -219,6 +223,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.changeColumnHide() if (this.action === 'add') { this.addInit(this.prefixNo) @@ -274,6 +279,7 @@ billMain.id = this.model.id } billMain.salesMan = this.personList.value + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 49201c70..f403b6ca 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -10,11 +10,15 @@ v-bind:prefixNo="prefixNo" switchHelp switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" :id="prefixNo" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -305,6 +309,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' this.rowCanEdit = true this.materialTable.columns[1].type = FormTypes.popupJsh this.changeColumnHide() @@ -382,6 +387,7 @@ billMain.id = this.model.id } billMain.salesMan = this.personList.value + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js index 96b2c41a..f6b0e3c9 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js @@ -33,11 +33,17 @@ export const FinancialListMixin = { methods: { myHandleAdd() { this.$refs.modalForm.action = "add"; + if(this.btnEnableList.indexOf(2)===-1) { + this.$refs.modalForm.isCanCheck = false + } this.handleAdd(); }, myHandleEdit(record) { if(record.status === '0') { this.$refs.modalForm.action = "edit"; + if(this.btnEnableList.indexOf(2)===-1) { + this.$refs.modalForm.isCanCheck = false + } this.handleEdit(record); } else { this.$message.warning("抱歉，只有未审核的单据才能编辑！") diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index 0e33a62f..c96d99a9 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -15,6 +15,8 @@ export const FinancialModalMixin = { organList: [], personList: [], accountList: [], + billStatus: '0', + isCanCheck: true, isTenant: false, spans: { labelCol1: {span: 2}, @@ -244,6 +246,11 @@ export const FinancialModalMixin = { }); typeof success === 'function' ? success(res) : '' tab.loading = false - } + }, + //保存并审核 + handleOkAndCheck() { + this.billStatus = '1' + this.handleOk() + }, } } \ No newline at end of file diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue index 79611ae0..978d8b8c 100644 --- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue +++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -180,6 +184,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' if (this.action === 'add') { this.addInit("SYF") this.fileList = [] @@ -217,6 +222,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue index 45e04a09..3c5b5985 100644 --- a/jshERP-web/src/views/financial/modules/GiroModal.vue +++ b/jshERP-web/src/views/financial/modules/GiroModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -191,6 +195,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' if (this.action === 'add') { this.addInit("ZZ") this.fileList = [] @@ -229,6 +234,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index db08054b..f5ced3bf 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -204,6 +208,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' if (this.action === 'add') { this.addInit("SR") this.fileList = [] @@ -242,6 +247,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index 684f858a..83ae67a7 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -204,6 +208,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' if (this.action === 'add') { this.addInit("ZC") this.fileList = [] @@ -243,6 +248,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index 537bf84a..4bd29470 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -226,6 +230,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' if (this.action === 'add') { this.addInit("SK") this.fileList = [] @@ -263,6 +268,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr), diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index b704fcc1..71aa11ca 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -8,10 +8,14 @@ :keyboard="false" :forceRender="true" switchFullscreen - @ok="handleOk" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden"> + @@ -229,6 +233,7 @@ methods: { //调用完edit()方法之后会自动调用此方法 editAfter() { + this.billStatus = '0' if (this.action === 'add') { this.addInit("FK") this.fileList = [] @@ -267,6 +272,7 @@ if(this.model.id){ billMain.id = this.model.id } + billMain.status = this.billStatus return { info: JSON.stringify(billMain), rows: JSON.stringify(detailArr),