From bf61ab4d9c0bfe16ede66c0a8e4b87371afc1e4a Mon Sep 17 00:00:00 2001
From: 15066119699 <bo.wu@finesys.com.cn>
Date: Tue, 11 Mar 2025 00:17:03 +0800
Subject: [PATCH] 1

---
 src/views/system/pmsOrderOut/index.vue | 20 +++++++++++++++++---
 src/views/system/stock/index.vue       |  4 ++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/system/pmsOrderOut/index.vue b/src/views/system/pmsOrderOut/index.vue
index b2bacac..2f23f79 100644
--- a/src/views/system/pmsOrderOut/index.vue
+++ b/src/views/system/pmsOrderOut/index.vue
@@ -99,7 +99,11 @@
       <!-- <el-table-column label="记录号" align="center" prop="recordId" /> -->
       <el-table-column label="单号" align="center" prop="orderId" width="270"/>
       <el-table-column label="出库单号" align="center" prop="listId" />
-      <el-table-column label="出库单类型" align="center" prop="orderType" />
+      <el-table-column label="出库单类型" align="center" prop="orderType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.out_order_type" :value="scope.row.orderType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="客户名称" align="center" prop="customerId" />
       <el-table-column label="物料号" align="center" prop="goodsId" />
       <el-table-column label="订单出库数量" align="center" prop="goodsNum" />
@@ -118,8 +122,16 @@
       </el-table-column>
       <el-table-column label="库存数量" align="center" prop="stockNum" />
       <el-table-column label="物料描述" align="center" prop="goodsDesc" />
-      <el-table-column label="订单状态" align="center" prop="orderStatus" />
-      <el-table-column label="是否锁定" align="center" prop="isLock" />
+      <el-table-column label="订单状态" align="center" prop="orderStatus" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.out_order_status" :value="scope.row.orderStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否锁定" align="center" prop="isLock" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.stock_or_order_status" :value="scope.row.isLock"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -209,7 +221,9 @@ export default {
   components: {
     OutboundDialog
   },
+  dicts: ["out_order_type", "out_order_status","stock_or_order_status"],
   data() {
+    
     return {
       // 遮罩层
       loading: true,
diff --git a/src/views/system/stock/index.vue b/src/views/system/stock/index.vue
index 8a27472..30f804d 100644
--- a/src/views/system/stock/index.vue
+++ b/src/views/system/stock/index.vue
@@ -136,7 +136,7 @@
       </el-table-column>
       <el-table-column label="库存状态" align="center" prop="stockStatus" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
+          <dict-tag :options="dict.type.stock_or_order_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="操作人" align="center" prop="createUser" />
@@ -262,7 +262,7 @@ import { listStock, getStock, delStock, addStock, updateStock } from "@/api/syst
 import {taskOutRequest} from "@/api/system/task";
 
 export default {
-  dicts: ["in_order_type", "stock_status"],
+  dicts: ["in_order_type", "stock_or_order_status"],
   name: "Stock",
   data() {
     return {