diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue
index ea446554..556d6152 100644
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -176,15 +176,7 @@
align:"center", width: 150,
scopedSlots: { customRender: 'action' },
},
- { title: '单据编号', dataIndex: 'number',width:160,
- customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
- }
- },
+ { title: '单据编号', dataIndex: 'number',width:160},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) {
if(text) {
diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue
index 20780b3f..90bd5ec2 100644
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -176,15 +176,7 @@
align:"center", width: 150,
scopedSlots: { customRender: 'action' },
},
- { title: '单据编号', dataIndex: 'number',width:160,
- customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
- }
- },
+ { title: '单据编号', dataIndex: 'number',width:160},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) {
if(text) {
diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue
index af1228bb..f7d1e587 100644
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -176,15 +176,7 @@
align:"center", width: 150,
scopedSlots: { customRender: 'action' },
},
- { title: '单据编号', dataIndex: 'number',width:160,
- customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
- }
- },
+ { title: '单据编号', dataIndex: 'number',width:160},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) {
if(text) {
diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue
index 37f6095e..baf520f4 100644
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -193,15 +193,7 @@
scopedSlots: { customRender: 'action' },
},
{ title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
- { title: '单据编号', dataIndex: 'number',width:160,
- customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
- }
- },
+ { title: '单据编号', dataIndex: 'number',width:160},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) {
if(text) {
diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue
index 0badcc54..3dacb867 100644
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -193,15 +193,7 @@
scopedSlots: { customRender: 'action' },
},
{ title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
- { title: '单据编号', dataIndex: 'number',width:160,
- customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
- }
- },
+ { title: '单据编号', dataIndex: 'number',width:160},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) {
if(text) {
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index 7f64610f..51528646 100644
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -205,11 +205,8 @@
{ title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
+ text = record.linkNumber?text+"[转]":text
+ return text
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 345265a0..8794674c 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -221,11 +221,9 @@
{ title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[订]";
- } else {
- return text;
- }
+ text = record.linkNumber?text+"[订]":text
+ text = record.hasBackFlag?text+"[退]":text
+ return text
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index 70f18530..e753abc5 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -185,11 +185,8 @@
{ title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
+ text = record.linkNumber?text+"[转]":text
+ return text
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue
index 5c019948..e94d8112 100644
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -205,11 +205,8 @@
{ title: '会员', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
+ text = record.linkNumber?text+"[转]":text
+ return text
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index a701ae85..e24c9707 100644
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -199,11 +199,8 @@
{ title: '会员', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
+ text = record.hasBackFlag?text+"[退]":text
+ return text
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index 5b16abc4..e0e98b2a 100644
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -205,11 +205,8 @@
{ title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[转]";
- } else {
- return text;
- }
+ text = record.linkNumber?text+"[转]":text
+ return text
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index 41633405..5d1172ce 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -221,11 +221,9 @@
{ title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
{ title: '单据编号', dataIndex: 'number',width:160,
customRender:function (text,record,index) {
- if(record.linkNumber) {
- return text + "[订]";
- } else {
- return text;
- }
+ text = record.linkNumber?text+"[订]":text
+ text = record.hasBackFlag?text+"[退]":text
+ return text
}
},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 94b2389b..f9b0e8cb 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -95,6 +95,13 @@
{{model.accountName}}
+
+
+
+ {{item.number}}
+
+
+
@@ -346,6 +353,15 @@
{{model.debt}}
+
+
+
+ {{item.number}}
+
+
+
+
+
@@ -608,7 +624,13 @@
{{model.debt}}
-
+
+
+
+ {{item.number}}
+
+
+
@@ -1003,6 +1025,7 @@
billPrintFlag: false,
fileList: [],
purchaseBySaleFlag: false,
+ linkNumberList: [],
financialBillNoList: [],
tableWidth: {
'width': '1500px'
@@ -1415,6 +1438,13 @@
}
})
},
+ getBillListByLinkNumber(number) {
+ getAction('/depotHead/getBillListByLinkNumber', {number: number}).then(res => {
+ if(res && res.code === 200){
+ this.linkNumberList = res.data
+ }
+ })
+ },
getFinancialBillNoByBillId(billId) {
getAction('/accountHead/getFinancialBillNoByBillId', {billId: billId}).then(res => {
if(res && res.code === 200){
@@ -1453,6 +1483,7 @@
this.requestSubTableData(record, type, url, params);
this.initPlatform()
this.getSystemConfig()
+ this.getBillListByLinkNumber(this.model.number)
this.getFinancialBillNoByBillId(this.model.id)
},
requestSubTableData(record, type, url, params, success) {