货代报表接口数据获取 2023-11-23

src/api/iosBasicData/reports.js

@@ -48,3 +48,12 @@ export const update = (row) => {
   })
 }
 
+// 货代报表数据
+export const reportsGetReportData = (row) => {
+  return request({
+    url: '/api/blade-los/reports/getReportData',
+    method: 'get',
+    params: row
+  })
+}
+

src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -64,7 +64,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/iosBasicData/reports";
+  import {getList, getDetail, add, update, remove,reportsGetReportData} from "@/api/iosBasicData/reports";
   import {getUserApprovalList} from "@/api/approval/processConfig";
   import {mapGetters} from "vuex";
   import {billsDetail} from '@/api/iosBasicData/bills'
@@ -361,7 +361,7 @@
     },
     methods: {
       // 设计报表
-      reportDesignButton(url) {
+      async reportDesignButton(url) {
             Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
             // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='
             Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile( '/reports/stimulsoft/Localization/zh-CHS.xml', true, 'zh-CHS')
@@ -532,138 +532,144 @@
             //   })
             // }
 
-        let data = [
-          {
-            id: 2,
-            billNo: 'JOB NO',
-            billDate: 'DATE',
-            operatorName: 'OP',
-            bookingNo: 'bookingNo',
-            mblno: 'ob/l no',
-            carrierCnName: 'CARRIER',
-            polCnName: 'POL',
-            vesselCnName: 'vsl/voy',
-            voyageNo: 'vsl/voy',
-            podCnName: 'POD',
-            cyCnName: 'DEPOT',
-            etd: 'etd/eta',
-            eta: 'etd/eta',
-            mpaymode: 'freight / freight',
-            volume: '箱型箱量',
-
-            hblno: 'hb/l no',
-            srcType: 'analysis1',
-            srcCnName: 'analysis2',
-            corpCnName: 'analysis3',
-            list: [
-              {
-                id:1,
-                pid:2,
-                feeCnNameData: 'fee list1',
-                usd: 'usd',
-                rmb: 'rmb',
-                tr: '税',
-                corpCnName: 'customer',
-              },
-              {
-                id:2,
-                pid:2,
-                feeCnNameData: 'fee list2',
-                usd: 'usd',
-                rmb: 'rmb',
-                tr: '税',
-                corpCnName: 'customer',
-              },
-            ]
-
-          }, {
-              id:3,
-            billNo: 'JOB NO',
-            billDate: 'DATE',
-            operatorName: 'OP',
-            bookingNo: 'bookingNo',
-            mblno: 'ob/l no',
-            carrierCnName: 'CARRIER',
-            polCnName: 'POL',
-            vesselCnName: 'vsl/voy',
-            voyageNo: 'vsl/voy',
-            podCnName: 'POD',
-            cyCnName: 'DEPOT',
-            etd: 'etd/eta',
-            eta: 'etd/eta',
-            mpaymode: 'freight / freight',
-            volume: '箱型箱量',
-
-            hblno: 'hb/l no',
-            srcType: 'analysis1',
-            srcCnName: 'analysis2',
-            corpCnName: 'analysis3',
-            list: [
-              {
-                id:3,
-                pid:3,
-                feeCnNameData: 'fee list',
-                usd: 'usd',
-                rmb: 'rmb',
-                tr: '税',
-                corpCnName: 'customer',
-              },
-              {
-                id:4,
-                pid:3,
-                feeCnNameData: 'fee list',
-                usd: 'usd',
-                rmb: 'rmb',
-                tr: '税',
-                corpCnName: 'customer',
-              },
-            ]
-
-          }, {
-              id:4,
-            billNo: 'JOB NO',
-            billDate: 'DATE',
-            operatorName: 'OP',
-            bookingNo: 'bookingNo',
-            mblno: 'ob/l no',
-            carrierCnName: 'CARRIER',
-            polCnName: 'POL',
-            vesselCnName: 'vsl/voy',
-            voyageNo: 'vsl/voy',
-            podCnName: 'POD',
-            cyCnName: 'DEPOT',
-            etd: 'etd/eta',
-            eta: 'etd/eta',
-            mpaymode: 'freight / freight',
-            volume: '箱型箱量',
-
-            hblno: 'hb/l no',
-            srcType: 'analysis1',
-            srcCnName: 'analysis2',
-            corpCnName: 'analysis3',
-            list: [
-              {
-                id:10,
-                pid:4,
-                feeCnNameData: 'fee list',
-                usd: 'usd',
-                rmb: 'rmb',
-                tr: '税',
-                corpCnName: 'customer',
-              },
-              {
-                id:11,
-                pid:4,
-                feeCnNameData: 'fee list',
-                usd: 'usd',
-                rmb: 'rmb',
-                tr: '税',
-                corpCnName: 'customer',
-              },
-            ]
-
-          },
-        ]
+        // let data = [
+        //   {
+        //     id: 2,
+        //     billNo: 'JOB NO',
+        //     billDate: 'DATE',
+        //     operatorName: 'OP',
+        //     bookingNo: 'bookingNo',
+        //     mblno: 'ob/l no',
+        //     carrierCnName: 'CARRIER',
+        //     polCnName: 'POL',
+        //     vesselCnName: 'vsl/voy',
+        //     voyageNo: 'vsl/voy',
+        //     podCnName: 'POD',
+        //     cyCnName: 'DEPOT',
+        //     etd: 'etd/eta',
+        //     eta: 'etd/eta',
+        //     mpaymode: 'freight / freight',
+        //     volume: '箱型箱量',
+        //     hblno: 'hb/l no',
+        //     srcType: 'analysis1',
+        //     srcCnName: 'analysis2',
+        //     corpCnName: 'analysis3',
+        //     list: [
+        //       {
+        //         id:1,
+        //         pid:2,
+        //         feeCnNameData: 'fee list1',
+        //         usd: 'usd',
+        //         rmb: 'rmb',
+        //         tr: '税',
+        //         corpCnName: 'customer',
+        //       },
+        //       {
+        //         id:2,
+        //         pid:2,
+        //         feeCnNameData: 'fee list2',
+        //         usd: 'usd',
+        //         rmb: 'rmb',
+        //         tr: '税',
+        //         corpCnName: 'customer',
+        //       },
+        //     ]
+        //
+        //   }, {
+        //       id:3,
+        //     billNo: 'JOB NO',
+        //     billDate: 'DATE',
+        //     operatorName: 'OP',
+        //     bookingNo: 'bookingNo',
+        //     mblno: 'ob/l no',
+        //     carrierCnName: 'CARRIER',
+        //     polCnName: 'POL',
+        //     vesselCnName: 'vsl/voy',
+        //     voyageNo: 'vsl/voy',
+        //     podCnName: 'POD',
+        //     cyCnName: 'DEPOT',
+        //     etd: 'etd/eta',
+        //     eta: 'etd/eta',
+        //     mpaymode: 'freight / freight',
+        //     volume: '箱型箱量',
+        //
+        //     hblno: 'hb/l no',
+        //     srcType: 'analysis1',
+        //     srcCnName: 'analysis2',
+        //     corpCnName: 'analysis3',
+        //     list: [
+        //       {
+        //         id:3,
+        //         pid:3,
+        //         feeCnNameData: 'fee list',
+        //         usd: 'usd',
+        //         rmb: 'rmb',
+        //         tr: '税',
+        //         corpCnName: 'customer',
+        //       },
+        //       {
+        //         id:4,
+        //         pid:3,
+        //         feeCnNameData: 'fee list',
+        //         usd: 'usd',
+        //         rmb: 'rmb',
+        //         tr: '税',
+        //         corpCnName: 'customer',
+        //       },
+        //     ]
+        //
+        //   }, {
+        //       id:4,
+        //     billNo: 'JOB NO',
+        //     billDate: 'DATE',
+        //     operatorName: 'OP',
+        //     bookingNo: 'bookingNo',
+        //     mblno: 'ob/l no',
+        //     carrierCnName: 'CARRIER',
+        //     polCnName: 'POL',
+        //     vesselCnName: 'vsl/voy',
+        //     voyageNo: 'vsl/voy',
+        //     podCnName: 'POD',
+        //     cyCnName: 'DEPOT',
+        //     etd: 'etd/eta',
+        //     eta: 'etd/eta',
+        //     mpaymode: 'freight / freight',
+        //     volume: '箱型箱量',
+        //
+        //     hblno: 'hb/l no',
+        //     srcType: 'analysis1',
+        //     srcCnName: 'analysis2',
+        //     corpCnName: 'analysis3',
+        //     list: [
+        //       {
+        //         id:10,
+        //         pid:4,
+        //         feeCnNameData: 'fee list',
+        //         usd: 'usd',
+        //         rmb: 'rmb',
+        //         tr: '税',
+        //         corpCnName: 'customer',
+        //       },
+        //       {
+        //         id:11,
+        //         pid:4,
+        //         feeCnNameData: 'fee list',
+        //         usd: 'usd',
+        //         rmb: 'rmb',
+        //         tr: '税',
+        //         corpCnName: 'customer',
+        //       },
+        //     ]
+        //   },
+        // ]
+          // 获取报表数据
+           const res = await reportsGetReportData({
+              billId:this.id,
+              reportCode:this.form.code,
+              groupCode:this.form.groupCode,
+          })
+          // 获取的数据赋值
+          let data = res.data.data
 
               var dataSet = new Stimulsoft.System.Data.DataSet(
                 'reportData'

src/views/iosBasicData/finstlbills/index.vue

@@ -343,18 +343,18 @@
               prop: "amountCr",
                 width: "160"
             },
-            {
-              label: "综合 USD 应收(USD) - 非 USD 外币转换为 USD",
-              prop: "amountDrUsd",
-                width: "160"
-            },
-            {
-              label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
-              prop: "amountCrUsd",
-                width: "160"
-            },
-            {
-              label: "合计本位币应收(CNY )",
+            // {
+            //   label: "综合 USD 应收(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountDrUsd",
+            //     width: "160"
+            // },
+            // {
+            //   label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountCrUsd",
+            //     width: "160"
+            // },
+            {
+              label: "合计本位币应收(CNY)",
               prop: "amountDrLoc",
                 width: "160"
             },
@@ -373,16 +373,16 @@
               prop: "amountCrNet",
                 width: "160"
             },
-            {
-              label: "综合 USD 税后应收(USD) - 非 USD 外币转换为 USD",
-              prop: "amountDrUsdNet",
-                width: "160"
-            },
-            {
-              label: "综合 USD 税后应付(USD) - 非 USD 外币转换为 USD",
-              prop: "amountCrUsdNet",
-                width: "160"
-            },
+            // {
+            //   label: "综合 USD 税后应收(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountDrUsdNet",
+            //     width: "160"
+            // },
+            // {
+            //   label: "综合 USD 税后应付(USD) - 非 USD 外币转换为 USD",
+            //   prop: "amountCrUsdNet",
+            //     width: "160"
+            // },
             {
               label: "合计本位币税后应收(CNY )",
               prop: "amountDrLocNet",