Inicio Explorar Ayuda
Iniciar sesión
kd-aiot
/
kd-aiot-frontend-mes
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

修改bug

695593266@qq.com hace 9 meses
padre
0cfbfbbb9e
commit
d7c9fcefeb
Se han modificado 3 ficheros con 53 adiciones y 3 borrados
Unificar vista Mostrar estadísticas de diff
  1. 7 1
      src/config/setting.js
  2. 23 1
      src/views/produce/components/jobBooking/components/batchSemiProductJobBom.vue
  3. 23 1
      src/views/produce/components/juRenPackOne.vue

+ 7 - 1
src/config/setting.js
Ver fichero 

@@ -21,7 +21,13 @@ export const SYSTEM_NAME = 'mes';
 
 export const REPEATABLE_TABS = [];
 
 export const REPEATABLE_TABS = [];
 
 
 
 // 不需要登录的路由
 
 // 不需要登录的路由
 
-export const WHITE_LIST = ['/login', '/forget', '/singleLogin'];
 
+export const WHITE_LIST = [
 
+  '/login',
 
+  '/forget',
 
+  '/singleLogin',
 
+  '/printJuren',
 
+  '/printJuRenOne'
 
+];
 
 
 
 // 开启 KeepAlive 后仍然不需要缓存的路由地址
 
 // 开启 KeepAlive 后仍然不需要缓存的路由地址
 
 export const KEEP_ALIVE_EXCLUDES = [];
 
 export const KEEP_ALIVE_EXCLUDES = [];

+ 23 - 1
src/views/produce/components/jobBooking/components/batchSemiProductJobBom.vue
Ver fichero 

@@ -12,7 +12,8 @@
 
             item.currentTaskDiagram.type == 4 &&
 
             item.currentTaskDiagram.type == 4 &&
 
             this.printStyle != 'notExist'
 
             this.printStyle != 'notExist'
 
           "
 
           "
 
-          ><el-button type="text" size="mini" @click="pritJuRen()"
 
+        >
 
+          <el-button type="text" size="mini" @click="pritJuRen()"
 
             >打印条码</el-button
 
             >打印条码</el-button
 
           >
 
           >
 
         </div>
 
         </div>
 
@@ -1939,6 +1940,27 @@
 
         // }
 
         // }
 
 
 
         if (this.printStyle == 'juRen1') {
 
         if (this.printStyle == 'juRen1') {
 
+          // const routeUrl = this.$router.resolve({
 
+          //   path: '/produce/components/juRenPackOne',
 
+          //   query: {
 
+          //     batchNo,
 
+          //     createDate,
 
+          //     enforceStandards,
 
+          //     layBy,
 
+          //     level,
 
+          //     netWeight,
 
+          //     notice,
 
+          //     productName,
 
+          //     purchaseOrigins,
 
+          //     specification,
 
+          //     warrantyPeriod,
 
+          //     warrantyPeriodUnit,
 
+          //     weightUnit,
 
+          //     workOrderId: this.item.workOrderId
 
+          //   }
 
+          // });
 
+          // window.open(routeUrl.href, '_blank');
 
+
 
           const query = `?batchNo=${batchNo}&createDate=${createDate}&enforceStandards=${enforceStandards}&layBy=${layBy}&level=${level}&netWeight=${netWeight}&notice=${notice}&productName=${productName}&purchaseOrigins=${purchaseOrigins}&specification=${specification}&warrantyPeriod=${warrantyPeriod}&warrantyPeriodUnit=${warrantyPeriodUnit}&weightUnit=${weightUnit}&workOrderId=${this.item.workOrderId}`;
 
           const query = `?batchNo=${batchNo}&createDate=${createDate}&enforceStandards=${enforceStandards}&layBy=${layBy}&level=${level}&netWeight=${netWeight}&notice=${notice}&productName=${productName}&purchaseOrigins=${purchaseOrigins}&specification=${specification}&warrantyPeriod=${warrantyPeriod}&warrantyPeriodUnit=${warrantyPeriodUnit}&weightUnit=${weightUnit}&workOrderId=${this.item.workOrderId}`;
 
           window.open('/printJuRenOne' + query, '_blank');
 
           window.open('/printJuRenOne' + query, '_blank');
 
         }
 
         }

+ 23 - 1
src/views/produce/components/juRenPackOne.vue
Ver fichero 

@@ -1,5 +1,5 @@
 
 <template>
 
 <template>
 
-  <div class="label-container">
 
+  <div class="label-container" id="printSection">
 
     <div class="ju_ren_one_level">
 
     <div class="ju_ren_one_level">
 
       <span>{{ productName ? productName : ' ' }}</span>
 
       <span>{{ productName ? productName : ' ' }}</span>
 
       <span class="ju_ren_one_level_two">{{ '' }}</span>
 
       <span class="ju_ren_one_level_two">{{ '' }}</span>
 
@@ -90,6 +90,8 @@
 
         weightUnit,
 
         weightUnit,
 
         workOrderId
 
         workOrderId
 
       } = this.$route.query;
 
       } = this.$route.query;
 
+      console.log('123');
 
+
 
       this.productName = productName ? productName : '';
 
       this.productName = productName ? productName : '';
 
       this.batchNo = batchNo ? batchNo : '';
 
       this.batchNo = batchNo ? batchNo : '';
 
       this.createDate = createDate ? createDate : '';
 
       this.createDate = createDate ? createDate : '';
 
@@ -129,6 +131,8 @@
 
         this.generateQRCodes();
 
         this.generateQRCodes();
 
         // window.print();
 
         // window.print();
 
       });
 
       });
 
+
 
+      // this.print();
 
     },
 
     },
 
 
 
     methods: {
 
     methods: {
 
@@ -146,6 +150,24 @@
 
             });
 
             });
 
         }
 
         }
 
       }
 
       }
 
+
 
+      // print() {
 
+      //   const printSection = document.getElementById('printSection');
 
+      //   // 创建打印任务
 
+      //   const printWindow = window.open('', '_blank');
 
+      //   printWindow.document.open();
 
+      //   printWindow.document.write('<html><head><title>打印预览</title>');
 
+      //   printWindow.document.write(
 
+      //     '<link rel="stylesheet" href="your-stylesheet-url.css" type="text/css" />'
 
+      //   );
 
+      //   printWindow.document.write('</head><body>');
 
+      //   printWindow.document.write(printSection.innerHTML);
 
+      //   printWindow.document.write('</body></html>');
 
+      //   printWindow.document.close();
 
+      //   // printWindow.onload = function () {
 
+      //   //   printWindow.print();
 
+      //   // };
 
+      // }
 
     }
 
     }
 
   };
 
   };
 
 </script>
 
 </script>