Эх сурвалжийг харах

Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

曹鹤洋 1 жил өмнө
parent
commit
27cc1a0310
26 өөрчлөгдсөн 5286 нэмэгдсэн , 1786 устгасан
  1. 16 0
      src/api/jixiaoguanli/baogong.js
  2. 15 0
      src/api/jixiaoguanli/jitairibaobiao.js
  3. 2 2
      src/api/mes_api_gty/orderAccounting.js
  4. 54 8
      src/api/yunyin/yunying.js
  5. 21 21
      src/view/job/job/job.vue
  6. 24 24
      src/view/job/related/related.vue
  7. 17 17
      src/view/job/rewards/rewards.vue
  8. 19 8
      src/view/job/sampling/sampling.vue
  9. 4 0
      src/view/performance/06-packingDocuments/index.vue
  10. 1 0
      src/view/performance/07-otherDocuments/index.vue
  11. 1 0
      src/view/performance/08-timesheet/index.vue
  12. 1 0
      src/view/performance/09-workOrderVerification/index.vue
  13. 15 5
      src/view/performance/12-orderAccounting/componets/detail.vue
  14. 43 25
      src/view/performance/12-orderAccounting/index.vue
  15. 2 0
      src/view/performance/14-overTimePayVerification/index.vue
  16. 23 10
      src/view/performance/Dayreports.vue
  17. 287 222
      src/view/performance/chejianbaogong.vue
  18. 30 30
      src/view/performance/yuangongrigongzi.vue
  19. 65 65
      src/view/yunyin/chanpinziliao/chanpinziliao.vue
  20. 20 20
      src/view/yunyin/renliziyuan/renyuanjibenziliao.vue
  21. 27 27
      src/view/yunyin/shengchanguanli/chengpinrucang.vue
  22. 319 0
      src/view/yunyin/shengchanguanli/components/addGongYi.vue
  23. 2720 0
      src/view/yunyin/shengchanguanli/components/print.vue
  24. 240 252
      src/view/yunyin/shengchanguanli/gongdanshengchan.vue
  25. 1051 988
      src/view/yunyin/shengchanguanli/gongdanziliao.vue
  26. 269 62
      src/view/yunyin/shengchanguanli/shebeiyunxing.vue

+ 16 - 0
src/api/jixiaoguanli/baogong.js

@@ -41,4 +41,20 @@ export const ModelChangeRecord = (params) => {
     method: 'get',
     params
   })
+}
+export const RemodelDetail = (params) => {
+  return service({
+    url: '/mes_server/Facility/RemodelDetail',
+    method: 'get',
+    params
+  })
+}
+
+//客诉记录
+export const  ComplaintRecord= (params) => {
+  return service({
+    url:'/mes_server/facility/ComplaintRecord',
+    method: 'get',
+	params
+  })
 }

+ 15 - 0
src/api/jixiaoguanli/jitairibaobiao.js

@@ -933,4 +933,19 @@ export const  dedhGetRate= (params) => {
     method: 'get',
     params
   })
+}
+//设备运行跟踪---换型清场
+export const remodelGetTab = (data) => {
+  return service({
+    url: '/mes_server/facility/remodelGetTab',
+    method: 'get',
+    data
+  })
+}
+export const ModelChangeRecord = (params) => {
+  return service({
+    url: '/mes_server/facility/ModelChangeRecord',
+    method: 'get',
+    params
+  })
 }

+ 2 - 2
src/api/mes_api_gty/orderAccounting.js

@@ -4,7 +4,7 @@ import service from '@/utils/request'
 * 工单超节损核算
 */
 
-// 1.1获取左侧菜单栏
+// 1.1获取左侧菜单栏(2.22修改)
 export const getSide = (params) => {
   return service({
     url: '/mes_server/order_super_loss/getTab',
@@ -13,7 +13,7 @@ export const getSide = (params) => {
   })
 }
 
-// 1.2获取超节损工单列表-筛选
+// 1.2获取超节损工单列表-筛选(2.22修改)
 export const getTable = (params) => {
   return service({
     url: '/mes_server/order_super_loss/getList',

+ 54 - 8
src/api/yunyin/yunying.js

@@ -172,7 +172,7 @@ export const getProductYjList = (params) => {
         params
     })
 }
-//3.5获取纸张代号及名称
+/3.5获取纸张代号及名称/
 export const getProductZzList = (params) => {
     return service({
         url: '/mes_server/Product/getProductZzList',
@@ -324,11 +324,11 @@ export const ReferenceWorkOrder = (params) => {
     })
 }
 //工艺流程调整->工艺资料修改
-export const ProcessCopy = (params) => {
+export const ProcessCopy = (data) => {
     return service({
         url: '/mes_server/work_order/ProcessCopy',
         method: 'post',
-        params
+        data
     })
 }
 // 查改U8工单(工单删除)
@@ -348,11 +348,11 @@ export const TestCoefficient = (params) => {
     })
 }
 //质检废品系数->质检系数更新
-export const TestCoefficientEdit = (params) => {
+export const TestCoefficientEdit = (data) => {
     return service({
         url: '/mes_server/work_order/TestCoefficientEdit',
         method: 'post',
-        params
+        data
     })
 }
 //修正工单核算参数->数据获取
@@ -438,7 +438,7 @@ export const capacityList = (params) => {
 //新增工单->客户列表
 export const ClientList  = (params) => {
     return service({
-        url: 'c',
+        url: '/mes_server/work_order/ClientList',
         method: 'get',
         params
     })
@@ -475,7 +475,46 @@ export const ProcessCodeList  = (params) => {
         params
     })
 }
-
+//新增印件资料->印件资料添加
+export const PrintDetailAdd  = (data) => {
+    return service({
+        url: '/mes_server/work_order/PrintDetailAdd',
+        method: 'post',
+        data
+    })
+}
+//新增工艺资料->工艺资料添加
+export const ProcessDetailAdd  = (data) => {
+    return service({
+        url: '/mes_server/work_order/ProcessDetailAdd',
+        method: 'post',
+        params
+    })
+}
+//新增工艺资料->印件编号获取
+export const PrintDetailList  = (params) => {
+    return service({
+        url: '/mes_server/work_order/PrintDetailList',
+        method: 'get',
+        params
+    })
+}
+//印件资料删除
+export const PrintDetailDel  = (params) => {
+    return service({
+        url: '/mes_server/work_order/PrintDetailDel',
+        method: 'get',
+        params
+    })
+}
+//工艺资料删除
+export const ProcessDetailDel  = (params) => {
+    return service({
+        url: '/mes_server/work_order/ProcessDetailDel',
+        method: 'get',
+        params
+    })
+}
 
 /**工单生产排单(排产管理)*/
 //计划中工单
@@ -610,7 +649,14 @@ export const MachineWorkOrderList = (params) => {
         params
     })
 }
-
+//机组调整
+export const MachineTeamEdit = (params) => {
+    return service({
+        url: '/mes_server/Manufacture/MachineTeamEdit',
+        method: 'get',
+        params
+    })
+}
 
 /** 7.设备运行跟踪*/
 //左侧菜单

+ 21 - 21
src/view/job/job/job.vue

@@ -66,27 +66,27 @@
 				highlight-current-row="true"
             >
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column align="left" fixed="left" label="设备编号" prop="设备编号" width="90" />
-              <el-table-column align="left" fixed="left" label="设备名称" prop="设备名称" width="200" />
-              <el-table-column align="left" label="生产工序" prop="生产工序" width="160" />
-              <el-table-column align="left" label="日定额" prop="日定额" width="100" />
-              <el-table-column align="left" label="千件工价" prop="千件工价" width="90" />
-              <el-table-column align="left" label="机长" prop="机长" width="80" />
-              <el-table-column align="left" label="副机" prop="副机" width="80" />
-              <el-table-column align="left" label="调墨" prop="调墨" width="80" />
-              <el-table-column align="left" label="二手" prop="二手" width="80" />
-              <el-table-column align="left" label="飞达" prop="飞达" width="80" />
-              <el-table-column align="left" label="辅助" prop="辅助" width="80" />
-              <el-table-column align="left" label="放卷" prop="放卷" width="80" />
-              <el-table-column align="left" label="分切1" prop="分切1" width="80" />
-              <el-table-column align="left" label="分切2" prop="分切2" width="80" />
-              <el-table-column align="left" label="检验" prop="检验" width="80" />
-              <el-table-column align="left" label="使用部门" prop="使用部门" width="90" />
-              <el-table-column align="left" label="设备编组" prop="" width="90" />
-              <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
-              <el-table-column align="left" label="创建时间" prop="mod_rq" width="160" />
-              <el-table-column align="left" label="修改时间" prop="sys_rq" width="160" />
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="75" >
+              <el-table-column align="left" sortable fixed="left" label="设备编号" prop="设备编号" width="90" />
+              <el-table-column align="left" sortable fixed="left" label="设备名称" prop="设备名称" width="200" />
+              <el-table-column align="left" sortable label="生产工序" prop="生产工序" width="160" />
+              <el-table-column align="left" sortable label="日定额" prop="日定额" width="100" />
+              <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="90" />
+              <el-table-column align="left" sortable label="机长" prop="机长" width="80" />
+              <el-table-column align="left" sortable label="副机" prop="副机" width="80" />
+              <el-table-column align="left" sortable label="调墨" prop="调墨" width="80" />
+              <el-table-column align="left" sortable label="二手" prop="二手" width="80" />
+              <el-table-column align="left" sortable label="飞达" prop="飞达" width="80" />
+              <el-table-column align="left" sortable label="辅助" prop="辅助" width="80" />
+              <el-table-column align="left" sortable label="放卷" prop="放卷" width="80" />
+              <el-table-column align="left" sortable label="分切1" prop="分切1" width="80" />
+              <el-table-column align="left" sortable label="分切2" prop="分切2" width="80" />
+              <el-table-column align="left" sortable label="检验" prop="检验" width="80" />
+              <el-table-column align="left" sortable label="使用部门" prop="使用部门" width="90" />
+              <el-table-column align="left" sortable label="设备编组" prop="" width="90" />
+              <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120" />
+              <el-table-column align="left" sortable label="创建时间" prop="mod_rq" width="160" />
+              <el-table-column align="left" sortable label="修改时间" prop="sys_rq" width="160" />
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="75" >
               <!-- <el-table-column align="center" fixed="right" label="操作"  min-width="100"> -->
                <!-- <template #default="scope">
                   <el-button type="primary" link class="table-button" @click="getDetails(scope.row)">

+ 24 - 24
src/view/job/related/related.vue

@@ -33,18 +33,18 @@
 			   :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 			   :header-cell-style="{ padding: '0px' }" @row-click="ontable" @row-dblclick="doubleClick">
               <!-- <el-table-column type="selection" width="55" /> -->
-			  <el-table-column align="left" label="员工编号" prop="员工编号" width="120"/>
-              <el-table-column align="left" label="员工姓名" prop="员工姓名" width="120"/>
-			  <el-table-column align="left" label="职称职务" prop="职称职务" width="160"/>
-			  <el-table-column align="left" label="所在部门" prop="所在部门" width="160"/>
-			  <el-table-column align="left" label="日期" prop="日期" width="160"/>
-			  <el-table-column align="left" label="关联系数" prop="关联系数" width="120"/>
-              <el-table-column align="left" label="关联人数" prop="关联人数" width="120"/>
-              <el-table-column align="left" label="关联计件工资" prop="个人计件工资" width="120"/>
-              <el-table-column align="left" label="关联加班工资" prop="个人加班工资" width="160"/>
-			  <el-table-column align="left" label="关联额定补差" prop="计时" width="160"/>
-              <el-table-column align="left" label="关联计时工资" prop="计时工资" width="160"/>
-              <el-table-column align="left" label="关联工资合计" prop="日工资合计" width="120"/>
+			  <el-table-column align="left" sortable label="员工编号" prop="员工编号" width="120"/>
+              <el-table-column align="left" sortable label="员工姓名" prop="员工姓名" width="120"/>
+			  <el-table-column align="left" sortable label="职称职务" prop="职称职务" width="160"/>
+			  <el-table-column align="left" sortable label="所在部门" prop="所在部门" width="160"/>
+			  <el-table-column align="left" sortable label="日期" prop="日期" width="160"/>
+			  <el-table-column align="left" sortable label="关联系数" prop="关联系数" width="120"/>
+              <el-table-column align="left" sortable label="关联人数" prop="关联人数" width="120"/>
+              <el-table-column align="left" sortable label="关联计件工资" prop="个人计件工资" width="120"/>
+              <el-table-column align="left" sortable label="关联加班工资" prop="个人加班工资" width="160"/>
+			  <el-table-column align="left" sortable label="关联额定补差" prop="计时" width="160"/>
+              <el-table-column align="left" sortable label="关联计时工资" prop="计时工资" width="160"/>
+              <el-table-column align="left" sortable label="关联工资合计" prop="日工资合计" width="120"/>
             </el-table>
             <!-- 分页 -->
             <!-- <div class="gva-pagination">
@@ -60,18 +60,18 @@
 		    <el-table ref="multipleTable" style="width: 100%" height="300px" tooltip-effect="dark" :data="tableData2" row-key="ID"
 		      highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
 		      <el-table-column type="selection" width="55" />
-		  	  <el-table-column align="left" label="日期" prop="日期" width="120"/>
-		      <el-table-column align="left" label="员工编号" prop="员工编号" width="120"/>
-		      <el-table-column align="left" label="员工姓名" prop="员工姓名" width="120"/>
-		      <el-table-column align="left" label="职称职务" prop="职称职务" width="120"/>
-		      <el-table-column align="left" label="所在部门" prop="所在部门" width="160"/>
-		      <el-table-column align="left" label="被关联员工" prop="被关联员工" width="160"/>
-		      <el-table-column align="left" label="被关联姓名" prop="被关联姓名" width="120"/>
-			  <el-table-column align="left" label="权重" prop="权重" width="120"/>
-			  <el-table-column align="left" label="计件工资" prop="个人计件工资" width="120"/>
-			  <el-table-column align="left" label="加班工资" prop="个人加班工资" width="120"/>
-			  <el-table-column align="left" label="定额补差" prop="定额补差" width="120"/>
-			  <el-table-column align="left" label="计时工资" prop="计时工资" width="160"/>
+		  	  <el-table-column align="left" sortable label="日期" prop="日期" width="120"/>
+		      <el-table-column align="left" sortable label="员工编号" prop="员工编号" width="120"/>
+		      <el-table-column align="left" sortable label="员工姓名" prop="员工姓名" width="120"/>
+		      <el-table-column align="left" sortable label="职称职务" prop="职称职务" width="120"/>
+		      <el-table-column align="left" sortable label="所在部门" prop="所在部门" width="160"/>
+		      <el-table-column align="left" sortable label="被关联员工" prop="被关联员工" width="160"/>
+		      <el-table-column align="left" sortable label="被关联姓名" prop="被关联姓名" width="120"/>
+			  <el-table-column align="left" sortable label="权重" prop="权重" width="120"/>
+			  <el-table-column align="left" sortable label="计件工资" prop="个人计件工资" width="120"/>
+			  <el-table-column align="left" sortable label="加班工资" prop="个人加班工资" width="120"/>
+			  <el-table-column align="left" sortable label="定额补差" prop="定额补差" width="120"/>
+			  <el-table-column align="left" sortable label="计时工资" prop="计时工资" width="160"/>
 		    </el-table>
 		    <!-- 分页 -->
 		    <!-- <div class="gva-pagination">

+ 17 - 17
src/view/job/rewards/rewards.vue

@@ -73,103 +73,103 @@
                 align="left"
                 label="工单编号"
                 prop="sczl_gdbh"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="印件名称"
                 prop="yj_yjmc"
-                width="210"
+                width="210" sortable
               />
               <el-table-column
                 align="left"
                 label="日期"
                 prop="sczl_rq"
-                width="100"
+                width="100" sortable
               />
               <el-table-column
                 align="left"
                 label="流程单备注"
                 prop="sczl_numDesc"
-                width="100"
+                width="100" sortable
               />
               <el-table-column
                 align="left"
                 label="联数"
                 prop="sczl_ls"
-                width="70"
+                width="70" sortable
               />
               <el-table-column
                 align="left"
                 label="责任部门"
                 prop="责任部门"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="大废品数"
                 prop="sczl_cl"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="废品类型"
                 prop="sczl_fplxA"
-                width="100"
+                width="100" sortable
               />
               <el-table-column
                 align="left"
                 label="废品来源"
                 prop="sczl_fplxB"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="奖励班组"
                 prop="Jl_bzdh"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="检验员工"
                 prop="JL_bh1"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="责任班组"
                 prop="sczl_bzdh"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="责任员工1"
                 prop="sczl_bh1"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="责任员工2"
                 prop="sczl_bh2"
-                width="90"
+                width="90" sortable
               />
               <el-table-column
                 align="left"
                 label="创建用户"
                 prop="sys_id"
-                width="120"
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="创建时间"
                 prop="sys_rq"
-                width="160"
+                width="160" sortable
               />
               <el-table-column
                 align="left"
                 label="UNIQID"
                 prop="UniqId"
-                width="80"
+                width="80" sortable
               />
             </el-table>
             <div class="gva-pagination">

+ 19 - 8
src/view/job/sampling/sampling.vue

@@ -83,114 +83,125 @@
               <el-table-column
                 type="selection"
                 width="55"
+				
               />
               <el-table-column
                 align="center"
                 label="日期"
                 prop="Sczl_rq"
                 width="100"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="员工编号"
                 prop="Sczl_bh"
                 width="90"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="员工姓名"
                 prop="name"
                 width="90"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="工单编号"
                 prop="Sczl_gdbh"
                 width="90"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="产品名称"
                 prop="Gd_cpmc"
                 width="130"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="工序名称"
                 prop="Sczl_gxmc"
                 width="95"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="印件号"
                 prop="sczl_yjno"
                 width="70"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="工序号"
                 prop="sczl_gxh"
                 width="70"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="流程单号"
                 prop="Sczl_num"
                 width="85"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="抽检数"
                 prop="Sczl_抽检数"
                 width="70"
+				sortable
               />
               <el-table-column
                 align="left"
                 label="A类废"
                 prop="sczl_A类废"
-                width="70"
+                width="70" sortable
               />
               <el-table-column
                 align="left"
                 label="B类废"
                 prop="sczl_B类废"
-                width="70"
+                width="70"  sortable
               />
               <el-table-column
                 align="left"
                 label="C类废"
                 prop="sczl_C类废"
-                width="70"
+                width="70" sortable
               />
               <el-table-column
                 align="left"
                 label="备注"
                 prop="Sczl_desc"
-                width="80"
+                width="80" sortable
               />
               <el-table-column
                 align="left"
                 label="创建用户"
                 prop="Sys_id"
-                width="120"
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="创建时间"
                 prop="Sys_rq"
-                width="160"
+                width="160" sortable
               />
               <el-table-column
                 align="left"
                 label="修改时间"
                 prop="Mod_rq"
-                width="120"
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="UNIQID"
                 prop="UniqId"
-                width="75"
+                width="75" sortable
               />
             </el-table>
             <div class="gva-pagination">

+ 4 - 0
src/view/performance/06-packingDocuments/index.vue

@@ -138,11 +138,13 @@
                 <el-table-column
                   label="工单编号"
                   width="100"
+				  
                 >
                   <template #default="{ row, $index }">
                     <el-input
                       v-model="row.sczl_gdbh"
                       @keyup.enter="handleEnter($index, row)"
+					  
                     />
                   </template>
                 </el-table-column>
@@ -329,6 +331,7 @@
               <el-table-column
                 type="selection"
                 width="55"
+				
               />
               <!-- 循环渲染列 -->
               <el-table-column
@@ -337,6 +340,7 @@
                 :prop="column.prop"
                 :label="column.label"
                 :width="column.width"
+				sortable
               />
             </el-table>
             <!-- 分页 -->

+ 1 - 0
src/view/performance/07-otherDocuments/index.vue

@@ -318,6 +318,7 @@
               :prop="column.prop"
               :label="column.label"
               :width="column.width"
+			  sortable
             />
 
           </el-table>

+ 1 - 0
src/view/performance/08-timesheet/index.vue

@@ -425,6 +425,7 @@
               :prop="column.prop"
               :label="column.label"
               :width="column.width"
+			  sortable
             />
 
           </el-table>

+ 1 - 0
src/view/performance/09-workOrderVerification/index.vue

@@ -103,6 +103,7 @@
                 :prop="column.prop"
                 :label="column.label"
                 :width="column.width"
+				sortable
               />
 
             </el-table>

+ 15 - 5
src/view/performance/12-orderAccounting/componets/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <el-dialog
-    :model-value="modelValue"
+    :model-value="isShow"
     title="产品工艺流程"
     destroy-on-close
-    :before-close="()=>{emits('update:modelValue', false )}"
+    :before-close="()=>{emits('destroy')}"
     style="width: 80vw; height: 80vh"
   >
     <el-form
@@ -89,7 +89,7 @@
 
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="()=>{emits('update:modelValue', false )}">取 消</el-button>
+        <el-button @click="()=>{emits('destroy')}">取 消</el-button>
         <el-button
           type="primary"
           @click="handleUpdateDatail"
@@ -129,8 +129,18 @@ const updateOrderGy = (data) => {
 import { defineEmits, defineProps, ref } from 'vue'
 import { ElMessage } from 'element-plus'
 
-const props = defineProps(['modelValue', 'gdbh'])
-const emits = defineEmits(['update:modelValue'])
+// const props = defineProps(['isShow', 'gdbh'])
+const props = defineProps({
+  isShow: {
+    type: Boolean,
+    default: false,
+  },
+  gdbh: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['destroy'])
 const detailData = ref([])
 const input = ref(props['gdbh'])
 

+ 43 - 25
src/view/performance/12-orderAccounting/index.vue

@@ -78,8 +78,9 @@
             <!-- 查改 -->
             <Detail
               v-if="dialogDetail"
-              v-model="dialogDetail"
+              :is-show="dialogDetail"
               :gdbh="gdbh"
+              @destroy="()=>{dialogDetail = false}"
             />
 
             <!-- 工单超节损统计 -->
@@ -155,6 +156,7 @@
               highlight-current-row
               border
               :row-class-name="rowClassName"
+              :cell-class-name="cellClassName"
               :row-style="{ height: '20px' }"
               :cell-style="{ padding: '0px' }"
               :header-row-style="{ height: '20px' }"
@@ -174,6 +176,7 @@
                 :label="column.label"
                 :width="column.width"
                 show-overflow-tooltip="true"
+				sortable
               />
 
             </el-table>
@@ -203,6 +206,7 @@
               :label="column.label"
               :width="column.width"
               show-overflow-tooltip="true"
+			  sortable
             />
           </el-table>
         </layout-content>
@@ -258,30 +262,30 @@ getSideData()
 
 // 表格数据
 const tableCols1 = [
-  { label: '超损工单', prop: '', width: '90' },
+  { label: '超损工单', prop: 'csgd', width: '90' },
   { label: '工单编号', prop: 'Gd_gdbh', width: '100' },
-  { label: '印件号', prop: 'yj_Yjno', width: '100' },
+  { label: '印件号', prop: 'jjcp_yjno', width: '100' },
   { label: '联数', prop: 'yj_ls', width: '80' },
-  { label: '产品代号', prop: 'Gd_cpdh', width: '150' },
-  { label: '产品名称', prop: 'Gd_cpmc', width: '250' },
+  { label: '产品代号', prop: '成品编码', width: '150' },
+  { label: '产品名称', prop: '成品名称', width: '250' },
   { label: '实际投料', prop: '实际投料', width: '100' },
   { label: '计量单位', prop: '计量单位', width: '100' },
   { label: '入仓日期', prop: 'warehousing_date', width: '120' },
   { label: '入仓数量', prop: 'warehousing_num', width: '100' },
   { label: '目标合格率', prop: 'target_rate', width: '100' },
   { label: '实际合格率', prop: 'real_rate', width: '100' },
-  { label: '奖惩系数', prop: '', width: '100' },
+  { label: '奖惩系数', prop: 'reward_rate', width: '100' },
   { label: '奖罚金额合计', prop: '', width: '120' },
   { label: '废品合计', prop: '废品合计', width: '100' },
-  { label: '工单无形损', prop: 'intangible_loss', width: '100' },
-  { label: '材料废', prop: 'material_waste', width: '100' },
-  { label: '零头处理', prop: '', width: '100' },
-  { label: '处发废', prop: 'waste_out', width: '100' },
-  { label: '外摊废', prop: '', width: '100' },
-  { label: '工单计划损耗', prop: 'plan_loss', width: '120' },
-  { label: '工单制程废', prop: 'zcfp', width: '100' },
-  { label: '工单检验废', prop: 'waste_quality', width: '100' },
-  { label: '年月', prop: '年月', width: '100' },
+  { label: '工单无形损', prop: '工单无形损', width: '100' },
+  { label: '材料废', prop: '材料废', width: '100' },
+  { label: '零头处理', prop: '零头处理', width: '100' },
+  { label: '处发废', prop: '外发废', width: '100' },
+  { label: '外摊废', prop: '分摊废', width: '100' },
+  { label: '工单计划损耗', prop: '工单计划损耗', width: '120' },
+  { label: '工单制程废', prop: '', width: '100' },
+  { label: '工单检验废', prop: '工单质检废', width: '100' },
+  { label: '年月', prop: '', width: '100' },
 ]
 const tableCols2 = [
   { label: '工单编号', prop: 'Gy0_gdbh', width: '100' },
@@ -311,10 +315,14 @@ watch(currentRow, (value, oldValue, onCleanup) => {
 
 // 显示上方表格
 const handleNodeClick = async(node) => {
-  if (node.children) {
-    const { date } = node
-    const res = await getTable({ date, limit: 9999, page: 1 })
-    tableData1.value = res.data.data
+  console.log(node)
+  if (!node.children) {
+    const { date, code } = node
+    const res = await getTable({ date, code, limit: 9999, page: 1 })
+    tableData1.value = res.data.data.map(item => ({
+      ...item,
+      csgd: parseFloat(item['target_rate']) - parseFloat(item['real_rate']) > 0 ? '√' : '',
+    }))
     console.log(res.data)
   } else {
     // console.log(node.date, node.code)
@@ -343,7 +351,17 @@ const handleSearch = () => {
   }
 }
 const rowClassName = ({ row, rowIndex }) => {
+  if (row['csgd'] === '√') {
+    return 'yellow-row'
+  }
+  return ''
+}
 
+const cellClassName = ({ row, column, rowIndex, columnIndex }) => {
+  if ([7, 11, 13, 21].includes(columnIndex)) {
+    return 'red-cell'
+  }
+  return ''
 }
 </script>
 
@@ -374,8 +392,12 @@ const rowClassName = ({ row, rowIndex }) => {
   flex: 1;
 }
 
-:deep(.el-table__body .warning-row) {
-  background: #FFFF80 !important;
+:deep(.el-table .yellow-row) {
+  background: #FFFF80;
+}
+
+:deep(.red-cell div) {
+  color: #FF0000 !important;
 }
 
 /* 选中某行时的背景色 */
@@ -383,10 +405,6 @@ const rowClassName = ({ row, rowIndex }) => {
   background: #ff80ff !important;
 }
 
-:deep(.el-table .bg-yellow) {
-  background: yellow;
-}
-
 </style>
 <style scoped>
 :deep(.el-table td .cell) {

+ 2 - 0
src/view/performance/14-overTimePayVerification/index.vue

@@ -77,6 +77,7 @@
                 :label="column.label"
                 :width="column.width"
                 show-overflow-tooltip="true"
+				sortable
               />
 
               // 下半数据展示
@@ -108,6 +109,7 @@
                 :label="column.label"
                 :width="column.width"
                 show-overflow-tooltip="true"
+				sortable
               />
             </el-table>
           </div>

+ 23 - 10
src/view/performance/Dayreports.vue

@@ -1506,11 +1506,18 @@ const ADD=ref('0')
 function onAdd() {
 	ADD.value='新增'
 	type.value = 'create'
-	if(typeof(lastCellValue)=='number'){
-		GetInfo(lastCellValue)
-	}
-	initFormData()
-	dialogFormVisible.value = true
+	if(table_type=='db_sczl'){	 
+		if(typeof(lastCellValue)=='number'){
+			GetInfo(lastCellValue)
+		}
+		initFormData()
+		dialogFormVisible.value = true
+	}else{
+		  // GetInfo(table.value)
+		  console.log(['table_type'])
+		  console.log('此数据无法新增')
+	}  
+	
 	// Productionadd()
 }
 //新增
@@ -1882,24 +1889,29 @@ const updateDetailData = async() => {
   // console.log(FormData)
 }
 let table=ref(5);
-let lastCellValue=ref()
+let lastCellValue=ref()
+let table_type=ref()
 // 双击表格操作
 const type = ref('')
 function doubleClick(row, column, event) {
   type.value = 'update';
     lastCellValue= row['UniqId'];
   table.value=lastCellValue
-  if(row['table_type']=='db_sczl'){
+  if(row['table_type']=='db_sczl'){
+	  console.log(['table_type'])
   	 dialogFormVisible.value = true
   	 GetInfo(table.value)
-  }else{
+  }else{
+	  // GetInfo(table.value)
+	  console.log(['table_type'])
 	  console.log('此数据不展示详细信息')
   }  
 }
 // 单击表格操作
 function Click(row, column, event) {
     lastCellValue= row['UniqId'];
-	console.log(lastCellValue)
+	console.log(lastCellValue)
+	table_type=row['table_type']
   // if(row['table_type']=='db_sczl'){
   // 	 dialogFormVisible.value = true
   // 	 GetInfo(table.value)
@@ -1910,7 +1922,8 @@ function Click(row, column, event) {
 //获取详细信息
 const GetInfo = async (value) => {
   const response = await productionInfo({UniqId:value});
-  if (response.code === 0) {
+  if (response.code === 0) {
+	  console.log(response)
 	formData.value=response.data;
 	console.log(formData)
   }

+ 287 - 222
src/view/performance/chejianbaogong.vue

@@ -12,6 +12,7 @@
 			<el-button type="primary" @click="onstatus" >设置机台状态</el-button>
 			<el-button type="primary" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
 			
 			
 			
@@ -313,7 +314,7 @@
           </el-tabs>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 1000px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
+          <el-dialog v-model="detailShow" style="width: 140vh" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <el-table ref="multipleTable"
                         :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -361,7 +362,7 @@
 			 </el-col>
 			</el-row> 	
 			<div style="display: flex;">
-			<div class="groupbox float-div" style="height: 17vh; width: 800px;">
+			<div class="groupbox float-div" style="height: 17vh; width: 130vh;">
 			    <span class="grouptitle">组员及分配比例</span>
 				<el-row :gutter="10" style="margin-top: 0px; height: 5vh;">
 								 <el-col :span="2">
@@ -558,10 +559,10 @@
 			  				</el-col> -->
 			  </el-row>
 			</div>
-			<div style="height: 17vh; width: 100px;margin-top: 30px;">
+			<div style="height: 17vh; width: 15vh;margin-top: 5vh;">
 				<el-button type="text"></el-button>
 				<!-- <el-button style="margin-bottom: 5px;" @click="" >新增</el-button> -->
-				<el-button style="margin-bottom: 5px;" @click="selectBz" >更新当前班组</el-button>
+				<el-button style="margin-bottom: 1vh;" @click="selectBz" >更新当前班组</el-button>
 				<!-- <el-button @click="delBz" >删除当前班组</el-button> -->
 			</div>
 			</div>
@@ -570,13 +571,115 @@
 
         
 		
+		<el-dialog v-model="complaintsShow" style="width: 140vh; height:78vh;" lock-scroll :before-close="closecomplaintsShow" title="产品客诉查询" destroy-on-close>
+		  <el-table ref="multipleTable"
+		           :row-style="{ height: '20px' }"
+		           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+		           :header-cell-style="{ padding: '0px' }"
+		           :show-overflow-tooltip="true"
+		           highlight-current-row="true" @row-click="complaintshandle"
+		           style="width: 100%;height: 30vh;margin-top: 0px;" border tooltip-effect="dark" 
+				  :data="complaintsData" row-key="ID" @selection-change="complaintsSelectionChange">
+		    <!-- <el-table-column type="selection" width="55" /> -->
+		    <el-table-column align="left" label="产品编号" prop="产品编号" width="120"/>
+		    <el-table-column align="left" label="产品名称" prop="产品名称" width="200"/>
+		    <el-table-column align="left" label="客诉日期" prop="客诉日期" width="120"/>
+		    <el-table-column align="left" label="客诉单号" prop="客诉单号" width="120"/>
+			<el-table-column align="left" label="客诉方式" prop="客诉方式" width="100"/>
+		    <el-table-column align="left" label="订单编号" prop="订单编号" width="100"/>
+		    <el-table-column align="left" label="缺陷关键字" prop="缺陷关键字" width="140"/>
+		    <el-table-column align="left" label="客诉性质" prop="客诉性质" width="100"/>
+		    <el-table-column align="left" label="主要责任部门" prop="主要责任部门" width="140"/>
+		    <el-table-column align="left" label="次要责任部门" prop="次要责任部门" width="140"/>
+		  </el-table>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="6" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客户编号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客户编号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="15" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客户名称" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.客户名称" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>	
+					
+					 
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="6" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客诉单号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉单号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客诉日期" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.客诉日期" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="方式" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				 	<el-input v-model="selectedRowData.客诉方式" style="margin-bottom: 1px;margin-top: 0px;" :clearable="true" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="批次号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				 	<el-input v-model="selectedRowData.订单编号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>		
+				
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="反馈问题" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉描述" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="缺陷关键字" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.缺陷关键字" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="性质" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉性质" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="扣分" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.扣分" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="主责任部门" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.主要责任部门" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="次责任部门" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.次要责任部门" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+		</el-dialog>
 		
 		<el-dialog
 		  v-model="dianjianVisible"
 		  title="设备点检记录"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="150vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 		    <el-col :span="4" style="margin-bottom: 0px;margin-top: 0px;">
@@ -595,7 +698,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;margin-top: 0px;">
-		      <el-aside width="180px" style="margin: 0; margin-top: 0px;">
+		      <el-aside width="25vh" style="margin: 0; height: 50vh; margin-top: 0px;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="dianjiantreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="dianjianNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -610,7 +713,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:100%; height:320px; margin-top: 5px;"
+		        style="width:100%; height:45vh; margin-top: 5px;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -657,7 +760,7 @@
 		      </el-table>
 			  <el-row :gutter="24">
 			    <el-col :span="24">			      
-			        <el-input v-model="pandingfangfa"  style="height: 50px;" :clearable="true"  />			      
+			        <el-input v-model="pandingfangfa" style="margin-top=0px; height: 40px; margin-bottom: 0px;" :clearable="true"  />			      
 			    </el-col>
 			  </el-row>
 		    </div>
@@ -674,8 +777,8 @@
 		  v-model="zhichengVisible"
 		  title="制程检验记录"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="150vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -716,7 +819,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="180px" style="margin: 0;">
+		      <el-aside width="25vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="zhichengtreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="zhichengNodeClick"></el-tree>
@@ -733,7 +836,7 @@
 		            highlight-current-row="true"
 		          				:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:310px;"
+		            style="width:100%; height:40vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -791,7 +894,7 @@
 		            highlight-current-row="true"
 		          				:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:320px;"
+		            style="width:100%; height:40vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -829,12 +932,12 @@
 		  v-model="huanxingVisible"
 		  title="换型清场"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="145vh"
+		  style="height: 78vh;"
 		>
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="180px" style="margin: 0;">
+		      <el-aside width="26vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 55vh; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="huanxingtreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="huanxingNodeClick"></el-tree>
@@ -844,7 +947,12 @@
 		    <div v-if="huanxingstatus" style="flex: 0; margin: 0;">
 		      <el-tabs v-model="activNames" type="card" @tab-click="handleClick">
 		        <el-tab-pane label="换型清场明细信息"  @click="showTable('换型清场明细信息')"  name="first">
-		          
+		          <tr>
+					  <td>1</td>
+					  <td>2</td>
+					  <td>3</td>
+					  <td>4</td>
+				  </tr>
 		        </el-tab-pane>
 		      
 		        <el-tab-pane label="当前设备换型记录"  @click="showTable('当前设备换型记录')"  name="second">
@@ -998,7 +1106,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 1;">
-		      <el-aside width="250px" style="margin: 0;">
+		      <el-aside width="34vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="yinbantreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="yinbanNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -1013,7 +1121,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:1000px; height:400px;"
+		        style="width:140vh; height:50vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -1096,8 +1204,8 @@
 		  v-model="xunchaVisible"
 		  title="管理人员现场巡查记录"
 		  destroy-on-close
-		  width="1200px"
-		  style="height: 78%;"
+		  width="162vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -1159,7 +1267,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="150px" style="margin: 0;">
+		      <el-aside width="20vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="xunchatreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="xunchaNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -1173,7 +1281,7 @@
 		        row-key="ID"
 		        highlight-current-row="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:70%; height:330px;"
+		        style="width:138vh; height:42vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 				:show-overflow-tooltip="true"
@@ -1255,179 +1363,176 @@
 		  v-model="chanliangVisible"
 		  title="日产量上报"
 		  destroy-on-close
-		  width="1300px"
-		  style="height: 115%;"
+		  width="160vh"
+		  style="height: 110vh;"
 		>
-		  <el-row :gutter="20">
-		        <el-row :gutter="20">
-		          <el-col :span="15">
-		          <el-form-item label="工单编号" prop="id">
-		            <el-input v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')" :clearable="true" placeholder="" />
+		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+		          <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+		          <el-form-item label="工单编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
+		            <el-input style="margin-top=0px; margin-bottom: 1px;" v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')" :clearable="true" placeholder="" />
 		          </el-form-item>
 		          </el-col>
-		        </el-row>
 
-			  <el-col :span="8">
-			  <el-form-item label="产品名称" prop="id">
-			    <el-input v-model="formData3.product_name" id="产品名称"  @keydown="ent($event, '工单编号', '产品名称', '工序名称')" :clearable="true" placeholder="" />
+			  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+			  <el-form-item label="产品名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-input v-model="formData3.product_name" id="产品名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '工单编号', '产品名称', '工序名称')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
-			  <el-col :span="8">
-			  <el-form-item label="工序名称" prop="id">
-			    <el-input v-model="formData3.gxmc" id="工序名称"  @keydown="ent($event, '产品名称', '工序名称', '印件号')" :clearable="true" placeholder="" />
+			  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+			  <el-form-item label="工序名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-input v-model="formData3.gxmc" id="工序名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产品名称', '工序名称', '印件号')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
-			  <el-col :span="8">
-			    <el-row :gutter="20">
-			      
-			    </el-row>
-			  </el-col>
+			  
 		    </el-row>
 			
-			<el-row :gutter="20">
-			      <el-row :gutter="20">
-			        <el-col :span="15">
-			        <el-form-item label="印件号" prop="id">
-			          <el-input v-model="formData3.yjno" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')" :clearable="true" placeholder="" />
+			<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-form-item label="印件号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			          <el-input v-model="formData3.yjno" style="margin-top=0px; margin-bottom: 1px;" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			        </el-col>
-			      </el-row>
 			
-				  <el-col :span="8">
-				  <el-form-item label="印件名称" prop="id">
-					<el-input v-model="formData3.yj_name" id="印件名称"  @keydown="ent($event, '印件号', '印件名称', '工艺名称')" :clearable="true" placeholder="" />
+				  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="印件名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.yj_name" id="印件名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '印件号', '印件名称', '工艺名称')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
-				  <el-col :span="8">
-				  <el-form-item label="工艺名称" prop="id">
-					<el-input v-model="formData3.gy_name" id="工艺名称"  @keydown="ent($event, '印件名称', '工艺名称', 'gxh')" :clearable="true" placeholder="" />
+				  <el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="工艺名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.gy_name" id="工艺名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '印件名称', '工艺名称', 'gxh')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
-				  <el-col :span="2">
-				  <el-form-item label="" prop="id">
-				    <el-input v-model="formData3.gxh" id="gxh"  @keydown="ent($event, '工艺名称', 'gxh', '日期')" :clearable="true" placeholder="" />
+				  <el-col :span="2" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+				    <el-input v-model="formData3.gxh" id="gxh" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '工艺名称', 'gxh', '日期')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>						  
 			  </el-row>
 			  
 			  
 			  
-			  <el-row :gutter="20">
-			        <el-row :gutter="20">
-			          <el-col :span="15">
-			          <el-form-item label="日期" prop="id">
-			            <el-input v-model="formData3.日期" id="日期"  @keydown="ent($event, 'gxh', '日期', '流程标牌')" :clearable="true" placeholder="" />
+			  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+				  </el-col>
+			          <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			          <el-form-item label="日期" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			            <el-input v-model="formData3.日期" id="日期" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')" :clearable="true" placeholder="" />
 			          </el-form-item>
 			          </el-col>
-			        </el-row>
 			  
-			  	  <el-col :span="5">
-			  	  <el-form-item label="流程标牌" prop="id">
-			  		<el-input v-model="formData3.流程标牌" id="流程标牌"  @keydown="ent($event, '日期', '流程标牌', '上机时间')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="流程标牌" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.流程标牌" id="流程标牌" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
-			  	  <el-col :span="5">
-			  	  <el-form-item label="上机时间" prop="id">
-			  		<el-input v-model="formData3.上机时间" id="上机时间"  @keydown="ent($event, '流程标牌', '上机时间', '下机时间')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="上机时间" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.上机时间" id="上机时间" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '流程标牌', '上机时间', '下机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
-			  	  <el-col :span="5">
-			  	  <el-form-item label="下机时间" prop="">
-			  	    <el-input v-model="formData3.下机时间"  id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="下机时间" prop="" style="margin-top=0px; margin-bottom: 1px;">
+			  	    <el-input v-model="formData3.下机时间" style="margin-top=0px; margin-bottom: 1px;" id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
-			  	  </el-col>						  
+			  	  </el-col>	
+				 <el-col :span="3">
+			     </el-col>
 			    </el-row>
 		    
 			
 			
-			<el-row :gutter="20">
-			      
-			    <el-col :span="3">
-			    <el-form-item label="产量" prop="id">
-			      <el-input v-model="formData3.产量" id="产量"  @keydown="ent($event, '下机时间', '产量', '制程废品')" :clearable="true" placeholder="" />
+			<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+			    </el-col>
+			    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-form-item label="产量" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			      <el-input v-model="formData3.产量" id="产量" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')" :clearable="true" placeholder="" />
 			    </el-form-item>
 			    </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="制程废品" prop="id">
-					<el-input v-model="formData3.制程废品" id="制程废品"  @keydown="ent($event, '产量', '制程废品', '制程次品')" :clearable="true" placeholder="" />
+				  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="制程废品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.制程废品" id="制程废品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产量', '制程废品', '制程次品')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="制程次品" prop="id">
-					<el-input v-model="formData3.制程次品" id="制程次品"  @keydown="ent($event, '制程废品', '制程次品', '前工序废')" :clearable="true" placeholder="" />
+				  <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="制程次品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.制程次品" id="制程次品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程废品', '制程次品', '前工序废')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="前工序废" prop="">
-				    <el-input v-model="formData3.前工序废" id="前工序废"  @keydown="ent($event, '制程次品', '前工序废', '来料异常')" :clearable="true" placeholder="" />
+				  <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="前工序废" prop="" style="margin-top=0px; margin-bottom: 1px;">
+				    <el-input v-model="formData3.前工序废" id="前工序废" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程次品', '前工序废', '来料异常')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>	
-				<el-col :span="3">
-				<el-form-item label="来料异常" prop="">
-				  <el-input v-model="formData3.来料异常" id="来料异常"  @keydown="ent($event, '前工序废', '来料异常', '联数')" :clearable="true" placeholder="" />
+				<el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				<el-form-item label="来料异常" prop="" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-input v-model="formData3.来料异常" id="来料异常" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '前工序废', '来料异常', '联数')" :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
-				<el-col :span="3">
-				<el-form-item label="联数" prop="">
-				  <el-input v-model="formData3.联数" id="联数"  @keydown="ent($event, '来料异常', '联数', '墨色')"  :clearable="true" placeholder="" />
+				<el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				<el-form-item label="联数" prop="" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-input v-model="formData3.联数" id="联数" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
-				<el-col :span="3">
-				<el-form-item label="墨色" prop="">
-				  <el-input v-model="formData3.墨色" id="墨色"  @keydown="ent($event, '联数', '墨色', '装版总时长')"  :clearable="true" placeholder="" />
+				<el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				<el-form-item label="墨色" prop="" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-input v-model="formData3.墨色" id="墨色" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
 			  </el-row>
 			  
 			  
-			  <el-row :gutter="20">			        
-			      <el-col :span="3">
-			      <el-form-item label="装版总时长" prop="id">
-			        <el-input v-model="formData3.装版总时长" id="装版总时长"  @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"  :clearable="true" placeholder="" />
+			  <el-row :gutter="20" style="margin-top=0px; margin-bottom: 1px;">			        
+			      <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			      <el-form-item label="装版总时长" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-input v-model="formData3.装版总时长" id="装版总时长" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"  :clearable="true" placeholder="" />
 			      </el-form-item>
 			      </el-col>
-			  	  <el-col :span="3">
-			  	  <el-form-item label="打样总工时" prop="id">
-			  		<el-input v-model="formData3.打样总工时" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')" :clearable="true" placeholder="" />
+			  	  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="打样总工时" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.打样总工时" style="margin-top=0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
-			  	  <el-col :span="3">
-			  	  <el-form-item label="通电工时" prop="id">
-			  		<el-input v-model="formData3.通电工时" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')" :clearable="true" placeholder="" />
+			  	  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="通电工时" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.通电工时" style="margin-top=0px; margin-bottom: 1px;" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
 			    </el-row>
 				
 				
-				<el-row :gutter="20">      
-				    <el-col :span="3">
-				    <el-form-item label="定额代号" prop="id">
-				      <el-input v-model="formData3.定额代号" id="定额代号"  @keydown="ent($event, '通电工时', '定额代号', '码包')" :clearable="true" placeholder="" />
+				<el-row :gutter="20" style="margin-top=0px; margin-bottom: 1vh;">      
+				    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;"> 
+				    <el-form-item label="定额代号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+				      <el-input v-model="formData3.定额代号" id="定额代号" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')" :clearable="true" placeholder="" />
 				    </el-form-item>
 				    </el-col>
-					  <el-col :span="3">
-					  <el-form-item label="码包" prop="id">
-						<el-input v-model="formData3.码包" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')" :clearable="true" placeholder="" />
+					<el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
+					</el-col>
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="码包" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.码包" style="margin-top=0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')" :clearable="true" placeholder="" />
 					  </el-form-item>
 					  </el-col>
-					  <el-col :span="3">
-					  <el-form-item label="主电表" prop="id">
-						<el-input v-model="formData3.主电表"  id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')" :clearable="true" placeholder="" />
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="主电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.主电表" style="margin-top=0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>					  
-					  <el-col :span="3">
-					  <el-form-item label="辅电表" prop="id">
-						<el-input v-model="formData3.辅电表" id="辅电表"  @keydown="ent($event, '主电表', '辅电表', 'bzdh')" :clearable="true" placeholder="" />
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="辅电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.辅电表" id="辅电表" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>
 				  </el-row>
 		  <div style="display: flex;">
-			  <div style="width: 136vh;">组员及分配比例</div>
-			  <div style="width: 15vh;">特殊组员</div>
+			  <div style="width: 131vh;">组员及分配比例</div>
+			  <div style="width: 13vh;">特殊组员</div>
 			  <div>拉料人员</div>
 		  </div>
-		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  <el-row :gutter="10" style="margin-top: 1vh;">
+		  	 <el-col :span="2">
 		  	   <el-input v-model="formData3.sczl_bzdh" id="bzdh"  @keydown="ent($event, '辅电表', 'bzdh', 'bh1')" :clearable="true" placeholder="ZI00401" />
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1461,14 +1566,14 @@
 			  <el-input v-model="formData3.sczl_bh10" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="getygsubmit($event, '10')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_bhll" id="bh11"  @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
+			  <el-input v-model="formData3.sczl_bh11" id="bh11"  @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
 			</el-col>
 		   </el-row>
 		   
 		   
 		  
 		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  	 <el-col :span="2">
 		  
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1502,12 +1607,12 @@
 			  <el-input v-model="formData3.sczl_name10" id="name10"  @keydown="ent($event, 'name9', 'name10', 'name11')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.llname" id="name11"  @keydown="ent($event, 'name10', 'name11', 'rate1')" :clearable="true" placeholder="" />
+			  <el-input v-model="formData3.sczl_name11" id="name11"  @keydown="ent($event, 'name10', 'name11', 'rate1')" :clearable="true" placeholder="" />
 			</el-col>
 		   </el-row>
 		  
 		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  	 <el-col :span="2">
 		  	   
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1551,7 +1656,7 @@
 		     highlight-current-row="true"
 		     border
 		     style="width:100%"
-		     height="400px"
+		     height="40vh"
 		     @row-dblclick="batchaddSelectClick"
 		     :selectable="row => rowSelectable(row)"
 		     @selection-change="chanliangSelectionChange"
@@ -1598,87 +1703,6 @@
 		  </template>
 		</el-dialog>
 		
-		
-		<el-dialog
-		  v-model="ClearVisible"
-		  title="换型清场"
-		  destroy-on-close
-		  width="1300px"
-		  style="height: 115%;"
-		>
-		  
-		   
-		   <div style="display: flex;">
-		     <div style="flex: 1;">
-		       <el-aside width="250px" style="margin: 0;">
-		         <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
-		           <el-tree :data="CleartreeData" :props="defaultProps" highlight-current="true"
-		             @node-click="ClearNodeClick" @node-dblclick="ClearDoubleClick"></el-tree>
-		         </div>
-		       </el-aside>
-		     </div>
-		     <div style="flex: 1; margin: 0;">
-		      <el-tabs v-model="activeName" type="card" @tab-click="duohandleClick"   >
-		      
-		                  <el-tab-pane label="换型清场明细信息"  @click="showTable('印件资料')"   name="first">
-		                    
-							
-							
-							
-		                  </el-tab-pane>
-		      
-		                  <el-tab-pane label="当前设备换型记录" @click="showTable('工艺资料')" name="second">
-		                    <el-table ref="multipleTable"
-		                              highlight-current-row="true"
-		                              :show-overflow-tooltip="true"
-		                              :row-style="{ height: '20px' }"
-		                              :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-		                              :header-cell-style="{ padding: '0px' }"
-		                              @row-dblclick="gyupdateCompanyFunc"
-		                              :row-class-name="rowClassStyle"
-		                              style="width: 100%;height: 400px" border tooltip-effect="dark" :data="ClearData" row-key="ID" @selection-change="handleSelectionChange"
-		                              @row-click="clickybupdate">
-		                     <el-table-column type="selection" label="选择" width="55" />
-		                      
-		                      <el-table-column align="left" label="日期" prop="班组号" width="80" />
-		                      <el-table-column align="left" label="机台编号" prop="0" width="240" />
-		                      <el-table-column align="left" label="班组" prop="1" width="240" />
-		                      <el-table-column align="left" label="工单编号A" prop="2" width="240" />
-		                      <el-table-column align="left" label="印件名称A" prop="3" width="240" />
-		                      <el-table-column align="left" label="印件工序A" prop="4" width="100" />
-		                      <el-table-column align="left" label="码包号A" prop="5" width="100" />
-		                      <el-table-column align="left" label="工单编号B" prop="6" width="100" />
-		                      <el-table-column align="left" label="印件名称B" prop="7" width="100" />
-		                      <el-table-column align="left" label="印件工序B" prop="8" width="100" />
-		                      <el-table-column align="left" label="码包号B" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="菲林_标样_签样品_留样品" prop="6" width="100" />
-							  <el-table-column align="left" label="板材_纸张_电化铝_油墨" prop="7" width="100" />
-							  <el-table-column align="left" label="过版纸_废品_次品" prop="8" width="100" />
-							  <el-table-column align="left" label="半成品_成品_零头" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="操作台桌面_抽屉_地面" prop="8" width="100" />
-							  <el-table-column align="left" label="机长" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="带班长" prop="6" width="100" />
-							  <el-table-column align="left" label="质量巡查员" prop="7" width="100" />
-							  <el-table-column align="left" label="创建时间" prop="8" width="100" />
-							  <el-table-column align="left" label="UNIQID" prop="9_正品版" width="120" />
-		                    </el-table>
-		                  </el-tab-pane>
-
-		      
-		                </el-tabs>
-		     </div>
-		   </div>
-		   
-		  <!-- </el-scrollbar> -->
-		  <template #footer>
-		    <div class="dialog-footer">
-		      <el-button @click="closeDialog">取 消</el-button>
-		      <el-button type="primary" @click="chanliangenterDialog">确 定</el-button>
-		    </div>
-		  </template>
-		</el-dialog>
-		
-		
 		<Shebeizhuangtai
 		  v-if="dialogSbyxgl"
 		  v-model="dialogSbyxgl"
@@ -1715,7 +1739,9 @@ import {
   getMac,
   remodelGetTab,
   setMachineTeam,
-  ModelChangeRecord
+  ModelChangeRecord,
+  ComplaintRecord,
+  RemodelDetail
 } from '@/api/jixiaoguanli/baogong'
 
 import {
@@ -1773,6 +1799,7 @@ const detailData = reactive([])
 const treeData=ref([])
 const huanxingtreeData=ref([])
 const huanxingselectData = ref([])
+const huanxingData = ref({})
 const huanxingstatus=ref(false)
 const zhichengtreeData=ref([{
 	label: '首件与过程确认'
@@ -1834,7 +1861,9 @@ const ent = (event,id1,id2,id3) => {
 const huanxingNodeClick = (node) => {
   //存放当前节点的nodeId
   if(node.machine){
+	  console.log(node.label.split('/')[1])
 	  huanxingstatus.value=true
+	  remodelDetail(node.label.split('/')[1])
 	  modelChangeRecord(node.machine)
   }else{
 	  console.log('2')
@@ -1846,6 +1875,12 @@ const modelChangeRecord = async (val) => {
 	huanxingselectData.value=response.data
   }
 }
+const remodelDetail = async (val) => {
+  const response = await RemodelDetail({UniqId:val});
+  if (response.code === 0) {
+	huanxingData.value=response.data
+  }
+}
 const handleNodeClick = (nodeData,node) => {
   //存放当前节点的nodeId
   if(nodeData.level === 1){
@@ -1923,7 +1958,6 @@ const FacilityProduction = async () => {
 				// // console.log(sczl_name)
 	   //        }
 	   //      }
-	   console.log()
 	   const responses = await MachineDetailList({workshop:CJMC});
 	   if(responses.code===0){
 		   responses.data.map(item=>{
@@ -1945,12 +1979,16 @@ const FacilityProduction = async () => {
 const FacilityWorklist = async () => {
   const response = await facilityWorklist({machine:JTMC});
   if (response.code === 0) {
-	// console.log(response)
 	sbzyData.splice(0, sbzyData.length, ...response.data);
-	formData.value.productCode= response.data[0]['产品代号']
+	// formData.value.productCode= response.data[0]['产品代号']
+	response.data.map(item=>{
+		if(item['工单编号|质量信息'].substring(0, 7)==formData.value.工单编号){
+			formData.value.productCode=item.产品代号
+		}
+	})
 	selectData.value=[]
 	const res = await facilityProcedure({ Gd_gdbh: sbzyData[0]['工单编号|质量信息'].substring(0, 7) })
-	formData.value.productCode= response.data[0]['产品代号']
+	// formData.value.productCode= response.data[0]['产品代号']
 	console.log(res)
 	if (res.code === 0) {
 	    selectData.value = res.data
@@ -2261,7 +2299,36 @@ const chanliangselectData = reactive([])
 const chanliangVisible = ref(false)
 const huanxingVisible = ref(false)
 const xunchaVisible = ref(false)
+//客诉记录
+const complaintsShow = ref(false)
+const complaintsData = ref([])
+function oncomplaints() {
+	Complaints()
+	
+}
+// 客诉记录表格填充
+const Complaints = async() => {
+	complaintsData.value=[]
+	selectedRowData.value={}
+    const res = await ComplaintRecord({productCode :formData.value.productCode})
+    if (res.msg === '成功') {
+		complaintsData.value=res.data;
+		selectedRowData.value=complaintsData.value[0]
+		complaintsShow.value=true
+    }else{
+		ElMessage({
+		  type: 'success',
+		  message: '未找到该产品客诉记录!'
+		})
+	}
+}
+const selectedRowData = ref({
 
+})
+//客诉表格单击
+const complaintshandle = (val, row) => {
+	selectedRowData.value=val
+};
 //设置机台状态
 function onstatus() {
 	dialogSbyxgl.value=true
@@ -2498,8 +2565,8 @@ const GetMachineMac = async () => {
 	xmlhttp.open("get", "http://127.0.0.1:8090/init")
 	// 5. 发送
 	xmlhttp.send();
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
-  const response = await getMachineMac({ addr: '68-ED-A4-26-60-C8' });
+  const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
+  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-C8' });
   // const response = await getMachineMac({ addr: '40-62-31-21-4E-15' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5F-42' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-60-E5' });
@@ -2520,11 +2587,6 @@ const GetMachineMac = async () => {
     };
     treeData.value.push(newNode);
 	CJMC=newNode.label
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log(CJMC)
     JTMC = newNode.children[0].label;
     FacilityProduction();
   }
@@ -2640,6 +2702,7 @@ const SubmitDailyProduction = async () => {
 	sczl_bh8: formData3.value.sczl_bh8,
 	sczl_bh9: formData3.value.sczl_bh9,
 	sczl_bh10: formData3.value.sczl_bh10,
+	sczl_bh98:formData3.value.sczl_bh11,
 	sczl_rate1: formData3.value.sczl_rate1,
 	sczl_rate2: formData3.value.sczl_rate2,
 	sczl_rate3: formData3.value.sczl_rate3,
@@ -2979,6 +3042,7 @@ const formData3= ref({
 	sczl_bh8:'',
 	sczl_bh9:'',
 	sczl_bh10:'',
+	sczl_bh11:'',
 	sczl_name1:'',
 	sczl_name2:'',
 	sczl_name3:'',
@@ -2989,6 +3053,7 @@ const formData3= ref({
 	sczl_name8:'',
 	sczl_name9:'',
 	sczl_name10:'',
+	sczl_name11:'',
 	sczl_rate1:'',
 	sczl_rate2:'',
 	sczl_rate3:'',

+ 30 - 30
src/view/performance/yuangongrigongzi.vue

@@ -33,14 +33,14 @@
 			   :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 			   :header-cell-style="{ padding: '0px' }" @row-click="ontable" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-			  <el-table-column align="left" label="员工编号" prop="bh" width="120"/>
-              <el-table-column align="left" label="员工姓名" prop="员工姓名" width="120"/>
-              <el-table-column align="left" label="日期" prop="sczl_rq" width="120"/>
-              <el-table-column align="left" label="计件工资" prop="计件工资" width="120"/>
-              <el-table-column align="left" label="加班工资" prop="加班工资" width="160"/>
-			  <el-table-column align="left" label="计时时数" prop="计时" width="160"/>
-              <el-table-column align="left" label="计时工资" prop="计时工资" width="160"/>
-              <el-table-column align="left" label="日工资合计" prop="日工资合计" width="120"/>
+			  <el-table-column align="left" sortable label="员工编号" prop="bh" width="120"/>
+              <el-table-column align="left" sortable label="员工姓名" prop="员工姓名" width="120"/>
+              <el-table-column align="left" sortable label="日期" prop="sczl_rq" width="120"/>
+              <el-table-column align="left" sortable label="计件工资" prop="计件工资" width="120"/>
+              <el-table-column align="left" sortable label="加班工资" prop="加班工资" width="160"/>
+			  <el-table-column align="left" sortable label="计时时数" prop="计时" width="160"/>
+              <el-table-column align="left" sortable label="计时工资" prop="计时工资" width="160"/>
+              <el-table-column align="left" sortable label="日工资合计" prop="日工资合计" width="120"/>
             </el-table>
             <!-- 分页 -->
             <!-- <div class="gva-pagination">
@@ -56,28 +56,28 @@
 		    <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData2" row-key="ID"
 		      highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
 		      <el-table-column type="selection" width="55" />
-		  	  <el-table-column align="left" label="日期" prop="sczl_rq" width="120"/>
-		      <el-table-column align="left" label="工单编号" prop="sczl_gdbh" width="120"/>
-		      <el-table-column align="left" label="产品名称" prop="Gd_cpmc" width="120"/>
-		      <el-table-column align="left" label="印件及工序" prop="sczl_type" width="120"/>
-		      <el-table-column align="left" label="机台编号" prop="sczl_jtbh" width="160"/>
-		      <el-table-column align="left" label="班组车头产量" prop="班组车头产量" width="160"/>
-		      <el-table-column align="left" label="班组换算产量" prop="班组换算产量" width="120"/>
-			  <el-table-column align="left" label="工序难度系数" prop="工序难度系数" width="120"/>
-			  <el-table-column align="left" label="个人计件工资" prop="个人计件工资" width="120"/>
-			  <el-table-column align="left" label="个人加班工资" prop="个人加班工资" width="120"/>
-			  <el-table-column align="left" label="装版工时" prop="装版工时" width="120"/>
-			  <el-table-column align="left" label="保养工时" prop="保养工时" width="160"/>
-			  <el-table-column align="left" label="打样工时" prop="打样工时" width="160"/>
-			  <el-table-column align="left" label="异常停机工时" prop="异常停机工时" width="120"/>
-			  <el-table-column align="left" label="车头产量占用机时" prop="车头产量占用机时" width="120"/>
-			  <el-table-column align="left" label="日定额" prop="日定额" width="120"/>
-			  <el-table-column align="left" label="达标定额" prop="达标定额" width="120"/>
-			  <el-table-column align="left" label="千件工价" prop="千件工价" width="120"/>
-			  <el-table-column align="left" label="补产标准" prop="补产标准" width="160"/>
-			  <el-table-column align="left" label="员工编号" prop="bh" width="160"/>
-			  <el-table-column align="left" label="姓名" prop="xm" width="120"/>
-			  <el-table-column align="left" label="比例" prop="Rate" width="120"/>
+		  	  <el-table-column align="left" sortable label="日期" prop="sczl_rq" width="120"/>
+		      <el-table-column align="left" sortable label="工单编号" prop="sczl_gdbh" width="120"/>
+		      <el-table-column align="left" sortable label="产品名称" prop="Gd_cpmc" width="120"/>
+		      <el-table-column align="left" sortable label="印件及工序" prop="sczl_type" width="120"/>
+		      <el-table-column align="left" sortable label="机台编号" prop="sczl_jtbh" width="160"/>
+		      <el-table-column align="left" sortable label="班组车头产量" prop="班组车头产量" width="160"/>
+		      <el-table-column align="left" sortable label="班组换算产量" prop="班组换算产量" width="120"/>
+			  <el-table-column align="left" sortable label="工序难度系数" prop="工序难度系数" width="120"/>
+			  <el-table-column align="left" sortable label="个人计件工资" prop="个人计件工资" width="120"/>
+			  <el-table-column align="left" sortable label="个人加班工资" prop="个人加班工资" width="120"/>
+			  <el-table-column align="left" sortable label="装版工时" prop="装版工时" width="120"/>
+			  <el-table-column align="left" sortable label="保养工时" prop="保养工时" width="160"/>
+			  <el-table-column align="left" sortable label="打样工时" prop="打样工时" width="160"/>
+			  <el-table-column align="left" sortable label="异常停机工时" prop="异常停机工时" width="120"/>
+			  <el-table-column align="left" sortable label="车头产量占用机时" prop="车头产量占用机时" width="120"/>
+			  <el-table-column align="left" sortable label="日定额" prop="日定额" width="120"/>
+			  <el-table-column align="left" sortable label="达标定额" prop="达标定额" width="120"/>
+			  <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="120"/>
+			  <el-table-column align="left" sortable label="补产标准" prop="补产标准" width="160"/>
+			  <el-table-column align="left" sortable label="员工编号" prop="bh" width="160"/>
+			  <el-table-column align="left" sortable label="姓名" prop="xm" width="120"/>
+			  <el-table-column align="left" sortable label="比例" prop="Rate" width="120"/>
 		    </el-table>
 		    <!-- 分页 -->
 		    <!-- <div class="gva-pagination">

+ 65 - 65
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -555,19 +555,19 @@
                       @row-click="tableRowClick"
                       :show-overflow-tooltip="true">
               <el-table-column type="selection" width="30" />
-              <el-table-column align="left" label="产品编号" prop="产品编号" width="115" />
-              <el-table-column align="left" label="产品名称" prop="产品名称" width="340" />
-              <el-table-column align="left" label="版本号" prop="版本号" width="100"/>
-              <el-table-column align="left" label="成品规格" prop="成品规格" width="100" />
-              <el-table-column align="left" label="单位" prop="计量单位" width="100"/>
-              <el-table-column align="left" label="产品分类" prop="产品类别" width="100" />
-              <el-table-column align="left" label="最近接单时间" prop="receiveDate" width="160" />
-              <el-table-column align="left" label="印件数" prop="yjData" width="100" />
-              <el-table-column align="left" label="工艺" prop="gyData" width="100"/>
-              <el-table-column align="left" label="当前状态" prop="状态"  width="100"/>
-              <el-table-column align="left" label="最后修改" prop="Sys_id" width="160" />
-              <el-table-column align="left" label="建档日期" prop="Sys_rq" width="160" />
-              <el-table-column sortable align="left" label="更新日期" prop="Mod_rq" width="160" />
+              <el-table-column sortable  align="left" label="产品编号" prop="产品编号" width="115" />
+              <el-table-column sortable  align="left" label="产品名称" prop="产品名称" width="340" />
+              <el-table-column sortable  align="left" label="版本号" prop="版本号" width="100"/>
+              <el-table-column sortable  align="left" label="成品规格" prop="成品规格" width="100" />
+              <el-table-column sortable  align="left" label="单位" prop="计量单位" width="100"/>
+              <el-table-column sortable  align="left" label="产品分类" prop="产品类别" width="100" />
+              <el-table-column sortable  align="left" label="最近接单时间" prop="receiveDate" width="160" />
+              <el-table-column sortable  align="left" label="印件数" prop="yjData" width="100" />
+              <el-table-column  sortable align="left" label="工艺" prop="gyData" width="100"/>
+              <el-table-column sortable  align="left" label="当前状态" prop="状态"  width="100"/>
+              <el-table-column sortable  align="left" label="最后修改" prop="Sys_id" width="160" />
+              <el-table-column sortable  align="left" label="建档日期" prop="Sys_rq" width="160" />
+              <el-table-column  sortable  align="left" label="更新日期" prop="Mod_rq" width="160" />
             </el-table>
             <div class="gva-pagination">
               <el-pagination
@@ -594,20 +594,20 @@
                         :header-cell-style="{ padding: '0px' }"
                         @row-dblclick="yjupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="30" />
-                <el-table-column align="left" label="印件号" prop="yj_yjno"  width="80"/>
-                <el-table-column align="left" label="印件代号" prop="yj_yjdh" width="100" />
-                <el-table-column align="left" label="印件名称" prop="yj_yjmc" width="540" />
-                <el-table-column align="left" label="纸张单号" prop="yj_zzdh" width="100"/>
-                <el-table-column align="left" label="纸张名称" prop="yj_zzmc" width="340"/>
-                <el-table-column align="left" label="投料规格" prop="yj_tlgg" width="240"/>
-                <el-table-column align="left" label="开料规格" prop="yj_klgg" width="100"/>
-                <el-table-column align="left" label="开数" prop="yj_ks" width="80" />
-                <el-table-column align="left" label="联数" prop="yj_ls" width="80" />
-                <el-table-column align="left" label="备注" prop="yj_desc" width="200" />
-                <el-table-column align="left" label="建档用户" prop="sys_id" width="130" />
-                <el-table-column align="left" label="建档日期" prop="sys_rq" width="160" />
-                <el-table-column align="left" label="更新日期" prop="mod_rq" width="160"/>
+                <el-table-column sortable type="selection" width="30" />
+                <el-table-column sortable align="left" label="印件号" prop="yj_yjno"  width="80"/>
+                <el-table-column sortable align="left" label="印件代号" prop="yj_yjdh" width="100" />
+                <el-table-column sortable align="left" label="印件名称" prop="yj_yjmc" width="540" />
+                <el-table-column sortable align="left" label="纸张单号" prop="yj_zzdh" width="100"/>
+                <el-table-column sortable align="left" label="纸张名称" prop="yj_zzmc" width="340"/>
+                <el-table-column sortable align="left" label="投料规格" prop="yj_tlgg" width="240"/>
+                <el-table-column sortable align="left" label="开料规格" prop="yj_klgg" width="100"/>
+                <el-table-column sortable align="left" label="开数" prop="yj_ks" width="80" />
+                <el-table-column sortable align="left" label="联数" prop="yj_ls" width="80" />
+                <el-table-column sortable align="left" label="备注" prop="yj_desc" width="200" />
+                <el-table-column sortable align="left" label="建档用户" prop="sys_id" width="130" />
+                <el-table-column sortable align="left" label="建档日期" prop="sys_rq" width="160" />
+                <el-table-column sortable align="left" label="更新日期" prop="mod_rq" width="160"/>
               </el-table>
             </el-tab-pane>
 
@@ -623,27 +623,27 @@
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange"
                         @row-click="clickybupdate">
                 <el-table-column type="selection" width="30" />
-                <el-table-column align="left" label="方案" prop="方案"  width="70"/>
-                <el-table-column align="left" label="印件" prop="Gy0_yjno" width="80" />
-                <el-table-column align="left" label="工序" prop="Gy0_gxh" width="70" />
-                <el-table-column align="left" label="工序名称" prop="gy0_gxmc" width="120" />
-                <el-table-column align="left" label="工序名称" prop="add_gxmc" width="340" />
-                <el-table-column align="left" label="开数" prop="Gy0_Ks" width="70" />
-                <el-table-column align="left" label="联数" prop="Gy0_ls" width="70" />
-                <el-table-column align="left" label="备注" prop="备注" width="150" />
-                <el-table-column align="left" label="工价系数" prop="工价系数" width="100" />
-                <el-table-column align="left" label="损耗系数" prop="损耗系数" width="100" />
-                <el-table-column align="left" label="计损色数" prop="Gy0_Ms" width="100" />
-                <el-table-column align="left" label="人工检_正品版" prop="人工检_正品版" width="120" />
-                <el-table-column align="left" label="人工检_次品版" prop="人工检_正品版" width="120" />
-                <el-table-column align="left" label="人工检_废检" prop="人工检_废检" width="120"/>
-                <el-table-column align="left" label="机检_正品版" prop="机检_正品版" width="120"/>
-                <el-table-column align="left" label="机检_次品检" prop="机检_次品检" width="120"/>
-                <el-table-column align="left" label="机检_废检" prop="机检_废检" width="120"/>
-                <el-table-column align="left" label="设备编号" prop="Gy0_sbmc" width="100"/>
-                <el-table-column align="left" label="最后修改" prop="最后修改" width="160"/>
-                <el-table-column align="left" label="建档日期" prop="建档日期" width="160"/>
-                <el-table-column align="left" label="更新日期" prop="更新日期" width="160"/>
+                <el-table-column align="left" sortable  label="方案" prop="方案"  width="70"/>
+                <el-table-column align="left" sortable  label="印件" prop="Gy0_yjno" width="80" />
+                <el-table-column align="left" sortable  label="工序" prop="Gy0_gxh" width="70" />
+                <el-table-column align="left" sortable  label="工序名称" prop="gy0_gxmc" width="120" />
+                <el-table-column align="left" sortable  label="工序名称" prop="add_gxmc" width="340" />
+                <el-table-column align="left" sortable  label="开数" prop="Gy0_Ks" width="70" />
+                <el-table-column align="left" sortable  label="联数" prop="Gy0_ls" width="70" />
+                <el-table-column align="left"  sortable label="备注" prop="备注" width="150" />
+                <el-table-column align="left" sortable  label="工价系数" prop="工价系数" width="100" />
+                <el-table-column align="left" sortable  label="损耗系数" prop="损耗系数" width="100" />
+                <el-table-column align="left" sortable  label="计损色数" prop="Gy0_Ms" width="100" />
+                <el-table-column align="left" sortable  label="人工检_正品版" prop="人工检_正品版" width="120" />
+                <el-table-column align="left" sortable  label="人工检_次品版" prop="人工检_正品版" width="120" />
+                <el-table-column align="left" sortable  label="人工检_废检" prop="人工检_废检" width="120"/>
+                <el-table-column align="left" sortable  label="机检_正品版" prop="机检_正品版" width="120"/>
+                <el-table-column align="left" sortable  label="机检_次品检" prop="机检_次品检" width="120"/>
+                <el-table-column align="left" sortable  label="机检_废检" prop="机检_废检" width="120"/>
+                <el-table-column align="left" sortable  label="设备编号" prop="Gy0_sbmc" width="100"/>
+                <el-table-column align="left" sortable  label="最后修改" prop="最后修改" width="160"/>
+                <el-table-column align="left" sortable  label="建档日期" prop="建档日期" width="160"/>
+                <el-table-column align="left" sortable  label="更新日期" prop="更新日期" width="160"/>
               </el-table>
             </el-tab-pane>
 
@@ -658,15 +658,15 @@
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange"
               >
                 <el-table-column type="selection" width="30" />
-                <el-table-column align="left" label="方案" prop="YB_方案"  width="70"/>
-                <el-table-column align="left" label="印件号" prop="YB_Yjno" width="80" />
-                <el-table-column align="left" label="印版类别" prop="印版类别" width="100" />
-                <el-table-column align="left" label="存货编码" prop="存货编码" width="100"/>
-                <el-table-column align="left" label="印版名称" prop="印版名称"  width="440"/>
-                <el-table-column align="left" label="考核印数" prop="考核印数" width="100"/>
-                <el-table-column align="left" label="建档用户" prop="Sys_id" width="120" />
-                <el-table-column align="left" label="建档日期" prop="建档日期" width="160" />
-                <el-table-column align="left" label="更新日期" prop="更新日期" width="160" />
+                <el-table-column align="left" sortable label="方案" prop="YB_方案"  width="70"/>
+                <el-table-column align="left" sortable label="印件号" prop="YB_Yjno" width="80" />
+                <el-table-column align="left" sortable label="印版类别" prop="印版类别" width="100" />
+                <el-table-column align="left" sortable label="存货编码" prop="存货编码" width="100"/>
+                <el-table-column align="left" sortable label="印版名称" prop="印版名称"  width="440"/>
+                <el-table-column align="left" sortable label="考核印数" prop="考核印数" width="100"/>
+                <el-table-column align="left" sortable label="建档用户" prop="Sys_id" width="120" />
+                <el-table-column align="left" sortable label="建档日期" prop="建档日期" width="160" />
+                <el-table-column align="left" sortable label="更新日期" prop="更新日期" width="160" />
               </el-table>
             </el-tab-pane>
 
@@ -679,14 +679,14 @@
                         highlight-current-row="true"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="handleSelectionChange">
                 <!--              <el-table-column type="selection" width="55" />-->
-                <el-table-column align="left" label="序号" prop="序号"  width="120"/>
-                <el-table-column align="left" label="适用工序" prop="适用工序" width="120" />
-                <el-table-column align="left" label="备注" prop="备注" width="120" />
-                <el-table-column align="left" label="文件类型" prop="文件类型" width="120"/>
-                <el-table-column align="left" label="关联产品" prop="关联产品"  width="360"/>
-                <el-table-column align="left" label="建档用户" prop="建档用户" width="120"/>
-                <el-table-column align="left" label="建档日期" prop="建档日期" width="160" />
-                <el-table-column align="left" label="更新日期" prop="更新日期" width="160" />
+                <el-table-column align="left" sortable label="序号" prop="序号"  width="120"/>
+                <el-table-column align="left" sortable label="适用工序" prop="适用工序" width="120" />
+                <el-table-column align="left" sortable label="备注" prop="备注" width="120" />
+                <el-table-column align="left" sortable label="文件类型" prop="文件类型" width="120"/>
+                <el-table-column align="left" sortable label="关联产品" prop="关联产品"  width="360"/>
+                <el-table-column align="left" sortable label="建档用户" prop="建档用户" width="120"/>
+                <el-table-column align="left" sortable label="建档日期" prop="建档日期" width="160" />
+                <el-table-column align="left" sortable label="更新日期" prop="更新日期" width="160" />
               </el-table>
             </el-tab-pane>
 

+ 20 - 20
src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -45,26 +45,26 @@
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-              <el-table-column  align="center" label="员工编号" prop="员工编号"  width="80" />
-              <el-table-column  align="left" label="员工姓名" prop="员工姓名"  width="80"/>
-              <el-table-column  align="center" label="性别" prop="性别" width="45"/>
-              <el-table-column  align="left" label="聘用日期" prop="聘用日期" width="110" />
-              <el-table-column  align="left" label="转正日期" prop="转正日期" width="110" />
-              <el-table-column  align="left" label="所在部门" prop="所在部门" width="110"  />
-              <el-table-column  align="left" label="职称职务" prop="职称职务" width="100" />
-              <el-table-column  align="left" label="身份证号" prop="身份证号" width="160" />
-              <el-table-column  align="left" label="出生日期" prop="出生日期" width="110" />
-              <el-table-column  align="left" label="人员性质" prop="人员性质" width="110" />
-              <el-table-column  align="left" label="人员类别" prop="人员类别" width="90" />
-              <el-table-column  align="left" label="班次类型" prop="班次类型" width="120" />
-              <el-table-column  align="left" label="工资表类别" prop="工资表类别" width="160" />
-              <el-table-column  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="110" />
-              <el-table-column  align="left" label="MES在职" prop="在职状态" width="80" />
-              <el-table-column  align="left" label="U8在职" prop="U8在职" width="80" />
-              <el-table-column  align="left" label="U8离职日期" prop="U8离职日期" width="110" />
-              <el-table-column  align="left" label="创建用户" prop="sys_id" width="110" />
-              <el-table-column  align="left" label="创建时间" prop="sys_rq" width="110" />
-              <el-table-column  align="left" label="修改时间" prop="mod_rq" width="110" />
+              <el-table-column  sortable align="center" label="员工编号" prop="员工编号"  width="80" />
+              <el-table-column  sortable align="left" label="员工姓名" prop="员工姓名"  width="80"/>
+              <el-table-column  sortable  align="center" label="性别" prop="性别" width="45"/>
+              <el-table-column  sortable  align="left" label="聘用日期" prop="聘用日期" width="110" />
+              <el-table-column  sortable  align="left" label="转正日期" prop="转正日期" width="110" />
+              <el-table-column  sortable  align="left" label="所在部门" prop="所在部门" width="110"  />
+              <el-table-column  sortable  align="left" label="职称职务" prop="职称职务" width="100" />
+              <el-table-column  sortable  align="left" label="身份证号" prop="身份证号" width="160" />
+              <el-table-column  sortable  align="left" label="出生日期" prop="出生日期" width="110" />
+              <el-table-column  sortable  align="left" label="人员性质" prop="人员性质" width="110" />
+              <el-table-column  sortable  align="left" label="人员类别" prop="人员类别" width="90" />
+              <el-table-column  sortable  align="left" label="班次类型" prop="班次类型" width="120" />
+              <el-table-column  sortable  align="left" label="工资表类别" prop="工资表类别" width="160" />
+              <el-table-column  sortable  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="110" />
+              <el-table-column  sortable  align="left" label="MES在职" prop="在职状态" width="80" />
+              <el-table-column  sortable  align="left" label="U8在职" prop="U8在职" width="80" />
+              <el-table-column  sortable  align="left" label="U8离职日期" prop="U8离职日期" width="110" />
+              <el-table-column  sortable  align="left" label="创建用户" prop="sys_id" width="110" />
+              <el-table-column  sortable  align="left" label="创建时间" prop="sys_rq" width="110" />
+              <el-table-column  sortable  align="left" label="修改时间" prop="mod_rq" width="110" />
             </el-table>
 
             <!-- 分页 -->

+ 27 - 27
src/view/yunyin/shengchanguanli/chengpinrucang.vue

@@ -32,33 +32,33 @@
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID" @row-click="Click"
               highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-			  <el-table-column align="left" label="入仓类型" prop="入仓类型" width="120"/>
-              <el-table-column align="left" label="仓库编号" prop="仓库编号" width="120"/>
-              <el-table-column align="left" label="仓库名称" prop="仓库名称" width="120"/>
-              <el-table-column align="left" label="入仓单号" prop="jjcp_num" width="120"/>
-              <el-table-column align="left" label="工单编号" prop="jjcp_gdbh" width="160"/>
-              <el-table-column align="left" label="印件号" prop="jjcp_yjno" width="160"/>
-              <el-table-column align="left" label="入仓数量" prop="jjcp_sl" width="120"/>
-			  <el-table-column align="left" label="累计入仓数量" prop="jjcp_sls" width="120"/>
-			  <el-table-column align="left" label="订单数量" prop="订单数量" width="120"/>
-			  <el-table-column align="left" label="完成率" prop="完成率" width="120"/>
-			  <el-table-column align="left" label="单位" prop="jjcp_dw" width="120"/>
-			  <el-table-column align="left" label="入仓日期" prop="jjcp_sj" width="160"/>
-			  <el-table-column align="left" label="首末版" prop="jjcp_smb" width="160"/>
-			  <el-table-column align="left" label="印件代号" prop="jjcp_cpdh" width="120"/>
-			  <el-table-column align="left" label="印件名称" prop="jjcp_cpmc" width="120"/>
-			  <el-table-column align="left" label="产品编号" prop="成品编码" width="120"/>
-			  <el-table-column align="left" label="产品名称" prop="成品名称" width="120"/>
-			  <el-table-column align="left" label="客户料号" prop="客户料号" width="120"/>
-			  <el-table-column align="left" label="备注" prop="jjcp_desc" width="160"/>
-			  <el-table-column align="left" label="客户编号" prop="客户编号" width="160"/>
-			  <el-table-column align="left" label="客户名称" prop="Gd_客户名称" width="120"/>
-			  <el-table-column align="left" label="最近入仓日期" prop="最近入仓日期" width="120"/>
-			  <el-table-column align="left" label="机型备注" prop="机型备注" width="120"/>
-			  <el-table-column align="left" label="创建用户" prop="Sys_id" width="120"/>
-			  <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
-			  <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-			  <el-table-column align="left" label="UNIQID" prop="UniqId" width="120"/>
+			  <el-table-column align="left" sortable  label="入仓类型" prop="入仓类型" width="120"/>
+              <el-table-column align="left" sortable  label="仓库编号" prop="仓库编号" width="120"/>
+              <el-table-column align="left"  sortable label="仓库名称" prop="仓库名称" width="120"/>
+              <el-table-column align="left" sortable  label="入仓单号" prop="jjcp_num" width="120"/>
+              <el-table-column align="left" sortable  label="工单编号" prop="jjcp_gdbh" width="160"/>
+              <el-table-column align="left" sortable  label="印件号" prop="jjcp_yjno" width="160"/>
+              <el-table-column align="left" sortable  label="入仓数量" prop="jjcp_sl" width="120"/>
+			  <el-table-column align="left" sortable  label="累计入仓数量" prop="jjcp_sls" width="120"/>
+			  <el-table-column align="left" sortable label="订单数量" prop="订单数量" width="120"/>
+			  <el-table-column align="left" sortable label="完成率" prop="完成率" width="120"/>
+			  <el-table-column align="left" sortable label="单位" prop="jjcp_dw" width="120"/>
+			  <el-table-column align="left" sortable label="入仓日期" prop="jjcp_sj" width="160"/>
+			  <el-table-column align="left" sortable label="首末版" prop="jjcp_smb" width="160"/>
+			  <el-table-column align="left" sortable label="印件代号" prop="jjcp_cpdh" width="120"/>
+			  <el-table-column align="left" sortable label="印件名称" prop="jjcp_cpmc" width="120"/>
+			  <el-table-column align="left" sortable label="产品编号" prop="成品编码" width="120"/>
+			  <el-table-column align="left" sortable label="产品名称" prop="成品名称" width="120"/>
+			  <el-table-column align="left" sortable label="客户料号" prop="客户料号" width="120"/>
+			  <el-table-column align="left" sortable label="备注" prop="jjcp_desc" width="160"/>
+			  <el-table-column align="left" sortable label="客户编号" prop="客户编号" width="160"/>
+			  <el-table-column align="left" sortable label="客户名称" prop="Gd_客户名称" width="120"/>
+			  <el-table-column align="left" sortable label="最近入仓日期" prop="最近入仓日期" width="120"/>
+			  <el-table-column align="left" sortable label="机型备注" prop="机型备注" width="120"/>
+			  <el-table-column align="left" sortable label="创建用户" prop="Sys_id" width="120"/>
+			  <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
+			  <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
+			  <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="120"/>
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">

+ 319 - 0
src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -0,0 +1,319 @@
+<template>
+  <div>
+    <!-- 新增工艺资料弹窗 -->
+    <el-dialog v-model="visible" :before-close="()=> visible = false" style="width: 70%;margin: 8px auto" :title="'新增工艺资料'" destroy-on-close>
+      <el-form>
+        <div>
+          <div style="display: flex; gap: 0px;">
+            <el-form-item label="印件编号:"  class="mab" prop="keyOrder">
+              <el-input v-model="form.yjno" id="印件编号" @keydown="add_gyzlent($event, '质量隐患', '印件编号', '工序编号')"  style="width: 100px;"/>
+            </el-form-item>
+            <el-form-item label="工序编号:" class="mab" prop="keyOrder" label-width=" 90">
+              <el-input v-model="form['工序']"  id="工序编号" @keydown="add_gyzlent($event, '印件编号', '工序编号', '重点工序')"  style="width: 100px;"/>
+            </el-form-item>
+            <el-form-item label="重点工序:"  class="mab" prop="keyOrder" label-width=" 90">
+              <el-select  v-model="form['重点工序']" id="重点工序"  @keydown="add_gyzlent($event, '', '重点工序', '开数')"  style="width: 140px;">
+                <el-option value=""></el-option>
+                <el-option value="重点工序">重点工序</el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备选工序:"  class="mab" prop="isBanciSelected" label-width=" 90">
+              <el-checkbox v-model="form['备选工序']"></el-checkbox>
+            </el-form-item>
+            <el-form-item label="加工开数:"  class="mab" prop="keyOrder" label-width=" 125">
+              <el-input  v-model="form['开数']"  style="width: 100px;" id="开数"  @keydown="add_gyzlent($event, '重点工序  ', '开数', '联数')" />
+            </el-form-item>
+            <el-form-item label="加工联数:"  class="mab" prop="keyOrder" label-width=" 80">
+              <el-input  v-model="form['联数']"  style="width: 100px;" id="联数"  @keydown="add_gyzlent($event, '开数', '联数', '车间名称')" />
+            </el-form-item>
+          </div>
+          <div style="display: flex; gap: 0px;">
+            <el-form-item label="车间名称:"  class="mab" prop="keyOrder">
+              <el-input v-model="form['车间名称']" id="车间名称" style="width: 140px;" @keydown="add_gyzlent($event, '联数', '车间名称', '工序名称')"/>
+            </el-form-item>
+            <el-form-item label="工艺名称:"  class="mab" prop="keyOrder" label-width=" 90">
+              <el-input disabled v-model="form['工艺名称']"  style="width: 140px;"/>
+            </el-form-item>
+            <el-form-item label="工序名称:"  class="mab" prop="keyOrder" label-width=" 90">
+              <el-input  v-model="form['工序名称']"  style="width: 300px;" id="工序名称"   @keydown="add_gyzlent($event, '车间名称', '工序名称', '设备编号')" />
+            </el-form-item>
+            <el-form-item label="计损色数"  class="mab" prop="keyOrder" label-width=" 80">
+              <el-input disabled v-model="form['计损色数']" style="width: 90px;"/>
+            </el-form-item>
+          </div>
+          <el-form-item label="设备编号:"  class="mab" prop="remark">
+            <el-select v-model="form['设备编号']" multiple
+                       id="设备编号"  @keydown="add_gyzlent($event, '工序名称', '设备编号', '工序损耗')"
+                       style="flex: 1; height: auto;">
+              <el-option
+                  @keydown.tab.prevent="sbbhclick"
+                  @click="sbbhclick"
+                  v-for="(item, index) in gdzl_MachineList_address"
+                  :key="index"
+                  :label="item.split('-->')[0].trim()"
+                  :value="item.split('-->')[0].trim()">
+                {{ item }}
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工序损耗:"  class="mab" prop="keyOrder" >
+            <el-input v-model="form['shdh']"  style="width: 10%;" id="工序损耗"  @keydown="add_gyzlent($event, '设备编号', '工序损耗', '装版工时')"/>
+            <el-input disabled v-model="form['工序损耗名称']"  style="width: 88.7%;margin-left: 10px"/>
+          </el-form-item>
+          <div style="display: flex; gap: 0px;">
+            <el-form-item label="损耗系数:"  class="mab" prop="keyOrder">
+              <el-input disabled v-model="form['损耗系数']"  style="flex: 1;" />
+            </el-form-item>
+            <el-form-item label="难度系数"  class="mab" prop="keyOrder">
+              <el-input disabled v-model="form['难度系数']"  style="flex: 1;" />
+            </el-form-item>
+            <el-form-item label="装版工时:"  class="mab" prop="keyOrder">
+              <el-input  v-model="form['装版工时']"  style="flex: 1;" id="装版工时"  @keydown="add_gyzlent($event, '工序损耗', '装版工时', '排产小时产能')"/>
+            </el-form-item>
+            <el-form-item label="排产小时产能:"  class="mab" prop="keyOrder" label-width=" 120px">
+              <el-input  v-model="form['小时产能']"  style="flex: 1;" id="排产小时产能"  @keydown="add_gyzlent($event, '装版工时', '排产小时产能', '备注')"/>
+            </el-form-item>
+            <el-form-item label="印刷方式"  class="mab" prop="keyOrder">
+              <el-input disabled v-model="form['印刷方式']"  style="flex: 1;"/>
+            </el-form-item>
+            <el-form-item label="版距"  class="mab" prop="keyOrder">
+              <el-input disabled v-model="form['版距']"  style="flex: 1;"/>
+            </el-form-item>
+          </div>
+          <el-form-item label="工序备注:"  class="mab" prop="remark">
+            <el-input  type="textarea" resize="none" v-model="form['备注']" rows="3" clearable   style="flex: 1;resize: none" id="备注"  @keydown="add_gyzlent($event, '排产小时产能', '备注', '质量要求')"/>
+          </el-form-item>
+          <el-form-item  label="质量要求:"  class="mab" prop="remark">
+            <el-input  type="textarea" resize="none" v-model="form['质量要求']" rows="2" clearable   style="flex: 1;resize: both;" id="质量要求"  @keydown="add_gyzlent($event, '备注', '质量要求', '质量隐患')"/>
+          </el-form-item>
+          <el-form-item label="质量隐患:"  class="mab" prop="remark">
+            <el-input  type="textarea" resize="none" v-model="form['质量隐患']" rows="2" clearable   style="flex: 1;" id="质量隐患"  @keydown="add_gyzlent($event, '质量要求', '质量隐患', '印件编号')"/>
+          </el-form-item>
+        </div>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer" style="text-align: right;top: auto">
+          <el-button @click="add_gdgycloseDialog">取 消</el-button>
+          <el-button type="primary" @click="add_gdgyenterDialog">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="yjdisplay" :before-close="()=> yjdisplay = false" style="width: 800px;margin: 8px auto" :title="'可选列表'" destroy-on-close>
+      <el-tree :data="yjList" :props="{children: 'children',label: 'name', value: 'no'}" @node-click="changeHandle" default-expand-all style="border: 1px solid #ececec; padding: 10px">
+      </el-tree>
+    </el-dialog>
+
+    <el-dialog v-model="cjdisplay" :before-close="()=> cjdisplay = false" style="width: 800px;" :title="'车间选择'" destroy-on-close>
+      <el-tree
+          :data="cjList"
+          :render-after-expand="false"
+          @node-click="selectHandle"
+          :props="{children: 'children',label: 'label', value: 'value'}"
+          style="border: 1px solid #ececec; padding: 10px"
+          node-key="value"
+          :default-expanded-keys="['标准工艺']"
+      >
+      </el-tree>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import {ref, reactive} from 'vue'
+import {gdzl_MachineList, PrintDetailList, getDepartName, capacityList} from "@/api/yunyin/yunying";
+
+const form = reactive({})
+const visible = ref(false)
+const yjdisplay = ref(false)
+const cjdisplay = ref(false)
+const id = ref()
+
+const gxList = ref([])
+const yjList = ref()
+const cjList = ref([
+  {
+    label: '标准工艺',
+    value: '标准工艺',
+    children: []
+  }
+])
+const gdzl_MachineList_address = ref()
+
+//新增工艺资料弹窗 键盘 input框跳转
+const add_gyzlent = (event,id1,id2,id3) => {
+  if (id2==='印件编号' && event.key==='Tab') {
+    const node = yjList.value.find(item => item.no ===form['yjno'])
+    if (! node) {
+      yjdisplay.value = true
+    }
+  }
+  if (id2 === '车间名称' && event.key==='Tab') {
+    cjdisplay.value = true
+  }
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+    if(id3!=''){
+      document.getElementById(id3).focus()
+    }
+  } else if (event.keyCode === 38) { // 向上箭头
+    if(id1!=''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 8) { // 删除箭头
+    if(id1!='' && document.getElementById(id2).value==''){
+      document.getElementById(id1).focus()
+    }
+    // console.log(document.getElementById(id2).value)
+  }else if (event.keyCode === 37) { // 向左箭头
+    if(id1!='' && document.getElementById(id2).selectionStart==0){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 39) { // 向右箭头
+    if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
+      document.getElementById(id3).focus()
+    }
+  }
+}
+
+const open = async (gdbh, gxlist) => {
+  id.value = gdbh
+  const res = await PrintDetailList({workOrder: id.value})
+  const chejian = await getDepartName()
+  cjList.value = [
+    {
+      label: '标准工艺',
+      value: '标准工艺',
+      children: []
+    }
+  ]
+  initChejian(chejian.data['标准工艺'])
+  yjList.value = res.data
+  gxList.value = gxlist
+  visible.value = true
+}
+
+const selectHandle = async (node)=>{
+  if (node.children && node.children.length> 0) return
+  function findParentInTree(tree, targetValue) {
+    for (let node of tree) {
+      // 如果找到了目标值,返回当前节点作为上级
+      if (node.value === targetValue) {
+        return node;
+      }
+
+      // 如果当前节点有子节点,递归地在子节点中查找
+      if (node.children && node.children.length > 0) {
+        let parent = findParentInTree(node.children, targetValue);
+        if (parent) return parent
+      }
+    }
+
+    // 如果没有找到目标值或其上级,返回null
+    return null;
+  }
+  const _node = findParentInTree(cjList.value, node.value)
+  if(_node.parent){
+    form['车间名称'] = _node.parent
+  }else{
+    form['车间名称'] = _node.label
+  }
+  form['工艺名称'] = _node.label
+  form['设备编号'] = []
+  //通过车间名称查询机台
+  const MachineList_jitai = await gdzl_MachineList({address:form['车间名称']});
+  console.log(MachineList_jitai)
+  gdzl_MachineList_address.value = MachineList_jitai.data;
+
+  cjdisplay.value = false
+}
+
+const initChejian = (data) => {
+  Object.keys(data).map( (name, index)=>{
+    const tmp = {
+      label: name, value: name, children: []
+    }
+    data[name].map(item => {
+      tmp.children.push({
+        label: item, value: item,parent: name,
+      })
+    })
+    cjList.value[0].children.push(tmp)
+  })
+}
+
+const changeHandle = (v) => {
+  const no = '0' + v.no
+  let list = gxList.value.map(item => {
+    const yj = item.split('-')[0]
+    if (yj === no) return Number(item.split('-')[1])
+  })
+  form['yjno'] = v.no
+  form['工序'] = (list.sort((a, b) => b-a)[0] + 1)
+  yjdisplay.value = false
+}
+
+const sbbhclick = () => {
+  _capacityList();
+}
+
+
+const _capacityList = async () => {
+  if(gdgyformData['设备编号'] === ''){
+    return false;
+  }else{
+    _capacityListsbbh.value = gdgyformData['设备编号'].join(' ');
+    const editProductedit_machine = await capacityList({machine:_capacityListsbbh.value});
+    gdgyformData['小时产能'] = editProductedit_machine.data;
+  }
+
+};
+
+// //默认弹窗关闭
+// const add_gdgydialogFormVisible = ref(false)
+// const add_gdgyformData = reactive({});
+// //清空对象的属性值
+// const gdgy_clearFormData = () => {
+//   Object.keys(add_gdgyformData).forEach(key => {
+//     add_gdgyformData[key] = '';
+//   });
+// };
+// //新增工艺资料弹窗
+// const addgdgy_onclick = () => {
+//   if(_Gd_gdbh.value == null){
+//     cgugdlist.value = false;
+//     ElMessage({
+//       type: 'warning',
+//       message: '请选择具体的工单后,再操作此功能'
+//     })
+//   }else{
+//     let gongxu = gytableData.value.map(item => {
+//       return item['印件-工序']
+//     })
+//     addGongYiRef.value.open(_Gd_gdbh.value, gongxu)
+//   }
+// }
+// //新增工艺资料确定
+// const add_gdgyenterDialog = async () => {
+//   console.log(add_gdgyformData)
+//   // const formattedData = {
+//   //   Yj_Gdbh: _Gd_gdbh.value,
+//   //   yj_Yjno: add_gdgyformData['yjno'],
+//   //   yj_Yjdh: add_gdgyformData['yjdh'],
+//   // };
+//   // console.log(formattedData)
+//   // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
+//   // console.log(ProcessDetailAdd_add)
+//   // add_gdgydialogFormVisible.value = false
+// }
+// 新增工艺资料取消
+const add_gdgycloseDialog = () => {
+  visible.value = false
+}
+
+defineExpose({ open })
+</script>
+
+<style scoped>
+
+</style>

+ 2720 - 0
src/view/yunyin/shengchanguanli/components/print.vue

@@ -0,0 +1,2720 @@
+<template>
+  <!--工单打印【弹窗】-->
+  <el-dialog v-model="visibie" title="生产工单打印" style="width: 40%">
+    <el-row>
+      <el-form-item label="工单编号:" prop="currentProcess" class="mab">
+        <el-input v-model="form['gdbh']"  @keydown="cp_print_ProductValue" style="width: 200px" />
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="印件号:" prop="yjno" class="mab" label-width="70">
+        <el-select v-model="form['yjno']" placeholder="请选择印件号" style="width: 120px;" @change="getmc">
+          <el-option
+              v-for="item in yjlist"
+              :label="item.印件号"
+              :value="item.印件号"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="终止工序号:" prop="currentProcess" class="mab" label-width="100">
+        <el-select v-model="form['gxh']" placeholder="请选择工序号" style="width: 120px;">
+          <el-option
+              v-for="item in gxlist"
+              :label="item.工序号"
+              :value="item.工序号"
+          />
+        </el-select>
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="印件名称:" prop="currentProcess" class="mab" >
+        <el-input v-model="form['yjmc']" placeholder="" style="width: 500px;" />
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="制单:" prop="currentProcess" class="mab" label-width="70">
+        <el-input v-model="form['zd']" placeholder="" style="width: 500px;" />
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="审核:" prop="currentProcess" class="mab" label-width="70">
+        <el-input v-model="form['sh']" placeholder="" style="width: 500px;"/>
+      </el-form-item>
+    </el-row>
+    <div class="dialog-footer" style="text-align: right; margin-top: 30px;">
+      <el-button @click="() => visibie = false">取消</el-button>
+      <el-button type="primary"  @click="cp_print_handleConfirm">确认</el-button>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import {ElMessage} from "element-plus";
+import {PrintCodeList, PrintJobOrder, ProcessCodeList} from "@/api/yunyin/yunying";
+import {hiprint} from "vue-plugin-hiprint";
+
+const visibie = ref(false)
+const form = reactive({})
+const id = ref()
+const yjlist = ref([])
+const gxlist = ref([])
+
+const getmc = async (v) => {
+  const res = await ProcessCodeList({workOrder: id.value, yjno: v})
+  const row = yjlist.value.find(item => item.印件号 === v)
+  form['yjmc'] = row.印件名称;
+  gxlist.value = res.data
+}
+
+const open = (gongdanId) => {
+  if (gongdanId == null) {
+    ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'});
+  } else {
+    id.value = gongdanId
+    form['gdbh'] = gongdanId;
+    form['zd'] = "刘玲";
+    form['sh'] ="谭鸿忠";
+    form['gxh'] = 1;
+    _PrintCodeList();
+    visibie.value = true;
+  }
+}
+
+//工单打印回车
+const cp_print_ProductValue = async (e) => {
+  if (e.key=='Tab' || e.key=='Enter') {
+    _PrintCodeList();
+  }
+}
+
+//打印作业通知单->工单印件及工序列表
+const _PrintCodeList = async () => {
+  const workOrder = form['gdbh'];
+  const PrintCodeList_list = await PrintCodeList({workOrder:workOrder});
+  if(PrintCodeList_list.data.length === 0){
+    ElMessage({type: 'warning',message: '工单编号错误 或 印件资料为空'});
+  }else{
+    yjlist.value = PrintCodeList_list.data
+    form['yjno'] = PrintCodeList_list.data[0].印件号;
+    form['yjmc'] = PrintCodeList_list.data[0].印件名称;
+
+    const res = await ProcessCodeList({workOrder:workOrder, yjno: form['yjno']});
+    gxlist.value = res.data
+  }
+}
+//json打印表格数据
+const jsondata = {
+  "panels": [
+    {
+      "index": 0,
+      "name": 1,
+      "paperType": "A4",
+      "height": 210,
+      "width": 297,
+      "paperHeader": 162,
+      "paperFooter": 516,
+      "printElements": [
+        {
+          "options": {
+            "left": 15,
+            "top": 6,
+            "height": 40,
+            "width": 40,
+            "field": "minong",
+            "src": "https://shangbiaopic.11467.com/13/85/13855845.jpg",
+            "fit": "contain",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 65,
+            "bottom": 50.807688786433296,
+            "vCenter": 40,
+            "hCenter": 25.807688786433292
+          },
+          "printElementType": {
+            "title": "图片",
+            "type": "image"
+          }
+        },
+        {
+          "options": {
+            "left": 510,
+            "top": 6,
+            "height": 40.5,
+            "width": 211.5,
+            "title": "文本",
+            "right": 723.75,
+            "bottom": 46.5,
+            "vCenter": 618,
+            "hCenter": 26.25,
+            "field": "ztlx",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "fontSize": 21,
+            "fontWeight": "bold",
+            "color": "#ff1414",
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 756,
+            "top": 10.5,
+            "height": 56,
+            "width": 56,
+            "textAlign": "center",
+            "title": "二维码",
+            "right": 817.6363761208273,
+            "bottom": 54.13636363636363,
+            "vCenter": 789.8863761208273,
+            "hCenter": 26.386363636363637,
+            "field": "printcode",
+            "testData": "2401191",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true
+          },
+          "printElementType": {
+            "title": "二维码",
+            "type": "qrcode"
+          }
+        },
+        {
+          "options": {
+            "left": 57,
+            "top": 12,
+            "height": 14,
+            "width": 180,
+            "title": "浙江美浓世纪集团有限公司",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 13.5,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 247.61537405160757,
+            "bottom": 27.999999999999996,
+            "vCenter": 157.61537405160757,
+            "hCenter": 21.499999999999996
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 319.5,
+            "top": 12,
+            "height": 30,
+            "width": 168,
+            "title": "生产作业通知单",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 16.5,
+            "color": "#000000",
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 486.94683837890614,
+            "bottom": 42.0000017606295,
+            "vCenter": 402.94683837890614,
+            "hCenter": 27.0000017606295,
+            "fontWeight": "bold"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 57,
+            "top": 28.5,
+            "height": 9.75,
+            "width": 209,
+            "title": "ZHEJIANG MINONG CENTURY GROUP CO.LTD.",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 7.5,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 280.99999295748194,
+            "bottom": 40.326923076923066,
+            "vCenter": 176.49999295748196,
+            "hCenter": 35.451923076923066
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 259.5,
+            "top": 51,
+            "height": 16,
+            "width": 250.5,
+            "title": "文本",
+            "right": 509.4468955993651,
+            "bottom": 67.02812528610227,
+            "vCenter": 384.1968955993651,
+            "hCenter": 59.028125286102274,
+            "field": "xsddh",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 510,
+            "top": 51,
+            "height": 16,
+            "width": 48,
+            "title": "打印时间",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 551.25,
+            "bottom": 66,
+            "vCenter": 527.25,
+            "hCenter": 55.5
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 557,
+            "top": 51,
+            "height": 16,
+            "width": 141,
+            "title": "文本",
+            "right": 697.5,
+            "bottom": 66,
+            "vCenter": 637.5,
+            "hCenter": 55.5,
+            "field": "dysj",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 51.5,
+            "height": 16,
+            "width": 74,
+            "title": "生产批次号:",
+            "right": 76.49999491373697,
+            "bottom": 64.77777523464624,
+            "vCenter": 40.49999491373698,
+            "hCenter": 54.27777523464624,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 12,
+            "fontWeight": "bold",
+            "color": "#f50808",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 87.95454545454545,
+            "top": 51.5,
+            "height": 16,
+            "width": 90,
+            "title": "文本",
+            "right": 182.38889058430985,
+            "bottom": 64.7777684529622,
+            "vCenter": 137.38889058430985,
+            "hCenter": 53.527768452962206,
+            "field": "scpch",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 183.95454545454544,
+            "top": 51.5,
+            "height": 16,
+            "width": 75,
+            "title": "销售订单号:",
+            "right": 312.75,
+            "bottom": 54.75,
+            "vCenter": 252.75,
+            "hCenter": 49.875,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 12,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 70.5,
+            "height": 88.5,
+            "width": 815,
+            "right": 831.5000057220459,
+            "bottom": 158.99999713897702,
+            "vCenter": 424.0000057220459,
+            "hCenter": 114.74999713897702,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "矩形",
+            "type": "rect"
+          }
+        },
+        {
+          "options": {
+            "left": 199.5,
+            "top": 70.5,
+            "height": 49,
+            "width": 2,
+            "right": 200.33333841959626,
+            "bottom": 163.49999745686844,
+            "vCenter": 195.83333841959626,
+            "hCenter": 118.49999745686844,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 262,
+            "top": 70.5,
+            "height": 49,
+            "width": 2,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 265.44688951969135,
+            "bottom": 119.49999713897702,
+            "vCenter": 264.44688951969135,
+            "hCenter": 94.99999713897702
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 462,
+            "top": 70.5,
+            "height": 49,
+            "width": 2,
+            "right": 486.0874862670897,
+            "bottom": 119.52812099456784,
+            "vCenter": 485.0874862670897,
+            "hCenter": 95.02812099456784,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 64,
+            "top": 71,
+            "height": 48,
+            "width": 2,
+            "right": 69.01506181196729,
+            "bottom": 118.8181815580888,
+            "vCenter": 68.01506181196729,
+            "hCenter": 94.3181815580888,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 514,
+            "top": 71,
+            "height": 31,
+            "width": 2,
+            "right": 519.9969024658201,
+            "bottom": 102.49999713897702,
+            "vCenter": 518.9969024658201,
+            "hCenter": 86.49999713897702,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 201,
+            "top": 73,
+            "height": 12,
+            "width": 60,
+            "title": "产品代码",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 275.38638028231526,
+            "bottom": 83.97102329947728,
+            "vCenter": 245.38638028231526,
+            "hCenter": 77.97102329947728
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 16.5,
+            "top": 73.5,
+            "height": 12,
+            "width": 45,
+            "title": "客户代码",
+            "right": 61.99687957763671,
+            "bottom": 85.33465966311365,
+            "vCenter": 39.49687957763671,
+            "hCenter": 79.33465966311365,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 64.5,
+            "top": 73.5,
+            "height": 12,
+            "width": 132,
+            "title": "客户名称",
+            "right": 183.99608670748194,
+            "bottom": 85.49999647874095,
+            "vCenter": 120.99608670748194,
+            "hCenter": 79.49999647874095,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 264,
+            "top": 73.5,
+            "height": 12,
+            "width": 196,
+            "title": "产品名称",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 463,
+            "top": 73.5,
+            "height": 12,
+            "width": 46.5,
+            "title": "版本号",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 536.2499942779539,
+            "bottom": 85.96874427795407,
+            "vCenter": 512.9999942779539,
+            "hCenter": 79.96874427795407
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 515,
+            "top": 73.5,
+            "height": 12,
+            "width": 314,
+            "title": "警语版面",
+            "right": 636.3749999999998,
+            "bottom": 86.99999999999997,
+            "vCenter": 576.3749999999998,
+            "hCenter": 80.99999999999997,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "textAlign": "center"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 87,
+            "height": 9,
+            "width": 815,
+            "borderWidth": "0.75",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 839.9960895885121,
+            "bottom": 96.00000416148792,
+            "vCenter": 421.99608958851206,
+            "hCenter": 91.50000416148792
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 65,
+            "top": 88.5,
+            "height": 12,
+            "width": 132,
+            "title": "文本",
+            "field": "khmc",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 188.6052679764597,
+            "bottom": 97.5789413452148,
+            "vCenter": 127.10526797645967,
+            "hCenter": 87.0789413452148,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 200.5,
+            "top": 88.5,
+            "height": 12,
+            "width": 60,
+            "title": "100301047",
+            "field": "cpdm",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 255.00000214576713,
+            "bottom": 119.99999999999996,
+            "vCenter": 225.75000214576713,
+            "hCenter": 109.49999999999996
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 264,
+            "top": 88.5,
+            "height": 12,
+            "width": 196,
+            "title": "文本",
+            "right": 384.23684873078986,
+            "bottom": 89.56578826904293,
+            "vCenter": 324.23684873078986,
+            "hCenter": 84.69078826904293,
+            "field": "cpmc",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "qrCodeLevel": 0,
+            "textContentVerticalAlign": "middle",
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 463,
+            "top": 88.5,
+            "height": 13,
+            "width": 50,
+            "title": "文本",
+            "field": "bbh",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "qrCodeLevel": 0,
+            "right": 572.4473732396174,
+            "bottom": 89.01315909937804,
+            "vCenter": 512.4473732396174,
+            "hCenter": 84.13815909937804,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 515,
+            "top": 88.5,
+            "height": 12,
+            "width": 314,
+            "title": "文本",
+            "right": 831.2812557220457,
+            "bottom": 99.18749999999997,
+            "vCenter": 680.5312557220457,
+            "hCenter": 93.18749999999997,
+            "field": "jybm",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "qrCodeLevel": 0,
+            "textContentVerticalAlign": "middle",
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 16.5,
+            "top": 89,
+            "height": 12,
+            "width": 45,
+            "title": "文本",
+            "right": 63.74999999999999,
+            "bottom": 100.84090466932813,
+            "vCenter": 41.24999999999999,
+            "hCenter": 94.84090466932813,
+            "field": "khdh",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 102,
+            "height": 9,
+            "width": 815,
+            "borderWidth": "0.75",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 514,
+            "top": 102,
+            "height": 17,
+            "width": 9,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 543.4031238555906,
+            "bottom": 119.0000028610229,
+            "vCenter": 538.9031238555906,
+            "hCenter": 110.5000028610229
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 580,
+            "top": 102,
+            "height": 17,
+            "width": 9,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 618.0000291304152,
+            "bottom": 118.99999895962796,
+            "vCenter": 613.5000291304152,
+            "hCenter": 110.49999895962796
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 636,
+            "top": 102,
+            "height": 17,
+            "width": 9,
+            "right": 664.4062557220457,
+            "bottom": 120.4062528610229,
+            "vCenter": 659.9062557220457,
+            "hCenter": 111.9062528610229,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 706,
+            "top": 102,
+            "height": 17,
+            "width": 9,
+            "right": 563.999985694885,
+            "bottom": 272.3437643051147,
+            "vCenter": 559.499985694885,
+            "hCenter": 227.3437643051147,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 764,
+            "top": 102,
+            "height": 17,
+            "width": 9,
+            "right": 774.0937414169308,
+            "bottom": 193.8750028610229,
+            "vCenter": 769.5937414169308,
+            "hCenter": 148.8750028610229,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 765,
+            "top": 103.5,
+            "height": 12,
+            "width": 62,
+            "title": "文本",
+            "field": "pzll",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 835.5000083229755,
+            "bottom": 115.15908973867236,
+            "vCenter": 801.0000083229755,
+            "hCenter": 109.15908973867236,
+            "color": "#fa1919"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 708,
+            "top": 104,
+            "height": 12,
+            "width": 54,
+            "title": "平张投料(张)",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 767.9062242507932,
+            "bottom": 114.9375028610229,
+            "vCenter": 731.9062242507932,
+            "hCenter": 108.9375028610229,
+            "color": "#ff0a0a"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 17,
+            "top": 105,
+            "height": 12,
+            "width": 45,
+            "title": "码源数量",
+            "right": 46.78570556640625,
+            "bottom": 117.2142933436802,
+            "vCenter": 26.535705566406246,
+            "hCenter": 111.2142933436802,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 64.5,
+            "top": 105,
+            "height": 12,
+            "width": 132,
+            "title": "文本",
+            "field": "mysl",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 201,
+            "top": 105,
+            "height": 12,
+            "width": 58.5,
+            "title": "客户ERP编码",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "right": 318.78572736467623,
+            "bottom": 115.92856597900385,
+            "vCenter": 258.78572736467623,
+            "hCenter": 109.92856597900385,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 264,
+            "top": 105,
+            "height": 11,
+            "width": 196,
+            "title": "文本",
+            "field": "kherpbm",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 387.07142421177446,
+            "bottom": 113.96428680419916,
+            "vCenter": 327.07142421177446,
+            "hCenter": 109.08928680419916,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 463,
+            "top": 105,
+            "height": 12,
+            "width": 52,
+            "title": "开单日期",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 536.687488555908,
+            "bottom": 117.37499427795406,
+            "vCenter": 516.687488555908,
+            "hCenter": 111.37499427795406
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 517,
+            "top": 105,
+            "height": 12,
+            "width": 61,
+            "title": "文本",
+            "field": "kdrq",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 553.8749742507932,
+            "bottom": 115.21874141693111,
+            "vCenter": 527.6249742507932,
+            "hCenter": 109.21874141693111,
+            "textContentWrap": "clip",
+            "fontWeight": "bold"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 582,
+            "top": 105,
+            "height": 12,
+            "width": 52,
+            "title": "交货日期",
+            "right": 607.499985694885,
+            "bottom": 115.9687585830688,
+            "vCenter": 584.999985694885,
+            "hCenter": 109.9687585830688,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 641,
+            "top": 105,
+            "height": 12,
+            "width": 61,
+            "title": "文本",
+            "right": 725.4710360440338,
+            "bottom": 117.0000026009299,
+            "vCenter": 696.4710360440338,
+            "hCenter": 111.0000026009299,
+            "field": "jhrq",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "textContentWrap": "clip",
+            "fontWeight": "bold"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 118.5,
+            "height": 9,
+            "width": 815,
+            "borderWidth": "0.75",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 831,
+            "bottom": 127.5000072826038,
+            "vCenter": 423,
+            "hCenter": 123.0000072826038
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 556,
+            "top": 118.5,
+            "height": 39,
+            "width": 5,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 609,
+            "top": 118.5,
+            "height": 39,
+            "width": 5,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 564.4999771118162,
+            "bottom": 160.50000762939447,
+            "vCenter": 561.9999771118162,
+            "hCenter": 140.00000762939447
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 660,
+            "top": 118.5,
+            "height": 39,
+            "width": 5,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 621.1590992320664,
+            "bottom": 159.15908973867238,
+            "vCenter": 618.6590992320664,
+            "hCenter": 138.65908973867238
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 718,
+            "top": 118.5,
+            "height": 39,
+            "width": 5,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 702.9999771118162,
+            "bottom": 166.0000076293945,
+            "vCenter": 700.4999771118162,
+            "hCenter": 145.5000076293945
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 774,
+            "top": 118.5,
+            "height": 39,
+            "width": 5,
+            "right": 774.4999771118161,
+            "bottom": 170.50000762939447,
+            "vCenter": 771.9999771118161,
+            "hCenter": 150.00000762939447,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 505,
+            "top": 119,
+            "height": 40,
+            "width": 9,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 17,
+            "top": 121.5,
+            "height": 34.5,
+            "width": 49.5,
+            "title": "工单说明:",
+            "right": 126.79411495433133,
+            "bottom": 137.73529580060165,
+            "vCenter": 66.79411495433133,
+            "hCenter": 131.73529580060165,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "color": "#ff0000",
+            "qrCodeLevel": 0,
+            "textAlign": "center"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 66,
+            "top": 121.5,
+            "height": 34.5,
+            "width": 438,
+            "title": "文本",
+            "right": 499.49999982118607,
+            "bottom": 155.49374771118158,
+            "vCenter": 277.49999982118607,
+            "hCenter": 138.24374771118158,
+            "field": "gdsm",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 507,
+            "top": 121.5,
+            "height": 12,
+            "width": 49,
+            "title": "投料率",
+            "right": 499.1052679764595,
+            "bottom": 134.05263037430606,
+            "vCenter": 481.1052679764595,
+            "hCenter": 128.05263037430606,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 559,
+            "top": 121.5,
+            "height": 12,
+            "width": 49,
+            "title": "目标合格率",
+            "right": 659.6841960706207,
+            "bottom": 132.55263669867261,
+            "vCenter": 625.1841960706207,
+            "hCenter": 126.55263669867261,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 611,
+            "top": 121.5,
+            "height": 12,
+            "width": 49,
+            "title": "平均合格率",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 734.7631723504314,
+            "bottom": 134.36841653522686,
+            "vCenter": 700.2631723504314,
+            "hCenter": 128.36841653522686
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 663,
+            "top": 121.5,
+            "height": 12,
+            "width": 54,
+            "title": "订货数量(箱)",
+            "right": 676.8947320235401,
+            "bottom": 210.71053143551467,
+            "vCenter": 616.8947320235401,
+            "hCenter": 204.71053143551467,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 721.5,
+            "top": 121.5,
+            "height": 12,
+            "width": 53,
+            "title": "库存数量(箱)",
+            "right": 787.7727564031427,
+            "bottom": 171.5454545454545,
+            "vCenter": 753.2727564031427,
+            "hCenter": 165.5454545454545,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 775.5,
+            "top": 121.5,
+            "height": 12,
+            "width": 55,
+            "title": "投料数量(箱)",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "right": 843.6818473122336,
+            "bottom": 134.18182650479406,
+            "vCenter": 809.1818473122336,
+            "hCenter": 128.18182650479406,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 505.5,
+            "top": 138,
+            "height": 6,
+            "width": 324,
+            "borderWidth": "0.75",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 560,
+            "top": 142,
+            "height": 12,
+            "width": 49,
+            "title": "文本",
+            "right": 554.5000381469724,
+            "bottom": 151.9999923706054,
+            "vCenter": 529.5000381469724,
+            "hCenter": 145.9999923706054,
+            "field": "mbhgl",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 720,
+            "top": 142,
+            "height": 12,
+            "width": 54,
+            "title": "文本",
+            "field": "kcsl",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 766.0000076293943,
+            "bottom": 155.0000076293945,
+            "vCenter": 731.5000076293943,
+            "hCenter": 149.5000076293945
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 775,
+            "top": 142,
+            "height": 12,
+            "width": 55,
+            "title": "文本",
+            "right": 864.0000076293944,
+            "bottom": 151.50000762939447,
+            "vCenter": 829.5000076293944,
+            "hCenter": 145.50000762939447,
+            "field": "tlsl",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 507,
+            "top": 142.5,
+            "height": 12,
+            "width": 49,
+            "title": "文本",
+            "right": 497.0000076293944,
+            "bottom": 153.5000076293945,
+            "vCenter": 479.0000076293944,
+            "hCenter": 147.5000076293945,
+            "field": "tll",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 611,
+            "top": 142.5,
+            "height": 12,
+            "width": 49,
+            "title": "文本",
+            "right": 613.9999771118162,
+            "bottom": 179.00000762939447,
+            "vCenter": 585.9999771118162,
+            "hCenter": 173.00000762939447,
+            "field": "pjhgl",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 661,
+            "top": 142.5,
+            "height": 12,
+            "width": 57,
+            "title": "文本",
+            "right": 608.9999771118162,
+            "bottom": 198.25000762939447,
+            "vCenter": 548.9999771118162,
+            "hCenter": 193.37500762939447,
+            "field": "dhsl",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 163.5,
+            "height": 9,
+            "width": 815,
+            "borderWidth": "0.75",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 349,
+            "top": 163.5,
+            "height": 38,
+            "width": 9,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 355.3333468967012,
+            "bottom": 205.50000423855244,
+            "vCenter": 350.8333468967012,
+            "hCenter": 189.00000423855244
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 654,
+            "top": 163.5,
+            "height": 38,
+            "width": 9,
+            "right": 655.827731662326,
+            "bottom": 205.6627646552191,
+            "vCenter": 651.327731662326,
+            "hCenter": 189.1627646552191,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 164,
+            "height": 38,
+            "width": 9,
+            "right": 11.647058823529411,
+            "bottom": 211.38234705083505,
+            "vCenter": 7.147058823529411,
+            "hCenter": 192.38234705083505,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 45,
+            "top": 164,
+            "height": 38,
+            "width": 9,
+            "right": 47.383238050672716,
+            "bottom": 207.05165354410798,
+            "vCenter": 42.883238050672716,
+            "hCenter": 190.55165354410798,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 294,
+            "top": 164,
+            "height": 38,
+            "width": 9,
+            "right": 297.0499182807073,
+            "bottom": 207.72222646077464,
+            "vCenter": 292.5499182807073,
+            "hCenter": 191.22222646077464,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 577,
+            "top": 164,
+            "height": 38,
+            "width": 9,
+            "right": 577.1110975477427,
+            "bottom": 208.05555301242396,
+            "vCenter": 572.6110975477427,
+            "hCenter": 188.55555301242396,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 684,
+            "top": 164,
+            "height": 38,
+            "width": 9,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 689.3889295789927,
+            "bottom": 207.27777184380417,
+            "vCenter": 684.8889295789927,
+            "hCenter": 190.77777184380417
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 830,
+            "top": 164,
+            "height": 39,
+            "width": 9,
+            "right": 863.478268830672,
+            "bottom": 259.63042881177813,
+            "vCenter": 858.978268830672,
+            "hCenter": 214.63042881177813,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 48,
+            "top": 165,
+            "height": 12,
+            "width": 245,
+            "title": "印件代号及名称",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 275.36842105263156,
+            "bottom": 173.6447371432655,
+            "vCenter": 161.36842105263156,
+            "hCenter": 168.7697371432655
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 299,
+            "top": 165,
+            "height": 12,
+            "width": 48,
+            "title": "平张投料量",
+            "right": 343.93882242838527,
+            "bottom": 186.1111119588215,
+            "vCenter": 317.43882242838527,
+            "hCenter": 180.1111119588215,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 350,
+            "top": 165,
+            "height": 12,
+            "width": 227,
+            "title": "纸张名称",
+            "right": 566.8832600911456,
+            "bottom": 186.66666751437708,
+            "vCenter": 457.88326009114564,
+            "hCenter": 180.66666751437708,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 579,
+            "top": 165,
+            "height": 12,
+            "width": 75,
+            "title": "投料规格",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 647.7222629123262,
+            "bottom": 186.3888897365993,
+            "vCenter": 609.4722629123262,
+            "hCenter": 180.3888897365993
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 656,
+            "top": 165,
+            "height": 12,
+            "width": 27,
+            "title": "联数",
+            "right": 678.6054823133676,
+            "bottom": 186.66666751437708,
+            "vCenter": 663.6054823133676,
+            "hCenter": 180.66666751437708,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 686,
+            "top": 165,
+            "height": 12,
+            "width": 27,
+            "title": "开数",
+            "right": 713.9388020833329,
+            "bottom": 186.55554962158195,
+            "vCenter": 698.9388020833329,
+            "hCenter": 180.55554962158195,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 712.5,
+            "top": 165,
+            "height": 38,
+            "width": 5,
+            "right": 720.9943983289927,
+            "bottom": 208.7777786254882,
+            "vCenter": 718.4943983289927,
+            "hCenter": 192.2777786254882,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "竖线",
+            "type": "vline"
+          }
+        },
+        {
+          "options": {
+            "left": 714,
+            "top": 165,
+            "height": 12,
+            "width": 116,
+            "title": "备注",
+            "right": 832.6054551866315,
+            "bottom": 187.22222306993262,
+            "vCenter": 775.1054551866315,
+            "hCenter": 181.22222306993262,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 17,
+            "top": 166,
+            "height": 12,
+            "width": 27,
+            "title": "印件",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 41.05263639751233,
+            "bottom": 177.39473232470056,
+            "vCenter": 25.30263639751233,
+            "hCenter": 171.39473232470056
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 178.5,
+            "height": 9,
+            "width": 815,
+            "borderWidth": "0.75",
+            "right": 516.3749999999998,
+            "bottom": 185.24998855590812,
+            "vCenter": 471.37499999999983,
+            "hCenter": 180.74998855590812,
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 350,
+            "top": 180,
+            "height": 12,
+            "width": 227,
+            "title": "文本",
+            "right": 481.50000214576704,
+            "bottom": 188.99998855590812,
+            "vCenter": 421.50000214576704,
+            "hCenter": 184.12498855590812,
+            "field": "zzmc",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 579,
+            "top": 180,
+            "height": 12,
+            "width": 75,
+            "title": "文本",
+            "field": "tlgg",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "textAlign": "center",
+            "textContentWrap": "clip",
+            "right": 645.4388156467011,
+            "bottom": 204.2777854071722,
+            "vCenter": 607.4388156467011,
+            "hCenter": 198.2777854071722
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 656,
+            "top": 180,
+            "height": 12,
+            "width": 27,
+            "title": "文本",
+            "field": "ls",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 679.8276774088538,
+            "bottom": 205.49999745686839,
+            "vCenter": 664.8276774088538,
+            "hCenter": 199.49999745686839,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 685.5,
+            "top": 180,
+            "height": 12,
+            "width": 27,
+            "title": "文本",
+            "field": "ks",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 715.1249999999997,
+            "bottom": 188.99998855590815,
+            "vCenter": 700.1249999999997,
+            "hCenter": 182.99998855590815,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 714,
+            "top": 180,
+            "height": 12,
+            "width": 116,
+            "title": "文本",
+            "right": 833.5499403211802,
+            "bottom": 205.1111187405055,
+            "vCenter": 776.0499403211802,
+            "hCenter": 199.1111187405055,
+            "field": "bz",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "qrCodeLevel": 0,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 296,
+            "top": 181,
+            "height": 14,
+            "width": 52,
+            "title": "文本",
+            "right": 348.7222425672742,
+            "bottom": 193.22222985161665,
+            "vCenter": 322.7222425672742,
+            "hCenter": 186.22222985161665,
+            "field": "pztll",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 17,
+            "top": 182,
+            "height": 12,
+            "width": 27,
+            "title": "文本",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 40.24999999999999,
+            "bottom": 192.99608612060536,
+            "vCenter": 24.749999999999993,
+            "hCenter": 186.99608612060536,
+            "field": "yjh",
+            "hideTitle": true
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 47,
+            "top": 182,
+            "height": 12,
+            "width": 247,
+            "title": "文本",
+            "field": "thdhjmc",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 287.125,
+            "bottom": 190.12498855590812,
+            "vCenter": 168.12499999999997,
+            "hCenter": 184.12498855590812,
+            "textContentWrap": "clip"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 202,
+            "height": 9,
+            "width": 816,
+            "borderWidth": "0.75",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "right": 936,
+            "bottom": 217.49999879535866,
+            "vCenter": 468,
+            "hCenter": 212.99999879535866
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 15,
+            "top": 207,
+            "height": 151.5,
+            "width": 816,
+            "field": "table1",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "textAlign": "center",
+            "tableHeaderBackground": "#ffffff",
+            "autoCompletion": true,
+            "right": 839.3181776566939,
+            "bottom": 371.3181818181818,
+            "vCenter": 420.8181776566939,
+            "hCenter": 297.8181818181818,
+            "maxRows": 12,
+            "gridColumns": 2,
+            "columns": [
+              [
+                {
+                  "width": 306.2256573863597,
+                  "title": "物料代码及名称",
+                  "titleSync": true,
+                  "field": "wldmjmc",
+                  "checked": true,
+                  "columnId": "wldmjmc",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "align": "left",
+                  "halign": "left",
+                  "vAlign": "middle",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "tableSummaryAlign": "justify"
+                },
+                {
+                  "width": 64.2564983208363,
+                  "title": "计划用量",
+                  "titleSync": false,
+                  "field": "jhyl",
+                  "checked": true,
+                  "columnId": "jhyl",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 37.51784429280394,
+                  "title": "单位",
+                  "titleSync": false,
+                  "field": "dw",
+                  "checked": true,
+                  "columnId": "dw",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "align": "center",
+                  "halign": "center",
+                  "vAlign": "middle",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 85.97291065362847,
+                  "title": "物料代码及名称",
+                  "titleSync": false,
+                  "field": "wldmjmc1",
+                  "checked": false,
+                  "columnId": "wldmjmc1",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 107.88106549200486,
+                  "title": "计划用量",
+                  "titleSync": false,
+                  "field": "jhyl1",
+                  "checked": false,
+                  "columnId": "jhyl1",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 170.29501525940995,
+                  "title": "单位",
+                  "titleSync": false,
+                  "field": "dw1",
+                  "checked": false,
+                  "columnId": "dw1",
+                  "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": 15,
+            "top": 372,
+            "height": 91.5,
+            "width": 816,
+            "right": 833.5,
+            "bottom": 466.83333333333337,
+            "vCenter": 425.5,
+            "hCenter": 370.08333333333337,
+            "field": "table2",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "tableHeaderBackground": "#ffffff",
+            "columns": [
+              [
+                {
+                  "width": 300.1855077418251,
+                  "title": "印件及工序名称",
+                  "titleSync": false,
+                  "field": "yjjgxmc",
+                  "checked": true,
+                  "columnId": "yjjgxmc",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 54.48396735336328,
+                  "title": "转序数(张)",
+                  "titleSync": false,
+                  "field": "zxs",
+                  "checked": true,
+                  "columnId": "zxs",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 45.53587180900963,
+                  "title": "报废定额",
+                  "titleSync": false,
+                  "field": "bfde",
+                  "checked": true,
+                  "columnId": "bfde",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 46.13787813620061,
+                  "title": "允许比例",
+                  "titleSync": false,
+                  "field": "yxbl",
+                  "checked": true,
+                  "columnId": "yxbl",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 46.26871540323957,
+                  "title": "损耗系数",
+                  "titleSync": false,
+                  "field": "shxs",
+                  "checked": true,
+                  "columnId": "shxs",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 45.722331785648365,
+                  "title": "装板工时",
+                  "titleSync": false,
+                  "field": "zbgs",
+                  "checked": true,
+                  "columnId": "zbgs",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 45.902414161246085,
+                  "title": "小时定额",
+                  "titleSync": false,
+                  "field": "xsde",
+                  "checked": true,
+                  "columnId": "xsde",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 51.093669275306894,
+                  "title": "生产工时",
+                  "titleSync": false,
+                  "field": "scgs",
+                  "checked": true,
+                  "columnId": "scgs",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                },
+                {
+                  "width": 180.66964433416047,
+                  "title": "备注",
+                  "titleSync": false,
+                  "field": "bz",
+                  "checked": true,
+                  "columnId": "bz",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1,
+                  "align": "center",
+                  "halign": "center",
+                  "vAlign": "middle",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": ""
+                }
+              ]
+            ]
+          },
+          "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": 15,
+            "top": 524,
+            "height": 14,
+            "width": 45,
+            "title": "制单:",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 12,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0,
+            "right": 45.54545038396662,
+            "bottom": 559.9999916770241,
+            "vCenter": 29.045450383966617,
+            "hCenter": 552.9999916770241
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 64.5,
+            "top": 524,
+            "height": 14,
+            "width": 120,
+            "title": "文本",
+            "right": 170.31817349520597,
+            "bottom": 559.0454711914062,
+            "vCenter": 110.31817349520597,
+            "hCenter": 552.0454711914062,
+            "field": "zdr",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "fontSize": 12,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 396,
+            "top": 524,
+            "height": 14,
+            "width": 40.5,
+            "title": "审核:",
+            "right": 515.8636405251243,
+            "bottom": 559.3181734952059,
+            "vCenter": 455.8636405251243,
+            "hCenter": 552.3181734952059,
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 12,
+            "textAlign": "center",
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 436.5,
+            "top": 524,
+            "height": 14,
+            "width": 120,
+            "title": "文本",
+            "right": 559.2421875,
+            "bottom": 557.99609375,
+            "vCenter": 499.2421875,
+            "hCenter": 550.99609375,
+            "field": "shr",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "hideTitle": true,
+            "fontSize": 12,
+            "textContentVerticalAlign": "middle",
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        }
+      ],
+      "paperNumberLeft": 565.5,
+      "paperNumberTop": 573,
+      "paperNumberDisabled": true,
+      "paperNumberContinue": true,
+      "backgroundColor": "#ffffff",
+      "overPrintOptions": {
+        "content": "",
+        "opacity": 0.7,
+        "type": 1
+      },
+      "watermarkOptions": {
+        "content": "",
+        "fillStyle": "rgba(255, 255, 255, 1)",
+        "fontSize": "36px",
+        "rotate": 25,
+        "width": 413,
+        "height": 310,
+        "timestamp": false,
+        "format": "YYYY-MM-DD HH:mm"
+      }
+    }
+  ]
+}
+hiprint.init()
+const hiprintTemplate = new hiprint.PrintTemplate({ template: jsondata })
+const cp_print_handleConfirm = async () => {
+  let params = {};
+  //2310707
+  //2012127
+  params.workOrder = form['gdbh'];
+  params.PrepareDocument = form['zd'];
+  params.examine = form['sh'];
+  params.yjno = form['yjno'];
+  params.gxh = form['gxh'];
+  //调用打印接口【打印作业通知单】
+  const print_PrintJobOrder = await PrintJobOrder(params);
+  console.log(print_PrintJobOrder)
+  if(print_PrintJobOrder.data === null){
+    ElMessage({type: 'error',message: print_PrintJobOrder.msg})
+  }
+  // 获取当前日期
+  const today = new Date();
+  const year = today.getFullYear();
+  const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始,需要补零
+  const day = String(today.getDate()).padStart(2, '0');
+  const hours = String(today.getHours()).padStart(2, '0');
+  const minutes = String(today.getMinutes()).padStart(2, '0');
+  const seconds = String(today.getSeconds()).padStart(2, '0');
+  const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  const printdata  = {
+    "minong": "https://shangbiaopic.11467.com/13/85/13855845.jpg",
+    "printcode":print_PrintJobOrder.data['二维码'],
+    "dysj":currentDate,
+    "scpch":print_PrintJobOrder.data['生产批次号'],
+    "xsddh":print_PrintJobOrder.data['生产批次号'],
+    // "xsddh":print_PrintJobOrder.data['销售订单号'],
+    "khdh":  print_PrintJobOrder.data['客户代码'],
+    "khmc":  print_PrintJobOrder.data['客户名称'],
+    "cpdm":  print_PrintJobOrder.data['产品代码'],
+    "cpmc":  print_PrintJobOrder.data['产品名称'],
+    "bbh":  print_PrintJobOrder.data['版本号'],
+    "jybm":  print_PrintJobOrder.data['警语版面'],
+    "mysl":  print_PrintJobOrder.data['码源数量'],
+    "kherpbm":  print_PrintJobOrder.data['客户ERP编码'],
+    "kdrq":  print_PrintJobOrder.data['开单日期'],
+    "jhrq":  print_PrintJobOrder.data['交货日期'],
+    "pzll":  print_PrintJobOrder.data['平张投料量'],
+    "gdsm":print_PrintJobOrder.data['工单说明'],
+    "tll":print_PrintJobOrder.data['投料率'],
+    "mbhgl":print_PrintJobOrder.data['目标合格率'],
+    "pjhgl":print_PrintJobOrder.data['平均合格率'],
+    "dhsl":print_PrintJobOrder.data['订货数量'],
+    "kcsl":print_PrintJobOrder.data['库存数量'],
+    "tlsl":print_PrintJobOrder.data['投料数量'],
+    "yjh":print_PrintJobOrder.data['印件'],
+    "thdhjmc":print_PrintJobOrder.data['印件代号及名称'],
+    "pztll":print_PrintJobOrder.data['平张投料量'],
+    "zzmc":print_PrintJobOrder.data['纸张名称'],
+    "tlgg":print_PrintJobOrder.data['投料规格'],
+    "ks":print_PrintJobOrder.data['开数'],
+    "ls":print_PrintJobOrder.data['联数'],
+    "bz":print_PrintJobOrder.data['印件备注'],
+    'table1': print_PrintJobOrder.data.materiel.map(item => ({
+      'wldmjmc': item.物料代码及名称,
+      'jhyl': item['计划用量'].toFixed(2),
+      'dw': item['投料单位'],
+    })),
+    'table2': print_PrintJobOrder.data.printDetail.map(item => ({
+      'yjjgxmc': item.印件及工序名称,
+      'zxs': item['转序数'],
+      'bfde': item['报废定额'],
+      'yxbl': item['允损比例'],
+      'shxs': item['损耗系数'],
+      'zbgs': item['装版工时'],
+      'xsde': item['小时定额'],
+      'scgs': item['生产工时'],
+      'bz': item['工序备注'],
+    })),
+    "shr":form['sh'],
+    "zdr":form['zd']
+
+  }
+  hiprintTemplate.print(printdata);
+  // cp_print_gdlist.value = false;
+}
+
+defineExpose({ open })
+</script>
+
+<style scoped>
+:deep(.el-table td .cell) {
+  line-height: 20px !important;
+}
+:deep(.el-tabs__header){
+  margin-bottom: 0;
+}
+.search{
+  margin-left: 0px !important;
+  margin-right: 10px !important;
+}
+.bt{
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
+.el-tabs__header{
+  margin: 0px !important;
+}
+.gva-table-box{
+  padding: 0px !important;
+}
+.el-pagination{
+  margin-top: 0px !important;
+}
+.mab{
+  margin-bottom: 5px;
+}
+
+</style>

+ 240 - 252
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -14,9 +14,9 @@
               <div v-if="treeType === 'customTree'">
                 <el-button type="primary" title="设置工单各个工序的 【完工】 状态" icon="edit" @click="ongxztgzClick" class="bt">工序状态更正</el-button>
                 <el-button type="primary" title="引用当前产品最近一次的生产参数【设备、显示产能、辅助工时】" icon="edit" @click="pd_yysjcsonClick" class="bt">引用实际参数</el-button>
-                <el-button type="primary" title="批量维护工序生产的排程参数" icon="edit" disabled @click="pd_pccswhonClick" class="bt">排程参数维护</el-button>
-                <el-button type="primary" title="将已经维护好的排产参数,复制给对应产品的对应工艺" icon="edit" disabled @click="pd_pdcsfzonClick" class="bt">排单参数复制</el-button>
-                <el-button type="primary" title="根据当前生产任务设备状态排程 编辑生产计划" icon="edit" disabled @click="pd_editscjhonClick" class="bt">编辑生产计划</el-button>
+                <!--                <el-button type="primary" title="批量维护工序生产的排程参数" icon="edit" disabled @click="pd_pccswhonClick" class="bt">排程参数维护</el-button>-->
+                <!--                <el-button type="primary" title="将已经维护好的排产参数,复制给对应产品的对应工艺" icon="edit" disabled @click="pd_pdcsfzonClick" class="bt">排单参数复制</el-button>-->
+                <!--                <el-button type="primary" title="根据当前生产任务设备状态排程 编辑生产计划" icon="edit" disabled @click="pd_editscjhonClick" class="bt">编辑生产计划</el-button>-->
               </div>
 
               <div v-else>
@@ -24,11 +24,11 @@
                 <el-button type="primary" title="暂停工序生产任务,【返回当前设备待产任务清单中】" icon="edit"  @click="onztwgClick" class="bt">暂停排产</el-button>
                 <el-button type="primary" title="将工序佘总为【完工状态】" icon="edit"  @click="ongxwgClick" class="bt">工序完工</el-button>
                 <el-button type="primary" title="设置工单各个工序的【完工】状态" icon="edit" @click="ongxztgzClick" class="bt">工序状态更正</el-button>
-                <el-button type="primary" title="可【批量设置】所选择的生产任务的生产机台" icon="edit" disabled @click="onjztzClick" class="bt">机组调整</el-button>
+                <el-button type="primary" title="可【批量设置】所选择的生产任务的生产机台" icon="edit"  @click="onjztzClick" class="bt">机组调整</el-button>
                 <el-button type="primary" title="给担负起那设备做生产任务排程" icon="edit"  @click="oncjsbpcClick" class="bt">车间设备制程排序</el-button>
               </div>
 
-              <el-button type="primary" title="打印生产工单" disabled icon="edit" @click="pd_gdprintonClick" class="bt">工单打印</el-button>
+              <el-button type="primary" title="打印生产工单" icon="edit" @click="pd_gdprintonClick" class="bt">工单打印</el-button>
               <el-button type="primary" icon="edit" @click="pd_gxclhconClick" class="bt">工序产量核查</el-button>
               <el-button type="primary" icon="edit" @click="pd_lcdlistonClick" class="bt">流程单查询</el-button>
 
@@ -76,10 +76,10 @@
                       :cell-class-name="gxztgzzCellClass">
               <template v-for="(item, idx) in gxztgzztableColumns">
                 <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
-<!--                  <div v-if="['完工时间'].includes(item.prop)">-->
-<!--                    <el-input v-model="row[item.prop]"-->
-<!--                              :id="`input${idx}${$index}`" @keyup="gxztgzz_handleKeyDown($event, idx, $index, item.prop)"/>-->
-<!--                  </div>-->
+                  <!--                  <div v-if="['完工时间'].includes(item.prop)">-->
+                  <!--                    <el-input v-model="row[item.prop]"-->
+                  <!--                              :id="`input${idx}${$index}`" @keyup="gxztgzz_handleKeyDown($event, idx, $index, item.prop)"/>-->
+                  <!--                  </div>-->
                   <div v-if="['完工时间'].includes(item.prop)">
                     <el-date-picker
                         v-model="row[item.prop]"
@@ -98,6 +98,23 @@
           <!--暂停完工【弹窗】-->
           <!--暂停完工【弹窗】-->
           <!--机组调整【弹窗】-->
+          <el-dialog v-model="jizuDisplay" title="机组调整" style="width: 600px;">
+            <el-row class="">
+              <el-col :span="18">
+                <el-tree :data="jizuList"
+                         :props="{label:'label', value: 'value', chidlren: 'children'}"
+                         node-key="value"
+                         show-checkbox
+                         :default-expanded-keys="jizuList[0].value"
+                         @check="checkTreeHandle"
+                         style="margin-right: 10px; padding: 10px; border-1px solid #ececec"></el-tree>
+              </el-col>
+              <el-col :span="6">
+                <div><el-button type="primary" @click="saveJizuTiaozheng">确定</el-button></div>
+                <div style="margin-top: 20px"><el-button @click="()=>jizuDisplay = false">取消</el-button>                </div>
+              </el-col>
+            </el-row>
+          </el-dialog>
           <!--车间设备排程【弹窗】-->
           <el-dialog v-model="cjsbpclist" title="车间设备制程排序" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
             <el-button type="" @click="cjsbpcCancel">退出</el-button>
@@ -123,32 +140,32 @@
                 </el-form-item>
 
                 <el-form-item label="" prop="" style="margin-left: 25px;">
-                <el-button type="" icon="edit" disabled @click="oneditpcClick">更新排程</el-button>
+                  <el-button type="" icon="edit" disabled @click="oneditpcClick">更新排程</el-button>
                 </el-form-item>
               </div>
 
               <el-table ref="paichengRef"
-                :show-overflow-tooltip="true"
-                :row-style="{ height: '0px' }"
-                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-                :header-cell-style="{ padding: '0px' }"
-                style="width: 100%;height: 74vh" border tooltip-effect="dark"
-                highlight-current-row="true"
-                @row-click="cjpc_tableRowClick"
-                :data="paichengData" row-key="ID"
-                :cell-class-name="cjzcCellClass"
+                        :show-overflow-tooltip="true"
+                        :row-style="{ height: '0px' }"
+                        :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
+                        :header-cell-style="{ padding: '0px' }"
+                        style="width: 100%;height: 74vh" border tooltip-effect="dark"
+                        highlight-current-row="true"
+                        @row-click="cjpc_tableRowClick"
+                        :data="paichengData" row-key="ID"
+                        :cell-class-name="cjzcCellClass"
               >
                 <template v-for="(item, idx) in paichengColumns">
                   <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
                     <div v-if="['优先次序', '生产工时', '辅助工时', '班次安排', '排单备注','最早开工时间', '计划开工时间'].includes(item.prop)">
                       <el-input v-model="row[item.prop]" :clearable="false"
-                        :id="`input${idx}${$index}`"
-                        @keyup="handleKeyDown($event, idx, $index, item.prop)"
+                                :id="`input${idx}${$index}`"
+                                @keyup="handleKeyDown($event, idx, $index, item.prop)"
                       />
-<!--                      <el-date-picker v-model="row[item.prop]" v-if="['最早开工时间', '计划开工时间'].includes(item.prop)" type="datetime" :clearable="false"-->
-<!--                        :id="`input${idx}${$index}`"-->
-<!--                        @keyup="handleKeyDown($event, idx, $index , item.prop)"-->
-<!--                      />-->
+                      <!--                      <el-date-picker v-model="row[item.prop]" v-if="['最早开工时间', '计划开工时间'].includes(item.prop)" type="datetime" :clearable="false"-->
+                      <!--                        :id="`input${idx}${$index}`"-->
+                      <!--                        @keyup="handleKeyDown($event, idx, $index , item.prop)"-->
+                      <!--                      />-->
                     </div>
                     <div v-else>
                       {{ row[item.prop] }}
@@ -159,54 +176,6 @@
             </div>
 
           </el-dialog>
-          <!--工单打印【弹窗】-->
-          <el-dialog v-model="print_gdlist" title="生产工单打印" style="width: 700px;height: 400px;">
-
-            <div style="border: 1px black solid;width: 600px;">
-            <el-row>
-                <el-form-item label="工单编号:" prop="currentProcess" class="mab">
-                  <el-input v-model="print_formData['gdbh']"  @keyup.enter="print_ProductValue" placeholder="" />
-                </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="印件号:" prop="currentProcess" class="mab" label-width="70">
-                <el-input v-model="print_formData['yjh']"  @keyup.enter="print_ProductValue" placeholder="" />
-              </el-form-item>
-              <el-form-item label="终止工序号:" prop="currentProcess" class="mab">
-                <el-input v-model="print_formData['zzgxh']"  @keyup.enter="print_ProductValue" placeholder="" />
-              </el-form-item>
-            </el-row>
-              <el-row>
-                <el-form-item label="印件名称:" prop="currentProcess" class="mab">
-                  <el-input v-model="print_formData['yjmc']"  @keyup.enter="print_ProductValue" placeholder="" />
-                </el-form-item>
-              </el-row>
-            <el-row>
-              <el-form-item label="报表输出到:" prop="currentProcess">
-                <el-radio-group v-model="status" style="margin-left: 10px;">
-                  <el-radio label="显示器">显示器</el-radio>
-                  <el-radio label="打印机">打印机</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="制单:" prop="currentProcess" class="mab" label-width="70">
-                <el-input v-model="print_formData['zd']"  @keyup.enter="print_ProductValue" placeholder="" />
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="审核:" prop="currentProcess" class="mab" label-width="70">
-                <el-input v-model="print_formData['sh']"  @keyup.enter="print_ProductValue" placeholder="" />
-              </el-form-item>
-            </el-row>
-            </div>
-            <div class="dialog-footer" style="text-align: right; margin-top: 40px;">
-              <el-button @click="print_handleCancel">取消</el-button>
-              <el-button type="primary"  @click="print_handleConfirm">确认</el-button>
-            </div>
-
-          </el-dialog>
-
 
           <!--工序产量核查【弹窗】-->
           <el-dialog v-model="pd_gxclhclist" title="工序产量核查" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
@@ -296,7 +265,7 @@
                         @selection-change="handleSelectionChange" :show-overflow-tooltip="true">
 
                 <template v-for="item in tableFields[currentNode]">
-                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" />
                 </template>
               </el-table>
               <!-- 分页 -->
@@ -318,21 +287,21 @@
                 <el-table ref="multipleTable" :show-overflow-tooltip="true" :row-style="{ height: '20px' }"
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }" highlight-current-row="true"
-                          style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column align="left" label="工单编号" prop="工单编号"  width="90"/>
-                  <el-table-column align="left" label="重点工序" prop="重点工序"  width="90"/>
-                  <el-table-column align="left" label="印件工序及名称" prop="印件工序及名称"  width="500"/>
-                  <el-table-column align="left" label="工序备注" prop="工序备注"  width="150"/>
-                  <el-table-column align="left" label="机组" prop="机组"  width="80"/>
-                  <el-table-column align="left" label="小时产能" prop="小时产能"  width="90"/>
-                  <el-table-column align="left" label="生产工时" prop="生产工时"  width="90"/>
-                  <el-table-column align="left" label="辅助工时" prop="辅助工时"  width="90"/>
-                  <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="90"/>
-                  <el-table-column align="left" label="版距" prop="版距"  width="70"/>
-                  <el-table-column align="left" label="创建用户" prop="创建用户"  width="100"/>
-                  <el-table-column align="left" label="创建时间" prop="创建时间"  width="110"/>
-                  <el-table-column align="left" label="修改时间" prop="修改时间"  width="110"/>
-                  <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="90"/>
+                          style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
+                  <el-table-column align="left"  label="工单编号" prop="工单编号"  width="90"/>
+                  <el-table-column align="left"  label="重点工序" prop="重点工序"  width="90"/>
+                  <el-table-column align="left"  label="印件工序及名称" prop="印件工序及名称"  width="500"/>
+                  <el-table-column align="left"  label="工序备注" prop="工序备注"  width="150"/>
+                  <el-table-column align="left"  label="机组" prop="机组"  width="80"/>
+                  <el-table-column align="left"  label="小时产能" prop="小时产能"  width="90"/>
+                  <el-table-column align="left"  label="生产工时" prop="生产工时"  width="90"/>
+                  <el-table-column align="left"  label="辅助工时" prop="辅助工时"  width="90"/>
+                  <el-table-column align="left"  label="印刷方式" prop="印刷方式"  width="90"/>
+                  <el-table-column align="left"  label="版距" prop="版距"  width="70"/>
+                  <el-table-column align="left"  label="创建用户" prop="创建用户"  width="100"/>
+                  <el-table-column align="left"  label="创建时间" prop="创建时间"  width="110"/>
+                  <el-table-column align="left"  label="修改时间" prop="修改时间"  width="110"/>
+                  <el-table-column align="left"  label="UNIQID" prop="UNIQID"  width="90"/>
                 </el-table>
               </el-tab-pane>
 
@@ -341,23 +310,23 @@
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }" :show-overflow-tooltip="true"
                           :highlight-current-row="true"
-                          style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column align="left" label="工单编号" prop="工单编号"  width="90"/>
-                  <el-table-column align="left" label="印件号" prop="印件号"  width="70"/>
-                  <el-table-column align="left" label="印件代号" prop="印件代号"  width="100"/>
-                  <el-table-column align="left" label="印件名称" prop="印件名称"  width="240"/>
-                  <el-table-column align="left" label="纸张名称" prop="纸张名称"  width="230"/>
-                  <el-table-column align="left" label="投料规格" prop="投料规格"  width="100"/>
-                  <el-table-column align="left" label="成品数量" prop="成品数量"  width="90"/>
-                  <el-table-column align="left" label="实际投料" prop="实际投料"  width="90"/>
-                  <el-table-column align="left" label="投料单位" prop="投料单位"  width="85"/>
-                  <el-table-column align="left" label="平张投料" prop="平张投料"  width="90"/>
-                  <el-table-column align="left" label="联数" prop="联数"  width="70"/>
-                  <el-table-column align="left" label="开数" prop="开数"  width="70"/>
-                  <el-table-column align="left" label="创建用户" prop="创建用户"  width="110"/>
-                  <el-table-column align="left" label="创建时间" prop="创建时间"  width="110"/>
-                  <el-table-column align="left" label="修改时间" prop="修改时间"  width="110"/>
-                  <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="90"/>
+                          style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
+                  <el-table-column align="left"  label="工单编号" prop="工单编号"  width="90"/>
+                  <el-table-column align="left"  label="印件号" prop="印件号"  width="70"/>
+                  <el-table-column align="left"  label="印件代号" prop="印件代号"  width="100"/>
+                  <el-table-column align="left"  label="印件名称" prop="印件名称"  width="240"/>
+                  <el-table-column align="left"  label="纸张名称" prop="纸张名称"  width="230"/>
+                  <el-table-column align="left"  label="投料规格" prop="投料规格"  width="100"/>
+                  <el-table-column align="left"  label="成品数量" prop="成品数量"  width="90"/>
+                  <el-table-column align="left"  label="实际投料" prop="实际投料"  width="90"/>
+                  <el-table-column align="left"  label="投料单位" prop="投料单位"  width="85"/>
+                  <el-table-column align="left"  label="平张投料" prop="平张投料"  width="90"/>
+                  <el-table-column align="left"  label="联数" prop="联数"  width="70"/>
+                  <el-table-column align="left"  label="开数" prop="开数"  width="70"/>
+                  <el-table-column align="left"  label="创建用户" prop="创建用户"  width="110"/>
+                  <el-table-column align="left"  label="创建时间" prop="创建时间"  width="110"/>
+                  <el-table-column align="left"  label="修改时间" prop="修改时间"  width="110"/>
+                  <el-table-column align="left"  label="UNIQID" prop="UNIQID"  width="90"/>
                 </el-table>
               </el-tab-pane>
             </el-tabs>
@@ -369,9 +338,9 @@
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :header-cell-style="{ padding: '0px' }" :highlight-current-row="true"
                         :cell-class-name="pczc_planUsageCellClass"
-                        style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="bottomData" row-key="ID" @selection-change="handleSelectionChange">
+                        style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="bottomData" row-key="ID" @selection-change="handleSelectionChange">
                 <template v-for="item in bottomTableF[currentNode]">
-                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" />
                 </template>
               </el-table>
             </div>
@@ -381,7 +350,8 @@
                         :show-overflow-tooltip="true" :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :header-cell-style="{ padding: '0px' }" :highlight-current-row="true"  @row-click="chejianRowClick"
-                        style="width: 100%;height: 25vh" border tooltip-effect="dark" :data="chejianData" row-key="ID" @selection-change="PC_handleChange">
+                        style="width: 100%;height: 25vh" border tooltip-effect="dark" :data="chejianData" row-key="ID" @selection-change="PC_handleChange"
+              >
                 <el-table-column type="selection" width="30" />
                 <template v-for="item in [
                   { align:'left', title: '工单编号', prop: '工单编号', width: 85  },
@@ -409,7 +379,7 @@
                         :show-overflow-tooltip="true" :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :header-cell-style="{ padding: '0px' }" :highlight-current-row="true"  @row-click="chejianfuRowClick"
-                        style="width: 100%;height: 50vh;margin-top: 10px" border tooltip-effect="dark" :data="chejianfuData" row-key="ID" @selection-change="ZP_handleChange">
+                        style="width: 100%;height: 49vh;margin-top: 10px" border tooltip-effect="dark" :data="chejianfuData" row-key="ID" @selection-change="ZP_handleChange">
                 <el-table-column type="selection" width="30" />
                 <template v-for="item in [
                   { align:'left', title: '工单编号', prop: '工单编号', width: 85  },
@@ -449,6 +419,8 @@
 
       </layout>
     </layout>
+
+    <PrintPage ref="printPageRef" />
   </div>
 </template>
 <script>
@@ -503,10 +475,16 @@ import {
   complete,
   getOrderProcessCount,
   getOrderProcessLeft,
-  getOrderProcessRight
+  getOrderProcessRight,
+  gdzl_MachineList,
+  MachineTeamEdit
 } from "@/api/yunyin/yunying";
+
+import PrintPage from './components/print.vue'
 defineOptions({name: 'Company'})
 
+const printPageRef = ref()
+
 // =========== 左侧树侧形结构 ===========
 const sctreeData = ref([
   {
@@ -522,76 +500,76 @@ const sctreeData = ref([
 //上方表格
 const tableFields = ref({
   "计划中": [
-      { title:'获取状态', prop: 'statusColumn', width: 80, align:'center'},
-      { title:'生产分类', prop: '生产分类', width: 80, align:'left', },
-      { title: '工单编号', prop: '工单编号', width: 80, align:'center', },
-      { title: '产品代号', prop: '产品代号', width: 90, align:'center', },
-      { title: '产品名称', prop: '产品名称', width: 280, align:'left', },
-      { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-      { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-      { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-      { title: '计量单位', prop: '计量单位', width: 80, align:'center', },
-      { title: '客户名称', prop: '客户名称', width: 200, align:'left', },
-      { title: '客户编号', prop: '客户编号', width: 80, align:'center', },
-      { title: '备注', prop: '备注', width: 230, align:'left', },
-      { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
-      { title: '创建用户', prop: '创建用户', width: 110, align:'left', },
-      { title: '创建时间', prop: '创建时间', width: 110, align:'left', },
-      { title: '修改时间', prop: '修改时间', width: 110, align:'left', },
-      { title: 'UNIQID', prop: 'UNIQID', width: 80  , align:'left', },
-      { title: '投料率', prop: '投料率', width: 100, align:'left', },
-      { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
-      ],
+    { title:'获取状态', prop: 'statusColumn', width: 80, align:'center'},
+    { title:'生产分类', prop: '生产分类', width: 80, align:'left', },
+    { title: '工单编号', prop: '工单编号', width: 80, align:'center', },
+    { title: '产品代号', prop: '产品代号', width: 90, align:'center', },
+    { title: '产品名称', prop: '产品名称', width: 280, align:'left', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
+    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
+    { title: '计量单位', prop: '计量单位', width: 80, align:'center', },
+    { title: '客户名称', prop: '客户名称', width: 200, align:'left', },
+    { title: '客户编号', prop: '客户编号', width: 80, align:'center', },
+    { title: '备注', prop: '备注', width: 230, align:'left', },
+    { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
+    { title: '创建用户', prop: '创建用户', width: 110, align:'left', },
+    { title: '创建时间', prop: '创建时间', width: 110, align:'left', },
+    { title: '修改时间', prop: '修改时间', width: 110, align:'left', },
+    { title: 'UNIQID', prop: 'UNIQID', width: 80  , align:'left', },
+    { title: '投料率', prop: '投料率', width: 100, align:'left', },
+    { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
+  ],
   "排程中": [
-      // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-      { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-      { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
-      { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-      { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-      { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-      { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-      { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-      { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
-      // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-      { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
-      { title: '客户名称', prop: '客户名称', width: 230, align:'left', },
-      { title: '创建用户', prop: '创建用户', width: 120, align:'left', },
-      // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
-      { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
-      ],
+    // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
+    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
+    { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
+    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
+    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
+    { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
+    { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
+    { title: '客户名称', prop: '客户名称', width: 230, align:'left', },
+    { title: '创建用户', prop: '创建用户', width: 120, align:'left', },
+    // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
+    { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
+  ],
   "制程中": [
-        // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-        { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-        { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
-        { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-        { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-        { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-        { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-        { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-        { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
-        // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-        { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
-        { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
-        { title: '客户料号', prop: '客户料号', width: 160, align:'left', },
-        // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
-        { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
-      ],
+    // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
+    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
+    { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
+    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
+    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
+    { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
+    { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
+    { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
+    { title: '客户料号', prop: '客户料号', width: 160, align:'left', },
+    // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
+    { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
+  ],
   "已完工": [
-        { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-        { title: '产品代号', prop: '产品代号', width: 110, align:'left', },
-        { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-        { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-        { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-        { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-        { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-        { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
-        { title: '客户编号', prop: '客户编号', width: 80, align:'left', },
-        { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
-        { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
-        // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-        { title: 'GDUID', prop: 'GDUID', width: 80, align:'left', },
-      ]
-    })
+    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
+    { title: '产品代号', prop: '产品代号', width: 110, align:'left', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
+    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
+    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
+    { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
+    { title: '客户编号', prop: '客户编号', width: 80, align:'left', },
+    { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
+    { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
+    { title: 'GDUID', prop: 'GDUID', width: 80, align:'left', },
+  ]
+})
 //排程中、制程中下方表格列表
 const bottomTableF = ref({
   "排程中": [
@@ -635,7 +613,7 @@ const bottomTableF = ref({
     { title:'排单备注', prop: '排单备注', width: 120, align:'left', },
     { title:'工序完工', prop: '工序完工', width: 160, align:'left', },
     { title:'UNIQID', prop: 'UNIQID', width: 120, align:'left', },
-      ],
+  ],
 })
 //左侧左边栏
 const treeData = ref([]);
@@ -835,13 +813,13 @@ const onSubmit = () => {
     return false;
   }
   if(!_machine.value){
-      if (currentNode.value === '计划中' || currentNode.value === '已完工') {
-        _Project();
-      } else if (currentNode.value === '排程中' || currentNode.value === '制程中') {
-        _Schedule();
-      } else {
-        ElMessage({ type: 'warning', message: '查询不到具体条件的工单' });
-      }
+    if (currentNode.value === '计划中' || currentNode.value === '已完工') {
+      _Project();
+    } else if (currentNode.value === '排程中' || currentNode.value === '制程中') {
+      _Schedule();
+    } else {
+      ElMessage({ type: 'warning', message: '查询不到具体条件的工单' });
+    }
   }else{
     _MachineWorkOrderList();
   }
@@ -918,20 +896,20 @@ const onztwgClick = async () => {
   if(_ZC_gdbh.value == null || _ZC_gdbh.value == ''){
     ElMessage({type: 'warning', message: '请勾选制程中工单'})
   }else{
-      let params = {}
-      params.workOrder = _ZC_gdbh.value;
-      params.machine = _machine.value;
-      params.printCode = _ZC_yjno.value;
-      params.processCode =  _ZC_gxh.value;
-      const ProductionSchedulingAdd_stop = await ProductionSchedulingPause(params);
-      if (ProductionSchedulingAdd_stop.code === 0) {
-        const pc_zc_table = await MachineWorkOrderList({machine:_machine.value});
-        chejianData.value = pc_zc_table.data['排程'];
-        chejianfuData.value = pc_zc_table.data['制程'];
-        ElMessage({type: 'success',message: '暂停排产 更新成功'});
-      } else {
-        ElMessage({ type: 'error',message: '更新失败'})
-      }
+    let params = {}
+    params.workOrder = _ZC_gdbh.value;
+    params.machine = _machine.value;
+    params.printCode = _ZC_yjno.value;
+    params.processCode =  _ZC_gxh.value;
+    const ProductionSchedulingAdd_stop = await ProductionSchedulingPause(params);
+    if (ProductionSchedulingAdd_stop.code === 0) {
+      const pc_zc_table = await MachineWorkOrderList({machine:_machine.value});
+      chejianData.value = pc_zc_table.data['排程'];
+      chejianfuData.value = pc_zc_table.data['制程'];
+      ElMessage({type: 'success',message: '暂停排产 更新成功'});
+    } else {
+      ElMessage({ type: 'error',message: '更新失败'})
+    }
   }
 };
 //工序完工按钮
@@ -960,6 +938,7 @@ const _PC_gxh = ref(null)
 const _PC_yjno = ref(null)
 const _PC_gdbh = ref(null)
 const _PC_xscn = ref(null)
+const jitaiArr = ref([])
 const PC_handleChange = (arr) => {
   let gxh = arr.map((val) => val['gxh']).join(",");
   let yjno = arr.map((val) => val['yjno']).join(",");
@@ -969,6 +948,7 @@ const PC_handleChange = (arr) => {
   _PC_yjno.value = yjno;
   _PC_gdbh.value = str;
   _PC_xscn.value = xscn;
+  jitaiArr.value = arr
 }
 //加入制程【下面到上面】
 const _ZC_gxh = ref(null)
@@ -986,47 +966,6 @@ const ZP_handleChange = (arr) => {
   _ZC_xscn.value = xscn;
 }
 
-
-//==============工单打印=============
-const print_gdlist = ref(false);
-const print_formData = ref({
-  gdbh: '',
-  yjh: '',
-  zzgxh: '',
-  yjmc: '',
-  zd: '',
-  sh: '',
-  outputType: ''
-});
-//工单打印按钮
-const pd_gdprintonClick = async () => {
-  console.log(213)
-  // print_formData['gdbh'] = _Gd_gdbh.value;
-  print_formData['gdbh'] = '2310777';
-  print_gdlist.value = true;
-}
-//工单打印回车
-const print_ProductValue = async () => {
-
-}
-//工单打印确定
-const print_handleConfirm = async () => {
-  // print_gdlist.value = false;
-}
-//工单打印取消
-const print_handleCancel = async () => {
-  print_gdlist.value = false;
-}
-//调用打印接口
-const _PrintJobOrder = async () => {
-  const print_PrintJobOrder = await PrintJobOrder();
-  console.log(print_PrintJobOrder)
-  print_gdlist.value = false;
-}
-
-
-
-
 //=========工序产量核查===========
 const pd_gxclhclist = ref(false);
 const gxclhc_Data = ref([]);
@@ -1077,9 +1016,9 @@ const _getOrderProcessCount = async () => {
   const getOrderProcessCount_list = await getOrderProcessCount({order:order});
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零
-      const formattedYjno = item.Gy0_yjno.length === 1 ? `0${item.Gy0_yjno}` : item.Gy0_yjno;
-      const formattedGxh = item.Gy0_gxh.length === 1 ? `0${item.Gy0_gxh}` : item.Gy0_gxh;
-      const concatenatedValue = `${formattedYjno}-${formattedGxh} ${item.Gy0_gxmc}`;
+    const formattedYjno = item.Gy0_yjno.length === 1 ? `0${item.Gy0_yjno}` : item.Gy0_yjno;
+    const formattedGxh = item.Gy0_gxh.length === 1 ? `0${item.Gy0_gxh}` : item.Gy0_gxh;
+    const concatenatedValue = `${formattedYjno}-${formattedGxh} ${item.Gy0_gxmc}`;
     return {
       ...item,
       concatenatedData: concatenatedValue, // 使用新属性名
@@ -1225,11 +1164,54 @@ const gxztgzzCancel = () => {
   gxztgzzlist.value = false;
 };
 
+
 //机组调整按钮
+const jizuDisplay = ref(false)
+const jizuList = ref([])
+const jizuSelection = ref([])
 const onjztzClick = async () => {
-
+  if (jitaiArr.value.length === 0) {
+    ElMessage.warning('请选择数据')
+    return
+  }
+  jizuList.value = [
+    {
+      label: jitaiArr.value[0].车间名称,
+      value: jitaiArr.value[0].车间名称,
+      disabled: true,
+      children: []
+    }
+  ]
+  const res = await gdzl_MachineList({address:jitaiArr.value[0].车间名称})
+  jizuList.value[0].children = res.data.map(item => {
+    return { label: item, value: item.match(/^\w+#/)[0]}
+  })
+  jizuDisplay.value = true
 };
 
+const checkTreeHandle = (data, tree) => {
+  jizuSelection.value = tree.checkedNodes
+}
+
+const saveJizuTiaozheng = async () => {
+  if (jizuSelection.value.length === 0) {
+    ElMessage.warning('请先勾选机组')
+    return
+  }
+  const uid = jitaiArr.value.map(item => item.GYUID).join(' ')
+  const jizu = jizuSelection.value.map(item=>item.value).join(' ')
+  try {
+    const res = await MachineTeamEdit({UniqId: uid, machine: jizu})
+    if (res.code == 0) ElMessage.success('调整成功')
+    const  pc_zc_table = await MachineWorkOrderList({machine:_machine.value});
+    chejianData.value = pc_zc_table.data['排程'];
+    chejianfuData.value = pc_zc_table.data['制程'];
+    jizuDisplay.value = false
+  } catch(e) {
+    ElMessage.error(e)
+  }
+}
+
 //=============引用实际参数================
 const pd_yysjcsonClick = () => {
   if(_Gd_gdbh.value == null){
@@ -1368,6 +1350,11 @@ const cjsbpcformData = reactive({
   banci: '',
   isBanciSelected: false,
 });
+
+const pd_gdprintonClick = () => {
+  printPageRef.value.open(_Gd_gdbh.value)
+}
+
 //车间设备排程【按钮】
 const oncjsbpcClick = () => {
   cjsbpcformData['sbdh'] = _machine.value;
@@ -1519,13 +1506,6 @@ const pd_lcdCancel = async () => {
 }
 
 
-
-
-
-
-
-
-
 //颜色
 //工序状态更正颜色
 const gxztgzzCellClass = ({row, column, rowIndex, columnIndex}) =>{
@@ -1553,6 +1533,14 @@ const pczc_planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
     return 'pczccolor-column-lan';
   }
 }
+
+
+// 右键勾选
+const rowContextMenu = (row) => {
+  // console.log(row)
+
+  return false
+}
 </script>
 <style scoped>
 /* 选中某行背景粉色 */

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 1051 - 988
src/view/yunyin/shengchanguanli/gongdanziliao.vue


+ 269 - 62
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -10,6 +10,7 @@
 			<el-button type="primary" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" @click="onstatus" >设置机台状态</el-button>
 			<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
+			<el-button type="primary" @click="onClear" >换型清场</el-button>
 		</header>
     <el-container>
       <el-aside width="200px">
@@ -153,16 +154,16 @@
                                     style="width: 100%;height: 330px" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
             <!--                <el-table-column type="selection" width="55" />-->
                             <!-- <el-table-column align="left" label="选择" prop="bh"  width="80"/> -->
-                            <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="145" />
-							<el-table-column align="left" label="印件资料" prop="印件资料" width="240" />
-                            <el-table-column align="left" label="工序名称" prop="工序名称" width="100" />
-                            <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="130"/>
-                            <el-table-column align="left" label="装版时数" prop="装版时数" width="85"/>
-                            <el-table-column align="left" label="工序产能" prop="工序产能" width="85"/>
-                            <el-table-column align="left" label="计划工时" prop="计划工时" width="85"/>
-                            <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="210" />
-                            <el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
-                            <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
+                            <el-table-column align="left" sortable label="工单编号|质量信息" prop="工单编号|质量信息" width="145" />
+							<el-table-column align="left" sortable label="印件资料" prop="印件资料" width="240" />
+                            <el-table-column align="left" sortable label="工序名称" prop="工序名称" width="100" />
+                            <el-table-column align="left" sortable label="计划产量/已完成" prop="计划产量/已完成" width="130"/>
+                            <el-table-column align="left" sortable label="装版时数" prop="装版时数" width="85"/>
+                            <el-table-column align="left" sortable label="工序产能" prop="工序产能" width="85"/>
+                            <el-table-column align="left" sortable label="计划工时" prop="计划工时" width="85"/>
+                            <el-table-column align="left" sortable label="计划生产时段" prop="计划生产时段" width="210" />
+                            <el-table-column align="left" sortable label="排产备注" prop="排产备注" width="100" />
+                            <el-table-column align="left" sortable label="产品名称" prop="产品名称" width="240" />
                           </el-table>
                         </el-tab-pane>
             
@@ -179,17 +180,17 @@
                                     @row-click="clickybupdate">
             <!--                <el-table-column type="selection" width="55" />-->
                             <!-- <el-table-column align="left" label="选择" prop="方案"  width="70"/> -->
-                            <el-table-column align="left" label="班组号" prop="班组号" width="70" />
-                            <el-table-column align="left" label="组员1" prop="0" width="200" />
-                            <el-table-column align="left" label="组员2" prop="1" width="200" />
-                            <el-table-column align="left" label="组员3" prop="2" width="200" />
-                            <el-table-column align="left" label="组员4" prop="3" width="200" />
-                            <el-table-column align="left" label="组员5" prop="4" width="200" />
-                            <el-table-column align="left" label="组员6" prop="5" width="70" />
-                            <el-table-column align="left" label="组员7" prop="6" width="70" />
-                            <el-table-column align="left" label="组员8" prop="7" width="70" />
-                            <el-table-column align="left" label="组员9" prop="8" width="70" />
-                            <el-table-column align="left" label="组员10" prop="9_正品版" width="70" />
+                            <el-table-column align="left" sortable label="班组号" prop="班组号" width="70" />
+                            <el-table-column align="left" sortable label="组员1" prop="0" width="200" />
+                            <el-table-column align="left" sortable label="组员2" prop="1" width="200" />
+                            <el-table-column align="left" sortable label="组员3" prop="2" width="200" />
+                            <el-table-column align="left" sortable label="组员4" prop="3" width="200" />
+                            <el-table-column align="left" sortable label="组员5" prop="4" width="200" />
+                            <el-table-column align="left" sortable label="组员6" prop="5" width="70" />
+                            <el-table-column align="left" sortable label="组员7" prop="6" width="70" />
+                            <el-table-column align="left" sortable label="组员8" prop="7" width="70" />
+                            <el-table-column align="left" sortable label="组员9" prop="8" width="70" />
+                            <el-table-column align="left" sortable label="组员10" prop="9_正品版" width="70" />
                           </el-table>
                         </el-tab-pane>
             
@@ -204,27 +205,27 @@
                                   style="width: 100%;height: 400px" border tooltip-effect="dark" :data="CLMXData" row-key="ID" @selection-change="handleSelectionChange"
                                   >
             <!--              <el-table-column type="selection" width="55" />-->
-                          <el-table-column align="left" label="生产时段" prop="生产时间段"  width="180"/>
-                          <el-table-column align="left" label="工单编号" prop="工单编号" width="85" />
-                          <el-table-column align="left" label="产品名称" prop="产品名称" width="150" />
-                          <el-table-column align="left" label="印件及工序" prop="印件及工序" width="320"/>
-                          <el-table-column align="left" label="标牌号" prop="标牌号"  width="80"/>
-                          <el-table-column align="left" label="产量" prop="产量" width="100"/>
-                          <el-table-column align="left" label="制程废品" prop="制程废品" width="100" />
-                          <el-table-column align="left" label="制程次品" prop="制程次品" width="100" />
-                          <el-table-column align="left" label="前工序废" prop="前工序废" width="100" />
-						  <el-table-column align="left" label="来料异常" prop="来料异常"  width="100"/>
-						  <el-table-column align="left" label="装版工时" prop="装版工时" width="100" />
-						  <el-table-column align="left" label="保养工时" prop="保养工时" width="100" />
-						  <el-table-column align="left" label="打样工时" prop="打样工时" width="100"/>
-						  <el-table-column align="left" label="异常停机工时" prop="异常停机工时"  width="120"/>
-						  <el-table-column align="left" label="通电工时" prop="通电工时" width="100"/>
-						  <el-table-column align="left" label="码开始行" prop="码开始行" width="100" />
-						  <el-table-column align="left" label="码结束行" prop="码结束行" width="100" />
-						  <el-table-column align="left" label="码包" prop="码包" width="100" />
-						  <el-table-column align="left" label="主电表" prop="主电表"  width="100"/>
-						  <el-table-column align="left" label="辅电表" prop="辅电表" width="100" />
-						  <el-table-column align="left" label="色度数" prop="色度数" width="100" />
+                          <el-table-column align="left" sortable label="生产时段" prop="生产时间段"  width="180"/>
+                          <el-table-column align="left" sortable label="工单编号" prop="工单编号" width="85" />
+                          <el-table-column align="left" sortable label="产品名称" prop="产品名称" width="150" />
+                          <el-table-column align="left" sortable label="印件及工序" prop="印件及工序" width="320"/>
+                          <el-table-column align="left" sortable label="标牌号" prop="标牌号"  width="80"/>
+                          <el-table-column align="left" sortable label="产量" prop="产量" width="100"/>
+                          <el-table-column align="left" sortable label="制程废品" prop="制程废品" width="100" />
+                          <el-table-column align="left" sortable label="制程次品" prop="制程次品" width="100" />
+                          <el-table-column align="left" sortable label="前工序废" prop="前工序废" width="100" />
+						  <el-table-column align="left" sortable label="来料异常" prop="来料异常"  width="100"/>
+						  <el-table-column align="left" sortable  label="装版工时" prop="装版工时" width="100" />
+						  <el-table-column align="left" sortable  label="保养工时" prop="保养工时" width="100" />
+						  <el-table-column align="left" sortable  label="打样工时" prop="打样工时" width="100"/>
+						  <el-table-column align="left"  sortable label="异常停机工时" prop="异常停机工时"  width="120"/>
+						  <el-table-column align="left" sortable  label="通电工时" prop="通电工时" width="100"/>
+						  <el-table-column align="left" sortable  label="码开始行" prop="码开始行" width="100" />
+						  <el-table-column align="left" sortable  label="码结束行" prop="码结束行" width="100" />
+						  <el-table-column align="left" sortable  label="码包" prop="码包" width="100" />
+						  <el-table-column align="left" sortable  label="主电表" prop="主电表"  width="100"/>
+						  <el-table-column align="left" sortable  label="辅电表" prop="辅电表" width="100" />
+						  <el-table-column align="left" sortable  label="色度数" prop="色度数" width="100" />
                         </el-table>
                         </el-tab-pane>
             
@@ -237,10 +238,10 @@
                                   highlight-current-row="true"
                                   style="width: 100%;height: 400px" border tooltip-effect="dark" :data="JYData" row-key="ID" @selection-change="handleSelectionChange">
             <!--              <el-table-column type="selection" width="55" />-->
-                          <el-table-column align="left" label="工单编号" prop="工单编号"  width="85"/>
-                          <el-table-column align="left" label="印件号" prop="印件号" width="70" />
-                          <el-table-column align="left" label="工序名称" prop="工序名称" width="85" />
-                          <el-table-column align="left" label="检验项目" prop="检验项目" width="85"/>
+                          <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="85"/>
+                          <el-table-column align="left" sortable label="印件号" prop="印件号" width="70" />
+                          <el-table-column align="left" sortable label="工序名称" prop="工序名称" width="85" />
+                          <el-table-column align="left" sortable label="检验项目" prop="检验项目" width="85"/>
                           <el-table-column
                              v-for="time in columnNames"
                              :key="time"
@@ -1150,6 +1151,153 @@
 					</div>
 		</el-dialog>
 		
+		
+		<el-dialog
+		  v-model="huanxingVisible"
+		  title="换型清场"
+		  destroy-on-close
+		  width="1100px"
+		  style="height: 78%;"
+		>
+		  <div style="display: flex;">
+		    <div style="flex: 0.1;">
+		      <el-aside width="180px" style="margin: 0;">
+		        <div class="JKWTree-tree" style="height: 55vh; border-right: 1px solid #ebeef5;">		          
+		          <el-tree :data="huanxingtreeData" :props="defaultProps" highlight-current="true"
+		            @node-click="huanxingNodeClick"></el-tree>
+		        </div>
+		      </el-aside>
+		    </div>
+		    <div v-if="huanxingstatus" style="flex: 0; margin: 0;">
+		      <el-tabs v-model="activNames" type="card" @tab-click="handleClick">
+		        <el-tab-pane label="换型清场明细信息"  @click="showTable('换型清场明细信息')"  name="first">
+		          
+		        </el-tab-pane>
+		      
+		        <el-tab-pane label="当前设备换型记录" style="width: 110%;"  @click="showTable('当前设备换型记录')"  name="second">
+		          <el-table
+		            tooltip-effect="dark"
+		            :data="huanxingselectData"
+		            row-key="ID" 
+		            highlight-current-row="true"
+		          	:show-overflow-tooltip="true"
+		            border  @row-click="dianjianhandle"
+		            style="width:30%; height:50vh;"
+		            @row-dblclick="handleSelectClick"
+		            :row-class-name="rowClassName"
+		          >
+		            <el-table-column
+		              prop="日期"
+		              label="日期"
+		              width="160"
+		            />
+		            <el-table-column
+		              prop="机台编号"
+		              label="机台编号"
+		              width="90"
+		            />
+					<el-table-column
+					  prop="班组"
+					  label="班组"
+					  width="70"
+					/>
+					<el-table-column
+					  prop="工单编号A"
+					  label="工单编号A"
+					  width="95"
+					/>
+					<el-table-column
+					  prop="印件名称A"
+					  label="印件名称A"
+					  width="130"
+					/>
+					<el-table-column
+					  prop="印件工序A"
+					  label="印件工序A"
+					  width="150"
+					/>
+					<el-table-column
+					  prop="码包号A"
+					  label="码包号A"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="工单编号B"
+					  label="工单编号B"
+					  width="100"
+					/>
+					<el-table-column
+					  prop="印件名称B"
+					  label="印件名称B"
+					  width="100"
+					/>
+					<el-table-column
+					  prop="印件工序B"
+					  label="印件工序B"
+					  width="150"
+					/>
+					<el-table-column
+					  prop="码包号B"
+					  label="码包号B"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="清场项目A"
+					  label="菲林_标样_签样品_留样品"
+					  width="190"
+					/>
+					<el-table-column
+					  prop="清场项目B"
+					  label="版材_纸张_电化铝_油墨"
+					  width="190"
+					/>
+					<el-table-column
+					  prop="清场项目C"
+					  label="过版纸_废品_次品"
+					  width="170"
+					/>
+					<el-table-column
+					  prop="清场项目D"
+					  label="半成品_成品_零头"
+					  width="170"
+					/>
+					<el-table-column
+					  prop="清场项目E"
+					  label="操作台桌面_抽屉_地面"
+					  width="180"
+					/>
+					<el-table-column
+					  prop="机长"
+					  label="机长"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="班长"
+					  label="带班长"
+					  width="80"
+					/>
+					<el-table-column
+					  prop="质量巡查员"
+					  label="质量巡查员"
+					  width="100"
+					/>
+					<el-table-column
+					  prop="创建时间"
+					  label="创建时间"
+					  width="120"
+					/>
+					<el-table-column
+					  prop="UNIQID"
+					  label="UNIQID"
+					  width="80"
+					/>
+		          </el-table>
+		        </el-tab-pane>
+		      </el-tabs>
+		    </div>
+		  </div>
+		</el-dialog>
+		
 		<Shebeizhuangtai
 		  v-if="dialogSbyxgl"
 		  v-model="dialogSbyxgl"
@@ -1203,7 +1351,9 @@ import {
   facilityPrintDetail,
   ProcessInspectionRecordsItem,
    MachineDetailList,
-   ComplaintRecord
+   ComplaintRecord,
+   remodelGetTab,
+   ModelChangeRecord
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -1300,7 +1450,7 @@ const FacilityProduction = async () => {
 				   })
 		}
 		// console.log(formData.value.工单编号)
-	    FacilityTeam(JTMC)
+		
   }
   // getTableData()
 }
@@ -1317,12 +1467,15 @@ const FacilityWorklist = async () => {
 	if (res.code === 0) {
 	    selectData.value = res.data
 	}
+	console.log('22222222')
+	FacilityTeam(JTMC)
   }
 }
 //检验记录
 const InspectionRecord = async () => {
 	console.log(formData.value.班组)
-  const response = await inspectionRecord({machine:JTMC,Gd_gdbh:formData.value.工单编号,team:formData.value.班组});
+  // const response = await inspectionRecord({machine:JTMC,Gd_gdbh:formData.value.工单编号,team:formData.value.班组});
+  const response = await inspectionRecord({machine:'JY01#',Gd_gdbh:'2311114',team:'A班'});
   // const response = await inspectionRecord({machine:'JY01#',Gd_gdbh:'2312191',team:'A班'});
   console.log(response)
   if(response.code==0){
@@ -1369,7 +1522,8 @@ const FacilityDetail = async () => {
 	console.log(formData.value.工单编号)
 	console.log('123123')
 	console.log(formData.value.班组)
-  const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: formData.value.班组 });
+  // const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: formData.value.班组 });
+   const response = await facilityDetail({ machine: 'JY01#', Gd_gdbh: '2312191', team: 'A班' });
   // const response = await facilityDetail({ machine: JTMC, Gd_gdbh: '2311114', team:'A班' });
   if (response.code === 0) {
 	console.log('123123')
@@ -1624,18 +1778,23 @@ function oncomplaints() {
 }
 // 客诉记录表格填充
 const Complaints = async() => {
-	console.log(sbzyData[0].产品代号)
-	console.log(sbzyData[0].产品代号)
-	console.log(sbzyData[0].产品代号)
-    const res = await ComplaintRecord({productCode :cpcode.value})
-    if (res.code === 0) {
-		// console.log(res)
-		complaintsData.splice(0, complaintsData.length, ...res.data);
-		console.log(complaintsData);
-		console.log(complaintsData[0].产品编号)
-		selectedRowData.value=complaintsData[0]
-		console.log(selectedRowData)
-		complaintsShow.value=true
+	// console.log(sbzyData[0].产品代号)
+	// console.log(sbzyData[0].产品代号)
+	// console.log(sbzyData[0].产品代号)
+    // const res = await ComplaintRecord({productCode :cpcode.value})
+	const res = await ComplaintRecord({productCode :'100601011'})
+    if (res.code === 0) {			
+		if(res.data==null){
+			console.log('暂无客诉记录')
+		}else{
+			complaintsData.splice(0, complaintsData.length, ...res.data);
+			console.log(complaintsData);
+			console.log(complaintsData[0].产品编号)
+			selectedRowData.value=complaintsData[0]
+			console.log(selectedRowData)
+			complaintsShow.value=true
+		}
+		
     }
 }
 const selectedRowData = ref({
@@ -1646,6 +1805,54 @@ const complaintshandle = (val, row) => {
 	console.log(val)
 	selectedRowData.value=val
 };
+//换型清场
+const huanxingVisible = ref(false)
+const huanxingtreeData=ref([])
+const huanxingselectData = ref([])
+const huanxingstatus=ref(false)
+const activNames=ref('first')
+function onClear() {
+	huanxingVisible.value=true
+	 RemodelGetTab()
+}
+const RemodelGetTab = async() => {
+  const response = await remodelGetTab()
+  let arr=[]
+  if (response.code === 0) {
+	  for(let key in response.data){
+		  if(response.data[key][0]){
+			  let children =[]
+			  for (let i = 0; i < response.data[key].length; i++) {
+				  children.push({label:response.data[key][i],machine:key})
+			  }
+			  arr.push({
+				  label:key,
+				  children:children
+			  })
+			  console.log(response.data[key].length)
+		  }else{
+			 arr.push({label:key}) 
+		  }
+	  }
+	  huanxingtreeData.value=arr
+  }
+}
+
+const huanxingNodeClick = (node) => {
+  //存放当前节点的nodeId
+  if(node.machine){
+	  huanxingstatus.value=true
+	  modelChangeRecord(node.machine)
+  }else{
+	  console.log('2')
+  }
+}
+const modelChangeRecord = async (val) => {
+  const response = await ModelChangeRecord({machine:val});
+  if (response.code === 0) {
+	huanxingselectData.value=response.data
+  }
+}
 import { nextTick } from 'vue';
 //设备点检
 function ondianjian() {

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно