提交欧记陆运

src/components/report-dialog/main.vue

@@ -207,16 +207,17 @@ export default {
           }
         });
       } else if (name == "经销商-可用库存表.ureport.xml") {
+        let tenantId = JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id;
         this.$router.push({
           path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`,
           query: {
-            tradeType: "GN",
+            // tradeType: tenantId === "922648"?"JXS":"GN",
+            ...this.searchValue,
             tenantId: tenantId
           }
         });
       } else if (name == "客户信息.ureport.xml") {
-        let userId = JSON.parse(localStorage.getItem("saber-userInfo")).content
-          .user_id;
+        let userId = JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id;
         this.$router.push({
           path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`,
           query: {

src/views/dealer/allocation/index.vue

@@ -237,6 +237,7 @@ export default {
       this.$store.commit("BX_IN_DETAIL");
     },
     onLoad(page, params) {
+      params = this.search
       // 重置掉展开
       this.dataList.forEach(item => {
         this.$refs.crud.toggleRowExpansion(item, false)

src/views/dealer/sales/detail.vue

@@ -820,8 +820,7 @@ export default {
             balanceAmount: 0,
             surplusRouteQuantity: 0
           };
-        this.$set(form,"purchaseAmount",a.inQuantity ? a.inQuantity == 0 ? 0 : (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2) : 0
-        );
+        this.$set(form,"purchaseAmount",a.inQuantity ? a.inQuantity == 0 ? 0 : (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2) : 0 );
         this.$set(form, "stock", a.surplusRouteQuantity);
       })
         .finally(() => {
@@ -921,7 +920,7 @@ export default {
                 item.unit = e.unit;
                 item.size = e.size;
                 item.priceCategory = e.goodsTypeName;
-                item.purchaseAmount = e.purchaseAmount;
+                // item.purchaseAmount = e.purchaseAmount;
                 item.batch = e.batch;
                 item.newDate = e.newDate;
                 item.newJob = e.newJob;

src/views/dealer/stock/index.vue

@@ -210,6 +210,7 @@ export default {
       done();
     },
     onLoad(page, params = {}) {
+      params = this.search
       if (this.search.createTime && this.search.createTime.length > 0) {
         params = {
           ...params,

src/views/landTransportation/driver/index.vue

@@ -323,6 +323,7 @@ export default {
           width: 90,
           search: true,
           index:7,
+          overHidden: true,
           filterable: true,
           // overHidden: true,
           prop: 'fleetId',

src/views/landTransportation/reportAnalysis/index.vue

@@ -559,6 +559,7 @@ export default {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
+              overHidden: true,
               index: 2,
               width: 70,
             }, {
@@ -669,6 +670,7 @@ export default {
             label: '业务员',
             prop: 'salesmanName',
             search: true,
+            overHidden: true,
             index: 2,
             width: 70,
           }, {
@@ -741,6 +743,7 @@ export default {
             label: '业务员',
             prop: 'salesmanName',
             search: true,
+            overHidden: true,
             index: 2,
             width: 70,
           }, {
@@ -1010,6 +1013,7 @@ export default {
                 label: '业务员',
                 prop: 'salesmanName',
                 search: true,
+                overHidden: true,
                 index: 2,
                 width: 70,
               }, {
@@ -1120,6 +1124,7 @@ export default {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
+              overHidden: true,
               index: 2,
               width: 70,
             }, {
@@ -1192,6 +1197,7 @@ export default {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
+              overHidden: true,
               index: 2,
               width: 70,
             }, {