Переглянути джерело

feat(disposalStorage): 列表不良品明细编码通过明细列表聚合展示并在详情弹窗新增明细列

lucw 3 днів тому
батько
коміт
1e33ca01bb

+ 3 - 5
src/views/disposalStorage/components/tgDetails.vue

@@ -21,11 +21,6 @@
               <el-input v-model="disposalTypeText" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="明细编码:">
-              <el-input v-model="row.sourceDetailCode" disabled />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="台账编号:">
               <el-input v-model="row.unqualifiedProductsCode" disabled />
@@ -82,6 +77,9 @@
         height="calc(100vh - 420px)"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column prop="sourceDetailCode" label="不良品明细编码" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="categoryCode" label="物品编码" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="categoryName" label="物品名称" min-width="110" show-overflow-tooltip />
         <el-table-column prop="batchNo" label="批次号" min-width="110" show-overflow-tooltip />
         <el-table-column prop="systemBatchNo" label="系统批次号" min-width="110" show-overflow-tooltip />
         <el-table-column prop="packingCount" label="包装数量" width="90" align="center" />

+ 9 - 1
src/views/disposalStorage/index.vue

@@ -140,7 +140,15 @@
             label: '不良品明细编码',
             align: 'center',
             minWidth: 150,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              const codes = (row.detailList || []).map((item) => item.sourceDetailCode).filter(Boolean);
+              if (!codes.length) {
+                // 历史单据没有明细来源,单号即不良品明细编码
+                return row.sourceBillCode ? '' : row.code || '';
+              }
+              return codes.length > 1 ? `${codes[0]} 等${codes.length}项` : codes[0];
+            }
           },
           {
             prop: 'unqualifiedProductsCode',