✨ feat(新增增值服务的表单验证):

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -27,7 +27,7 @@
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
           <span>装车班组：{{ deliverydata.loadingTeamName }} </span>
         </el-col>
-           <el-col :xl="7" :lg="7" :md="8" :sm="24">
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
           <span>司机电话:{{ deliverydata.driverPhone }} </span>
         </el-col>
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
@@ -282,15 +282,15 @@
         </div>
       </el-row>
       <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
-        <el-form :model="formCustomer">
+        <el-form :model="formCustomer" ref="formCustomer" :rules="formCustomerRolus">
           <el-row>
             <el-col :span="10">
-              <el-form-item label="姓名" :label-width="formLabelWidth">
+              <el-form-item label="姓名" prop="consignee" :label-width="formLabelWidth">
                 <el-input v-model="formCustomer.consignee" autocomplete="off" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="是否加急" :label-width="formLabelWidth">
+              <el-form-item label="是否加急" prop="isUrgent" :label-width="formLabelWidth">
                 <el-radio-group v-model="formCustomer.isUrgent">
                   <el-radio :label="'1'" :value="'1'"> 否 </el-radio>
                   <el-radio :label="'2'" :value="'2'"> 是 </el-radio>
@@ -300,12 +300,12 @@
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-form-item label="电话" :label-width="formLabelWidth">
+              <el-form-item label="电话" prop="deliveryPhone" :label-width="formLabelWidth">
                 <el-input v-model="formCustomer.deliveryPhone" autocomplete="off" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="配送方式" :label-width="formLabelWidth">
+              <el-form-item label="配送方式" prop="deliveryWay" :label-width="formLabelWidth">
                 <!--                            v-for="item in this.deliveryWayData"-->
                 <el-radio-group v-model="formCustomer.deliveryWay">
                   <el-radio :label="'10'" :value="'10'">送货&emsp; </el-radio>
@@ -318,7 +318,7 @@
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-form-item label="地址" :label-width="formLabelWidth">
+              <el-form-item label="地址" prop="deliveryAddress" :label-width="formLabelWidth">
                 <el-input
                   v-model="formCustomer.deliveryAddress"
                   :rows="1"
@@ -355,7 +355,7 @@
           <span class="dialog-footer">
             <el-button @click="dialogFormCustomer = false">取消</el-button>
             <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-            <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
+            <el-button type="primary" @click="callFordelivery('formCustomer')"> 确定 </el-button>
           </span>
         </template>
       </el-dialog>
@@ -420,8 +420,8 @@
         </avue-form>
         <div style="bottom: 7%; margin-left: 500px; width: 50%">
           <div style="width: 100%">
+            <el-button @click="cancellation">取消</el-button>
             <el-button type="primary" @click="submitForm">确定</el-button>
-            <el-button type="primary" @click="cancellation">取消</el-button>
           </div>
         </div>
       </el-dialog>
@@ -1609,6 +1609,13 @@ export default {
       // 查询信息
       query: {},
       formCustomer: {},
+      formCustomerRolus: {
+        consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+        isUrgent: [{ required: true, message: '请选择是否加急', trigger: 'change' }],
+        deliveryPhone: [{ required: true, message: '请输入电话', trigger: 'blur' }],
+        deliveryWay: [{ required: true, message: '请选择配送方式', trigger: 'change' }],
+        deliveryAddress: [{ required: true, message: '请输入地址', trigger: 'blur' }],
+      },
       formLabelWidth: '120px',
       inputTypeData: [],
       // 分页信息
@@ -1802,11 +1809,13 @@ export default {
             width: '150px',
             align: 'center',
             disabled: true,
-            // rules: [{
-            //   required: true,
-            //   message: "输入承运商编号",
-            //   trigger: "blur"
-            // }],
+            rules: [
+              {
+                required: true,
+                message: '请输入收货人姓名',
+                trigger: 'blur',
+              },
+            ],
           },
           {
             label: '收货人电话',
@@ -1817,6 +1826,13 @@ export default {
             width: '150px',
             align: 'center',
             disabled: true,
+            rules: [
+              {
+                required: true,
+                message: '请输入送货人电话',
+                trigger: 'blur',
+              },
+            ],
           },
           {
             label: '收货地址',
@@ -1826,7 +1842,14 @@ export default {
             type: 'input',
             width: '150px',
             align: 'center',
-            disabled: true,
+            disabled: false,
+            rules: [
+              {
+                required: true,
+                message: '请输入收货地址',
+                trigger: 'blur',
+              },
+            ],
           },
           {
             label: '签收类型',
@@ -1847,6 +1870,13 @@ export default {
                 value: '2',
               },
             ],
+            rules: [
+              {
+                required: true,
+                message: '请选择签收类型',
+                trigger: 'change',
+              },
+            ],
           },
           {
             label: '签收图片',
@@ -1865,6 +1895,13 @@ export default {
               url: 'link',
             },
             disabled: false,
+            rules: [
+              {
+                required: true,
+                message: '请上传签收图片',
+                trigger: 'change',
+              },
+            ],
           },
           // {
           //   label: "复核图片",
@@ -2404,19 +2441,26 @@ export default {
     },
   },
   methods: {
-    callFordelivery() {
-      console.log('提交的数据》》》', this.formCustomer);
-      updateReservation(this.formCustomer).then(res => {
-        console.log('返回的数据', res.data.data);
-        this.selectionClear();
-        this.onLoad(this.page);
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
-        });
-      });
+    callFordelivery(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          console.log('提交的数据》》》', this.formCustomer);
+          updateReservation(this.formCustomer).then(res => {
+            console.log('返回的数据', res.data.data);
+            this.selectionClear();
+            this.onLoad(this.page);
+            this.$message({
+              type: 'success',
+              message: '操作成功!',
+            });
+          });
 
-      this.dialogFormCustomer = false;
+          this.dialogFormCustomer = false;
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
     },
     handleCallDelivery(ind, row) {
       switch (ind) {
@@ -2810,7 +2854,7 @@ export default {
         const data = res.data.data;
         this.deliverydata = data;
         // this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
-        if(data.stockupInfo.forkliftName){
+        if (data.stockupInfo.forkliftName) {
           this.deliverydata.forkliftName = data.stockupInfo.forkliftName;
         }
 

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -85,7 +85,7 @@
               >转预约单</el-button
             >
             <el-button type="primary" icon="el-icon-edit" @click="handleStockList" v-if="handler"
-              >批量加配转库存品</el-button
+              >批量转库存品</el-button
             >
             <el-button
               type="danger"

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -81,7 +81,7 @@
               >创建提货单</el-button
             >
             <el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if="handler"
-              >批量加配转库存品</el-button
+              >批量转库存品</el-button
             >
             <el-button
               type="danger"
@@ -103,7 +103,9 @@
             <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1', '2')"
               >再次通知</el-button
             >
-            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
+            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
+              >导 出</el-button
+            >
           </div>
           <div class="avue-crud__left">
             <!--            <el-button type="primary" icon="el-icon-plus" @click="handlebill"  >创建提货单</el-button>-->
@@ -507,7 +509,8 @@ import {
   add,
   update,
   remove,
-  addStock, stockArticExport
+  addStock,
+  stockArticExport,
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from '@/api/distribution/distributionParcelList';
 import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
@@ -1180,17 +1183,15 @@ export default {
   methods: {
     //导出
     handleExport() {
-      let row = {  };
-      if(!!this.ids){
+      let row = {};
+      if (!!this.ids) {
         row.ids = this.ids;
-
       }
-      row.typeService ="3"
-      stockArticExport(row).then( res =>{
+      row.typeService = '3';
+      stockArticExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '自提订单数据.xlsx');
       });
-
     },
     /*getMethodName(row,num){
       console.log("名称选择事件",row);
@@ -1386,6 +1387,12 @@ export default {
           return false;
         }
 
+        // 判断订单类型
+        if (Number(item.typeService) === 1) {
+          this.$message.warning(item.orderCode + ' - 为商配订单, 无法转为库存品');
+          return false;
+        }
+
         if (item.reservationStatus == '30') {
           console.log('1 :>> ', 1);
           this.$message.warning(item.orderCode + ' - 已预约，无法转为库存品！！！');
@@ -1399,8 +1406,8 @@ export default {
         }
 
         if (item.isZero === '1') {
-          this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品')
-          return false
+          this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品');
+          return false;
         }
 
         ids.push(item.id);
@@ -1519,7 +1526,7 @@ export default {
         }
         if (i.reservationStatus === '30') {
           this.$message.warning(i.orderCode + '已预约，请勿重复预约！！！');
-          return  false;
+          return false;
         }
 
         if (consigneeMobile != i.consigneeMobile && consigneePerson != i.consigneePerson) {