|
|
|
@ -91,12 +91,12 @@ |
|
|
|
<el-table-column prop="materialDesc" header-align="center" align="left" label="材料描述" width="180" :show-overflow-tooltip="true"></el-table-column> |
|
|
|
<el-table-column prop="mainIfsPartNo" header-align="center" align="left" label="IFS物料编码" width="120"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span>{{ scope.row.mainIfsPartNo || scope.row.ifsPartNo || '' }}</span> |
|
|
|
<span>{{ scope.row.mainIfsPartNo || '' }}</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="mainPartDesc" header-align="center" align="left" label="IFS物料描述" width="250" :show-overflow-tooltip="true"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span>{{ scope.row.mainPartDesc || scope.row.materialDesc || '' }}</span> |
|
|
|
<span>{{ scope.row.mainPartDesc || '' }}</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="materialValidityTime" header-align="center" align="center" label="材料有效期" width="100"></el-table-column> |
|
|
|
@ -3268,8 +3268,8 @@ export default { |
|
|
|
this.$set(target, 'expiredDate', normalizedExpiredDate) |
|
|
|
this.$set(target, 'expiryDate', this.calculateExpiryDateByRule(normalizedExpiredDate, target.validUntilValue, target.validUntil)) |
|
|
|
const firstMaterialDisplay = this.resolveFirstMaterialDisplay(target) |
|
|
|
const fallbackMainIfsPartNo = fallbackData.mainIfsPartNo || fallbackData.ifsPartNo || '' |
|
|
|
const fallbackMainPartDesc = fallbackData.mainPartDesc || fallbackData.materialDesc || '' |
|
|
|
const fallbackMainIfsPartNo = fallbackData.mainIfsPartNo || '' |
|
|
|
const fallbackMainPartDesc = fallbackData.mainPartDesc || '' |
|
|
|
this.$set(target, 'mainIfsPartNo', firstMaterialDisplay.mainIfsPartNo || target.mainIfsPartNo || fallbackMainIfsPartNo) |
|
|
|
this.$set(target, 'mainPartDesc', firstMaterialDisplay.mainPartDesc || target.mainPartDesc || fallbackMainPartDesc) |
|
|
|
}, |
|
|
|
|