Browse Source

超节损统计

tty 1 year ago
parent
commit
425d854733

+ 2 - 0
src/view/job/processSheet/processSheet.vue

@@ -307,6 +307,7 @@
 
 
 		 }
 		 }
 	}
 	}
+  //在使用中的不带边框的模板
   const jsondata1= {
   const jsondata1= {
     "panels": [
     "panels": [
       {
       {
@@ -1525,6 +1526,7 @@
       }
       }
     ]
     ]
   }
   }
+  //带边框的模板
   const jsondata = {
   const jsondata = {
     "panels": [
     "panels": [
       {
       {

+ 6 - 4
src/view/performance/12-orderAccounting/componets/gdcjstj.vue

@@ -44,6 +44,7 @@ const props = defineProps({
 })
 })
 const input = ref(props['gdbh'])
 const input = ref(props['gdbh'])
 
 
+// 按工序打印
 const handlePrint1 = async() => {
 const handlePrint1 = async() => {
   // 引入后初始化
   // 引入后初始化
   hiprint.init()
   hiprint.init()
@@ -101,8 +102,8 @@ const handlePrint1 = async() => {
         'mbbfl': item['target_loss_rate'],
         'mbbfl': item['target_loss_rate'],
         'sjbfl': item['actual_loss_rate'],
         'sjbfl': item['actual_loss_rate'],
         'cdbl': item['超节损承担比例'],
         'cdbl': item['超节损承担比例'],
-        'cjsje': item[''],
-        'zgqr': item[''],
+        'gxcjsje': item['工序超节损金额'].substring(0, item['工序超节损金额'].length - 2),
+        'zgqr': '',
       })),
       })),
     }
     }
     console.log(tableData)
     console.log(tableData)
@@ -110,6 +111,7 @@ const handlePrint1 = async() => {
   }
   }
 }
 }
 
 
+// 按班组打印
 const handlePrint2 = async() => {
 const handlePrint2 = async() => {
   // 引入后初始化
   // 引入后初始化
   hiprint.init()
   hiprint.init()
@@ -139,7 +141,7 @@ const handlePrint2 = async() => {
       'clf': data['材料废'],
       'clf': data['材料废'],
       'wff': data['外发废'],
       'wff': data['外发废'],
       'ltcl': data['零头处理'],
       'ltcl': data['零头处理'],
-      'zcf': data[''],
+      'zcf': data['zcfp'],
       'zjf': data['工单质检废'],
       'zjf': data['工单质检废'],
       'wxs': data[''],
       'wxs': data[''],
       'mbhgl': data['target_rate'],
       'mbhgl': data['target_rate'],
@@ -159,7 +161,7 @@ const handlePrint2 = async() => {
         'wxsft': item['无形损分摊'],
         'wxsft': item['无形损分摊'],
         'jssl': item['节损数量'],
         'jssl': item['节损数量'],
         'cdbl': item['超节损承担比例'],
         'cdbl': item['超节损承担比例'],
-        'jsj': `<span style="color: red;">${item['loss'] ? item['loss'] : ''}</span>`,
+        'jsj': `<span style="color: red;">${item['节损奖'] ? item['节损奖'] : ''}</span>`,
       })),
       })),
     }
     }
     console.log(tableData)
     console.log(tableData)

+ 1 - 1
src/view/performance/12-orderAccounting/componets/template-bz.json

@@ -1678,7 +1678,7 @@
                         "bottom": 198.0000057220459,
                         "bottom": 198.0000057220459,
                         "vCenter": 405.75,
                         "vCenter": 405.75,
                         "hCenter": 177.7500057220459,
                         "hCenter": 177.7500057220459,
-                        "fontSize": 9,
+                        "fontSize": 8,
                         "lineHeight": 18,
                         "lineHeight": 18,
                         "maxRows": 21,
                         "maxRows": 21,
                         "columns": [
                         "columns": [