|
|
@@ -353,6 +353,18 @@
|
|
|
:show-overflow-tooltip="true"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="supplierName"
|
|
|
+ label="供应商"
|
|
|
+ min-width="200"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="supplierCode"
|
|
|
+ label="供应商代号"
|
|
|
+ min-width="200"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column
|
|
|
label="质检结果"
|
|
|
prop="result"
|
|
|
@@ -572,7 +584,10 @@
|
|
|
// 获取动态表头
|
|
|
getFieldModel() {
|
|
|
storageApi.fieldModel({ fieldModel: 't_main_category' }).then((res) => {
|
|
|
- console.log(res,'res111111111111111111111111111111111111111111111111');
|
|
|
+ console.log(
|
|
|
+ res,
|
|
|
+ 'res111111111111111111111111111111111111111111111111'
|
|
|
+ );
|
|
|
let newRes = res.map((m) => {
|
|
|
return {
|
|
|
prop: 'extField.' + m.prop,
|
|
|
@@ -651,36 +666,35 @@
|
|
|
return;
|
|
|
}
|
|
|
let res = {};
|
|
|
- let resAll=[]
|
|
|
+ let resAll = [];
|
|
|
console.log('isInterior', this.isInterior);
|
|
|
if (this.isInterior) {
|
|
|
res = await storageApi.getInboundDetailsById(id);
|
|
|
} else if (this.isIds) {
|
|
|
resAll = await storageApi.getInboundDetailsByIds(id);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
res = await storageApi.getInfoBySourceBizNoAll(id);
|
|
|
- res=res[0]||{}
|
|
|
+ res = res[0] || {};
|
|
|
}
|
|
|
console.log(
|
|
|
'===============================================================',
|
|
|
res
|
|
|
);
|
|
|
if (this.isIds) {
|
|
|
- res =JSON.parse(JSON.stringify(resAll[0]));
|
|
|
+ res = JSON.parse(JSON.stringify(resAll[0]));
|
|
|
this.extInfo = resAll[0].extInfo;
|
|
|
- res['outInDetailList']=[]
|
|
|
- resAll.forEach(item=>{
|
|
|
- item.outInDetailList.forEach(val=>{
|
|
|
- val['bizNo']=item.bizNo
|
|
|
- res['outInDetailList'].push(val)
|
|
|
- })
|
|
|
- })
|
|
|
+ res['outInDetailList'] = [];
|
|
|
+ resAll.forEach((item) => {
|
|
|
+ item.outInDetailList.forEach((val) => {
|
|
|
+ val['bizNo'] = item.bizNo;
|
|
|
+ res['outInDetailList'].push(val);
|
|
|
+ });
|
|
|
+ });
|
|
|
res['bizNo'] = resAll.map((item) => item.bizNo);
|
|
|
- this.infoData=res
|
|
|
+ this.infoData = res;
|
|
|
} else {
|
|
|
this.infoData = res;
|
|
|
this.extInfo = res?.extInfo;
|
|
|
-
|
|
|
}
|
|
|
this.productList = res?.outInDetailList?.map(
|
|
|
(productItem, productIndex) => {
|
|
|
@@ -695,6 +709,8 @@
|
|
|
...packingItem,
|
|
|
categoryName: productItem.categoryName,
|
|
|
categoryCode: productItem.categoryCode,
|
|
|
+ supplierCode: productItem.supplierCode,
|
|
|
+ supplierName: productItem.supplierName,
|
|
|
materialDetailList: packingItem.materialDetailList?.map(
|
|
|
(materialItem) => {
|
|
|
return {
|