diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 268ebdbe..1d53fa96 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -201,7 +201,7 @@
- {{model.linkNumber}}
+ {{model.linkNumber}}
diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 8d65af46..4df17294 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -58,7 +58,8 @@
:customRow="rowAction"
@change="handleTableChange">
- {{record.number}}
+ {{record.number}}
+ {{record.number}}
@@ -139,7 +140,7 @@
// 表头
columns: [
{ title: '', dataIndex: 'organName',width:120, ellipsis:true},
- { title: '单据编号', dataIndex: 'number',width:150,
+ { title: '单据编号', dataIndex: 'number',width:130,
scopedSlots: { customRender: 'numberCustomRender' },
},
{ title: '商品信息', dataIndex: 'materialsList',width:280, ellipsis:true,
@@ -151,6 +152,7 @@
},
{ title: '单据日期', dataIndex: 'operTimeStr',width:145},
{ title: '操作员', dataIndex: 'userName',width:70},
+ { title: '数量', dataIndex: 'materialCount',width:60},
{ title: '金额合计', dataIndex: 'totalPrice',width:70},
{ title: '含税合计', dataIndex: 'totalTaxLastMoney',width:70,
customRender:function (text,record,index) {
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index 3fb27071..b72e0bc3 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -203,7 +203,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index 9d007b6b..e54bc72a 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -201,7 +201,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 9ea8e23b..b93449cd 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -200,7 +200,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index d068a949..b39f3d69 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -227,7 +227,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 4af8d760..b7c90ab1 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -227,7 +227,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 7cff04c6..373c3478 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -325,7 +325,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 4f8c1e86..4aa7060e 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -368,7 +368,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index edc8dbca..eaea247e 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -314,7 +314,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 1c89f17e..9b4ab411 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -307,7 +307,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 9771ad9d..ea7fc2cb 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -317,7 +317,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 1ec7f05b..e3ca1ed6 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -332,7 +332,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index db906bba..89eba99d 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -297,7 +297,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 452163c7..8c221b51 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -386,7 +386,8 @@
// 加载子表数据
let params = {
headerId: this.model.id,
- mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
+ mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
+ linkType: 'basic'
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.materialTable);