purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给其它入库和其它出库单据增加关联单据的功能，支持全部和部分关联

Browse Source
This commit is contained in:
季圣华
2023-12-05 00:28:04 +08:00
parent 040bc6701c
commit 66b1a21320
13 changed files with 93 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -1248,6 +1248,7 @@
{ title: '有效期', dataIndex: 'expirationDate'},
{ title: '多属性', dataIndex: 'sku'},
{ title: '数量', dataIndex: 'operNumber'},
{ title: '已入库', dataIndex: 'finishNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
{ title: '税率(%)', dataIndex: 'taxRate'},
@@ -1271,6 +1272,7 @@
{ title: '有效期', dataIndex: 'expirationDate'},
{ title: '多属性', dataIndex: 'sku'},
{ title: '数量', dataIndex: 'operNumber'},
{ title: '已出库', dataIndex: 'finishNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
{ title: '税率(%)', dataIndex: 'taxRate'},
@@ -1313,6 +1315,7 @@
{ title: '有效期', dataIndex: 'expirationDate'},
{ title: '多属性', dataIndex: 'sku'},
{ title: '数量', dataIndex: 'operNumber'},
{ title: '已出库', dataIndex: 'finishNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
{ title: '税率(%)', dataIndex: 'taxRate'},
@@ -1336,6 +1339,7 @@
{ title: '有效期', dataIndex: 'expirationDate'},
{ title: '多属性', dataIndex: 'sku'},
{ title: '数量', dataIndex: 'operNumber'},
{ title: '已入库', dataIndex: 'finishNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
{ title: '税率(%)', dataIndex: 'taxRate'},
@@ -1616,10 +1620,16 @@
this.form.setFieldsValue(pick(this.model, 'id'))
});
let showType = 'basic'
if (item.status === '3') {
showType = 'basic'
} else if (item.purchaseStatus === '3') {
showType = 'purchase'
if(item.subType === '采购' || item.subType === '采购退货' || item.subType === '销售' || item.subType === '销售退货') {
if (item.status === '3') {
showType = 'other'
}
} else {
if (item.status === '3') {
showType = 'basic'
} else if (item.purchaseStatus === '3') {
showType = 'purchase'
}
}
let isReadOnly = '1'
if(item.subType === '组装单' || item.subType === '拆卸单') {

4
jshERP-web/src/views/bill/dialog/WaitBillList.vue
View File

@@ -182,7 +182,7 @@
methods: {
show(type, subType, status) {
this.selectType = 'list'
this.showType = 'basic'
this.showType = 'other'
this.queryParam.type = type
this.queryParam.subType = subType
this.queryParam.status = status
@@ -229,7 +229,7 @@
} else {
if(this.selectedDetailRowKeys.length) {
this.getSelectBillDetailRows()
this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discountMoney, this.deposit, this.remark)
this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.remark)
this.close()
} else {
this.$message.warning('抱歉，请选择单据明细！')