From 359fa68474d7b0c4ae1d5b4aaedd7cc38d2fb208 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 5 Sep 2025 14:22:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BF=AE=E6=94=B9=E8=B0=83?=
 =?UTF-8?q?=E6=8B=A8=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉新增和修改按钮
- 修改出库仓库和入库仓库列的属性，从代码改为名称
- 添加审批按钮
- 修改物料列的属性，从代码改为名称
---
 src/views/wms/linkage/index.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
index 19a0e41..5e7967d 100644
--- a/src/views/wms/linkage/index.vue
+++ b/src/views/wms/linkage/index.vue
@@ -18,10 +18,10 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="parentTableAdd">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="ids.length !== 1" @click="parentTableUpdate(null)">修改
             </el-button>
-          </el-col>
+          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="ids.length < 1" @click="parentTableDelete(null)">删除
             </el-button>
@@ -41,13 +41,13 @@
         <el-table-column label="调拨单号" align="center" prop="allocateOrderCode"/>
 <!--        <el-table-column label="物料大类" align="center" prop="materialCategoryName">
         </el-table-column>-->
-        <el-table-column label="出库仓库" align="center" prop="planWarehouseCode"/>
+        <el-table-column label="出库仓库" align="center" prop="planWarehouseName"/>
         <el-table-column label="工单状态" align="center" prop="orderStatus">
           <template #default="scope">
             <dict-tag :options="wms_allocate_status" :value="scope.row.orderStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="入库仓库" align="center" prop="targetWarehouseCode"/>
+        <el-table-column label="入库仓库" align="center" prop="targetWarehouseName"/>
         <el-table-column label="审核人" align="center" prop="auditBy"/>
         <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
           <template #default="scope">
@@ -82,8 +82,11 @@
             <!--            <el-button size="small" @click.stop="viewDetails(scope.row)">-->
             <!--              查看-->
             <!--            </el-button>-->
-            <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
+<!--            <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
               修改
+            </el-button>-->
+            <el-button size="small" @click.stop="parentTableApprove(scope.row)" v-if="scope.row.auditStatus==0&&scope.row.auditBy!=''">
+              审批
             </el-button>
             <el-button
               size="small"
@@ -103,7 +106,7 @@
       <el-table :data="childrenTableData" style="width: 100%" v-loading="childrenTableLoad">
         <el-table-column label="调拨子表主键" align="center" prop="aoDId" v-if="false"/>
         <el-table-column label="调拨单号" align="center" prop="allocateCode"/>
-        <el-table-column label="物料" align="center" prop="materialCode"/>
+        <el-table-column label="物料" align="center" prop="materialName"/>
         <el-table-column label="调拨数量" align="center" prop="allocateOrderQty"/>
         <el-table-column label="erp同步状态" align="center" prop="erpSynchronousStatus">
           <template #default="scope">