解决冲突

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -15,10 +15,10 @@
         @saveColumn="saveColumn"
         @refresh-change="refreshChange"
     >
-      <template slot="cname" slot-scope="{row,index}">
+      <template slot="itemId" slot-scope="{row,index}">
         {{row.goodsName}}
       </template>
-      <template slot="storageId" slot-scope="{row,index}">
+      <template slot="warehouseId" slot-scope="{row,index}">
         {{row.warehouse}}
       </template>
       <template slot="corpNameSearch">
@@ -27,12 +27,19 @@
       <template slot="purchaserSearch">
         <crop-select v-model="search.purchaserId" corpType="KH" :refresh="false"></crop-select>
       </template>
+      <template slot="menuLeft">
+        <el-button type="warning"
+                   icon="el-icon-plus"
+                   size="small"
+                   @click="outExport()">导出</el-button>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
 import {getList} from "@/api/purchasingManagement/inventoryAccount";
+import {getToken} from "@/util/auth";
 
 export default {
   data() {
@@ -117,7 +124,7 @@ export default {
           index: 10
         }, {
           label: '仓库',
-          prop: 'storageId',
+          prop: 'warehouseId',
           type: "tree",
           dicUrl: "/api/blade-client/storagetype/tree",
           index: 11,
@@ -253,6 +260,29 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search);
     },
+    //导出
+    outExport() {
+      this.$confirm('是否导出数据明细？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let queryParams = this.query
+        const routeData = this.$router.resolve({
+          path: '/api/trade-purchase/woodHarvestingCloud/generalLedgerExport',      //跳转目标窗口的地址
+          query: {
+            'Blade-Auth':getToken(),
+            ...queryParams    //括号内是要传递给新窗口的参数
+          }
+        })
+        window.open(routeData.href.slice(1, routeData.href.length));
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消' //
+        });
+      })
+    },
   }
 }
 </script>

src/views/landTransportation/motorcadeDriver/index.vue

@@ -287,7 +287,8 @@ export default {
           label: "司机",
           prop: "driverId",
           type: 'select',
-          dicUrl: "/api/blade-client/land-driver/driver-list?vehicleId={{key}}",
+          // dicUrl: "/api/blade-client/land-driver/driver-list?vehicleId={{key}}",
+          dicUrl: "/api/blade-client/land-driver/driver-list",
           props: {
             label: "name",
             value: "id"

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -551,15 +551,16 @@ export default {
       window.open(`/api/trade-purchase/woodHarvestingCloud/export-template?${this.website.tokenHeader}=${getToken()}`)
     },
     uploadAfter(res, done, loading, column) {
-      if (res instanceof Array) {
+      if (!res.message){
         res.forEach(item => this.itemsVOList.push({
           ...item,
           $cellEdit: true
         }))
         this.excelBox = false
+        done();
+      }else {
+        loading()
       }
-      loading()
-      done();
     },
     //返回列表
     backToList() {