From b6741cffc74f6578466c0075179de83485520ef7 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Tue, 30 Apr 2024 00:20:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E3=80=81=E5=AE=A2=E6=88=B7=E3=80=81?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E3=80=81=E8=B4=A6=E5=8F=B7=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AE=8C=E4=B9=8B=E5=90=8E=E9=BB=98=E8=AE=A4=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/bill/mixins/BillModalMixin.js | 35 +++++++++++++------ .../src/views/bill/modules/OtherInModal.vue | 2 +- .../src/views/bill/modules/OtherOutModal.vue | 2 +- .../views/bill/modules/PurchaseBackModal.vue | 4 +-- .../views/bill/modules/PurchaseInModal.vue | 4 +-- .../views/bill/modules/PurchaseOrderModal.vue | 4 +-- .../views/bill/modules/RetailBackModal.vue | 9 +++-- .../src/views/bill/modules/RetailOutModal.vue | 9 +++-- .../src/views/bill/modules/SaleBackModal.vue | 4 +-- .../src/views/bill/modules/SaleOrderModal.vue | 4 +-- .../src/views/bill/modules/SaleOutModal.vue | 4 +-- 11 files changed, 50 insertions(+), 31 deletions(-) diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 7237d46b..1a33fa7e 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -169,27 +169,36 @@ export const BillModalMixin = { } }) }, - initSupplier() { + initSupplier(isChecked) { let that = this; findBySelectSup({}).then((res)=>{ if(res) { - that.supList = res; + that.supList = res + if(isChecked && res.length>0) { + that.form.setFieldsValue({'organId': res[0].id}) + } } }); }, - initCustomer() { + initCustomer(isChecked) { let that = this; findBySelectCus({}).then((res)=>{ if(res) { - that.cusList = res; + that.cusList = res + if(isChecked && res.length>0) { + that.form.setFieldsValue({'organId': res[0].id}) + } } }); }, - initRetail() { + initRetail(isChecked) { let that = this; findBySelectRetail({}).then((res)=>{ if(res) { - that.retailList = res; + that.retailList = res + if(isChecked && res.length>0) { + that.form.setFieldsValue({'organId': res[0].id}) + } } }); }, @@ -221,13 +230,17 @@ export const BillModalMixin = { } }) }, - initAccount(){ + initAccount(isChecked){ let that = this; getAccount({}).then((res)=>{ if(res && res.code === 200) { let list = res.data.accountList + let lastId = list.length>0?list[0].id:'' list.splice(0,0,{id: 0, name: '多账户'}) that.accountList = list + if(isChecked) { + that.form.setFieldsValue({'accountId': lastId}) + } } }) }, @@ -286,13 +299,13 @@ export const BillModalMixin = { this.$refs.accountModalForm.disableSubmit = false; }, vendorModalFormOk() { - this.initSupplier() + this.initSupplier(1) }, customerModalFormOk() { - this.initCustomer() + this.initCustomer(1) }, memberModalFormOk() { - this.initRetail() + this.initRetail(1) }, batchSetDepotModalFormOk(depotId) { this.getAllTable().then(tables => { @@ -346,7 +359,7 @@ export const BillModalMixin = { this.initDepot() }, accountModalFormOk() { - this.initAccount() + this.initAccount(1) }, onAdded(event) { const { row, target } = event diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index b5212015..3eafca5d 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -267,7 +267,7 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initSupplier() + this.initSupplier(0) this.initDepot() }, //提交单据时整理成formData diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index 72511d6f..ece47e47 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -267,7 +267,7 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initCustomer() + this.initCustomer(0) this.initDepot() }, //提交单据时整理成formData diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index cbdeed32..cb2a85f0 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -338,9 +338,9 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initSupplier() + this.initSupplier(0) this.initDepot() - this.initAccount() + this.initAccount(0) }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 81bff2bd..4c65f3f9 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -387,9 +387,9 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initSupplier() + this.initSupplier(0) this.initDepot() - this.initAccount() + this.initAccount(0) }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 1c2b10c2..518a7ba6 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -346,8 +346,8 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initSupplier() - this.initAccount() + this.initSupplier(0) + this.initAccount(0) }, /** 整理成formData */ classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 4b6f630f..e37c5f33 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -320,9 +320,9 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initRetail() + this.initRetail(0) this.initDepot() - this.initAccount() + this.initAccount(0) }, //提交单据时整理成formData classifyIntoFormData(allValues) { @@ -351,10 +351,13 @@ rows: JSON.stringify(detailArr), } }, - initAccount(){ + initAccount(isChecked){ getAccount({}).then((res)=>{ if(res && res.code === 200) { this.accountList = res.data.accountList + if(isChecked && this.accountList.length>0) { + this.form.setFieldsValue({'accountId': this.accountList[0].id}) + } } }) }, diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 23158f4c..65b1da3b 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -330,9 +330,9 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initRetail() + this.initRetail(0) this.initDepot() - this.initAccount() + this.initAccount(0) }, //提交单据时整理成formData classifyIntoFormData(allValues) { @@ -364,10 +364,13 @@ initPayTypeList() { this.payTypeList.push({"value":"现付", "text":"现付"}) }, - initAccount(){ + initAccount(isChecked){ getAccount({}).then((res)=>{ if(res && res.code === 200) { this.accountList = res.data.accountList + if(isChecked && this.accountList.length>0) { + this.form.setFieldsValue({'accountId': this.accountList[0].id}) + } } }) }, diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index e76e077c..a5ee1e3e 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -345,10 +345,10 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initCustomer() + this.initCustomer(0) this.initSalesman() this.initDepot() - this.initAccount() + this.initAccount(0) }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 6d4f386a..2c26af5d 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -321,9 +321,9 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initCustomer() + this.initCustomer(0) this.initSalesman() - this.initAccount() + this.initAccount(0) }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 9424eeb2..fb1aa2ab 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -405,10 +405,10 @@ this.copyAddInit(this.prefixNo) } this.initSystemConfig() - this.initCustomer() + this.initCustomer(0) this.initSalesman() this.initDepot() - this.initAccount() + this.initAccount(0) }, //提交单据时整理成formData classifyIntoFormData(allValues) {