From 8fbf0081f81572e076e7b202a5cc1fe8f676d12a Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Wed, 5 Feb 2025 15:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryAlarm/index.vue       | 37 ++++++++++--------
 src/views/wms/inventoryCheck/index.vue       | 25 +++++++-----
 src/views/wms/inventoryCheckRecord/index.vue | 24 ++++++------
 src/views/wms/linkage/index.vue              |  1 +
 src/views/wms/moveOrder/index.vue            | 41 ++++++++++++--------
 src/views/wms/returnOrder/index.vue          |  6 +--
 src/views/wms/wmsPurchaseOrderCopy/index.vue | 18 +++++----
 7 files changed, 89 insertions(+), 63 deletions(-)

diff --git a/src/views/wms/inventoryAlarm/index.vue b/src/views/wms/inventoryAlarm/index.vue
index fc59f5f..4d9f810 100644
--- a/src/views/wms/inventoryAlarm/index.vue
+++ b/src/views/wms/inventoryAlarm/index.vue
@@ -4,33 +4,37 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="表主键" prop="inventoryId">
+            <!-- <el-form-item label="表主键" prop="inventoryId">
               <el-input v-model="queryParams.inventoryId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="批次码" prop="batchCode">
+            </el-form-item> -->
+            <!-- <el-form-item label="批次码" prop="batchCode">
               <el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="物料" prop="materialCode">
+              <el-input v-model="queryParams.materialCode" placeholder="请输入物料" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="物料id" prop="materialId">
-              <el-input v-model="queryParams.materialId" placeholder="请输入物料id" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="库位编码" prop="locationCode">
+            <!-- <el-form-item label="库位编码" prop="locationCode">
               <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="物料大类" prop="materialCategories">
-              <el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable >
+                <el-option v-for="dict in material_mategories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
             </el-form-item>
-            <el-form-item label="库存数量" prop="inventoryQty">
+            <!-- <el-form-item label="库存数量" prop="inventoryQty">
               <el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="锁定状态" prop="lockState">
-              <el-input v-model="queryParams.lockState" placeholder="请输入锁定状态" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
+            <!-- <el-form-item label="锁定状态" prop="lockState">
+              <el-select v-model="queryParams.inventoryStatus" placeholder="请选择锁定状态" clearable >
+                <el-option v-for="dict in lock_state" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item> -->
             <!-- <el-form-item label="库存状态" prop="inventoryStatus">
               <el-select v-model="queryParams.inventoryStatus" placeholder="请选择库存状态" clearable >
                 <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item> -->
-            <el-form-item label="仓库ID" prop="storeId">
+            <el-form-item label="仓库" prop="storeId">
               <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -79,6 +83,7 @@
             <dict-tag :options="material_mategories" :value="scope.row.materialCategories"/>
           </template>
         </el-table-column>
+        <el-table-column label="物料" align="center" prop="materialCode" v-if="columns[6].visible"/>
         <el-table-column label="库存数量" align="center" prop="inventoryQty" v-if="columns[6].visible"/>
         <el-table-column label="锁定状态" align="center" prop="lockState" v-if="columns[8].visible">
           <template #default="scope">
@@ -90,7 +95,7 @@
             <dict-tag :options="inventory_status" :value="scope.row.inventoryStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="仓库ID" align="center" prop="warehouseCode" v-if="columns[10].visible"/>
+        <el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[10].visible"/>
         <el-table-column label="上限" align="center" prop="maxStockAmount"/>
         <el-table-column label="下限" align="center" prop="minStockAmount"/>
         <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/wms/inventoryCheck/index.vue b/src/views/wms/inventoryCheck/index.vue
index 8c61a80..2d02cdd 100644
--- a/src/views/wms/inventoryCheck/index.vue
+++ b/src/views/wms/inventoryCheck/index.vue
@@ -4,17 +4,24 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="表主键" prop="inventoryCheckId">
+            <!-- <el-form-item label="表主键" prop="inventoryCheckId">
               <el-input v-model="queryParams.inventoryCheckId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="盘点单号" prop="checkCode">
               <el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <!-- <el-form-item label="物料大类" prop="materialCategories">
               <el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
-            <el-form-item label="计划仓库ID" prop="planWarehouseId">
-              <el-input v-model="queryParams.planWarehouseId" placeholder="请输入计划仓库ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="计划仓库" prop="planWarehouseId">
+              <el-select v-model="form.planWarehouseId" placeholder="请选择计划仓库">
+            <el-option
+              v-for="item in baseStoreList"
+              :key="item.warehouseId"
+              :label="item.warehouseName"
+              :value="item.warehouseId"
+            ></el-option>
+          </el-select>
             </el-form-item>
             <!-- <el-form-item label="盘点类型" prop="checkType">
               <el-select v-model="queryParams.checkType" placeholder="请选择盘点类型" clearable >
@@ -26,7 +33,7 @@
                 <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item> -->
-            <el-form-item label="审核人" prop="auditBy">
+            <!-- <el-form-item label="审核人" prop="auditBy">
               <el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="审核时间" prop="auditTime">
@@ -36,13 +43,13 @@
                 value-format="YYYY-MM-DD"
                 placeholder="请选择审核时间"
               />
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
               <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态(0待审核,1审核通过,2审核未通过)" clearable >
                 <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item> -->
-            <el-form-item label="审核意见" prop="auditComments">
+            <!-- <el-form-item label="审核意见" prop="auditComments">
               <el-input v-model="queryParams.auditComments" placeholder="请输入审核意见" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="开始时间" prop="beginTime">
@@ -60,7 +67,7 @@
                 value-format="YYYY-MM-DD"
                 placeholder="请选择结束时间"
               />
-            </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>
@@ -91,7 +98,7 @@
 
       <el-table v-loading="loading" :data="inventoryCheckList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="表主键" align="center" prop="inventoryCheckId" v-if="columns[0].visible"/>
+        <!-- <el-table-column label="表主键" align="center" prop="inventoryCheckId" v-if="columns[0].visible"/> -->
         <el-table-column label="盘点单号" align="center" prop="checkCode" v-if="columns[2].visible"/>
         <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible">
           <template #default="scope">
diff --git a/src/views/wms/inventoryCheckRecord/index.vue b/src/views/wms/inventoryCheckRecord/index.vue
index 2336e7e..8c1e6bc 100644
--- a/src/views/wms/inventoryCheckRecord/index.vue
+++ b/src/views/wms/inventoryCheckRecord/index.vue
@@ -4,11 +4,13 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="盘点记录主键" prop="icRecordId">
+            <!-- <el-form-item label="盘点记录主键" prop="icRecordId">
               <el-input v-model="queryParams.icRecordId" placeholder="请输入盘点记录主键" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="物料大类" prop="materialCategories">
-              <el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable >
+                <el-option v-for="dict in material_mategories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
             </el-form-item>
             <el-form-item label="盘点单号" prop="checkCode">
               <el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" clearable @keyup.enter="handleQuery" />
@@ -16,9 +18,9 @@
             <el-form-item label="批次码" prop="batchCode">
               <el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="物料id" prop="materialId">
+            <!-- <el-form-item label="物料id" prop="materialId">
               <el-input v-model="queryParams.materialId" placeholder="请输入物料id" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="库位编码" prop="locationCode">
               <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -28,12 +30,12 @@
             <el-form-item label="物料名称" prop="materialName">
               <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="库存数量" prop="inventoryQty">
+            <!-- <el-form-item label="库存数量" prop="inventoryQty">
               <el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="盘点数量" prop="checkQty">
               <el-input v-model="queryParams.checkQty" placeholder="请输入盘点数量" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="盘点状态(0异常，1正常)" prop="checkStatus">
               <el-select v-model="queryParams.checkStatus" placeholder="请选择盘点状态(0异常，1正常)" clearable >
                 <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -44,13 +46,13 @@
                 <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item> -->
-            <el-form-item label="erp同步数量" prop="erpSynchronousQty">
+            <!-- <el-form-item label="erp同步数量" prop="erpSynchronousQty">
               <el-input v-model="queryParams.erpSynchronousQty" placeholder="请输入erp同步数量" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="是否发起调整" prop="isAdjust">
               <el-input v-model="queryParams.isAdjust" placeholder="请输入是否发起调整" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="审核人" prop="auditBy">
+            </el-form-item> -->
+            <!-- <el-form-item label="审核人" prop="auditBy">
               <el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="审核时间" prop="auditTime">
@@ -60,7 +62,7 @@
                 value-format="YYYY-MM-DD"
                 placeholder="请选择审核时间"
               />
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
               <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态(0待审核,1审核通过,2审核未通过)" clearable >
                 <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
index 05bc359..be29ccb 100644
--- a/src/views/wms/linkage/index.vue
+++ b/src/views/wms/linkage/index.vue
@@ -503,6 +503,7 @@ const reset = () => {
   queryForm.value = {
     allocateOrderCode: ''
   }
+  getParentTable();
 }
 
 // 父表格行点击
diff --git a/src/views/wms/moveOrder/index.vue b/src/views/wms/moveOrder/index.vue
index 74c28d4..02a16b1 100644
--- a/src/views/wms/moveOrder/index.vue
+++ b/src/views/wms/moveOrder/index.vue
@@ -4,17 +4,26 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="表主键" prop="moveId">
+            <!-- <el-form-item label="表主键" prop="moveId">
               <el-input v-model="queryParams.moveId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="物料ID" prop="materialId">
+            </el-form-item> -->
+            <!-- <el-form-item label="物料ID" prop="materialId">
               <el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="物料大类" prop="materialCategories">
-              <el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable >
+                <el-option v-for="dict in material_mategories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
             </el-form-item>
-            <el-form-item label="仓库ID" prop="warehouseId">
-              <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="仓库" prop="warehouseId">
+              <el-select v-model="form.warehouseId" placeholder="请选择所属仓库" clearable>
+            <el-option
+              v-for="item in baseStoreList"
+              :key="item.warehouseId"
+              :label="item.warehouseName"
+              :value="item.warehouseId"
+            ></el-option>
+          </el-select>
             </el-form-item>
             <el-form-item label="计划库位" prop="planLocationCode">
               <el-input v-model="queryParams.planLocationCode" placeholder="请输入计划库位" clearable @keyup.enter="handleQuery" />
@@ -27,33 +36,33 @@
             <el-form-item label="目标库位" prop="targetLocationCode">
               <el-input v-model="queryParams.targetLocationCode" placeholder="请输入目标库位" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="审核人" prop="auditBy">
+            <!-- <el-form-item label="审核人" prop="auditBy">
               <el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="审核时间" prop="auditTime">
+            </el-form-item> -->
+            <!-- <el-form-item label="审核时间" prop="auditTime">
               <el-date-picker clearable
                 v-model="queryParams.auditTime"
                 type="date"
                 value-format="YYYY-MM-DD"
                 placeholder="请选择审核时间"
               />
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
               <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态(0待审核,1审核通过,2审核未通过)" clearable >
                 <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select> -->
             <!-- </el-form-item> -->
-            <el-form-item label="审核意见" prop="auditComments">
+            <!-- <el-form-item label="审核意见" prop="auditComments">
               <el-input v-model="queryParams.auditComments" placeholder="请输入审核意见" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="erp同步状态" prop="erpSynchronousStatus">
               <el-select v-model="queryParams.erpSynchronousStatus" placeholder="请选择erp同步状态" clearable >
                 <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item> -->
-            <el-form-item label="erp同步数量" prop="erpSynchronousQty">
+            <!-- <el-form-item label="erp同步数量" prop="erpSynchronousQty">
               <el-input v-model="queryParams.erpSynchronousQty" placeholder="请输入erp同步数量" clearable @keyup.enter="handleQuery" />
-            </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>
@@ -84,7 +93,7 @@
 
       <el-table v-loading="loading" :data="moveOrderList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="表主键" align="center" prop="moveId" v-if="columns[0].visible"/>
+        <!-- <el-table-column label="表主键" align="center" prop="moveId" v-if="columns[0].visible"/> -->
         <el-table-column label="物料" align="center" prop="materialCode" v-if="columns[2].visible"/>
         <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible">
           <template #default="scope">
diff --git a/src/views/wms/returnOrder/index.vue b/src/views/wms/returnOrder/index.vue
index 771ac11..1e3ba00 100644
--- a/src/views/wms/returnOrder/index.vue
+++ b/src/views/wms/returnOrder/index.vue
@@ -93,7 +93,7 @@
 
       <el-table v-loading="loading" :data="returnOrderList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="表主键" align="center" prop="roId" v-if="columns[0].visible"/>
+        <!-- <el-table-column label="表主键" align="center" prop="roId" v-if="columns[0].visible"/> -->
         <el-table-column label="物料ID" align="center" prop="materialCode" v-if="columns[6].visible"/>
         <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[7].visible">
           <template #default="scope">
@@ -125,7 +125,7 @@
           </template>
         </el-table-column>
         <el-table-column label="erp同步数量" align="center" prop="erpSynchronousQty" v-if="columns[20].visible"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:returnOrder:edit']"></el-button>
@@ -134,7 +134,7 @@
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:returnOrder:remove']"></el-button>
             </el-tooltip>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
diff --git a/src/views/wms/wmsPurchaseOrderCopy/index.vue b/src/views/wms/wmsPurchaseOrderCopy/index.vue
index a777563..ea636aa 100644
--- a/src/views/wms/wmsPurchaseOrderCopy/index.vue
+++ b/src/views/wms/wmsPurchaseOrderCopy/index.vue
@@ -69,15 +69,15 @@
             <span>{{ parseTime(scope.row.planDeliveryDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商ID" align="center" prop="supplierId"/>
+        <el-table-column label="供应商" align="center" prop="supplierCode"/>
         <el-table-column label="订单类型" align="center" prop="poType">
           <template #default="scope">
             <dict-tag :options="wms_po_type" :value="scope.row.poType"/>
           </template>
         </el-table-column>
-        <el-table-column label="单据的ID" align="center" prop="erpId"/>
+        <!-- <el-table-column label="单据的ID" align="center" prop="erpId"/> -->
         <el-table-column label="备注" align="center" prop="remark"/>
-        <el-table-column label="租户号" align="center" prop="tenantId"/>
+        <!-- <el-table-column label="租户号" align="center" prop="tenantId"/> -->
         <!-- <el-table-column label="创建人" align="center" prop="createBy"/>
         <el-table-column label="创建时间" align="center" prop="createTime" width="180"> -->
           <!-- <template #default="scope">
@@ -172,7 +172,7 @@
     <el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%">
       <el-card shadow="never">
         <el-form :model="dialogForm" :inline="true" label-width="120px" :disabled="isView">
-          <el-form-item label="订单编号" prop="poNo">
+          <!-- <el-form-item label="订单编号" prop="poNo">
           <el-input v-model="dialogForm.poNo" placeholder="请输入订单编号" />
         </el-form-item>
         <el-form-item label="订单状态" prop="poStatus">
@@ -184,7 +184,7 @@
                 :value="dict.value"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="计划交货日期" prop="planDeliveryDate">
           <el-date-picker clearable
             v-model="dialogForm.planDeliveryDate"
@@ -231,7 +231,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="审核人" prop="auditBy">
-          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人">
+          <el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">
             <el-option
               v-for="item in userList"
               :key="item.userId"
@@ -310,7 +310,7 @@
             <el-option
                 v-for="item in supplierList"
                 :key="item.supplierId"
-                :label="item.supplierName"
+                :label="item.supplierCode"
                 :value="item.supplierId"
             ></el-option>
           </el-select>
@@ -537,6 +537,7 @@ const reset = () => {
   queryForm.value = {
     poNo: ''
   }
+  getParentTable();
 }
 
 // 父表格行点击
@@ -547,7 +548,7 @@ const parentTableCellClick = async (e) => {
 
 // 表格多选
 const selectionChange = (e) => {
-  ids.value = e.map(v => v.instockId)
+  ids.value = e.map(v => v.poId)
 }
 // 查看
 const viewDetails = (e) => {
@@ -576,6 +577,7 @@ const parentTableUpdate = async (e) => {
   }
   if (!id.value) return
   parentTableInfoForm.value = (await getWmsPurchaseOrder(id.value)).data
+  parentTableInfoForm.value.createBy = ''
   parentTableInfoVisible.value = true
   updateDialog.value = true
 }