From 7836e62cc9b0c9a02e713811e4a2fb563bbb644c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 3 Jun 2026 18:17:49 +0800
Subject: [PATCH] =?UTF-8?q?1.1.53=20=E5=8F=91=E8=B4=A7=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA=E5=BF=85=E5=A1=AB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/wmsShippingBill/edit.vue  | 5 ++---
 src/views/wms/wmsShippingBill/index.vue | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/wmsShippingBill/edit.vue b/src/views/wms/wmsShippingBill/edit.vue
index 90d9da1..90c23c6 100644
--- a/src/views/wms/wmsShippingBill/edit.vue
+++ b/src/views/wms/wmsShippingBill/edit.vue
@@ -14,7 +14,7 @@
       />
     </el-card>
 
-    <!-- 全部到货确认区块：查看/审批页都展示，仅到货确认节点允许申请人录入 -->
+    <!-- 全部到货确认区块：查看/审批页都展示-->
     <el-card
       v-if="showArrivalConfirmSection"
       shadow="never"
@@ -570,7 +570,6 @@ const isCurrentTaskBusinessMatched = computed(() => {
 const isArrivalConfirmApprover = computed(() => {
   return (
     routeParams.value.type === 'approval' &&
-    String(form.value.needArrivalConfirm || '') === '1' &&
     isArrivalConfirmTask.value &&
     isCurrentTaskBusinessMatched.value &&
     String(userStore.userId || '') === String(form.value.createBy || '')
@@ -579,7 +578,6 @@ const isArrivalConfirmApprover = computed(() => {
 
 const showArrivalConfirmSection = computed(() => {
   const hasArrivalConfirmData =
-    String(form.value.needArrivalConfirm || '') === '1' ||
     !!form.value.isAllReceiving ||
     !!form.value.arrivalConfirmTime ||
     !!form.value.arrivalConfirmByName ||
@@ -760,6 +758,7 @@ const validateContractWhenBind = (rule: any, value: any, callback: any) => {
 const data = reactive<{ form: WmsShippingBillForm; rules: any }>({
   form: { ...initFormData },
   rules: {
+    shippingType: [{ required: true, message: '发货类型不能为空', trigger: 'change' }],
     shippingMode: [{ required: true, message: '发货方式不能为空', trigger: 'change' }],
     bindType: [{ required: true, message: '绑定类型不能为空', trigger: 'change' }],
     projectId: [{ validator: validateProjectOrContract, trigger: 'change' }],
diff --git a/src/views/wms/wmsShippingBill/index.vue b/src/views/wms/wmsShippingBill/index.vue
index fd5519b..a3286a0 100644
--- a/src/views/wms/wmsShippingBill/index.vue
+++ b/src/views/wms/wmsShippingBill/index.vue
@@ -119,8 +119,7 @@
         </el-table-column>
         <el-table-column label="到货标识" align="center" prop="isAllReceiving" width="100" v-if="columns[9].visible">
           <template #default="scope">
-            <dict-tag :options="is_all_receiving" :value="scope.row.needArrivalConfirm === '1' ? scope.row.isAllReceiving : undefined" />
-            <span v-if="scope.row.needArrivalConfirm === '0'">-</span>
+            <dict-tag :options="is_all_receiving" :value="scope.row.isAllReceiving" />
           </template>
         </el-table-column>
         <el-table-column label="到货确认时间" align="center" prop="arrivalConfirmTime" width="160" v-if="columns[10].visible">