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

src/views/basicdata/brand/basicdataCategory.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="5">
+      <!-- <el-col :span="5">
         <div class="box" v-if="qw">
           <el-scrollbar>
             <basic-container>
@@ -9,8 +9,8 @@
             </basic-container>
           </el-scrollbar>
         </div>
-      </el-col>
-      <el-col :span="19">
+      </el-col> -->
+      <el-col >
         <basic-container>
           <avue-crud
             :option="option"
@@ -299,6 +299,7 @@ export default {
       if (['edit', 'view'].includes(type)) {
         getDetail(this.form.id).then(res => {
           this.form = res.data.data;
+          this.form.type=String(this.form.type)
         });
       }
       done();
@@ -330,17 +331,14 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
+      console.log(this.query,';this.query');
+      
       this.loading = false;
       const { name, type } = this.query;
       let values = {
         name_like: name,
         type: type,
       };
-      if (!!this.treeId) {
-        values.pid = this.treeId;
-      } else {
-        values.type = 1;
-      }
       console.log('查询条件', values);
       getList(page.currentPage, page.pageSize, values).then(res => {
         const data = res.data.data;

src/views/distribution/signfor/distributionSignfor.vue

@@ -801,7 +801,7 @@ export default {
       // // console.log("<><><>>",ids);
       // getSignforExportOwn(row).then(res => {
       //   // console.log(res.data);
-      //   downloadXls(res.data, '签收数据.xlsx');
+      //   downloadXls(res.data, '签收数据.xlsx');`
       // });
     },
 
@@ -810,23 +810,24 @@ export default {
     },
 
     //查询司机信息
-    getMasterDriverData() {
-      return new Promise((rv, rev) => {
-        getDriverList(1, 10, '').then(res => {
-          const data = res.data.data;
-          let po = [];
-          data.records.forEach(item => {
-            let a = {
-              dictKey: item.id,
-              dictValue: item.name,
-            };
-            po.push(a);
-          });
-          this.driverData = po;
-          console.log('===============>', res.data.data);
-          rv(res.data.data.records);
-        });
-      });
+    async getMasterDriverData() {
+      try {
+        const res = await getDriverList(1, 10, '');
+        const { code, data } = res.data;
+        if (code !== 200) {
+          return 
+        }
+        console.log(res, '司机信息');
+        this.driverData = data.map(item => ({
+          dictKey: item.id,
+          dictValue: item.name,
+        }));
+
+        console.log('===============>', data);
+        return Promise.resolve(data.records);
+      } catch (error) {
+        console.error('Error:', error);
+      }
     },
     selectionsc(value) {
       console.log(value);