补充查询条件

src/components/boxManagement/businessReportsJc.vue

@@ -599,6 +599,7 @@ export default {
         getPrint({ id: this.id });
       }
       const res = await getReportDataStatistics({
+        ...this.queryData,
         reportCode: this.reportCode,
         groupCode: this.groupCode,
         reportType: this.businessValue,
@@ -785,6 +786,7 @@ export default {
           };
         } else {
           obj = {
+            ...this.queryData,
             reportCode: this.reportCode,
             groupCode: this.groupCode,
             reportType: this.businessValue,

src/components/boxManagement/reportsJc.vue

@@ -82,36 +82,36 @@ import mailComponent from "@/components/iosbasic-data/mail-component.vue";
 export default {
   components: {
     reportContainer,
-    mailComponent
+    mailComponent,
   },
   props: {
     assemblyForm: {
       type: Object,
-      default: {}
+      default: {},
     },
     id: {
-      type: String
+      type: String,
     },
     disabled: {
       type: Boolean,
-      default: false
+      default: false,
     },
     businessValue: {
       type: String,
-      default: ""
+      default: "",
     },
     groupCode: {
       type: String,
-      default: ""
+      default: "",
     },
     reportCode: {
       type: String,
-      default: ""
+      default: "",
     },
     printUpdate: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -125,7 +125,7 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
       },
       selectionList: [],
       option: {},
@@ -151,8 +151,8 @@ export default {
             dicData: [],
             props: {
               label: "cnName",
-              value: "code"
-            }
+              value: "code",
+            },
             // rules: [{
             //   required: true,
             //   message: "请输入业务类型",
@@ -167,9 +167,9 @@ export default {
               {
                 required: true,
                 message: "请输入类别",
-                trigger: "blur"
-              }
-            ]
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "组别",
@@ -179,9 +179,9 @@ export default {
               {
                 required: true,
                 message: "请输入组别",
-                trigger: "blur"
-              }
-            ]
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "报表编码",
@@ -192,9 +192,9 @@ export default {
               {
                 required: true,
                 message: "请输入报表编码",
-                trigger: "blur"
-              }
-            ]
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "中文名称",
@@ -205,14 +205,14 @@ export default {
               {
                 required: true,
                 message: "请输入中文名称",
-                trigger: "blur"
-              }
-            ]
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "英文名称",
             prop: "enName",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "报表格式",
@@ -222,9 +222,9 @@ export default {
               {
                 required: true,
                 message: "请输入报表格式",
-                trigger: "blur"
-              }
-            ]
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "授权用户",
@@ -237,16 +237,16 @@ export default {
             multiple: true,
             props: {
               label: "realName",
-              value: "id"
+              value: "id",
             },
             dicData: [],
             rules: [
               {
                 required: true,
                 message: "请选择授权用户",
-                trigger: "blur"
-              }
-            ]
+                trigger: "blur",
+              },
+            ],
           },
           // {
           //   label: "版本",
@@ -265,20 +265,20 @@ export default {
             dicData: [
               {
                 label: "正常",
-                value: 0
+                value: 0,
               },
               {
                 label: "停用",
-                value: 1
-              }
+                value: 1,
+              },
             ],
             rules: [
               {
                 required: true,
                 message: "请输入状态",
-                trigger: "blur"
-              }
-            ]
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "设计报表",
@@ -289,28 +289,28 @@ export default {
               {
                 required: true,
                 message: "请输入备注",
-                trigger: "blur"
-              }
-            ]
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "备注",
-            prop: "remarks"
-          }
-        ]
+            prop: "remarks",
+          },
+        ],
       },
       data: [],
       previewDialog: false,
-      queryData:{}
+      queryData: {},
     };
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(398), this.optionBack);
-    getUserApprovalList().then(res => {
+    getUserApprovalList().then((res) => {
       this.findObject(this.option.column, "authorizedUsersId").dicData = res.data.data;
     });
     // 获取业务类型
-    bbusinesstypeList(1, 20).then(res => {
+    bbusinesstypeList(1, 20).then((res) => {
       this.findObject(this.option.column, "businessType").dicData = res.data.data.records;
     });
   },
@@ -321,20 +321,20 @@ export default {
         addBtn: this.vaildData(this.permission.reports_add, false),
         viewBtn: this.vaildData(this.permission.reports_view, false),
         delBtn: this.vaildData(this.permission.reports_delete, false),
-        editBtn: this.vaildData(this.permission.reports_edit, false)
+        editBtn: this.vaildData(this.permission.reports_edit, false),
       };
     },
     ids() {
       let ids = [];
-      this.selectionList.forEach(ele => {
+      this.selectionList.forEach((ele) => {
         ids.push(ele.id);
       });
       return ids.join(",");
-    }
+    },
   },
   methods: {
     openDialog(query) {
-      this.queryData=query
+      this.queryData = query;
       this.previewDialog = true;
     },
     // 设计报表
@@ -366,7 +366,7 @@ export default {
 
       let designer = new Stimulsoft.Designer.StiDesigner(options, "StiDesigner", false);
 
-      designer.onSaveReport = e => {
+      designer.onSaveReport = (e) => {
         console.log("onSaveReport");
         // let jsObject = this.jsObject
 
@@ -665,7 +665,7 @@ export default {
             this.createDesignerButtons();
           }, 50);
         },
-        () => {}
+        () => {},
       );
     },
     testMail(e) {
@@ -738,135 +738,136 @@ export default {
       // let data = res.data.data.data
 
       getReportDataStatistics({
-          reportCode: this.reportCode,
-          groupCode: this.groupCode,
-          reportType: this.businessValue
-        }).then(res => {
-          // var data = res.data.data.data.map((item,index)=>{
-          //     item.index = index
-          //     item.feeCenterList.forEach(ite=>{
-          //         ite.ppid = index
-          //     })
-          //     return item
-          // })
-          var data = res.data.data.data;
-
-          console.log(data, "hshipperDetails");
-
-          // var aaa = data.hshipperDetails.split('\n')
-          // console.log(aaa)
-
-          data.pageOne = "Page : 1 of 1";
-          // 处理超长数据
-          if (data.hshipperDetails) {
-            var consignerIndex2 = data.hshipperDetails.indexOf("\n");
-            for (let i = 0; i < 4; i++) {
-              consignerIndex2 = data.hshipperDetails.indexOf("\n", consignerIndex2 + 1);
-            }
-            if (consignerIndex2 != -1) {
-              var hshipperDetails = data.hshipperDetails.substring(consignerIndex2 + 2, data.hshipperDetails.length);
-              data.hshipperDetails = data.hshipperDetails.substring(0, consignerIndex2) + " *";
-              data.commodityDescr += "\n*" + hshipperDetails;
-            }
+        ...this.queryData,
+        reportCode: this.reportCode,
+        groupCode: this.groupCode,
+        reportType: this.businessValue,
+      }).then((res) => {
+        // var data = res.data.data.data.map((item,index)=>{
+        //     item.index = index
+        //     item.feeCenterList.forEach(ite=>{
+        //         ite.ppid = index
+        //     })
+        //     return item
+        // })
+        var data = res.data.data.data;
+
+        console.log(data, "hshipperDetails");
+
+        // var aaa = data.hshipperDetails.split('\n')
+        // console.log(aaa)
+
+        data.pageOne = "Page : 1 of 1";
+        // 处理超长数据
+        if (data.hshipperDetails) {
+          var consignerIndex2 = data.hshipperDetails.indexOf("\n");
+          for (let i = 0; i < 4; i++) {
+            consignerIndex2 = data.hshipperDetails.indexOf("\n", consignerIndex2 + 1);
           }
-
-          if (data.hconsigneeDetails) {
-            var consigneeIndex2 = data.hconsigneeDetails.indexOf("\n");
-            for (let i = 0; i < 3; i++) {
-              consigneeIndex2 = data.hconsigneeDetails.indexOf("\n", consigneeIndex2 + 1);
-            }
-            if (consigneeIndex2 != -1) {
-              var hconsigneeDetails = data.hconsigneeDetails.substring(consigneeIndex2 + 2, data.hconsigneeDetails.length);
-              data.hconsigneeDetails = data.hconsigneeDetails.substring(0, consigneeIndex2) + " **";
-              data.commodityDescr += "\n**" + hconsigneeDetails;
-            }
+          if (consignerIndex2 != -1) {
+            var hshipperDetails = data.hshipperDetails.substring(consignerIndex2 + 2, data.hshipperDetails.length);
+            data.hshipperDetails = data.hshipperDetails.substring(0, consignerIndex2) + " *";
+            data.commodityDescr += "\n*" + hshipperDetails;
           }
+        }
 
-          if (data.hnotifyDetails) {
-            var notifierIndex2 = data.hnotifyDetails.indexOf("\n");
-            for (let i = 0; i < 3; i++) {
-              notifierIndex2 = data.hnotifyDetails.indexOf("\n", notifierIndex2 + 1);
-            }
-            if (notifierIndex2 != -1) {
-              var hnotifyDetails = data.hnotifyDetails.substring(notifierIndex2 + 2, data.hnotifyDetails.length);
-              data.hnotifyDetails = data.hnotifyDetails.substring(0, notifierIndex2) + " ***";
-              data.commodityDescr += "\n***" + hnotifyDetails;
-            }
+        if (data.hconsigneeDetails) {
+          var consigneeIndex2 = data.hconsigneeDetails.indexOf("\n");
+          for (let i = 0; i < 3; i++) {
+            consigneeIndex2 = data.hconsigneeDetails.indexOf("\n", consigneeIndex2 + 1);
           }
-
-          // 处理箱号
-          if (this.isPrintTheBoxNumber) {
-            data.commodityDescr += "\n.\n.\n";
+          if (consigneeIndex2 != -1) {
+            var hconsigneeDetails = data.hconsigneeDetails.substring(consigneeIndex2 + 2, data.hconsigneeDetails.length);
+            data.hconsigneeDetails = data.hconsigneeDetails.substring(0, consigneeIndex2) + " **";
+            data.commodityDescr += "\n**" + hconsigneeDetails;
           }
+        }
 
-          // PLACE & DATE OF ISSUE
-          data.placeAndDateOfIssue = "";
-          if (data.issueAt) {
-            data.placeAndDateOfIssue += data.issueAt;
+        if (data.hnotifyDetails) {
+          var notifierIndex2 = data.hnotifyDetails.indexOf("\n");
+          for (let i = 0; i < 3; i++) {
+            notifierIndex2 = data.hnotifyDetails.indexOf("\n", notifierIndex2 + 1);
           }
-          if (data.issueDate) {
-            let date = new Date(data.issueDate.replace(/-/g, "/"));
-            let yyyy = date.getFullYear();
-            let mmmm = date.toDateString().split(" ")[1];
-            let dd = date.getDate();
-            data.placeAndDateOfIssue += ", " + dd + "-" + mmmm + "-" + yyyy;
+          if (notifierIndex2 != -1) {
+            var hnotifyDetails = data.hnotifyDetails.substring(notifierIndex2 + 2, data.hnotifyDetails.length);
+            data.hnotifyDetails = data.hnotifyDetails.substring(0, notifierIndex2) + " ***";
+            data.commodityDescr += "\n***" + hnotifyDetails;
           }
+        }
 
-          // Total number of containers or packages received by the Carriers
-          if (data.preContainersList) {
-            let boxMap = new Map();
-            for (let boxQuantity of data.preContainersList) {
-              if (boxMap.get(boxQuantity.cntrTypeCode)) {
-                let v = boxMap.get(boxQuantity.cntrTypeCode);
-                boxMap.set(boxQuantity.cntrTypeCode, v + boxQuantity.quantity);
-              } else {
-                boxMap.set(boxQuantity.cntrTypeCode, boxQuantity.quantity);
-              }
-            }
-            let boxs = "";
-            boxMap.forEach(function(value, key, map) {
-              boxs += value + "x" + key + ", ";
-            });
-            boxs = boxs.substring(0, boxs.length - 2);
+        // 处理箱号
+        if (this.isPrintTheBoxNumber) {
+          data.commodityDescr += "\n.\n.\n";
+        }
 
-            data.boxQuantity = boxs + " CONTAINER(S) ONLY";
-          }
+        // PLACE & DATE OF ISSUE
+        data.placeAndDateOfIssue = "";
+        if (data.issueAt) {
+          data.placeAndDateOfIssue += data.issueAt;
+        }
+        if (data.issueDate) {
+          let date = new Date(data.issueDate.replace(/-/g, "/"));
+          let yyyy = date.getFullYear();
+          let mmmm = date.toDateString().split(" ")[1];
+          let dd = date.getDate();
+          data.placeAndDateOfIssue += ", " + dd + "-" + mmmm + "-" + yyyy;
+        }
 
-          // Number of original B/Ls
-          if (data.numberOfObl) {
-            data.numberOfObl += " (" + data.numberOfOblDigit + ")";
+        // Total number of containers or packages received by the Carriers
+        if (data.preContainersList) {
+          let boxMap = new Map();
+          for (let boxQuantity of data.preContainersList) {
+            if (boxMap.get(boxQuantity.cntrTypeCode)) {
+              let v = boxMap.get(boxQuantity.cntrTypeCode);
+              boxMap.set(boxQuantity.cntrTypeCode, v + boxQuantity.quantity);
+            } else {
+              boxMap.set(boxQuantity.cntrTypeCode, boxQuantity.quantity);
+            }
           }
+          let boxs = "";
+          boxMap.forEach(function (value, key, map) {
+            boxs += value + "x" + key + ", ";
+          });
+          boxs = boxs.substring(0, boxs.length - 2);
 
-          if (data.commodityDescr) {
-            var descriptionIndex2 = data.commodityDescr.indexOf("\n");
-            for (let i = 0; i < 19; i++) {
-              descriptionIndex2 = data.commodityDescr.indexOf("\n", descriptionIndex2 + 1);
-            }
-            if (descriptionIndex2 != -1) {
-              data.pageOne = "Page : 1 of 2";
-              data.pageTwo = "Page : 2 of 2";
-              var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length);
-              data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2);
-              data.extraLongTips = "** TO BE CONTINUED ON ATTACHED LIST **";
-              data.extraLongText = extraLongText;
-            }
+          data.boxQuantity = boxs + " CONTAINER(S) ONLY";
+        }
+
+        // Number of original B/Ls
+        if (data.numberOfObl) {
+          data.numberOfObl += " (" + data.numberOfOblDigit + ")";
+        }
+
+        if (data.commodityDescr) {
+          var descriptionIndex2 = data.commodityDescr.indexOf("\n");
+          for (let i = 0; i < 19; i++) {
+            descriptionIndex2 = data.commodityDescr.indexOf("\n", descriptionIndex2 + 1);
           }
+          if (descriptionIndex2 != -1) {
+            data.pageOne = "Page : 1 of 2";
+            data.pageTwo = "Page : 2 of 2";
+            var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length);
+            data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2);
+            data.extraLongTips = "** TO BE CONTINUED ON ATTACHED LIST **";
+            data.extraLongText = extraLongText;
+          }
+        }
 
-          // console.log(data.hshipperDetails, 'hshipperDetails2')
+        // console.log(data.hshipperDetails, 'hshipperDetails2')
 
-          // 创建一个 Stimulsoft 数据集（DataSet）的实例的代码
-          var dataSet = new Stimulsoft.System.Data.DataSet("reportData");
+        // 创建一个 Stimulsoft 数据集（DataSet）的实例的代码
+        var dataSet = new Stimulsoft.System.Data.DataSet("reportData");
 
-          dataSet.readJson(data); // 用于将 JSON 格式的数据加载到数据集中。data 是包含报表数据的 JSON 对象。
-          // 这是一个方法调用，用于在报表中注册数据源。参数 'reportData' 是数据源的名称，
-          // 第二个 'reportData' 是数据源的别名，dataSet 则是之前创建的数据集实例
-          report.regData("reportData", "reportData", dataSet);
-          // 从模版和数据加载报表
-          // loadReport(report, '', {})
+        dataSet.readJson(data); // 用于将 JSON 格式的数据加载到数据集中。data 是包含报表数据的 JSON 对象。
+        // 这是一个方法调用，用于在报表中注册数据源。参数 'reportData' 是数据源的名称，
+        // 第二个 'reportData' 是数据源的别名，dataSet 则是之前创建的数据集实例
+        report.regData("reportData", "reportData", dataSet);
+        // 从模版和数据加载报表
+        // loadReport(report, '', {})
 
-          // 这是将报表对象指定给报表查看器的属性。viewer 是报表查看器的实例，而 report 是之前创建的报表对象。
-          viewer.report = report;
-        });
+        // 这是将报表对象指定给报表查看器的属性。viewer 是报表查看器的实例，而 report 是之前创建的报表对象。
+        viewer.report = report;
+      });
 
       this.$refs.reportContainer.showContainer(
         () => {
@@ -875,17 +876,14 @@ export default {
             this.createViewerButtons(viewer);
           }, 50);
         },
-        () => {}
+        () => {},
       );
 
       console.log("加载成功完成!");
     },
 
     loadReport(report, content, data) {
-      var mimeString = content
-        .split(",")[0]
-        .split(":")[1]
-        .split(";")[0];
+      var mimeString = content.split(",")[0].split(":")[1].split(";")[0];
       var byteString = atob(content.split(",")[1]);
 
       var ab = new ArrayBuffer(byteString.length);
@@ -896,11 +894,11 @@ export default {
       }
 
       var blob = new Blob([ab]);
-      JSZip.loadAsync(blob).then(function(unziped) {
+      JSZip.loadAsync(blob).then(function (unziped) {
         unziped
           .file("reportfile.json")
           .async("string")
-          .then(res => {
+          .then((res) => {
             report.load(res);
 
             if (!!data) {
@@ -934,13 +932,13 @@ export default {
       toolBarRow.appendChild(buttonCell);
 
       let that = this;
-      customButton.action = function(e) {
+      customButton.action = function (e) {
         let jsObject = this.jsObject;
 
         if (jsObject.options.reportIsModified) {
           var messageForm = jsObject.MessageFormForSave();
           messageForm.changeVisibleState(true);
-          messageForm.action = function(state) {
+          messageForm.action = function (state) {
             if (state) {
               jsObject.SendCommandSaveReport();
               setTimeout(() => {
@@ -976,11 +974,11 @@ export default {
       const buttonsTablePrint = toolbarTable.rows[0].childNodes[0].lastChild; // 打印按钮
       const userButtonPrint = buttonsTablePrint.rows[0].childNodes[0]; // 打印按钮dom位置
 
-      userButtonPrint.addEventListener("click", event => {
+      userButtonPrint.addEventListener("click", (event) => {
         console.log("打印点击");
         // event.preventDefault()
       });
-      userButtonPrint.addEventListener("mouseover", event => {
+      userButtonPrint.addEventListener("mouseover", (event) => {
         console.log("移入打印按钮");
         console.log(event, 1035);
       });
@@ -992,7 +990,7 @@ export default {
 
       let that = this;
       // 关闭按钮的监听点击
-      closeBtn.action = function() {
+      closeBtn.action = function () {
         console.log(that.$refs.ReportContainer, "1022");
         if (that.$refs.reportContainer) that.$refs.reportContainer.hideContainer();
       };
@@ -1039,14 +1037,14 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
           done();
         },
-        error => {
+        (error) => {
           loading();
           window.console.log(error);
-        }
+        },
       );
     },
     rowUpdate(row, index, done, loading) {
@@ -1057,21 +1055,21 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
           done();
         },
-        error => {
+        (error) => {
           loading();
           console.log(error);
-        }
+        },
       );
     },
     rowDel(row) {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           return reportsRemove(row.id);
@@ -1080,7 +1078,7 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
         });
     },
@@ -1092,7 +1090,7 @@ export default {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           return reportsRemove(this.ids);
@@ -1101,14 +1099,14 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
           this.$refs.crud.toggleSelection();
         });
     },
     beforeOpen(done, type) {
       if (["edit", "view"].includes(type)) {
-        reportsDetail(this.form.id).then(res => {
+        reportsDetail(this.form.id).then((res) => {
           this.form = res.data.data;
         });
       }
@@ -1145,7 +1143,7 @@ export default {
       params.businessType = this.businessValue;
       params.groupCode = this.groupCode;
       params.classifyCode = this.reportCode;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
@@ -1188,8 +1186,8 @@ export default {
         }
       }
       return back;
-    }
-  }
+    },
+  },
 };
 </script>