Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-ui/src/views/wms/stockIo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="出入库单号" prop="stockIoCode">
+      <el-form-item label="出入库单号" prop="stockIoCode" style="min-width:200px;max-width:220px;">
         <el-input
           v-model="queryParams.stockIoCode"
           placeholder="请输入出入库单号"
@@ -94,12 +94,16 @@
       <el-table-column label="出入库单号" align="center" prop="stockIoCode" />
       <el-table-column label="类型" align="center" prop="ioType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.stock_io_type" :value="scope.row.ioType"/>
+          <el-tag :type="getIoTypeTagType(scope.row.ioType)">
+            {{ getIoTypeLabel(scope.row.ioType) }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="业务类型" align="center" prop="bizType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.stock_biz_type" :value="scope.row.bizType"/>
+          <el-tag :type="getBizTypeTagType(scope.row.bizType)">
+            {{ getBizTypeLabel(scope.row.bizType) }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="单据状态" align="center" prop="status">
@@ -401,6 +405,35 @@ export default {
       }
       // 刷新列表
       this.getList();
+    },
+    getIoTypeTagType(type) {
+      if (type === 'in') return 'success';
+      if (type === 'out') return 'primary';
+      if (type === 'transfer') return 'warning';
+      return '';
+    },
+    getIoTypeLabel(type) {
+      if (type === 'in') return '入库';
+      if (type === 'out') return '出库';
+      if (type === 'transfer') return '移库';
+      return type;
+    },
+    getBizTypeTagType(type) {
+      if (type === 'purchase') return 'success';
+      if (type === 'sales') return 'primary';
+      if (type === 'return') return 'warning';
+      if (type === 'relocation') return 'info';
+      return 'default';
+    },
+    getBizTypeLabel(type) {
+      const map = {
+        purchase: '采购',
+        sales: '销售',
+        return: '退货',
+        relocation: '调拨',
+        other: '其他'
+      };
+      return map[type] || type;
     }
   }
 };

klp-ui/src/views/wms/stockIo/panels/detail.vue

@@ -3,8 +3,16 @@
     <template v-if="stockIo && stockIo.stockIoId">
       <!-- 主表信息 -->
       <el-descriptions :title="'单号：' + (stockIo.stockIoCode || '-')" :column="2" border>
-        <el-descriptions-item label="类型">{{ stockIo.ioType }}</el-descriptions-item>
-        <el-descriptions-item label="业务类型">{{ stockIo.bizType }}</el-descriptions-item>
+        <el-descriptions-item label="类型">
+          <el-tag :type="getIoTypeTagType(stockIo.ioType)">
+            {{ getIoTypeLabel(stockIo.ioType) }}
+          </el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="业务类型">
+          <el-tag :type="getBizTypeTagType(stockIo.bizType)">
+            {{ getBizTypeLabel(stockIo.bizType) }}
+          </el-tag>
+        </el-descriptions-item>
         <el-descriptions-item label="状态">
           <el-tag :type="stockIo.status === 2 ? 'success' : (stockIo.status === 1 ? 'warning' : 'info')">
             {{ stockIo.status === 2 ? '已完成' : (stockIo.status === 0 ? '草稿' : '待审核') }}
@@ -63,12 +71,12 @@
       <el-table v-loading="loading" :data="stockIoDetailList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="明细ID" align="center" prop="detailId"/>
-        <el-table-column label="库区/库位ID" align="center" prop="warehouseId" />
+        <el-table-column label="库区/库位" align="center" prop="warehouseName" />
         <el-table-column 
           v-if="stockIo.ioType === 'transfer'" 
-          label="源库区/库位ID" 
+          label="源库区/库位" 
           align="center" 
-          prop="fromWarehouseId" 
+          prop="fromWarehouseName" 
         />
         <el-table-column label="物品类型" align="center" prop="itemType" />
         <el-table-column label="物品ID" align="center" prop="itemId" />
@@ -469,6 +477,35 @@ export default {
           console.error('刷新主表状态失败:', error);
         });
       }
+    },
+    getIoTypeTagType(type) {
+      if (type === 'in') return 'success';
+      if (type === 'out') return 'primary';
+      if (type === 'transfer') return 'warning';
+      return '';
+    },
+    getIoTypeLabel(type) {
+      if (type === 'in') return '入库';
+      if (type === 'out') return '出库';
+      if (type === 'transfer') return '移库';
+      return type;
+    },
+    getBizTypeLabel(type) {
+      const map = {
+        purchase: '采购',
+        sales: '销售',
+        return: '退货',
+        relocation: '调拨',
+        other: '其他'
+      };
+      return map[type] || type;
+    },
+    getBizTypeTagType(type) {
+      if (type === 'purchase') return 'success';
+      if (type === 'sales') return 'primary';
+      if (type === 'return') return 'warning';
+      if (type === 'relocation') return 'info';
+      return 'default';
     }
   }
 }