陆运台账增加筛选条件导出

src/api/landTransportation/index.js

@@ -256,7 +256,10 @@ export function getSalesman(data) {
     return request({
         url: '/api/blade-user/userList',
         method: 'get',
-        params:data
+        params:{
+            roleAlias:'业务员',
+            ...data
+        }
     })
 }
 //批量提交调度

src/views/landTransportation/placeAnOrder/index.vue

@@ -232,7 +232,7 @@ export default {
             search: true,
             overHidden: true,
             type: "select",
-            dicUrl: "/api/blade-user/userList",
+            dicUrl: "/api/blade-user/userList?roleAlias=业务员",
             props: {
               label: "realName",
               value: "id"

src/views/landTransportation/reportAnalysis/index.vue

@@ -12,6 +12,7 @@
           @saveColumn="saveColumn"
           @search-change="searchChange"
           @search-reset="query = {}"
+          :search.sync="query"
           @search-criteria-switch="searchCriteriaSwitch"
           @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
           @row-update="rowSave">
@@ -732,8 +733,21 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        console.log(this.query);
+        let queryParams = this.query
+        if (queryParams.arrivalTime) {
+          queryParams.beginArrivalTime = queryParams.arrivalTime[0]
+          queryParams.endArrivalTime = queryParams.arrivalTime[1]
+          delete queryParams.arrivalTime
+        }
+        const routeData = this.$router.resolve({
+          path: '/api/blade-land/order/acct-export',      //跳转目标窗口的地址
+          query: {
+            ...queryParams    //括号内是要传递给新窗口的参数
+          }
+        })
         window.open(
-            `/api/blade-land/order/acct-export?${this.website.tokenHeader}=${getToken()}`
+            routeData.href.slice(1,routeData.href.length-1)+'&'+`${this.website.tokenHeader}=${getToken()}`
         );
       }).catch(() => {
         this.$message({