From 7cb060e3de76121bea932b318baf34cf83cc8949 Mon Sep 17 00:00:00 2001
From: yangk <yangk@mesnac.com>
Date: Fri, 15 May 2026 10:48:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E7=A7=BB=E9=99=A4=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 shipping_status 字典项及相关下拉选项
- 删除 shippingStatus 相关表单字段和查询参数
- 移除发货状态默认值设置逻辑
- 在提交数据前删除 shippingStatus 字段
- 移除到货确认时同步维护发货状态的逻辑
---
 src/views/oa/erp/orderLedger/index.vue  | 23 ++++-------------------
 src/views/wms/wmsShippingBill/edit.vue  | 22 +++++++++++-----------
 src/views/wms/wmsShippingBill/index.vue | 11 ++---------
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/src/views/oa/erp/orderLedger/index.vue b/src/views/oa/erp/orderLedger/index.vue
index 7c90de7..528bc5e 100644
--- a/src/views/oa/erp/orderLedger/index.vue
+++ b/src/views/oa/erp/orderLedger/index.vue
@@ -57,11 +57,7 @@
                   </el-descriptions-item>
                   <el-descriptions-item label="已生效客户订单">
                     <span>{{
-                      contractInfo.effectiveCustomerOrderFlag === '1'
-                        ? '是'
-                        : contractInfo.effectiveCustomerOrderFlag === '0'
-                          ? '否'
-                          : '-'
+                      contractInfo.effectiveCustomerOrderFlag === '1' ? '是' : contractInfo.effectiveCustomerOrderFlag === '0' ? '否' : '-'
                     }}</span>
                   </el-descriptions-item>
                 </el-descriptions>
@@ -255,11 +251,7 @@
                 </el-table-column>
               </el-table>
 
-              <el-empty
-                v-if="!loadingPurchase && purchaseMaterialList.length === 0"
-                description="暂无合同物料信息"
-                class="empty-state"
-              />
+              <el-empty v-if="!loadingPurchase && purchaseMaterialList.length === 0" description="暂无合同物料信息" class="empty-state" />
             </div>
           </div>
         </el-tab-pane>
@@ -291,13 +283,8 @@
               <el-table-column label="收货地址" prop="shippingAddress" width="200" align="center" show-overflow-tooltip />
               <el-table-column label="收货联系人" prop="receiverName" width="100" align="center" />
               <el-table-column label="收货电话" prop="receiverPhone" width="130" align="center" />
-<!--              <el-table-column label="物流公司" prop="logisticsCompany" width="130" align="center" />-->
-<!--              <el-table-column label="运单号" prop="trackingNo" width="150" align="center" />-->
-              <el-table-column label="发货状态" prop="shippingStatus" width="100" align="center">
-                <template #default="scope">
-                  <dict-tag :options="shipping_status" :value="scope.row.shippingStatus" />
-                </template>
-              </el-table-column>
+              <!--              <el-table-column label="物流公司" prop="logisticsCompany" width="130" align="center" />-->
+              <!--              <el-table-column label="运单号" prop="trackingNo" width="150" align="center" />-->
               <el-table-column label="计划到货时间" prop="planArrivalTime" width="120" align="center">
                 <template #default="scope">
                   <span>{{ parseTime(scope.row.planArrivalTime, '{y}-{m}-{d}') }}</span>
@@ -517,7 +504,6 @@ const {
   currency_type,
   contract_template_flag,
   shipping_mode,
-  shipping_status,
   order_purchase_status,
   order_delivery_status,
   order_invoice_status,
@@ -538,7 +524,6 @@ const {
     'currency_type',
     'contract_template_flag',
     'shipping_mode',
-    'shipping_status',
     'order_purchase_status',
     'order_delivery_status',
     'order_invoice_status',
diff --git a/src/views/wms/wmsShippingBill/edit.vue b/src/views/wms/wmsShippingBill/edit.vue
index 67bbd9b..5c39806 100644
--- a/src/views/wms/wmsShippingBill/edit.vue
+++ b/src/views/wms/wmsShippingBill/edit.vue
@@ -504,8 +504,8 @@ const userStore = useUserStore();
 const routeParams = ref<Record<string, any>>({});
 
 // 字典
-const { shipping_mode, shipping_status, shipping_bill_status, material_source_type, shipping_type, is_all_receiving } = toRefs<any>(
-  proxy?.useDict('shipping_mode', 'shipping_status', 'shipping_bill_status', 'material_source_type', 'shipping_type', 'is_all_receiving')
+const { shipping_mode, shipping_bill_status, material_source_type, shipping_type, is_all_receiving } = toRefs<any>(
+  proxy?.useDict('shipping_mode', 'shipping_bill_status', 'material_source_type', 'shipping_type', 'is_all_receiving')
 );
 
 const buttonLoading = ref(false);
@@ -715,7 +715,6 @@ const initFormData: WmsShippingBillForm = {
   arrivalConfirmTime: undefined,
   arrivalConfirmBy: undefined,
   arrivalConfirmByName: undefined,
-  shippingStatus: '1', // 默认待发货
   remark: undefined,
   createBy: undefined,
   createTime: undefined,
@@ -961,10 +960,12 @@ const initShippingDetailsFromContract = (contractMaterialList: ContractOrderPurc
 const initFromContractSource = async (contractId: string | number, projectId?: string | number) => {
   const [contractRes, projectRes] = await Promise.all([
     getContractInfo(contractId),
-    projectId ? getContractOrder(projectId).catch((error) => {
-      console.error('加载合同订单项目数据失败:', error);
-      return null;
-    }) : Promise.resolve(null)
+    projectId
+      ? getContractOrder(projectId).catch((error) => {
+          console.error('加载合同订单项目数据失败:', error);
+          return null;
+        })
+      : Promise.resolve(null)
   ]);
   const contract = contractRes.data;
   applyContractInfoToForm(contract);
@@ -1216,6 +1217,8 @@ const submitForm = async (status: string, mode: boolean) => {
 
     // 准备提交数据
     const submitData = { ...form.value };
+    // shippingStatus 已弃用，前端不再继续回写旧状态字段。
+    delete submitData.shippingStatus;
 
     if (status !== 'draft') {
       // 提交流程：设置流程编码与变量，驱动审批流
@@ -1364,14 +1367,11 @@ const submitCallback = async () => {
       projectId: form.value.projectId,
       contractId: form.value.contractId,
       isAllReceiving: arrivalConfirmForm.value.isAllReceiving,
-      arrivalReceiptOssId: arrivalConfirmForm.value.arrivalReceiptOssId,
-      // 到货确认存储时同步维护发货状态，避免审批提交后状态与到货标识不一致
-      shippingStatus: arrivalConfirmForm.value.isAllReceiving === '0' ? '3' : '2'
+      arrivalReceiptOssId: arrivalConfirmForm.value.arrivalReceiptOssId
     };
     await updateWmsShippingBill(saveData);
     form.value.isAllReceiving = saveData.isAllReceiving;
     form.value.arrivalReceiptOssId = saveData.arrivalReceiptOssId;
-    form.value.shippingStatus = saveData.shippingStatus;
   }
   await proxy?.$tab.closePage(route);
   router.go(-1);
diff --git a/src/views/wms/wmsShippingBill/index.vue b/src/views/wms/wmsShippingBill/index.vue
index 7cf7529..6db4537 100644
--- a/src/views/wms/wmsShippingBill/index.vue
+++ b/src/views/wms/wmsShippingBill/index.vue
@@ -23,11 +23,6 @@
                 <el-option v-for="dict in shipping_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="发货状态" prop="shippingStatus">
-              <el-select v-model="queryParams.shippingStatus" placeholder="请选择发货状态" clearable style="width: 180px">
-                <el-option v-for="dict in shipping_status" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
             <el-form-item label="需到货确认" prop="needArrivalConfirm">
               <el-select v-model="queryParams.needArrivalConfirm" placeholder="请选择" clearable style="width: 180px">
                 <el-option v-for="dict in need_arrival_confirm" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -334,8 +329,8 @@ const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 // 字典定义
-const { shipping_mode, shipping_status, shipping_bill_status, shipping_type, need_arrival_confirm, is_all_receiving } = toRefs<any>(
-  proxy?.useDict('shipping_mode', 'shipping_status', 'shipping_bill_status', 'shipping_type', 'need_arrival_confirm', 'is_all_receiving')
+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 wmsShippingBillList = ref<WmsShippingBillVO[]>([]);
@@ -410,7 +405,6 @@ const initFormData: WmsShippingBillForm = {
   completedTime: undefined,
   outStockBillStatus: undefined,
   flowStatus: undefined,
-  shippingStatus: undefined,
   warehouseId: undefined,
   warehouseName: undefined,
   remark: undefined
@@ -452,7 +446,6 @@ const data = reactive<PageData<WmsShippingBillForm, WmsShippingBillQuery>>({
     completedTime: undefined,
     outStockBillStatus: undefined,
     flowStatus: undefined,
-    shippingStatus: undefined,
     needArrivalConfirm: undefined,
     isAllReceiving: undefined,
     warehouseId: undefined,