From 355a7896eff75f127e9155afea97212bed118531 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 4 Sep 2025 15:11:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=88=9B=E5=BB=BA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加表单验证规则，提高数据完整性
- 增加客户名称字段，完善客户信息展示
- 优化订单编号输入，根据不同出库类型显示
- 调整出库类型选择框，增加禁用状态
- 添加高价值物料标签，增强物料信息展示
---
 src/api/wms/outstockOrder/types.ts        | 21 ++++++++++++--
 src/views/wms/outstockOrderCopy/index.vue | 35 +++++++++++++++++------
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/api/wms/outstockOrder/types.ts b/src/api/wms/outstockOrder/types.ts
index d9ec1e1..216d4ff 100644
--- a/src/api/wms/outstockOrder/types.ts
+++ b/src/api/wms/outstockOrder/types.ts
@@ -67,7 +67,12 @@ export interface OutstockOrderVO {
   /**
    * 仓库名称
    */
-  warehouseName: string;
+  warehouseName?: string;
+
+  /**
+   * 客户名称
+   */
+  customerName?: string;
 
 
 }
@@ -138,7 +143,12 @@ export interface OutstockOrderForm extends BaseEntity {
   /**
    * 仓库名称
    */
-  warehouseName: string;
+  warehouseName?: string;
+
+  /**
+   * 客户名称
+   */
+  customerName?: string;
 
   /**
    * 出库明细集合（一次性提交）
@@ -214,7 +224,12 @@ export interface OutstockOrderQuery extends PageQuery {
   /**
    * 仓库名称
    */
-  warehouseName: string;
+  warehouseName?: string;
+
+  /**
+   * 客户名称
+   */
+  customerName?: string;
 
     /**
      * 日期范围参数
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index 3850049..717801d 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -78,7 +78,7 @@
           </template>
         </el-table-column>
         <el-table-column label="审核意见" align="center" prop="auditComments"/>
-        <el-table-column label="客户" align="center" prop="customerId">
+        <el-table-column label="客户" align="center" prop="customerName">
 
         </el-table-column>
         <!-- <el-table-column label="入库方式" align="center" prop="inMethod">
@@ -124,6 +124,9 @@
 <!--        <el-table-column label="物料大类" align="center" prop="materialCategoryName">-->
 <!--        </el-table-column>-->
         <el-table-column label="是否高价值" align="center" prop="isHighValue">
+          <template #default="scope">
+            <dict-tag :options="is_high_value" :value="scope.row.isHighValue"/>
+          </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" width="200">
           <template #default="scope">
@@ -147,8 +150,8 @@
 
     <el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%">
       <el-card shadow="never">
-        <el-form :model="dialogForm" :inline="true" label-width="120px" :disabled="isView" ref="dialogFormRef">
-          <el-form-item label="仓库" prop="warehouseId">
+        <el-form :model="dialogForm" :rules="dialogFormRules" :inline="true" label-width="120px" :disabled="isView" ref="dialogFormRef">
+          <el-form-item label="仓库" prop="warehouseId" :rules="[{ required: true, message: '请选择仓库', trigger: 'change' }]">
           <el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -158,7 +161,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="出库类型" prop="outstockType">
+        <el-form-item label="出库类型" prop="outstockType" :rules="[{ required: true, message: '请选择出库类型', trigger: 'change' }]">
           <el-select v-model="dialogForm.outstockType" placeholder="请选择出库类型">
             <el-option
                 v-for="dict in wms_out_type"
@@ -197,6 +200,9 @@
 <!--            />-->
 <!--          </el-select>-->
 <!--        </el-form-item>-->
+          <el-form-item label="订单编号" prop="orderNo" v-if="dialogForm.outstockType === '1'" :rules="dialogForm.outstockType === '1' ? [{ required: true, message: '请输入订单编号', trigger: 'blur' }] : []">
+            <el-input v-model="dialogForm.orderNo" placeholder="请输入销售单号" clearable/>
+          </el-form-item>
           <el-form-item label="销售客户" prop="customerId"  v-if =" dialogForm.outstockType === '1' ">
             <el-select v-model="dialogForm.customerId" placeholder="请选择客户">
               <el-option
@@ -385,7 +391,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="出库类型" prop="outstockType">
-          <el-select v-model="parentTableInfoForm.outstockType" placeholder="请选择出库类型">
+          <el-select v-model="parentTableInfoForm.outstockType" placeholder="请选择出库类型" :disabled="true">
             <el-option
                 v-for="dict in wms_out_type"
                 :key="dict.value"
@@ -561,8 +567,9 @@ const {
   mes_material_categories,
   wms_allocate_status,
   wms_allocate_create,
-  wms_allocate_way
-} = toRefs<any>(proxy?.useDict('wms_out_type', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way'));
+  wms_allocate_way,
+  is_high_value
+} = toRefs<any>(proxy?.useDict('wms_out_type', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way', 'is_high_value'));
 
 
 interface User {
@@ -584,6 +591,13 @@ const updateDialog = ref(false)
 const dialogTitle = ref('添加')
 
 const dialogForm = ref({})
+
+// 表单验证规则
+const dialogFormRules = ref({
+  warehouseId: [{ required: true, message: '请选择仓库', trigger: 'change' }],
+  outstockType: [{ required: true, message: '请选择出库类型', trigger: 'change' }],
+  orderNo: [{ required: true, message: '请输入订单编号', trigger: 'blur' }]
+})
 const parentTableInfoForm = ref({})
 const childrenTableInfoForm = ref({})
 
@@ -735,7 +749,12 @@ const selectionChange = (e) => {
 const parentTableAdd = () => {
   getBaseCustomerList();
   dialogVisible.value = true
-  dialogForm.value = {}
+  dialogForm.value = {
+    warehouseId: '',
+    outstockType: '',
+    orderNo: '',
+    customerId: ''
+  }
   dialogtable.value = []
 }
 // 父表格修改