bug

src/api/produceOrder/index.js

@@ -98,6 +98,16 @@ export async function reportPage (data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+// 打印详情页-tab列表
+export async function printWorkOrderInfo (workOrderId) {
+  const res = await request.get(
+    `/mes/workreport/printWorkOrderInfo/${workOrderId}`
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 // 获取详情页数据
 export async function getInfoById (id) {
@@ -135,13 +145,11 @@ export async function getDeviceByTaskId (params) {
   return Promise.reject(new Error(res.data.message));
 }
 
-// 获取槽数 
+// 获取槽数
 export async function getSoltNum (id) {
-  const res = await request.get(
-    `/main/categorypallet/getByCategoryId/${id}`
-  );
+  const res = await request.get(`/main/categorypallet/getByCategoryId/${id}`);
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}

src/components/print/OrderPrint.vue

@@ -280,7 +280,7 @@
 
 <script>
   import { downloadPDF } from '@/utils/pdf.js';
-  import { reportPage } from '@/api/produceOrder/index.js';
+  import { printWorkOrderInfo } from '@/api/produceOrder/index.js';
   export default {
     props: {
       infoData: {
@@ -950,15 +950,10 @@
         this.init();
       },
       init () {
-        for (const p of this.processList) {
-          reportPage({
-            size: -1,
-            workOrderId: this.workOrderId,
-            taskCode: p.taskCode
-          }).then((res) => {
-            this.$set(p, 'list', res.list || []);
-          });
-        }
+        printWorkOrderInfo(this.workOrderId).then((res) => {
+          console.log(res);
+          // this.$set(p, 'list', res.list || []);
+        });
       },
       cancel () {
         this.visible = false;

src/views/produceOrder/report.vue

@@ -122,7 +122,7 @@
         :is="componentName"
         :key="activeName + isUpdate"
         :infoData="infoData"
-		:formData="formData"
+        :formData="formData"
         :taskInfo="{
           ...tabList[activeName],
           lastTaskCode:
@@ -190,7 +190,7 @@
           包装: 'Package',
           入库: 'Warehousing'
         },
-		formData:{}
+        formData: {}
       };
     },
     computed: {
@@ -207,7 +207,7 @@
     },
     created () {
       this.init();
-	  this.getInfoData()
+      this.getInfoData();
     },
     methods: {
       handleReport () {
@@ -257,20 +257,20 @@
         const res1 = await getTaskListById(this.infoData.produceVersionId);
 
         this.tabList = res1;
-		this.tabList.push({
-			name: "入库",
-			code: "999999"
-		})
+        this.tabList.push({
+          name: '入库',
+          code: '999999'
+        });
         this.activeName = '0';
       },
-	  async getInfoData(){
-	  	const res = await getInfo()
-	  	if(typeof res != 'string'){
-	  		this.formData = res
-	  	}else{
-			this.formData = {}
-		}
-	  },
+      async getInfoData () {
+        const res = await getInfo();
+        if (typeof res != 'string') {
+          this.formData = res;
+        } else {
+          this.formData = {};
+        }
+      }
     }
   };
 </script>

vue.config.js

@@ -31,8 +31,8 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.3.51:18086', // 测试
-        target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.51:18086', // 测试
+        // target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平