Просмотр исходного кода

```
feat(order): 添加已签收状态图片验证功能

- 将发货人字段改为送货人以匹配业务术语
- 为已签收状态添加图片上传验证规则,确保必须上传签收图片
- 移除物流信息字段的禁用状态,允许编辑物流公司和物流单号
- 注释掉订单确认相关按钮,暂时隐藏确认订单功能

fix(order): 调整发货详情页面显示文本

- 将发货详情中的"收货人"改为"送货人"以保持术语一致性
```

hurx 1 день назад
Родитель
Сommit
7f1d95c2d2

+ 15 - 2
src/views/order/saleOrder/addOrderStatusLogDrawer.vue

@@ -23,7 +23,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="货人" prop="shipper">
+        <el-form-item label="货人" prop="shipper">
           <el-input v-model="form.shipper" disabled />
         </el-form-item>
 
@@ -92,7 +92,20 @@ const statusOptions = [
   { label: '已签收', value: '已签收' }
 ];
 const rules = {
-  statusName: [{ required: true, message: '请选择状态名称', trigger: 'change' }]
+  statusName: [{ required: true, message: '请选择状态名称', trigger: 'change' }],
+  images: [
+    {
+      validator: (_rule: any, _value: any, callback: any) => {
+        if (form.statusName === '已签收' && !form.images) {
+          ElMessage.warning('已签收状态必须上传签收图片');
+          callback(new Error('已签收状态必须上传签收图片'));
+        } else {
+          callback();
+        }
+      },
+      trigger: 'change'
+    }
+  ]
 };
 
 // 打开抽屉

+ 2 - 9
src/views/order/saleOrder/editDeliverDialog.vue

@@ -22,14 +22,7 @@
         </el-col>
         <el-col :span="12" v-if="form.deliverMethod === '1'">
           <el-form-item label="物流公司名称" prop="logisticsCompanyId">
-            <el-select
-              v-model="form.logisticsCompanyId"
-              placeholder="请选择"
-              style="width: 100%"
-              filterable
-              @change="handleLogisticsCompanyChange"
-              disabled
-            >
+            <el-select v-model="form.logisticsCompanyId" placeholder="请选择" style="width: 100%" filterable @change="handleLogisticsCompanyChange">
               <el-option v-for="company in logisticsCompanyList" :key="company.id" :label="company.logisticsName" :value="company.id" />
             </el-select>
           </el-form-item>
@@ -38,7 +31,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="form.deliverMethod === '1'" label="物流单号" prop="logisticNo">
-            <el-input v-model="form.logisticNo" placeholder="请输入物流单号" disabled />
+            <el-input v-model="form.logisticNo" placeholder="请输入物流单号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">

+ 2 - 2
src/views/order/saleOrder/index.vue

@@ -603,12 +603,12 @@ const getButtonsByStatus = (orderStatus: string, checkStatus: string): ActionBut
   // 待支付状态:显示查看按钮
   if (orderStatus === OrderStatus.PENDING_PAYMENT) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
   // 待确认状态:显示确认订单按钮
   if (orderStatus === OrderStatus.PENDING_CONFIRM) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
 
   // 待审核:显示审核按钮

+ 3 - 3
src/views/order/saleOrder/indexProject.vue

@@ -60,7 +60,7 @@
           <span style="font-size: 16px; font-weight: 500">销售订单信息列表</span>
 
           <div style="display: flex; flex-wrap: nowrap; gap: 10px">
-            <el-button type="primary" @click="handleBatchConfirm()" :disabled="!ids.length" plain>批量确认订单</el-button>
+            <!-- <el-button type="primary" @click="handleBatchConfirm()" :disabled="!ids.length" plain>批量确认订单</el-button> -->
             <el-button type="primary" @click="handleCloseOrder()" :disabled="!ids.length" plain>关闭订单</el-button>
             <el-button type="primary" @click="handleDelete()" :disabled="!ids.length" plain>删除订单</el-button>
             <el-button type="primary" :disabled="!ids.length" plain>导出订单</el-button>
@@ -569,12 +569,12 @@ const getButtonsByStatus = (orderStatus: string, checkStatus: string): ActionBut
   // 待支付状态:显示查看按钮
   if (orderStatus === OrderStatus.PENDING_PAYMENT) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
   // 待确认状态:显示确认订单按钮
   if (orderStatus === OrderStatus.PENDING_CONFIRM) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
 
   // 待审核:显示审核按钮

+ 1 - 1
src/views/order/saleOrder/sendDetail.vue

@@ -214,7 +214,7 @@
                 <span>发货单号:{{ (deliver as any).deliverCode || '--' }}</span>
                 <span>发货时间:{{ (deliver as any).createTime || '--' }}</span>
                 <span>发货方式:{{ getDictLabel(deliver_method, deliver.deliverMethod || '--') }}</span>
-                <span v-if="deliver.deliverMethod == '0'">货人:{{ deliver.deliverMan || '--' }}</span>
+                <span v-if="deliver.deliverMethod == '0'">货人:{{ deliver.deliverMan || '--' }}</span>
                 <span>手机:{{ deliver.phone || deliver.consigneePhone }}</span>
                 <span style="margin-left: 30px" v-if="deliver.deliverMethod == '1'">物流单号:{{ deliver.logisticNo || '--' }}</span>
                 <span style="margin-left: 20px">发货备注:{{ deliver.deliverRemark || '--' }}</span>