diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index 802f4c4f..d76d14ab 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -97,6 +97,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index 9a355f78..a24e1b55 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -97,6 +97,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index 4248d3ba..25d0fa44 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -97,6 +97,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index 83aede22..f1b49a2f 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -106,6 +106,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index dd46bc70..9b6b466c 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -106,6 +106,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index 56a8d5a6..13d60a36 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -106,6 +106,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 5e8bdcb4..67ab5b4c 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -108,6 +108,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 233e942c..81f6d3cf 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -107,6 +107,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index 0f7c2312..9b17253c 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -106,6 +106,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 0891b128..4533ab1b 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -106,6 +106,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index c779cc42..eefa8dc8 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -107,6 +107,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index c2360f85..fcf42126 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -108,6 +108,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 7b36d2bc..a93a6f1a 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -109,6 +109,8 @@ 编辑 + 复制 + 删除 diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js index 6e28f062..c217d206 100644 --- a/jshERP-web/src/views/bill/mixins/BillListMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js @@ -33,6 +33,12 @@ export const BillListMixin = { this.$refs.modalForm.action = "add"; this.handleAdd(); }, + myHandleCopyAdd(record) { + this.$refs.modalForm.action = "copyAdd"; + this.$refs.modalForm.edit(record); + this.$refs.modalForm.title = "复制新增"; + this.$refs.modalForm.disableSubmit = false; + }, myHandleEdit(record) { if(record.status === '0') { this.$refs.modalForm.action = "edit"; diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 39a7182b..b035d8ec 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -69,6 +69,16 @@ export const BillModalMixin = { this.accountMoneyList = [] this.manyAccountBtnStatus = false }, + copyAddInit(amountNum) { + getAction('/sequence/buildNumber').then((res) => { + if (res && res.code === 200) { + this.form.setFieldsValue({'number':amountNum + res.data.defaultNumber}) + } + }) + this.$nextTick(() => { + this.form.setFieldsValue({'operTime':getNowFormatDateTime()}) + }) + }, initSupplier() { let that = this; findBySelectSup({}).then((res)=>{ diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 40d42543..ff6a7f63 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -165,6 +165,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initDepot() }, //提交单据时整理成formData diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index 425e3941..bfcd568a 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -167,6 +167,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initDepot() }, //提交单据时整理成formData diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index 61f863c0..8ff9414e 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -166,6 +166,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initDepot() }, //提交单据时整理成formData diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index 74f65d68..33b4c5ff 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -173,6 +173,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initSupplier() this.initDepot() }, diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index fe99ae24..0ee75317 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -173,6 +173,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initCustomer() this.initDepot() }, diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 6d0b8c4c..c125f79c 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -253,6 +253,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initSupplier() this.initDepot() this.initAccount() diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 0868e1a9..0f7e0849 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -254,6 +254,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initSupplier() this.initDepot() this.initAccount() diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index d0323cfc..7b23e5c6 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -175,6 +175,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initSupplier() this.initDepot() }, diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 278016f4..14a20342 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -220,6 +220,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initRetail() this.initDepot() this.initAccount() diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 1a50e2a3..c76c622c 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -228,6 +228,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initRetail() this.initDepot() this.initAccount() diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 8bd6e980..4048e085 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -260,6 +260,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initCustomer() this.initSalesman() this.initDepot() diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 79d117fd..160d44ed 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -181,6 +181,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initCustomer() this.initSalesman() this.initDepot() diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 4ceccc24..6d6bd2c4 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -260,6 +260,12 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.materialTable); } + //复制新增单据-初始化单号和日期 + if(this.action === 'copyAdd') { + this.model.id = '' + this.model.tenantId = '' + this.copyAddInit(this.prefixNo) + } this.initCustomer() this.initSalesman() this.initDepot()