Merge remote-tracking branch 'origin/dev' into dev

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -2810,7 +2810,9 @@ export default {
         const data = res.data.data;
         this.deliverydata = data;
         // this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
-        this.deliverydata.forkliftName = data.stockupInfo.forkliftName;
+        if(data.stockupInfo.forkliftName){
+          this.deliverydata.forkliftName = data.stockupInfo.forkliftName;
+        }
 
         console.log('this.deliverydata>>>>>>>>>>>>', this.deliverydata);
         this.deliverydata.remarks = data.remarks;

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -10,18 +10,19 @@
         <el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px">
             <el-row>
                 <el-col :span="6">
-                    <el-form-item label="配送车辆:" prop="vehicleIds">
+                    <el-form-item label="配送司机:" prop="goodsShelfId">
+                        <!--                        @change="changeSlaveDriver"-->
                         <el-select
-                                filterable
+                                v-model="deliveryDriver"
                                 multiple
-                                v-model="vehicleIds"
-                                placeholder="请选择车辆"
-                                @change="changeVehicle"
+                                filterable
+                                @change="changeDriver"
+                                placeholder="请选择司机"
                         >
                             <el-option
-                                    v-for="item in vehicleData"
+                                    v-for="item in driverData"
                                     :key="item.id"
-                                    :label="item.vehicleNub"
+                                    :label="item.name"
                                     :value="item.id"
                             >
                             </el-option>
@@ -29,19 +30,18 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="配送司机:" prop="goodsShelfId">
-                        <!--                        @change="changeSlaveDriver"-->
+                    <el-form-item label="配送车辆:" prop="vehicleIds">
                         <el-select
-                                v-model="deliveryDriver"
-                                multiple
                                 filterable
-                                @change="changeDriver"
-                                placeholder="请选择司机"
+                                multiple
+                                v-model="vehicleIds"
+                                placeholder="请选择车辆"
+                                @change="changeVehicle"
                         >
                             <el-option
-                                    v-for="item in driverData"
+                                    v-for="item in vehicleData"
                                     :key="item.id"
-                                    :label="item.name"
+                                    :label="item.vehicleNub"
                                     :value="item.id"
                             >
                             </el-option>
@@ -49,6 +49,7 @@
                     </el-form-item>
                 </el-col>
 
+
                 <el-col :span="6">
           <span>
             <el-form-item label="主司机:" prop="forklift">
@@ -969,7 +970,7 @@ import { ElMessage } from 'element-plus'
       //查询司机信息
       getDriverData() {
         return new Promise((rv, rev) => {
-          getDriverList(1, 10, '').then(res => {
+          getDriverList().then(res => {
             this.driverData = res.data.data;
             console.log('===============>', res.data.data);
             rv(res.data.data);
@@ -1004,7 +1005,7 @@ import { ElMessage } from 'element-plus'
       //查询车辆信息
       getvehicleData() {
         return new Promise((rv, rev) => {
-          getVehicleList(1, 10, '').then(res => {
+          getVehicleList().then(res => {
             this.vehicleData = res.data.data;
             console.log('^^^^^^^^^^^^^^^^', res.data.data);
             rv(res.data.data);