fix: 修复华泰的要求

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -505,7 +505,9 @@
             showOverflowTooltip: true,
             width: 130,
             align: 'center',
-            formatter: (row) => row.stockCountBase
+            // 物品维度后端回填的是 measureQuantity（物品聚合库存），
+            // 批次维度回填的是 stockCountBase（批次库存），两者兜底展示
+            formatter: (row) => row.stockCountBase ?? row.measureQuantity
           },
           // {
           //   prop: 'supplierName',

src/views/warehouseManagement/stocktaking/reportLoss/components/addReportDialog.vue

@@ -168,6 +168,69 @@
                   prop="categoryName"
                   :show-overflow-tooltip="true"
                 ></el-table-column>
+                <el-table-column
+                  width="150"
+                  label="物品编码"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="{ row }">
+                    {{
+                      (row.info && row.info.categoryCode) ||
+                        row.categoryCode ||
+                        '-'
+                    }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="牌号"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="{ row }">
+                    {{
+                      (row.info && row.info.brandNum) || row.brandNum || '-'
+                    }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="型号"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="{ row }">
+                    {{
+                      (row.info && row.info.categoryModel) ||
+                        row.categoryModel ||
+                        '-'
+                    }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="规格"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="{ row }">
+                    {{
+                      (row.info && row.info.specification) ||
+                        row.specification ||
+                        '-'
+                    }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="颜色"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="{ row }">
+                    {{ (row.info && row.info.colorKey) || row.colorKey || '-' }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="机型"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="{ row }">
+                    {{ (row.info && row.info.modelKey) || row.modelKey || '-' }}
+                  </template>
+                </el-table-column>
                 <el-table-column
                   label="批次号"
                   prop="batchNo"

src/views/warehouseManagement/stocktaking/work/details.vue

@@ -138,6 +138,22 @@
               prop="info.specification"
               :show-overflow-tooltip="true"
             ></el-table-column>
+            <el-table-column
+              label="颜色"
+              :show-overflow-tooltip="true"
+            >
+              <template slot-scope="{ row }">
+                {{ (row.info && row.info.colorKey) || row.colorKey || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="机型"
+              :show-overflow-tooltip="true"
+            >
+              <template slot-scope="{ row }">
+                {{ (row.info && row.info.modelKey) || row.modelKey || '-' }}
+              </template>
+            </el-table-column>
             <el-table-column
               label="计量数量"
               prop="info.measureQuantity"
@@ -202,6 +218,47 @@
               prop="categoryName"
               :show-overflow-tooltip="true"
             ></el-table-column>
+            <el-table-column
+              width="150"
+              label="物品编码"
+              :show-overflow-tooltip="true"
+            >
+              <template slot-scope="{ row }">
+                {{
+                  (row.info && row.info.categoryCode) ||
+                    row.categoryCode ||
+                    '-'
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column label="牌号" :show-overflow-tooltip="true">
+              <template slot-scope="{ row }">
+                {{ (row.info && row.info.brandNum) || row.brandNum || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="型号" :show-overflow-tooltip="true">
+              <template slot-scope="{ row }">
+                {{
+                  (row.info && row.info.categoryModel) ||
+                    row.categoryModel ||
+                    '-'
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column label="规格" :show-overflow-tooltip="true">
+              <template slot-scope="{ row }">
+                {{
+                  (row.info && row.info.specification) ||
+                    row.specification ||
+                    '-'
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column label="颜色" :show-overflow-tooltip="true">
+              <template slot-scope="{ row }">
+                {{ (row.info && row.info.colorKey) || row.colorKey || '-' }}
+              </template>
+            </el-table-column>
             <el-table-column
               label="批次号"
               prop="batchNo"

src/views/warehouseManagement/unlockApplication/components/unlockModal.vue

@@ -10,15 +10,22 @@
     :maxable="true"
   >
     <el-card shadow="never">
-      <el-descriptions>
-          <el-descriptions-item label="创建时间">{{ formData.createTime }}</el-descriptions-item>
-          <!-- <el-descriptions-item label="创建人">{{ formData.createUser }}</el-descriptions-item> -->
-          <el-descriptions-item label="物品编码">{{ formData.productCode }}</el-descriptions-item>
-          <el-descriptions-item label="名称">{{ formData.productName }}</el-descriptions-item>
-          <el-descriptions-item label="批次号">{{ formData.batchNo }}</el-descriptions-item>
-          <!-- <el-descriptions-item label="规格">{{ formData.spec }}</el-descriptions-item> -->
-          <!-- <el-descriptions-item label="型号">{{ formData.model }}</el-descriptions-item> -->
-          <!-- <el-descriptions-item label="牌号">{{ formData.certificateNumber }}</el-descriptions-item> -->
+      <el-descriptions :column="3" border size="small">
+          <el-descriptions-item label="创建时间">{{ formData.createTime || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="物品编码">{{ formData.productCode || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="名称">{{ formData.productName || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="批次号">{{ formData.batchNo || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="系统内部批次号">{{ formData.systemBatchNo || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="牌号">{{ formData.brandNum || formData.certificateNumber || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="型号">{{ formData.categoryModel || formData.model || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="规格">{{ formData.specification || formData.spec || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="机型">{{ formData.modelKey || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="颜色">{{ formData.colorKey || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="级别">{{ formData.level || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="计量单位">{{ formData.measureUnit || formData.measuringUnit || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="锁定数量">{{ formData.lockQuantity != null ? formData.lockQuantity : '-' }}</el-descriptions-item>
+          <el-descriptions-item label="仓库">{{ formData.warehouseName || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="供应商">{{ formData.supplierName || '-' }}</el-descriptions-item>
       </el-descriptions>
       <div style="margin-top: 12px">
         <ele-pro-table