diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index bdf066ed..38c612f8 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -216,6 +216,7 @@
return text
}
},
+ { title: '关联请购单', dataIndex: 'linkApply',width:140},
{ title: '关联订单', dataIndex: 'linkNumber',width:140},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true},
{ title: '单据日期', dataIndex: 'operTimeStr',width:145},
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index ed00c2e0..ccda3314 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -280,6 +280,11 @@
{{model.number}}
+
+
+ {{model.linkApply}}
+
+
{{model.linkNumber}}
diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 804a85a7..c25a0551 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -70,8 +70,10 @@
未审核
已审核
+ 完成采购
完成采购
完成销售
+ 部分采购
部分采购
部分销售
已审核
@@ -213,9 +215,9 @@
this.queryParam.type = type
this.queryParam.subType = subType
this.queryParam.status = status
- this.columns[0].title = organType
this.model = Object.assign({}, {});
this.visible = true;
+ this.initColumns(subType, organType)
this.loadData(1)
},
purchaseShow(type, subType, organType, status, purchaseStatus) {
@@ -225,11 +227,31 @@
this.queryParam.subType = subType
this.queryParam.status = status
this.queryParam.purchaseStatus = purchaseStatus
- this.columns[0].title = organType
this.model = Object.assign({}, {});
this.visible = true;
+ this.initColumns(subType, organType)
this.loadData(1)
},
+ initColumns(subType, organType) {
+ for(let i=0; i {
if (res && res.code === 200) {
@@ -266,6 +288,7 @@
this.discountMoney = record.discountMoney
this.deposit = record.changeAmount - record.finishDeposit
this.remark = record.remark
+ this.initListColumns()
this.loadDetailData(1)
}
} else {
@@ -278,6 +301,27 @@
}
}
},
+ initListColumns() {
+ if(this.queryParam.subType === '请购单') {
+ for(let i=0; i
+
+
+
+
+
{
- this.form.setFieldsValue({
- 'linkNumber': linkNumber
+ if(linkNumber.indexOf('QGD')===-1) {
+ this.$nextTick(() => {
+ this.form.setFieldsValue({
+ 'linkNumber': linkNumber
+ })
})
- })
+ } else {
+ //关联请购单
+ this.$nextTick(() => {
+ this.form.setFieldsValue({
+ 'linkApply': linkNumber
+ })
+ })
+ }
//给优惠后金额重新赋值
discountLastMoney = discountLastMoney?discountLastMoney:0
this.$nextTick(() => {