Browse Source

优化打印logo

liuhairui 1 year ago
parent
commit
6e58af89e7

+ 2 - 0
src/view/performance/12-orderAccounting/componets/gdcjstj.vue

@@ -66,6 +66,7 @@ const handlePrint1 = async() => {
       return
       return
     }
     }
     const tableData = {
     const tableData = {
+      "minong": "/src/assets/logotx.png",
       'gdbh': data['Gd_gdbh'],
       'gdbh': data['Gd_gdbh'],
       'cpdh': data['成品代号'],
       'cpdh': data['成品代号'],
       'cpmc': data['成品名称'],
       'cpmc': data['成品名称'],
@@ -133,6 +134,7 @@ const handlePrint2 = async() => {
       return
       return
     }
     }
     const tableData = {
     const tableData = {
+      "minong": "/src/assets/logotx.png",
       'gdbh': data['Gd_gdbh'],
       'gdbh': data['Gd_gdbh'],
       'cpmc': data['成品名称'],
       'cpmc': data['成品名称'],
       'sjtl': parseFloat(data['实际投料']).toFixed(2) + '万张',
       'sjtl': parseFloat(data['实际投料']).toFixed(2) + '万张',

File diff suppressed because it is too large
+ 0 - 4
src/view/performance/12-orderAccounting/componets/template-bz.json


File diff suppressed because it is too large
+ 1 - 4
src/view/performance/12-orderAccounting/componets/template-gx.json


+ 6 - 17
src/view/yunyin/shengchanguanli/components/print.vue

@@ -193,7 +193,7 @@ const jsondata = {
             "top": 12,
             "top": 12,
             "height": 14,
             "height": 14,
             "width": 180,
             "width": 180,
-            "title": "浙江美浓世纪集团有限公司",
+            "title": "浙江翌星包装科技有限公司",
             "coordinateSync": false,
             "coordinateSync": false,
             "widthHeightSync": false,
             "widthHeightSync": false,
             "fontSize": 13.5,
             "fontSize": 13.5,
@@ -240,7 +240,7 @@ const jsondata = {
             "top": 28.5,
             "top": 28.5,
             "height": 9.75,
             "height": 9.75,
             "width": 209,
             "width": 209,
-            "title": "ZHEJIANG MINONG CENTURY GROUP CO.LTD.",
+            "title": "ZHEJIANG YIXING CENTURY GROUP CO.LTD.",
             "coordinateSync": false,
             "coordinateSync": false,
             "widthHeightSync": false,
             "widthHeightSync": false,
             "fontSize": 7.5,
             "fontSize": 7.5,
@@ -2680,7 +2680,7 @@ const jsondatas = {
             "top": 12,
             "top": 12,
             "height": 14,
             "height": 14,
             "width": 180,
             "width": 180,
-            "title": "浙江美浓世纪集团有限公司",
+            "title": "浙江翌星包装科技有限公司",
             "coordinateSync": false,
             "coordinateSync": false,
             "widthHeightSync": false,
             "widthHeightSync": false,
             "fontSize": 13.5,
             "fontSize": 13.5,
@@ -2719,7 +2719,7 @@ const jsondatas = {
             "top": 28.5,
             "top": 28.5,
             "height": 9.75,
             "height": 9.75,
             "width": 209,
             "width": 209,
-            "title": "ZHEJIANG MINONG CENTURY GROUP CO.LTD.",
+            "title": "ZHEJIANG YIXING CENTURY GROUP CO.LTD.",
             "coordinateSync": false,
             "coordinateSync": false,
             "widthHeightSync": false,
             "widthHeightSync": false,
             "fontSize": 7.5,
             "fontSize": 7.5,
@@ -4586,7 +4586,6 @@ const cp_print_handleConfirm = async () => {
     return false;
     return false;
   }
   }
   let params = {};
   let params = {};
-  //2310707、2012127
   params.workOrder = form['gdbh'];
   params.workOrder = form['gdbh'];
   params.PrepareDocument = form['zd'];
   params.PrepareDocument = form['zd'];
   params.examine = form['sh'];
   params.examine = form['sh'];
@@ -4616,19 +4615,9 @@ const cp_print_handleConfirm = async () => {
   const minutes = String(today.getMinutes()).padStart(2, '0');
   const minutes = String(today.getMinutes()).padStart(2, '0');
   const seconds = String(today.getSeconds()).padStart(2, '0');
   const seconds = String(today.getSeconds()).padStart(2, '0');
   const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
   const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-
-
-  // console.log(print_PrintJobOrder.data.materiel)
-  // if(print_PrintJobOrder.data.materiel.length === 0){
-  //   console.log(1)
-  // }else{
-  //   console.log(22222)
-  // }
-
-
   const printdata  = {
   const printdata  = {
-    // "minong": "https://shangbiaopic.11467.com/13/85/13855845.jpg",
-    "minong": "https://www.zjminong.com/static/web/images/logo.png?v=v2",
+    // "minong": "https://www.zjminong.com/static/web/images/logo.png?v=v2",
+    "minong": "/src/assets/logotx.png",
     "ztlx":_gdlx.value,
     "ztlx":_gdlx.value,
     "printcode":print_PrintJobOrder.data['生产批次号'],
     "printcode":print_PrintJobOrder.data['生产批次号'],
     "dysj":currentDate,
     "dysj":currentDate,

Some files were not shown because too many files changed in this diff