From af703708fe9cb23875ed6530b204ba21dac7d288 Mon Sep 17 00:00:00 2001
From: yangk <yangk@mesnac.com>
Date: Fri, 15 May 2026 17:58:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=B1=BB=E5=9E=8B=E8=81=94=E5=8A=A8=E5=92=8C=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E9=80=89=E6=8B=A9=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加发货类型变更时自动设置到货确认标识的联动逻辑
- 实现合同表格单选功能并同步选中状态
- 将计划到货时间选择器从日期时间改为日期格式
- 修复字典选项错误引用问题
- 更新需到货确认字段的显示逻辑为根据发货类型自动计算
---
 src/views/wms/wmsShippingBill/edit.vue  | 53 +++++++++++++++++++++++--
 src/views/wms/wmsShippingBill/index.vue |  8 ++--
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/wmsShippingBill/edit.vue b/src/views/wms/wmsShippingBill/edit.vue
index 5c39806..86dadf8 100644
--- a/src/views/wms/wmsShippingBill/edit.vue
+++ b/src/views/wms/wmsShippingBill/edit.vue
@@ -89,7 +89,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="发货类型" prop="shippingType">
-              <el-select v-model="form.shippingType" placeholder="请选择发货类型" style="width: 100%">
+              <el-select v-model="form.shippingType" placeholder="请选择发货类型" style="width: 100%" @change="handleShippingTypeChange">
                 <el-option v-for="dict in shipping_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -198,8 +198,8 @@
             <el-form-item label="计划到货时间" prop="planArrivalTime">
               <el-date-picker
                 v-model="form.planArrivalTime"
-                type="datetime"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                type="date"
+                value-format="YYYY-MM-DD"
                 placeholder="请选择计划到货时间"
                 style="width: 100%"
               />
@@ -377,7 +377,16 @@
           <el-button icon="Refresh" @click="resetContractQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="contractLoading" :data="contractList" border @row-click="handleContractRowClick" max-height="400">
+      <el-table
+        ref="contractTableRef"
+        v-loading="contractLoading"
+        :data="contractList"
+        border
+        @row-click="handleContractRowClick"
+        @select="handleContractSelect"
+        max-height="400"
+      >
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="合同编号" align="center" prop="contractCode" min-width="120" />
         <el-table-column label="合同名称" align="center" prop="contractName" min-width="180" show-overflow-tooltip />
         <el-table-column label="合同总价" align="center" prop="totalPrice" min-width="120" />
@@ -640,6 +649,7 @@ const projectSelectRef = ref<InstanceType<typeof ProjectSelect>>();
 // 合同选择
 const selectedContractName = ref<string>('');
 const selectedSapOrderCode = ref<string>(''); // SAP订单号（来自合同）
+const contractTableRef = ref();
 const contractDialog = reactive({ visible: false });
 const contractLoading = ref(false);
 const contractList = ref<ContractInfoVO[]>([]);
@@ -884,6 +894,24 @@ const resetContractQuery = () => {
 
 const handleContractRowClick = (row: ContractInfoVO) => {
   selectedContract.value = row;
+  // 同步选中状态到选择框
+  if (contractTableRef.value) {
+    contractTableRef.value.clearSelection();
+    contractTableRef.value.toggleRowSelection(row, true);
+  }
+};
+
+/** 合同选择框点击事件 - 实现单选 */
+const handleContractSelect = (selection: any[], row: any) => {
+  if (contractTableRef.value) {
+    contractTableRef.value.clearSelection();
+    if (selection.length > 0) {
+      contractTableRef.value.toggleRowSelection(row, true);
+      selectedContract.value = row;
+    } else {
+      selectedContract.value = null;
+    }
+  }
 };
 
 const submitContractSelect = () => {
@@ -1090,6 +1118,23 @@ const handleWarehouseChange = (warehouseId: any) => {
   }
 };
 
+/** 发货类型变化 - 联动需到货确认标识 */
+const handleShippingTypeChange = (val: any) => {
+  if (val === '1') {
+    form.value.needArrivalConfirm = '1';
+  } else if (val === '2' || val === '3') {
+    form.value.needArrivalConfirm = '0';
+  }
+};
+
+/** 监听发货类型，确保逻辑一致性 */
+watch(
+  () => form.value.shippingType,
+  (val) => {
+    handleShippingTypeChange(val);
+  }
+);
+
 /** 物料来源切换 */
 const handleMaterialSourceChange = () => {
   // 切换物料来源时，可以选择是否清空已选物料
diff --git a/src/views/wms/wmsShippingBill/index.vue b/src/views/wms/wmsShippingBill/index.vue
index 6db4537..fd5519b 100644
--- a/src/views/wms/wmsShippingBill/index.vue
+++ b/src/views/wms/wmsShippingBill/index.vue
@@ -109,12 +109,12 @@
         <el-table-column label="供应商" align="center" prop="supplier" min-width="120" show-overflow-tooltip v-if="columns[6].visible" />
         <el-table-column label="发货单状态" align="center" prop="outStockBillStatus" width="110" v-if="columns[7].visible">
           <template #default="scope">
-            <dict-tag :options="shipping_bill_status" :value="scope.row.outStockBillStatus" />
+            <dict-tag :options="out_stock_bill_status" :value="scope.row.outStockBillStatus" />
           </template>
         </el-table-column>
         <el-table-column label="需到货确认" align="center" prop="needArrivalConfirm" width="100" v-if="columns[8].visible">
           <template #default="scope">
-            <dict-tag :options="need_arrival_confirm" :value="scope.row.needArrivalConfirm" />
+            <dict-tag :options="need_arrival_confirm" :value="scope.row.shippingType === '1' ? '1' : '0'" />
           </template>
         </el-table-column>
         <el-table-column label="到货标识" align="center" prop="isAllReceiving" width="100" v-if="columns[9].visible">
@@ -329,8 +329,8 @@ const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 // 字典定义
-const { shipping_mode, shipping_bill_status, shipping_type, need_arrival_confirm, is_all_receiving } = toRefs<any>(
-  proxy?.useDict('shipping_mode', 'shipping_bill_status', 'shipping_type', 'need_arrival_confirm', 'is_all_receiving')
+const { shipping_mode, shipping_type, need_arrival_confirm, is_all_receiving, out_stock_bill_status } = toRefs<any>(
+  proxy?.useDict('shipping_mode', 'shipping_type', 'need_arrival_confirm', 'is_all_receiving', 'out_stock_bill_status')
 );
 
 const wmsShippingBillList = ref<WmsShippingBillVO[]>([]);