From 21df05fe66262b5f127502a124c1655bf29d9b9f Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 5 Sep 2025 15:25:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BC=98=E5=8C=96=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8=E5=8D=95=E5=92=8C=E5=BA=93=E5=AD=98=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-调整联动单审批按钮显示逻辑
- 修复库存选择界面物料大类筛选功能
-优化代码格式和注释
---
 .../wms/inventory/selectInventoryInWMS.vue    | 32 +++++++++----------
 src/views/wms/linkage/index.vue               | 18 +++++------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/inventory/selectInventoryInWMS.vue b/src/views/wms/inventory/selectInventoryInWMS.vue
index 9f907e7..957072e 100644
--- a/src/views/wms/inventory/selectInventoryInWMS.vue
+++ b/src/views/wms/inventory/selectInventoryInWMS.vue
@@ -11,16 +11,16 @@
         <el-form-item label="库位编码" prop="locationCode">
           <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="物料大类" prop="materialCategoryId">
+<!--        <el-form-item label="物料大类" prop="materialCategoryId">
           <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable>
-            <el-option 
+            <el-option
               v-for="item in mategoryOptions"
               :key="item.materialCategoryId"
               :label="item.materialCategoryName"
               :value="item.materialCategoryId"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item>
           <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -29,9 +29,9 @@
     </el-card>
 
     <el-card style="margin-top: 8px" shadow="never">
-      <el-table 
-        v-loading="loading" 
-        :data="inventoryList" 
+      <el-table
+        v-loading="loading"
+        :data="inventoryList"
         @row-click="handleRowClick"
         @current-change="handleCurrentChange"
         ref="tableRef"
@@ -57,12 +57,12 @@
         <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
       </el-table>
 
-      <pagination 
-        v-show="total > 0" 
-        :total="total" 
-        v-model:page="queryParams.pageNum" 
-        v-model:limit="queryParams.pageSize" 
-        @pagination="getList" 
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
       />
     </el-card>
   </div>
@@ -80,7 +80,7 @@ const props = defineProps({
     default: undefined
   },
   warehouseId: {
-    type: [String, Number], 
+    type: [String, Number],
     default: undefined
   }
 });
@@ -123,7 +123,7 @@ const getList = async () => {
   loading.value = true;
   try {
     const res = await listInventory(queryParams.value);
-    inventoryList.value = res.rows.filter(item => 
+    inventoryList.value = res.rows.filter(item =>
       item.inventoryQty > 0 && // 只显示有库存的物料
       (item.lockState === '0' || item.lockState === null || item.lockState === undefined || item.lockState === '') && // 允许未锁定或空值
       item.inventoryStatus === '1' // 只显示正常状态的库存
@@ -173,7 +173,7 @@ watch(
 );
 
 onMounted(async () => {
-  await getMaterialCategorySelect();
+  // await getMaterialCategorySelect();
   await getList();
 });
 
@@ -187,4 +187,4 @@ defineExpose({
 .p-2 {
   padding: 8px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
index dc98dd3..4f0d28e 100644
--- a/src/views/wms/linkage/index.vue
+++ b/src/views/wms/linkage/index.vue
@@ -85,7 +85,7 @@
 <!--            <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 size="small" @click.stop="parentTableApprove(scope.row)" v-if="scope.row.auditStatus == '0' ">审批
             </el-button>
             <el-button
               size="small"
@@ -376,13 +376,13 @@
         </el-form-item>
 <!--        <el-form-item label="审核人" prop="auditBy">
           <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人">
-            <el-option
-              v-for="item in userList"
-              :key="item.userId"
-              :label="item.userName"
-              :value="item.userName"
-            />
-          </el-select>
+              <el-option
+                v-for="item in userList"
+                :key="item.userId"
+                :label="item.userName"
+                :value="item.userName"
+              />
+            </el-select>
         </el-form-item>-->
       </el-form>
       <template #footer>
@@ -1174,7 +1174,7 @@ const loadAllTasks = async () => {
 const childrenTablePrint = async (row) => {
   try {
     // 检查是否已经打印过
-    const result = await validatePrintable(row.aoDId);
+    const result = await validatePrintable({aoDId: row.aoDId});
     if (!result.data) {
       ElMessage.warning('该调拨明细已经打印过，不允许重复打印');
       return;