Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/reservation/reservationAddFrom.vue

@@ -15,7 +15,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="预约时间:" label-width="100px">
+            <el-form-item label="预约时间:" label-width="100px" prop="reservationDate">
               <el-date-picker
                 v-model="form.reservationDate"
                 type="date"
@@ -1965,9 +1965,10 @@ export default {
       inventoryTable: [],
       inventoryShow: false,
       reservationRules: {
-        consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
+        consignee: [{ required: true, message: '请填写收货人名称', trigger: 'change' }],
-        deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
+        reservationDate: [{ required: true, message: '请填选择预约时间', trigger: 'change' }],
-        deliveryPhone: [{ required: true, message: '请填写收货人电话!!!', trigger: 'change' }],
+        deliveryAddress: [{ required: true, message: '请填写收货人地址', trigger: 'blur' }],
+        deliveryPhone: [{ required: true, message: '请填写收货人电话', trigger: 'change' }],
         // enableStatus: [
         //   { required: true, message: '请选择启用状态!', trigger: 'change' }
         // ],