提交

web-admin/src/views/db/inventory/index.vue

@@ -151,7 +151,7 @@
             <el-table-column
               v-if="isColumnVisible('id')"
               prop="id"
-              label="ID"
+              label="出入库单ID"
               min-width="100"
               align="center"
               header-align="center"
@@ -569,7 +569,7 @@
   const loading = ref(false)
 
   const listColumnDefs = [
-    { prop: 'id', label: 'ID', defaultVisible: false },
+    { prop: 'id', label: '出入库单ID' },
     { prop: 'planNo', label: '计划号' },
     { prop: 'date', label: '日期' },
     { prop: 'partnerCompany', label: '往来单位' },
@@ -595,7 +595,7 @@
     isIndeterminate,
     isColumnVisible,
     resetToDefault
-  } = usePersistedListColumns('db-inventory-list-columns', listColumnDefs)
+  } = usePersistedListColumns('db-inventory-list-columns-v2', listColumnDefs)
 
   const inventoryExportColumns = computed(() => {
     const cols = [...visibleColumns.value]

web-admin/src/views/db/weighing/index.vue

@@ -126,6 +126,19 @@
           >
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column type="index" label="序号" width="60" align="center" header-align="center" />
+            <el-table-column
+              v-if="isColumnVisible('inboundOutboundId')"
+              prop="inboundOutboundId"
+              label="出入库单ID"
+              min-width="100"
+              align="center"
+              header-align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                {{ row.inboundOutboundId || '—' }}
+              </template>
+            </el-table-column>
             <el-table-column
               v-if="isColumnVisible('inventoryDate')"
               prop="inventoryDate"
@@ -559,6 +572,7 @@
   const router = useRouter()
 
   const listColumnDefs = [
+    { prop: 'inboundOutboundId', label: '出入库单ID' },
     { prop: 'inventoryDate', label: '日期' },
     { prop: 'planNo', label: '计划单号' },
     { prop: 'vehicleNo', label: '车牌号' },
@@ -584,7 +598,7 @@
     isIndeterminate,
     isColumnVisible,
     resetToDefault
-  } = usePersistedListColumns('db-weighing-list-columns', listColumnDefs)
+  } = usePersistedListColumns('db-weighing-list-columns-v2', listColumnDefs)
 
   const weighingExportColumns = computed(() => {
     const cols = [...visibleColumns.value]
@@ -605,6 +619,9 @@
       { key: '__selection', interactive: false },
       { key: '__index', interactive: false }
     ]
+    if (isColumnVisible('inboundOutboundId')) {
+      cols.push({ key: 'inboundOutboundId', interactive: true, prop: 'inboundOutboundId' })
+    }
     if (isColumnVisible('inventoryDate')) {
       cols.push({ key: 'inventoryDate', interactive: true, prop: 'inventoryDate' })
     }
@@ -613,7 +630,9 @@
     }
     cols.push({ key: 'batchNo', interactive: true, prop: 'batchNo' })
     for (const def of listColumnDefs) {
-      if (def.prop === 'inventoryDate' || def.prop === 'planNo') continue
+      if (def.prop === 'inventoryDate' || def.prop === 'planNo' || def.prop === 'inboundOutboundId') {
+        continue
+      }
       if (!isColumnVisible(def.prop)) continue
       cols.push({
         key: def.prop,