新增报表

src/components/report-dialog/main.vue

@@ -120,7 +120,6 @@ export default {
       });
     },
     goReport(name) {
-      console.log(name)
       let tenantId = this.$store.getters.userInfo.tenant_id
       if(this.reportName == "同海-统计列表"){
         this.$router.push({
@@ -143,7 +142,15 @@ export default {
         this.$router.push({
           path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}
           &code=${this.searchValue.code}
-          &cname=${this.searchValue.cname}`
+          &cname=${this.searchValue.cname}
+          &brandItem=${this.searchValue.brandItem}
+          &placeProduction=${this.searchValue.placeProduction}
+          &typeno=${this.searchValue.typeno}
+          &typenoOne=${this.searchValue.typenoOne}
+          &typenoTwo=${this.searchValue.typenoTwo}
+          &stockName=${this.searchValue.stockName}
+          &brand=${this.searchValue.brand}
+          &tenantId=${tenantId}`
         });
       }else{
         this.$router.push({

src/views/businessManagement/inventoryAccount/configuration/mainList.json

@@ -62,7 +62,7 @@
       "overHidden": true
     },
     {
-      "label": "规格1",
+      "label": "负荷指数",
       "prop": "typenoOne",
       "search": true,
       "index": 1,
@@ -70,8 +70,8 @@
       "overHidden": true
     },
     {
-      "label": "规格型号",
-      "prop": "itemType",
+      "label": "速级",
+      "prop": "typenoTwo",
       "search": true,
       "index": 1,
       "width": 100,
@@ -134,7 +134,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "prop": "createTime",
-      "search": true,
+      "search": false,
       "index": 1,
       "width": 100,
       "format": "yyyy-MM-dd",