首页，报表修改

src/views/home/index.vue

@@ -89,25 +89,25 @@ export default {
       columns,
       arr: [
         {
-          name: '在制工单数',
+          name: '生产总数',
           num: '188',
           imgUrl: require('../../assets/Group1.png'),
           unit: ''
         },
         {
-          name: '在制工单生产数',
+          name: '待生产数量',
           num: '188',
           imgUrl: require('../../assets/Group2.png'),
           unit: ''
         },
         {
-          name: '已入库数',
+          name: '已完成数量',
           num: '188',
           imgUrl: require('../../assets/Group3.png'),
           unit: ''
         },
         {
-          name: '在制工单延期生产数',
+          name: '生产中数量',
           num: '188',
           imgUrl: require('../../assets/Group4.png'),
           unit: '',
@@ -140,7 +140,6 @@ export default {
     setTimeout(() => {
       this.$refs.barRef.resize();
       this.$refs.pieRef.resize();
-
     }, 300);
   },
   methods: {
@@ -158,14 +157,14 @@ export default {
     async getCount() {
       let rest = await getCount({factoriesId: 0});
       this.arr.forEach((item, index) => {
-        if (item.name === '在制工单数') {
-          item.num = rest.inProductCount || 0;
-        } else if (item.name === '在制工单生产数') {
+        if (item.name === '生产总数') {
+          item.num = rest.formingNum || 0;
+        } else if (item.name === '待生产数量') {
+          item.num = rest.pendingProductionCount || 0;
+        } else if (item.name === '已完成数量') {
+          item.num = rest.formedNum || 0;
+        } else if (item.name === '生产中数量') {
           item.num = rest.inProgressWorkOrderCount || 0;
-        } else if (item.name === '已入库数') {
-          item.num = rest.inWarehouseCount || 0;
-        } else if (item.name === '在制工单延期生产数') {
-          item.num = rest.postponeCount || 0;
         }
       })
       // console.log(rest, 'rest');

src/views/reportForms/sourceLink/index.vue

@@ -30,11 +30,14 @@
         this.getJmPrintBrowse()
     },
     methods: {
-       async getJmPrintBrowse(){
-        let id = this.$route.path.split('/').pop()
+      async getJmPrintBrowse() {
+        let id = this.$route.path.split('/').pop();
+        let params = this.$route.query;
         let url = await getServiceurl();
-        this.fileUrl = `${url}/jmreport/view/${id}?token=${getToken()}`;
-       }
+        this.fileUrl = `${url}/jmreport/view/${id}?token=${getToken()}&${Object.keys(params).map((key) => {
+          return `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`;
+        }).join('&')}`;
+      }
     }
   };
   </script>