From 89574dfc39d7493819340336198505c5a351e884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 25 Sep 2021 22:10:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=87=87=E8=B4=AD=E5=92=8C=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8D=95=E6=8D=AE=E6=94=AF=E6=8C=81=E5=88=86=E6=89=B9?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/views/bill/PurchaseInList.vue | 2 +- .../src/views/bill/PurchaseOrderList.vue | 3 ++- jshERP-web/src/views/bill/SaleOrderList.vue | 3 ++- jshERP-web/src/views/bill/SaleOutList.vue | 2 +- .../src/views/bill/dialog/BillDetail.vue | 2 ++ .../src/views/bill/dialog/LinkBillList.vue | 17 +++++++++--- .../views/bill/modules/PurchaseInModal.vue | 27 +++++++++++++++---- .../src/views/bill/modules/SaleOutModal.vue | 27 +++++++++++++++---- 8 files changed, 66 insertions(+), 17 deletions(-) diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 67ab5b4c..8ef0ff27 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -170,7 +170,7 @@ { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { - return text + "[转]"; + return text + "[订]"; } else { return text; } diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index af1b9963..0d22c1bc 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -107,7 +107,8 @@ diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 34f550bb..94a7fcf5 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -108,7 +108,8 @@ diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index a93a6f1a..cd0b972a 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -170,7 +170,7 @@ { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { - return text + "[转]"; + return text + "[订]"; } else { return text; } diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index 71f0d81e..01ec35a3 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -1005,6 +1005,7 @@ { title: '单位', dataIndex: 'unit', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'}, + { title: '已入库', dataIndex: 'finishNumber', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '备注', dataIndex: 'remark', width: '5%'} @@ -1068,6 +1069,7 @@ { title: '单位', dataIndex: 'unit', width: '4%'}, { title: '多属性', dataIndex: 'sku', width: '4%'}, { title: '数量', dataIndex: 'operNumber', width: '5%'}, + { title: '已入库', dataIndex: 'finishNumber', width: '5%'}, { title: '单价', dataIndex: 'unitPrice', width: '5%'}, { title: '金额', dataIndex: 'allPrice', width: '5%'}, { title: '备注', dataIndex: 'remark', width: '5%'} diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue index e4487141..9f581953 100644 --- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue +++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue @@ -21,6 +21,14 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}" :customRow="rowAction" @change="handleTableChange"> + @@ -61,7 +69,7 @@ }, { title: '', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:150}, - { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true, + { title: '商品信息', dataIndex: 'materialsList',width:280, ellipsis:true, customRender:function (text,record,index) { if(text) { return text.replace(",","，"); @@ -69,8 +77,11 @@ } }, { title: '单据日期', dataIndex: 'operTimeStr',width:145}, - { title: '操作员', dataIndex: 'userName',width:60}, - { title: '金额合计', dataIndex: 'totalPrice',width:70} + { title: '操作员', dataIndex: 'userName',width:70}, + { title: '金额合计', dataIndex: 'totalPrice',width:70}, + { title: '状态', dataIndex: 'status', width: 70, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + } ], url: { list: "/depotHead/list" diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 09e7a2b2..c98f1a97 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -183,14 +183,16 @@ { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true }, { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true }, - { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, + { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.input, readonly: true }, + { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.input, readonly: true }, + { title: '数量', key: 'operNumber', width: '4%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, + { title: '单价', key: 'unitPrice', width: '4%', type: FormTypes.inputNumber}, { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, - { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true , readonly: true}, + { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税额', key: 'taxMoney', width: '3%', type: FormTypes.inputNumber, statistics: true , readonly: true}, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } ] @@ -293,7 +295,7 @@ } }, onSearchLinkNumber() { - this.$refs.linkBillList.show('其它', '采购订单', '供应商', "1") + this.$refs.linkBillList.show('其它', '采购订单', '供应商', "1,3") this.$refs.linkBillList.title = "选择采购订单" }, linkBillListOk(selectBillRows) { @@ -323,13 +325,28 @@ if(res && res.code === 200){ let list = res.data.rows let listEx = [] + let discountLastMoney = 0 for(let j=0; j { + this.form.setFieldsValue({ + 'discountLastMoney': discountLastMoney, + 'changeAmount': discountLastMoney + }) + }); + } typeof success === 'function' ? success(res) : '' } }).finally(() => { diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 2dc0e996..bdf6c6c8 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -187,14 +187,16 @@ { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true }, { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true }, - { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, + { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.input, readonly: true }, + { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.input, readonly: true }, + { title: '数量', key: 'operNumber', width: '4%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, + { title: '单价', key: 'unitPrice', width: '4%', type: FormTypes.inputNumber}, { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, - { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true}, + { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税额', key: 'taxMoney', width: '3%', type: FormTypes.inputNumber, statistics: true, readonly: true}, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } ] @@ -299,7 +301,7 @@ } }, onSearchLinkNumber() { - this.$refs.linkBillList.show('其它', '销售订单', '客户', "1") + this.$refs.linkBillList.show('其它', '销售订单', '客户', "1,3") this.$refs.linkBillList.title = "选择销售订单" }, linkBillListOk(selectBillRows) { @@ -329,13 +331,28 @@ if(res && res.code === 200){ let list = res.data.rows let listEx = [] + let discountLastMoney = 0 for(let j=0; j { + this.form.setFieldsValue({ + 'discountLastMoney': discountLastMoney, + 'changeAmount': discountLastMoney + }) + }); + } typeof success === 'function' ? success(res) : '' } }).finally(() => {