配送司机车辆搜索调整

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -34,6 +34,7 @@
               <el-select
                 v-model="query.driverName"
                 filterable
+                clearable
                 placeholder="请输入司机名称"
                 :loading="loading"
               >
@@ -50,6 +51,7 @@
               <el-select
                 v-model="query.vehicleName"
                 filterable
+                clearable
                 placeholder="请输入司机名称"
                 :loading="loading"
               >
@@ -752,10 +754,10 @@ export default {
     },
     getvehicleData() {
       return new Promise((rv, rev) => {
-        getVehicleList(1, 10, '').then(res => {
+        getVehicleList().then(res => {
           const data = res.data.data;
           let po = [];
-          data.records.forEach(item => {
+          data.forEach(item => {
             let a = {
               dictKey: item.id,
               dictValue: item.vehicleNub,
@@ -764,16 +766,16 @@ export default {
           });
           this.vehicleData = po;
           console.log('^^^^^^^^^^^^^^^^', res.data.data);
-          rv(res.data.data.records);
+          rv(res.data.data);
         });
       });
     },
     getDriverData() {
       return new Promise((rv, rev) => {
-        getDriverList(1, 10, '').then(res => {
+        getDriverList().then(res => {
           const data = res.data.data;
           let po = [];
-          data.records.forEach(item => {
+          data.forEach(item => {
             let a = {
               dictKey: item.id,
               dictValue: item.name,
@@ -782,7 +784,7 @@ export default {
           });
           this.driverData = po;
           console.log('===============>', res.data.data);
-          rv(res.data.data.records);
+          rv(res.data.data);
         });
       });
     },

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -645,11 +645,11 @@ export default {
     },
     getvehicleData() {
       return new Promise((rv, rev) => {
-        getVehicleList(1, 10, '').then(res => {
+        getVehicleList().then(res => {
           const data = res.data.data;
-          if (!data.records) return
+          if (!data) return
           let po = [];
-          data.records.forEach(item => {
+          data.forEach(item => {
             let a = {
               dictKey: item.id,
               dictValue: item.vehicleNub,
@@ -658,16 +658,16 @@ export default {
           });
           this.vehicleData = po;
           console.log('^^^^^^^^^^^^^^^^', res.data.data);
-          rv(res.data.data.records);
+          rv(res.data.data);
         });
       });
     },
     getDriverData() {
       return new Promise((rv, rev) => {
-        getDriverList(1, 10, '').then(res => {
+        getDriverList().then(res => {
           const data = res.data.data;
           let po = [];
-          data.records.forEach(item => {
+          data.forEach(item => {
             let a = {
               dictKey: item.id,
               dictValue: item.name,
@@ -676,7 +676,7 @@ export default {
           });
           this.driverData = po;
           console.log('===============>', res.data.data);
-          rv(res.data.data.records);
+          rv(res.data.data);
         });
       });
     },