优化

src/view/DecisionSupport/operation/operationPersonnel.vue

@@ -61,7 +61,7 @@
                 <el-table ref="multipleTable"
                           id="tab2"
                           :row-style="{ height: '20px' }"
-                          show-summary
+                          :cell-class-name="cellClassName"  show-summary 
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }"
                           :show-overflow-tooltip="true"
@@ -76,8 +76,10 @@
                   <el-table-column align="left" sortable label="印件名称" prop="印件名称"  width="340"/>
                   <el-table-column align="left" sortable label="工序名称" prop="工序名称"  width="110"/>
                   <el-table-column align="left" sortable label="产量" prop="产量"  width="110"/>
+                  <el-table-column align="left" sortable label="实际每小时车头产量" prop="实际每小时车头产量"  width="105"/>
                   <el-table-column align="left" sortable label="计件系数" prop="工价系数"  width="110"/>
                   <el-table-column align="left" sortable label="补产标准" prop="补产标准"  width="110"/>
+                  <el-table-column align="left" sortable label="实际每小时计件产量与补产标准差额" prop="实际每小时计件产量与补产标准差额"  width="110"/>
                   <el-table-column align="left" sortable label="设备运行工时" prop="设备运行工时"  width="140"/>
                   <el-table-column align="left" sortable label="保养工时" prop="保养工时"  width="110"/>
                   <el-table-column align="left" sortable label="打样总工时" prop="打样总工时"  width="140"/>
@@ -436,8 +438,12 @@ const tableRowClick = async (row) => {
 
 
 // 行为控制标记（弹窗内部需要增还是改）
-const type = ref('')
-
+function cellClassName({ row, column, rowIndex, columnIndex }) {
+  if(column.property === '实际每小时计件产量与补产标准差额' && row.实际每小时计件产量与补产标准差额 > 0){
+    return 'red-cell'
+  }
+  return ''
+}
 
 </script>
 <style scoped>
@@ -540,4 +546,8 @@ const type = ref('')
 .mab{
   margin-bottom: 5px;
 }
+:deep(.red-cell div) {
+  color: #ff0000 !important;
+  font-weight: bold;
+}
 </style>

src/view/job/processSheet/processSheet.vue

@@ -11,6 +11,8 @@
 		                    <th style="width:40%;"><span>字段</span> </th>
 		                    <th><span>值</span></th>
 		                </tr>
+                    <el-checkbox v-model="Oldpaper">旧末版纸</el-checkbox>
+
 		                <tr>
 		                    <td><span>生产批次号</span></td>
 		                    <td><input name="Gd_gdbh" type="text" v-model="workData.Gd_gdbh" @input="propertyChange" class="required" style="width: 380px;height: 30px;"></td>
@@ -172,6 +174,7 @@
 	const selectedPaper = ref([])
 	const selectedPeijian = ref([])
 	const datas = ref([])
+  const Oldpaper = ref(false)
 
   // //在使用中的不带边框的模板
   // const jsondata1= {
@@ -5380,8 +5383,1140 @@ const selectpYj = (event) => {
       }
     ]
   }
+  const jsondata2 ={
+  "panels": [{
+    "index": 0,
+    "name": 1,
+    "paperType": "A4",
+    "height": 297,
+    "width": 210,
+    "paperHeader": 196.5,
+    "paperFooter": 822,
+    "printElements": [{
+      "options": {
+        "left": 504,
+        "top": 19.5,
+        "height": 65,
+        "width": 65,
+        "textType": "qrcode",
+        "title": "qrcode",
+        "right": 575.0000457763672,
+        "bottom": 84.99999237060547,
+        "vCenter": 542.5000457763672,
+        "hCenter": 52.49999237060547,
+        "field": "qrcode",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "qrCodeLevel": 0
+      },
+      "printElementType": {
+        "title": "qrcode",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 241.5,
+        "top": 27,
+        "height": 20,
+        "width": 103,
+        "title": "流程单",
+        "right": 344.5,
+        "bottom": 47,
+        "vCenter": 293,
+        "hCenter": 37,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 21.75,
+        "fontWeight": "900",
+        "letterSpacing": 12,
+        "textAlign": "center",
+        "qrCodeLevel": 0,
+        "field": "lcd1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 31,
+        "top": 40,
+        "height": 9.75,
+        "width": 133,
+        "title": "文本",
+        "right": 159.5,
+        "bottom": 42.75,
+        "vCenter": 100,
+        "hCenter": 37.875,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "qrCodeLevel": 0,
+        "field": "qr",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 61,
+        "height": 36,
+        "width": 58,
+        "title": "生产批次号",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "scpch1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 55,
+        "top": 65,
+        "height": 36,
+        "width": 100,
+        "title": "文本",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 127,
+        "bottom": 96.75,
+        "vCenter": 98,
+        "hCenter": 78.75,
+        "field": "scpch",
+        "hideTitle": true,
+        "draggable": false
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 172,
+        "top": 97,
+        "height": 36,
+        "width": 35,
+        "title": "码包号",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 206.5,
+        "bottom": 133.5,
+        "vCenter": 188,
+        "hCenter": 115.5,
+        "draggable": false,
+        "field": "mbh1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 422,
+        "top": 97,
+        "height": 36,
+        "width": 32,
+        "title": "流程单号",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 456.25,
+        "bottom": 134.25,
+        "vCenter": 437.75,
+        "hCenter": 116.25,
+        "draggable": false,
+        "field": "lcdh1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 97,
+        "height": 36,
+        "width": 58,
+        "title": "销售订单号",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 68.9921875,
+        "bottom": 133.74609375,
+        "vCenter": 39.9921875,
+        "hCenter": 115.74609375,
+        "draggable": false,
+        "field": "xsddh1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 460,
+        "top": 98,
+        "height": 36,
+        "width": 130,
+        "title": "销售订单号",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 24,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 582.5,
+        "bottom": 133.5,
+        "vCenter": 518.5,
+        "hCenter": 115.5,
+        "field": "lcdh",
+        "hideTitle": true,
+        "draggable": false
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 208,
+        "top": 100,
+        "height": 36,
+        "width": 212,
+        "title": "销售订单号",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "left",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 306.49609375,
+        "bottom": 130.74609375,
+        "vCenter": 256.49609375,
+        "hCenter": 112.74609375,
+        "field": "mbh",
+        "hideTitle": true,
+        "draggable": false
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 62,
+        "top": 107,
+        "height": 36,
+        "width": 90,
+        "title": "文本",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 127.24609375,
+        "bottom": 130.74609375,
+        "vCenter": 98.24609375,
+        "hCenter": 112.74609375,
+        "field": "xsddh",
+        "hideTitle": true,
+        "draggable": false
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 138,
+        "height": 26,
+        "width": 58,
+        "title": "工单",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "bottom",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 71.5,
+        "bottom": 163,
+        "vCenter": 42.5,
+        "hCenter": 150.5,
+        "field": "gd1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 71,
+        "top": 155,
+        "height": 52,
+        "width": 513,
+        "title": "销售订单号",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "left",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 171.25,
+        "bottom": 188.75,
+        "vCenter": 121.25,
+        "hCenter": 163.75,
+        "field": "gdsm",
+        "hideTitle": true,
+        "draggable": false
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 164,
+        "height": 26,
+        "width": 58,
+        "title": "说明",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 70.75,
+        "bottom": 188.75,
+        "vCenter": 41.75,
+        "hCenter": 175.75,
+        "field": "sm1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 291,
+        "top": 196,
+        "height": 28,
+        "width": 59,
+        "title": "总投纸数",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 349.25,
+        "bottom": 224.5,
+        "vCenter": 319.75,
+        "hCenter": 210.5,
+        "draggable": false,
+        "field": "ztzs1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 440,
+        "top": 196,
+        "height": 28,
+        "width": 50,
+        "title": "规矩号",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 497.24609375,
+        "bottom": 223.24609375,
+        "vCenter": 455.74609375,
+        "hCenter": 209.24609375,
+        "draggable": false,
+        "field": "gjh1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 490,
+        "top": 196,
+        "height": 28,
+        "width": 94,
+        "title": "产品名称",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 571.25,
+        "bottom": 224.5,
+        "vCenter": 529.75,
+        "hCenter": 210.5,
+        "field": "gjh",
+        "hideTitle": true,
+        "draggable": false
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 196,
+        "height": 28,
+        "width": 76,
+        "title": "产品名称",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 70.24609375,
+        "bottom": 231.99609375,
+        "vCenter": 41.24609375,
+        "hCenter": 213.99609375,
+        "draggable": false,
+        "field": "cpmc1",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 89,
+        "top": 215,
+        "height": 28,
+        "width": 165,
+        "title": "文本",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "right": 171.5,
+        "bottom": 224.5,
+        "vCenter": 130,
+        "hCenter": 210.5,
+        "field": "cpmc",
+        "hideTitle": true,
+        "draggable": false
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 330,
+        "top": 217,
+        "height": 28,
+        "width": 90,
+        "title": "产品名称",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 432.5,
+        "bottom": 223.75,
+        "vCenter": 391,
+        "hCenter": 209.75,
+        "field": "ztzs",
+        "hideTitle": true,
+        "draggable": false
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13.5,
+        "top": 262.5,
+        "height": 378,
+        "width": 572,
+        "autoCompletion": true,
+        "right": 585.4895629882812,
+        "bottom": 640.4974021911621,
+        "vCenter": 299.48956298828125,
+        "hCenter": 451.4974021911621,
+        "field": "table",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "maxRows": 15,
+        "textAlign": "center",
+        "tableHeaderRowHeight": 22.5,
+        "tableBodyRowHeight": 30,
+        "tableBorder": "noBorder",
+        "tableHeaderBorder": "noBorder",
+        "tableHeaderCellBorder": "noBorder",
+        "tableHeaderBackground": "#ffffff",
+        "tableBodyRowBorder": "noBorder",
+        "tableBodyCellBorder": "noBorder",
+        "tableFooterBorder": "noBorder",
+        "tableFooterCellBorder": "noBorder",
+        "columns": [
+          [{
+            "width": 76.00117854913401,
+            "field": "gxmc",
+            "checked": true,
+            "columnId": "gxmc",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 28.21724282582224,
+            "field": "rq",
+            "checked": true,
+            "columnId": "rq",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 30.69105523642733,
+            "field": "sj",
+            "checked": true,
+            "columnId": "sj",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 46.073534173378626,
+            "field": "hgps",
+            "checked": true,
+            "columnId": "hgps",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 46.04603945028347,
+            "field": "cps",
+            "checked": true,
+            "columnId": "cps",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 39.14565526604929,
+            "field": "fps",
+            "checked": true,
+            "columnId": "fps",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 34.03023853973766,
+            "field": "bc",
+            "checked": true,
+            "columnId": "bc",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 32.85485487917184,
+            "field": "jt",
+            "checked": true,
+            "columnId": "jt",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 42.70438913874767,
+            "field": "czg",
+            "checked": true,
+            "columnId": "czg",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 102.76126350532134,
+            "field": "yczlczxx",
+            "checked": true,
+            "columnId": "yczlczxx",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 39.91518563922935,
+            "field": "lzg",
+            "checked": true,
+            "columnId": "lzg",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 53.559362796697215,
+            "field": "fptj",
+            "checked": true,
+            "columnId": "fptj",
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1,
+            "tableQRCodeLevel": 0,
+            "tableSummaryTitle": true,
+            "tableSummary": ""
+          }, {
+            "width": 85.25,
+            "checked": false,
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1
+          }, {
+            "width": 85.25,
+            "checked": false,
+            "fixed": false,
+            "rowspan": 1,
+            "colspan": 1
+          }]
+        ]
+      },
+      "printElementType": {
+        "title": "表格",
+        "type": "table",
+        "editable": true,
+        "columnDisplayEditable": true,
+        "columnDisplayIndexEditable": true,
+        "columnTitleEditable": true,
+        "columnResizable": true,
+        "columnAlignEditable": true,
+        "isEnableEditField": true,
+        "isEnableContextMenu": true,
+        "isEnableInsertRow": true,
+        "isEnableDeleteRow": true,
+        "isEnableInsertColumn": true,
+        "isEnableDeleteColumn": true,
+        "isEnableMergeCell": true
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 612,
+        "height": 17,
+        "width": 572,
+        "title": "成品检验记录",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 585.25,
+        "bottom": 629,
+        "vCenter": 299.75,
+        "hCenter": 620.5,
+        "draggable": false,
+        "field": "cpjyjl",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 121,
+        "top": 629,
+        "height": 17,
+        "width": 35,
+        "title": "时间",
+        "right": 156.5,
+        "bottom": 645.5,
+        "vCenter": 139,
+        "hCenter": 637,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 156,
+        "top": 629,
+        "height": 17,
+        "width": 52,
+        "title": "合格品数",
+        "right": 185.75,
+        "bottom": 645.5,
+        "vCenter": 169.75,
+        "hCenter": 637,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 208,
+        "top": 629,
+        "height": 17,
+        "width": 38,
+        "title": "废品数",
+        "right": 243.5,
+        "bottom": 645.5,
+        "vCenter": 224.5,
+        "hCenter": 637,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 382,
+        "top": 629,
+        "height": 17,
+        "width": 45,
+        "title": "检验员",
+        "right": 423,
+        "bottom": 644,
+        "vCenter": 400.5,
+        "hCenter": 635.5,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 347,
+        "top": 629,
+        "height": 17,
+        "width": 35,
+        "title": "工序",
+        "right": 382.25,
+        "bottom": 643.25,
+        "vCenter": 364.75,
+        "hCenter": 634.75,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 462,
+        "top": 629,
+        "height": 17,
+        "width": 35,
+        "title": "时间",
+        "right": 362,
+        "bottom": 648.5,
+        "vCenter": 346,
+        "hCenter": 640,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 246,
+        "top": 629,
+        "height": 17,
+        "width": 101,
+        "title": "AB类废品及倒查",
+        "right": 276.5,
+        "bottom": 646.25,
+        "vCenter": 260.5,
+        "hCenter": 637.75,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 497,
+        "top": 629,
+        "height": 17,
+        "width": 52,
+        "title": "合格品数",
+        "right": 544.75,
+        "bottom": 647,
+        "vCenter": 518.75,
+        "hCenter": 638.5,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 549,
+        "top": 629,
+        "height": 17,
+        "width": 36,
+        "title": "废品数",
+        "right": 584,
+        "bottom": 644.75,
+        "vCenter": 565,
+        "hCenter": 636.25,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 646,
+        "height": 17,
+        "width": 35,
+        "title": "机检",
+        "right": 45.5,
+        "bottom": 661.25,
+        "vCenter": 29.5,
+        "hCenter": 652.75,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 663,
+        "height": 17,
+        "width": 572,
+        "title": "机台废次品信息记录",
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "fontSize": 12,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "lineHeight": 15,
+        "qrCodeLevel": 0,
+        "right": 139.75,
+        "bottom": 677.75,
+        "vCenter": 76.25,
+        "hCenter": 669.25,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 67,
+        "top": 680,
+        "height": 128,
+        "width": 89,
+        "title": "废次品留样黏贴处",
+        "right": 157.25,
+        "bottom": 693.5,
+        "vCenter": 112.75,
+        "hCenter": 686.5,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 680,
+        "height": 16,
+        "width": 54,
+        "title": "废次品工序",
+        "right": 67.5,
+        "bottom": 693.25,
+        "vCenter": 40.5,
+        "hCenter": 685.25,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 712,
+        "height": 16,
+        "width": 54,
+        "title": "废次品原因",
+        "right": 67.5,
+        "bottom": 728.5,
+        "vCenter": 40.5,
+        "hCenter": 720.5,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 744,
+        "height": 16,
+        "width": 54,
+        "title": "废次品数量",
+        "right": 65.25,
+        "bottom": 761.5,
+        "vCenter": 38.25,
+        "hCenter": 753.5,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }, {
+      "options": {
+        "left": 13,
+        "top": 776,
+        "height": 16,
+        "width": 54,
+        "title": "联拼号",
+        "right": 65.25,
+        "bottom": 792.25,
+        "vCenter": 38.25,
+        "hCenter": 784.25,
+        "coordinateSync": false,
+        "widthHeightSync": false,
+        "textAlign": "center",
+        "textContentVerticalAlign": "middle",
+        "qrCodeLevel": 0,
+        "draggable": false,
+        "field": "gx",
+        "hideTitle": true
+      },
+      "printElementType": {
+        "title": "文本",
+        "type": "text"
+      }
+    }],
+    "paperNumberLeft": 565.5,
+    "paperNumberTop": 819,
+    "paperNumberDisabled": true,
+    "paperNumberContinue": true,
+    "watermarkOptions": {
+      "content": "",
+      "fillStyle": "rgba(255, 255, 255, 1)",
+      "fontSize": "36px",
+      "rotate": 25,
+      "width": 413,
+      "height": 310,
+      "timestamp": false,
+      "format": "YYYY-MM-DD HH:mm"
+    },
+    "panelLayoutOptions": {}
+  }]
+}
+console.log(Oldpaper.value)
   // hiprint.init()
-  const hiprintTemplate = new hiprint.PrintTemplate({ template: jsondata1 });
+  const hiprintTemplate = new hiprint.PrintTemplate({ 
+  template: Oldpaper.value ? jsondata2 : jsondata1 
+});
 
 // 获取起始和结束值
 const start = workData.value.start_liucheng;//起始流程单号

src/view/managements/hardversionlibrary.vue

@@ -11,6 +11,7 @@
                 <el-button type="primary" class="bt" icon="edit" @click="onADD">添加</el-button>
                 <el-button type="primary" class="bt" icon="delete" :disabled="!selectedIds" @click="on_delete">删除</el-button>
                 <el-button type="primary" class="bt" icon="download"  @click="ToExcel" >导出到Excel</el-button>
+                <el-button type="primary" class="bt" icon="download"  @click="ToExcel" >导出报废印版</el-button>
                 <el-button type="primary" class="bt" icon="edit" @click="onsync">获取U8资料</el-button>
               </el-form-item>
             </el-form>
@@ -437,6 +438,21 @@ getTreeData()
   const wltableData = ref([])
   const nodecode = ref('')
   const handleNodeClick = async (node) => {
+  // 取消所有节点的颜色
+  const allNodes = document.querySelectorAll('.treecolor .el-tree-node');
+  allNodes.forEach(node => {
+    node.querySelector('.el-tree-node__label').style.color = '';
+  });
+
+  // 获取点击的节点
+  const clickedNodeId = node['$treeNodeId'];
+  const clickedNode = document.querySelector(`.treecolor .el-tree-node[data-key="${clickedNodeId}"]`);
+  console.log(node)
+  console.log(clickedNode)
+  if (clickedNode) {
+    // 给当前点击的节点改变颜色
+    clickedNode.querySelector('.el-tree-node__label').style.color = 'red';
+  }
     console.log(node) 
     if(!node.children){
       nodecode.value = node.label.split(' ')[0]

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2686,7 +2686,7 @@ const selectZhiNode = (v) => {
 //新增印件表格input
 const add_gdzlyjent = async (event,id1,id2,id3,idx) => {
   if (id2 === 'yjdh' && event.key==='Tab' || id2 === 'yjdh' && event.key=== 'Enter') {
-    _getProductYjList();
+    // _getProductYjList();
     searchModel.value = true
   }
   if(id2=='pztl' && event.key==='Tab' || id2 === 'pztl' && event.key=== 'Enter'){
@@ -3864,7 +3864,7 @@ const edit_selectZhiNode = (v) => {
 //修改印件表格input
 const edit_gdyjent = (event,id1,id2,id3,idx) => {
   if (id2 === '印件代号' && event.key==='Tab' || id2 === '印件代号' && event.key=== 'Enter') {
-    edit_getProductYjList();
+    // edit_getProductYjList();
     edit_searchModel.value = true
   }
   if(id2=='平张投料' && event.key==='Tab' || id2 === '平张投料' && event.key=== 'Enter'){

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -2794,6 +2794,10 @@ const JPmachineDetails = async (jt, riqi) => {
         let rowA = {
             产品名称: `A班${item.检验类型}合计：`, 
             计件箱数: `${item.箱数}`, // 添加合计箱数字段
+			换膜补时: `${item.总换膜补时}`, 
+			保养工时: `${item.总保养工时}`, 
+			异常总工时: `${item.总异常总工时}`, 
+			通电工时: `${item.总通电工时}`,
 			isTotal: true //标识合计行改变颜色
         };
         JPgytableData.value.push(rowA);
@@ -2805,6 +2809,10 @@ if (sortedTotalB.length !== 0) {
         let rowB = {
             产品名称: `B班${item.检验类型}合计：`, 
             计件箱数: `${item.箱数}`,// 添加合计箱数字段
+			换膜补时: `${item.总换膜补时}`, 
+			保养工时: `${item.总保养工时}`, 
+			异常总工时: `${item.总异常总工时}`, 
+			通电工时: `${item.总通电工时}`,
 			isTotal: true //标识合计行改变颜色
         };
         JPgytableData.value.push(rowB);