Преглед изворни кода

```
feat(order): 添加已签收状态图片验证并调整发货字段

- 将发货人字段标签修改为送货人以保持一致性
- 为已签收状态添加必传签收图片的验证规则
- 移除物流公司选择器和物流单号输入框的禁用状态
- 更新发货详情页面中收货人标签为送货人
```

hurx пре 19 часа
родитељ
комит
4ce2b129d8

+ 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">

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

@@ -212,7 +212,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>