Merge branch 'pre-production'

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -96,7 +96,7 @@
                 </el-col>
                 <el-col :span="6">
                     <el-form-item label="车辆车牌:" prop="goodsShelfId">
-                        <el-input v-model="waixieForm.vehicleNum" placeholder="请输入本次费用"></el-input>
+                        <el-input v-model="waixieForm.vehicleNum" placeholdeonSubmitOrderr="请输入本次费用"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -940,6 +940,10 @@
       },
       // 提交(配送内容)
       onSubmitOrder() {
+
+
+      // 司机 信息 需要为自主 才验证司机
+      if(this.aaa){
             if(this.deliveryDriver==''){
                 ElMessage({
                 message: '配送司机信息不能为空',
@@ -954,6 +958,10 @@
               })
               return
               } 
+      }
+
+      console.log(">>>>>>>>>>>> 配送类型:",this.aaa +"   "+ this.bbb)
+
         let stockup = {};
         let tripartite = {};
         let data = {};