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

package.json

@@ -29,6 +29,7 @@
         "qs": "^6.11.2",
         "screenfull": "^6.0.2",
         "spark-md5": "^3.0.2",
+        "splitpanes": "^3.1.5",
         "tailwindcss": "^3.3.3",
         "vue": "^3.3.4",
         "vue-contextmenu": "^1.5.11",
@@ -36,6 +37,7 @@
         "vue-router": "^4.2.4"
     },
     "devDependencies": {
+        "@arco-design/web-vue": "^2.54.3",
         "@babel/eslint-parser": "^7.22.9",
         "@vitejs/plugin-legacy": "^4.1.0",
         "@vitejs/plugin-vue": "^4.2.3",

src/api/jixiaoguanli/jitairibaobiao.js

@@ -404,6 +404,22 @@ export const  dailygetAllList= (params) => {
 	params
   })
 }
+//每日工资统计
+export const  statistics= (params) => {
+  return service({
+    url:'/mes_server/employee_daily_salary/statistics',
+    method: 'get',
+	params
+  })
+}
+//月度计时工资调整
+export const  wageAdjustment= (params) => {
+  return service({
+    url:'/mes_server/employee_daily_salary/wageAdjustment',
+    method: 'get',
+	params
+  })
+}
 //员工计件明细
 export const  getPieceDetail= (params) => {
   return service({
@@ -534,6 +550,30 @@ export const  facilityWorklist= (params) => {
 	params
   })
 }
+//印件、工序、完成数量
+export const  facilityProcedure= (params) => {
+  return service({
+    url:'/mes_server/facility/Procedure',
+    method: 'get',
+	params
+  })
+}
+//机台印版领用->左侧菜单
+export const  facilityPrintGetTab= (params) => {
+  return service({
+    url:'/mes_server/facility/PrintGetTab',
+    method: 'get',
+	params
+  })
+}
+//机台印版领用->右侧详情
+export const  facilityPrintDetail= (params) => {
+  return service({
+    url:'/mes_server/facility/PrintDetail',
+    method: 'get',
+	params
+  })
+}
 //当前生产订单
 export const  facilityProduction= (params) => {
   return service({
@@ -607,7 +647,7 @@ export const  relatedList= (params) => {
 	params
   })
 }
-//关联工资核算上侧列表
+//定位
 export const  relatedsearch= (params) => {
   return service({
     url:'/mes_server/related_salary_accounting/search',
@@ -615,6 +655,22 @@ export const  relatedsearch= (params) => {
 	params
   })
 }
+//关联工资核算下侧列表
+export const  relatedAllList= (params) => {
+  return service({
+    url:'/mes_server/related_salary_accounting/getAllList',
+    method: 'get',
+	params
+  })
+}
+//关联工资设置
+export const  setting= (params) => {
+  return service({
+    url:'/mes_server/related_salary_accounting/setting',
+    method: 'get',
+	params
+  })
+}
 
 //车间报工
 //获取机台生产信息
@@ -672,4 +728,28 @@ export const submitDailyProduction = (params) => {
     method: 'post',
     params
   })
+}
+//提交巡查记录
+export const submitPatrolRecord = (params) => {
+  return service({
+    url:'/mes_server/reporting_work/submitPatrolRecord',
+    method: 'post',
+    params
+  })
+}
+//设置机台状态
+export const setMachineStatus = (params) => {
+  return service({
+    url:'/mes_server/reporting_work/setMachineStatus',
+    method: 'post',
+    params
+  })
+}
+//获取机台编号
+export const getMachineMac = (params) => {
+  return service({
+    url:'/mes_server/reporting_work/getMachineMac',
+    method: 'get',
+    params
+  })
 }

src/api/yunyin/yunying.js

@@ -17,6 +17,14 @@ export const getStaffList = (params) => {
         params
     })
 }
+// 3.获取员工资料
+export const getStaffInfo = (params) => {
+    return service({
+        url: '/mes_server/staff/getStaffInfo',
+        method: 'get',
+        params
+    })
+}
 //3.修改员工资料
 export const ygjbzledit = (data) => {
     return service({
@@ -291,15 +299,51 @@ export const U8workOrder = (params) => {
     })
 }
 
+//印件资料修改
+export const PrintedEdit = (data) => {
+    return service({
+        url: '/mes_server/work_order/PrintedEdit',
+        method: 'post',
+        data
+    })
+}
+
+//工艺资料修改
+export const ProcessDetailEdit = (data) => {
+    return service({
+        url: '/mes_server/work_order/ProcessDetailEdit',
+        method: 'post',
+        data
+    })
+}
+
+//打印作业通知单
+export const PrintJobOrder = (data) => {
+    return service({
+        url: '/mes_server/work_order/PrintJobOrder',
+        method: 'post',
+        data
+    })
+}
+
+//工艺资料编辑->机台列表获取
+export const gdzl_MachineList = (params) => {
+    return service({
+        url: '/mes_server/work_order/MachineList',
+        method: 'get',
+        params
+    })
+}
+
 
 
 /**工单生产排单(排产管理)*/
 //计划中工单
-export const Project = (data) => {
+export const Project = (params) => {
     return service({
         url: '/mes_server/manufacture/Project',
         method: 'get',
-        data
+        params
     })
 }
 //计划中工单->工艺资料
@@ -327,27 +371,27 @@ export const workbench = (data) => {
     })
 }
 //生产中工单工序接口
-export const scheduleProcess = (data) => {
+export const scheduleProcess = (params) => {
     return service({
         url: '/mes_server/manufacture/scheduleProcess',
         method: 'get',
-        data
+        params
     })
 }
 //查找工单
-export const WorkOrderSearch = (data) => {
+export const WorkOrderSearch = (params) => {
     return service({
         url: '/mes_server/manufacture/WorkOrderSearch',
         method: 'get',
-        data
+        params
     })
 }
 //工序完工
-export const complete = (data) => {
+export const complete = (params) => {
     return service({
         url: '/mes_server/manufacture/complete',
         method: 'get',
-        data
+        params
     })
 }
 //加入排产
@@ -383,11 +427,11 @@ export const ScheduleSelection = (data) => {
     })
 }
 //车间设备排程->数据展示
-export const EquipmentScheduling = (data) => {
+export const EquipmentScheduling = (params) => {
     return service({
         url: '/mes_server/manufacture/EquipmentScheduling',
         method: 'get',
-        data
+        params
     })
 }
 //车间设备排程->数据编辑
@@ -399,6 +443,15 @@ export const EquipmentSchedulingEdit = (data) => {
     })
 }
 
+//排程/制程中工单
+export const Schedule = (params) => {
+    return service({
+        url: '/mes_server/Manufacture/Schedule',
+        method: 'get',
+        params
+    })
+}
+
 //工单状态设置
 export const StatusEdit = (data) => {
     return service({
@@ -408,6 +461,24 @@ export const StatusEdit = (data) => {
     })
 }
 
+//工序状态更正->编辑
+export const ProcessStatusCorrectionEdit = (data) => {
+    return service({
+        url: '/mes_server/manufacture/ProcessStatusCorrectionEdit',
+        method: 'post',
+        data
+    })
+}
+
+//机台制程/排程工单列表
+export const MachineWorkOrderList = (params) => {
+    return service({
+        url: '/mes_server/manufacture/MachineWorkOrderList',
+        method: 'get',
+        params
+    })
+}
+
 
 /** 7.设备运行跟踪*/
 //左侧菜单
@@ -497,4 +568,13 @@ export const teamDel = (params) => {
         method: 'get',
         params
     })
+}
+
+//获取机台编号
+export const getMachineMac = (data) => {
+    return service({
+        url:'/mes_server/reporting_work/getMachineMac',
+        method: 'get',
+        data
+    })
 }

src/main.js

@@ -22,6 +22,9 @@ initDom()
  * */
 import Nprogress from 'nprogress'
 import 'nprogress/nprogress.css'
+
+import '@arco-design/web-vue/dist/arco.css';
+
 Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 })
 Nprogress.start()
 

src/view/layout/bottomInfo/bottomInfo.vue

@@ -1,24 +1,24 @@
 <!-- 此文件禁止修改！如果您没有购买授权，请联系wx:shouzi_1994购买授权，未授权状态只需保留此代码 不影响任何正常使用 -->
 
-<template>
-  <div class="flex gap-4 items-center text-sm text-gray-500 justify-center mb-4">
-    <span>Powered by</span>
-    <span>
-      <a
-        class="text-gray-800 font-bold"
-        href="#"
-      >mes -admin ui</a>
-    </span>
+<!--<template>-->
+<!--  <div class="flex gap-4 items-center text-sm text-gray-500 justify-center mb-4">-->
+<!--    <span>Powered by</span>-->
+<!--    <span>-->
+<!--      <a-->
+<!--        class="text-gray-800 font-bold"-->
+<!--        href="#"-->
+<!--      >mes -admin ui</a>-->
+<!--    </span>-->
 
-    <span>Copyright</span>
-    <span>
-      <a
-        class="text-gray-800 font-bold"
-        href="#"
-      >Abc 团队</a>
-    </span>
-  </div>
-</template>
+<!--    <span>Copyright</span>-->
+<!--    <span>-->
+<!--      <a-->
+<!--        class="text-gray-800 font-bold"-->
+<!--        href="#"-->
+<!--      >Abc 团队</a>-->
+<!--    </span>-->
+<!--  </div>-->
+<!--</template>-->
 
 <script  setup>
 // 此文件内容为版权信息，如需改动，请联系wx:shouzi_1994购买授权 未授权状态只需保留此代码 不影响任何正常使用

src/view/performance/chejianbaogong.vue

@@ -2,11 +2,16 @@
   <div>
     
 	<header>
-			<el-button type="primary" @click="onBZ">班组维护</el-button>
-			<el-button type="primary" @click="onDel">删除</el-button>
-			<el-button type="primary" @click="onOver">完工</el-button>
-			<el-button type="primary" @click="ondianjian">设备点检</el-button>
-			<el-button type="primary" @click="onchanliang">日产量上报</el-button>
+		<div style="height: 90px;">
+			<el-button type="primary" @click="onBZ" style="height: 70px;width: 75px;">班组维护</el-button>
+			<el-button type="primary" @click="onDel" style="height: 70px;width: 75px;">删除</el-button>
+			<el-button type="primary" @click="onOver" style="height: 70px;width: 75px;">完工</el-button>
+			<el-button type="primary" @click="ondianjian" style="height: 70px;width: 75px;" >设备点检</el-button>
+			<el-button type="primary" @click="onchanliang"  v-if="zdtreeType === true" style="height: 70px;width: 75px;">日产量上报</el-button>
+			<el-button type="primary" @click="onxuncha" style="height: 70px;width: 75px;">管理巡查</el-button>
+			<el-button type="primary" @click="onstatus" style="height: 70px;width: 75px;">设置机台状态</el-button>
+		</div>
+			
 		</header>
 		
 		
@@ -26,7 +31,7 @@
           
 <div class="gva-search-box" style="overflow: hidden; padding: 0; display: flex;">
 
-			<div style="flex: 1; border: 1px magenta solid; margin: 0; padding: 0;">
+			<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px;">
 			
 						  <el-row :gutter="20">
 							<el-col :span="6">
@@ -47,7 +52,7 @@
 						  <el-row :gutter="20">
 							<el-col :span="4">
 							 <el-form-item label="印件编号" prop="id">
-							   <el-input v-model="formData.印件编号" :clearable="true" placeholder="2023.12.14" />
+							   <el-input v-model="formData.印件号" :clearable="true" placeholder="2023.12.14" />
 							 </el-form-item>
 							</el-col>
 						  <el-col :span="6">
@@ -136,7 +141,7 @@
 			                                 		                    
 			</div>
                     
-	<div style="flex: 1; border: 1px lawngreen solid; margin: 0; padding: 0; overflow: hidden;">
+	<div style="flex: 1; border: 0px lawngreen solid; margin: 0; padding: 0; overflow: hidden;">
 
 	 <el-table
 	   tooltip-effect="dark"
@@ -176,9 +181,9 @@
                 </template>
               </el-popover>
             </div>
-            <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+            <el-tabs v-model="activeName" type="card" @tab-click="duohandleClick"   >
             
-                        <el-tab-pane label="设备作业清单"  @click="showTable('印件资料')"  name="first">
+                        <el-tab-pane label="设备作业清单"  @click="showTable('印件资料')"   name="first">
                           <el-table ref="multipleTable"
                                     :show-overflow-tooltip="true"
                                     highlight-current-row="true"
@@ -229,7 +234,7 @@
                           </el-table>
                         </el-tab-pane>
             
-                        <el-tab-pane label="当班产量明细" @click="showTable('印版资料')" name="third">
+                        <el-tab-pane label="当班产量明细" @click="showsTable('印版资料')" name="third">
                         <el-table ref="multipleTable"
                                   highlight-current-row="true"
                                   :show-overflow-tooltip="true"
@@ -1118,8 +1123,163 @@
              </template>
 		</el-dialog>
 		
+		<el-dialog
+		  v-model="xunchaVisible"
+		  title="选择"
+		  destroy-on-close
+		  width="1300px"
+		  style="height: 110%;"
+		>
+		  <el-row :gutter="0">
+		    <el-col :span="4">
+		      <el-form-item label="工单编号" prop="id">
+		        <el-input v-model="formData.order" :clearable="true" placeholder="2023.12.14" />
+		      </el-form-item>
+		    </el-col>
+
+		    <el-col :span="10">
+		      <el-row :gutter="20">
+		        <el-col :span="5">
+		          <el-input v-model="formData.product_name" :clearable="true" placeholder="ZT01733" />
+		        </el-col>
+		      </el-row>
+		    </el-col>
+			
+			<el-col :span="4">
+			  <el-form-item label="流程单" prop="id">
+			    <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="2023.12.14" />
+			  </el-form-item>
+			</el-col>
+		  </el-row>
+		  
+		  <el-row :gutter="0">
+		    <el-col :span="4">
+		      <el-form-item label="印件编号" prop="id">
+		        <el-input v-model="formData.yjno" :clearable="true" placeholder="2023.12.14" />
+		      </el-form-item>
+		    </el-col>
+		    <el-col :span="10">
+		      <el-row :gutter="20">
+		        <el-col :span="5">
+		          <el-input v-model="formData.gxmc" :clearable="true" placeholder="ZT01733" />
+		        </el-col>
+		      </el-row>
+		    </el-col>
+			<el-col :span="4">
+			  <el-form-item label="工号" prop="id">
+			    <el-input v-model="formData3.sczl_bh11"  @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="2023.12.14" />
+			  </el-form-item>
+			</el-col>
+			<el-col :span="4">
+			  <el-form-item label="姓名" prop="id">
+			    <el-input v-model="formData3.sczl_name11" :clearable="true" placeholder="2023.12.14" />
+			  </el-form-item>
+			</el-col>
+		  </el-row>
+		
+		
+		<el-row :gutter="0">
+		  <el-col :span="4">
+		    <el-form-item label="检验备注" prop="id">
+		      <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="2023.12.14" />
+		    </el-form-item>
+		  </el-col>
+		  
+					
+		</el-row>
+		
+		  <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="xunchatreeData" :props="defaultProps" highlight-current="true"
+		            @node-click="xunchaNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
+		        </div>
+		      </el-aside>
+		    </div>
+		    <div style="flex: 1; margin: 0;">
+		      <el-table
+		        tooltip-effect="dark"
+		        :data="xunchaselectData"
+		        row-key="ID"
+		        highlight-current-row="true"
+		        border  @row-click="dianjianhandle"
+		        style="width:40%; height:100px;"
+		        @row-dblclick="handleSelectClick"
+		        :row-class-name="rowClassName"
+		      >
+		        <el-table-column
+		          prop="检验项目"
+		          label="工单编号"
+		          width="180"
+		        />
+		        <el-table-column
+		          prop="点检方法"
+		          label="印件号"
+		          width="180"
+		        />
+				<el-table-column
+				  prop="检验项目"
+				  label="工序名称"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="点检方法"
+				  label="流程单号"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="检验项目"
+				  label="设备编号"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="点检方法"
+				  label="班组编号"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="检验项目"
+				  label="检验备注"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="点检方法"
+				  label="现场管理人员"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="检验项目"
+				  label="提交时间"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="点检方法"
+				  label="开工时间"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="检验项目"
+				  label="分钟差数"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="点检方法"
+				  label="归属时段"
+				  width="180"
+				/>
+		      </el-table>			  
+		    </div>
+		  </div>
+		  
+		  <template #footer>
+		    <div class="dialog-footer">
+		      <el-button @click="closeDialog">关 闭</el-button>
+		      <el-button type="primary" @click="xunjianerDialog">提 交</el-button>
+		    </div>
+		  </template>
+		</el-dialog>
         </el-main>
-
       </el-container>
     </el-container>
 
@@ -1130,7 +1290,9 @@
   </div>
 </template>
 
+
 <script setup>
+	
 import {
   createCompany,
   deleteCompany,
@@ -1158,7 +1320,10 @@ import {
   submitDailyProduction,
   facilityDetail,
   inspectionRecord,
-  getYg
+  getYg,
+  submitPatrolRecord,
+  getMachineMac,
+  setMachineStatus
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -1173,18 +1338,12 @@ import { ref, reactive } from 'vue'
 defineOptions({
     name: 'Company'
 })
+const xunchatreeData=ref([{label: '现场巡查记录',} ])
 let checked1=ref(false)
 let checked2=ref(false)
 let checked3=ref(false)
 const detailData = reactive([])
 const treeData=ref([
-	{
-	  label: '胶印车间',
-	  level: 1 ,
-	  children: [{
-	    label: 'JY01# 【海德堡对开八色平板胶印机】',
-	    level: 2,
-		}]}
 ])
 let  dianjiantreeData;
 let JTMC=ref()
@@ -1195,21 +1354,25 @@ let JYData = reactive([])
 
 const handleNodeClick = (nodeData,node) => {
   //存放当前节点的nodeId
-   if (nodeData.level === 1) {
-        console.log(node.label); // 第一级节点
-      } else if (nodeData.level === 2) {
-        console.log(node.label); // 第二级节点
-		JTMC=node.label.split("【")[0]
-		FacilityProduction()
-		FacilityWorklist()
-		FacilityTeam(JTMC)
-		// InspectionRecord()
-		// FacilityDetail()
-		// ReportProduceInfo()
-		console.log(JTMC)
-      } else if (nodeData.level === 3) {
-        console.log(node.label); // 第三级节点
-	   }  
+  //  if (nodeData.level === 1) {
+  //       console.log(node.label); // 第一级节点
+  //     } else if (nodeData.level === 2) {
+  //       console.log(node.label); // 第二级节点
+		// JTMC=node.label.split("【")[0]
+		// FacilityProduction()
+		// FacilityWorklist()
+		// FacilityTeam(JTMC)
+		// // InspectionRecord()
+		// // FacilityDetail()
+		// // ReportProduceInfo()
+		// console.log(JTMC)
+  //     } else if (nodeData.level === 3) {
+  //       console.log(node.label); // 第三级节点
+	 //   }  
+	 JTMC=node.label.split("【")[0]
+	 FacilityProduction()
+	 FacilityWorklist()
+	 FacilityTeam(JTMC)
 		 // console.log(node.label)
 }
 //当前生产订单
@@ -1218,10 +1381,11 @@ const FacilityProduction = async () => {
   if (response.code === 0) {
 	console.log(response)
 	// 填充formData对象的基本字段
-	    formData.value.工单编号 = response.data.工单编号;
-	    formData.value.印件编号 = response.data.印件编号;
-	    formData.value.工序名称 = response.data.工序名称;
-	    formData.value.产品名称 = response.data.产品名称;
+	console.log(response.data[0].工单编号)
+	    formData.value.工单编号 = response.data[0].工单编号;
+	    formData.value.印件号 = response.data[0].印件号;
+	    formData.value.工序名称 = response.data[0].工序名称;
+	    formData.value.产品名称 = response.data[0].产品名称;
 		// console.log()
 	    formData.value.班组 = response.data.班组;
 	       // 填充sczl_bh和sczl_name字段
@@ -1243,6 +1407,7 @@ const FacilityProduction = async () => {
 				// console.log(sczl_name)
 	          }
 	        }
+		console.log(formData.value)
 	    InspectionRecord()
 	    FacilityDetail()
 	        // 输出填充后的formData对象
@@ -1495,6 +1660,86 @@ function ondianjian() {
 }
 const chanliangselectData = reactive([])
 const chanliangVisible = ref(false)
+const xunchaVisible = ref(false)
+
+//设置机台状态
+function onstatus() {
+	 SetMachineStatus()
+	 // ReportProduceInfo()
+}
+//设置机台状态
+const SetMachineStatus = async () => {
+  const response = await setMachineStatus({
+	  machine:'JY03',
+	  gy_name:'02-胶印〖白、黑、哑油【预干】、NT光油',
+	  order:'2311114',
+	  yjno:'1',
+	  class:'ZM00545,ZM01351,ZM01170',
+	  status:'维修',
+	  production_now:'',
+	  production_all:'',
+  });
+  console.log(response) 
+  if (response.code === 0) {
+	console.log(response) 
+  }
+}
+//提交巡查记录
+function onxuncha() {
+	 
+	 ReportProduceInfo()
+}
+//巡检弹窗确定
+const xunjianerDialog = async () => {
+   SubmitPatrolRecord()
+}
+//获取机台生产信息
+const ReportProduceInfo = async (value,inputName) => {
+  const response = await reportProduceInfo({machine:JTMC.split("#")[0]});
+  console.log(response) 
+  if (response.code === 0) {
+	formData.value.order=response.data.order
+	formData.value.yjno=response.data.yjno
+	formData.value.product_name=response.data.product_name
+	formData.value.gxmc=response.data.gxmc
+    xunchaVisible.value=true 
+  }
+}
+//获取机台编号
+const GetMachineMac = async () => {
+  const response = await getMachineMac({addr:'68-ED-A4-26-5F-37'});
+  console.log(response) 
+  if (response.code === 0) {
+	  // 将接口返回的数据添加到树型结构中
+	     // 将接口返回的数据添加到树型结构中
+	     let newNode = {
+	       label: response.data["设备编号"],
+	       children: []
+	     };
+	     
+	     treeData.value.push(newNode);
+  }
+}
+GetMachineMac()
+//提交巡查记录
+const SubmitPatrolRecord = async () => {
+  const response = await submitPatrolRecord({
+	  type:'现场巡查记录',
+	  machine:'JY01',
+	  order:'2311114',
+	  yjno:'1',
+	  process:'45',
+	  no:'ZM00215',
+	  name:'吴鹏飞',
+	  remark:'',
+  });
+  console.log(response) 
+  if (response.code === 0) {
+	console.log(response) 
+  }
+}
+
+
 //日产量上报
 function onchanliang() {
 	 console.log(JTMC.split("#")[0]); // 通过value属性获取ref对象的值，然后再调用split方法
@@ -1556,6 +1801,8 @@ const ReportInfo = async () => {
   }
   // getTableData()
 }
+
+
 //日报表弹窗确定
 const chanliangenterDialog = async () => {
  SubmitDailyProduction()
@@ -1861,7 +2108,7 @@ const formData3= ref({
 // 自动化生成的字典（可能为空）以及字段
 const formData= ref({
 	工单编号:'',
-	印件编号:'',
+	印件号:'',
 	工序名称:'',
 	产品名称:'',
 	sczl_bh1:'',
@@ -1885,6 +2132,10 @@ const formData= ref({
 	sczl_name9:'',
 	sczl_name10:'',
 	班组:'',
+	order:'',
+	yjno:'',
+	product_name:'',
+	gxmc:'',
 })
 const formDatasData= reactive([])
 
@@ -1960,6 +2211,10 @@ const multipleSelection = ref([])
 const handleSelectionChange = (val) => {
     multipleSelection.value = val
 }
+const zdtreeType = ref(false)
+const showsTable = (val,tab) => {
+	zdtreeType.value=true
+}
 
 // 删除行
 const deleteRow = (row) => {

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -1,35 +1,45 @@
 <template>
-  <div style="margin: 0 auto">
-    <el-container>
-      <!-- 左侧树形结构 -->
-      <el-aside width="210px" >
-        <div class="JKWTree-tree" style="height: 746px">
-          <h3>组织架构</h3>
-          <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
-            <template #default="{node,data}">{{data['名称']}}<{{data['num']}}人></template>
-          </el-tree>
+  <div>
+    <layout>
+
+      <layout-header>
+        <div class="">
+          <!--          按钮部分-->
+          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+            <el-form-item>
+              <el-input v-model="searchInfo" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;margin: 5px"></el-input>
+              <el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
+              <el-button disabled type="primary" icon="Download" @click="exportToExcel" style="margin: 5px;float: right;">导出到Excel</el-button>
+              <el-dialog v-model="dialogexportToExcel" disabled title="员工基本资料导出" width="50%">
+              </el-dialog>
+            </el-form-item>
+          </el-form>
         </div>
-      </el-aside>
+      </layout-header>
 
-      <!-- 右侧区域 -->
-      <el-container>
-        <el-main>
-<!--          按钮 搜索 部分-->
-          <div class="gva-search-box">
-            <el-form ref="elSearchFormRef" :inline="true"  class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
-              <el-form-item>
-                <el-input v-model="searchInfo" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;margin: 5px"></el-input>
-                <el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
-                <el-button disabled type="primary" icon="Download" @click="exportToExcel" style="margin: 5px;float: right;">导出到Excel</el-button>
-                <el-dialog v-model="dialogexportToExcel" disabled title="员工基本资料导出" width="50%">
-                </el-dialog>
-              </el-form-item>
-            </el-form>
+
+      <layout>
+
+        <!--    左侧树侧形结构-->
+        <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
+          <div class="JKWTree-tree" style="height: 200px">
+            <h3>组织架构</h3>
+            <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
+            <!--<template #default="{node,data}">{{data['名称']}}<{{data['num']}}人></template>-->
+              <template #default="{ node, data }">
+                {{ data['名称'] }}
+                <{{ data['num'] ? data['num'] + '人' : data['total'] + '人' }}>
+              </template>
+            </el-tree>
           </div>
+        </layout-sider>
 
+        <!-- 右侧区域 -->
+        <layout-content >
+        <el-main>
           <div class="gva-table-box">
             <!-- 表格数据 -->
-            <el-table ref="multipleTable" style="width: 100%;height: 580px" tooltip-effect="dark"
+            <el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
                       :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :data="tableData"  border row-key="ID"
@@ -37,67 +47,68 @@
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-<!--              <el-table-column type="selection" width="55" />-->
-              <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="性别" />
-              <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="140"  />
-              <el-table-column align="left" label="职称职务" prop="职称职务" width="300" />
-              <el-table-column align="left" label="身份证号" prop="身份证号" width="170" />
-              <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="100" />
-              <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="120" />
-              <el-table-column align="left" label="MES在职" prop="在职状态" width="100" />
-              <el-table-column align="left" label="U8在职" prop="U8在职" width="100" />
-              <el-table-column align="left" label="U8离职日期" prop="U8离职日期" width="160" />
-              <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 align="left" label="修改时间" prop="mod_rq" width="160" />
+              <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>
 
             <!-- 分页 -->
             <div class="gva-pagination">
-              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]"
+              <el-pagination layout="total" :current-page="page" :page-size="pageSize"
                :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+<!--              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]"-->
+<!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
             </div>
           </div>
 
           <!-- 弹窗 -->
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" width="900px" style="height: 600px;" :title="'修改员工基本资料'" destroy-on-close>
-            <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
+          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" width="900px" style="height: 52%;" :title="'修改员工基本资料'" destroy-on-close>
+            <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="90px">
               <div>
                 <div style="float: left; width: 34%;">
                   <!-- 左侧部分 -->
-                  <el-form-item label="员工编号：" prop="employeeId">
+                  <el-form-item label="员工编号：" prop="employeeId" class="mab">
                     <el-input v-model="formDataTest['员工编号']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="性别：" prop="gender">
+                  <el-form-item label="性别：" prop="gender" class="mab">
                     <el-input v-model="formDataTest['性别']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="身份证号：" prop="gender">
+                  <el-form-item label="身份证号：" prop="gender" class="mab">
                     <el-input v-model="formDataTest['身份证号']"  placeholder="" style="width: 200px;" />
                   </el-form-item>
-                  <el-form-item label="部门名称：" prop="gender">
+                  <el-form-item label="部门名称：" prop="gender"  class="mab">
                     <el-input v-model="formDataTest['所在部门']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="入职日期:" prop="joinDate">
+                  <el-form-item label="入职日期:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['聘用日期']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="人员类别:" prop="joinDate">
+                  <el-form-item label="人员类别:" prop="joinDate"  v>
                     <el-select v-model="formDataTest['人员类别']" placeholder="" style="width: 190px;">
                       <el-option label="生产" value="生产"></el-option>
                       <el-option label="行政" value="行政"></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="班次类型:" prop="joinDate">
+                  <el-form-item label="班次类型:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['班次类型']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="工资表类别:" prop="joinDate">
+                  <el-form-item label="工资表类别:" prop="joinDate" class="mab">
                     <el-select v-model="formDataTest['工资表类别']" placeholder="" style="width: 190px;">
                       <el-option label="职员级计时工资表" value="职员级计时工资表"></el-option>
                       <el-option label="另发工资" value="另发工资"></el-option>
@@ -105,31 +116,31 @@
                       <el-option label="操作级计时工资表" value="操作级计时工资表"></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="U8在职:" prop="joinDate">
+                  <el-form-item label="U8在职:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['U8在职']"   placeholder="" style="width: 190px;" />
                   </el-form-item>
                 </div>
                 <div style="float: left; width: 33%;margin-left: 50px">
                   <!-- 中间部分 -->
-                  <el-form-item label="员工姓名:" prop="name">
+                  <el-form-item label="员工姓名:" prop="name" class="mab">
                     <el-input v-model="formDataTest['员工姓名']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="出生日期:" prop="birthDate">
+                  <el-form-item label="出生日期:" prop="birthDate" class="mab">
                     <el-input v-model="formDataTest['出生日期']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="职务:" prop="position">
+                  <el-form-item label="职务:" prop="position" class="mab">
                     <el-input v-model="formDataTest['职称职务']" placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="部门编号:" prop="position">
+                  <el-form-item label="部门编号:" prop="position" class="mab">
                     <el-input v-model="formDataTest['部门编码']" placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="转正日期:" prop="departmentId">
+                  <el-form-item label="转正日期:" prop="departmentId" class="mab">
                     <el-input v-model="formDataTest['转正日期']" placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="扣减司龄:" prop="departmentId">
+                  <el-form-item label="扣减司龄:" prop="departmentId" class="mab">
                     <el-input v-model="formDataTest['扣减司龄']" placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="人员性质:" prop="departmentId">
+                  <el-form-item label="人员性质:" prop="departmentId" class="mab">
                     <el-select v-model="formDataTest['人员性质']" placeholder="" style="width: 190px;">
                       <el-option label="退休返聘" value="退休返聘"></el-option>
                       <el-option label="劳动合同工" value="劳动合同工"></el-option>
@@ -138,10 +149,10 @@
                       <el-option label="实习生" value="实习生"></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="工资核算分组:" prop="joinDate">
+                  <el-form-item label="工资核算分组:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['薪酬核算分组']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="在职状态:" prop="joinDate">
+                  <el-form-item label="在职状态:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['在职状态']" placeholder="" style="width: 190px;" />
                   </el-form-item>
                 </div>
@@ -163,18 +174,20 @@
 <!--            <template #footer>-->
               <div  style="text-align: right; position: absolute; bottom: 20px; right: 20px; width: 90%;">
                 <el-button @click="closeDialog">取消</el-button>
-                <el-button type="primary" disabled @click="enterDialog">确定</el-button>
+                <el-button type="primary"  @click="enterDialog">确定</el-button>
               </div>
 <!--            </template>-->
           </el-dialog>
+        </el-main>
 
+      </layout-content>
 
-        </el-main>
-      </el-container>
-    </el-container>
+      </layout>
+
+
+    </layout>
   </div>
 </template>
-
 <script>
 export default {
   data() {
@@ -208,11 +221,12 @@ export default {
   }
 };
 </script>
-
 <script setup>
 // 全量引入格式化工具 请按需保留
+import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
+
 import {ref, reactive} from 'vue'
-import {getCustom, getDepartment, getProductData, getStaffList, ygjbzledit} from '@/api/yunyin/yunying'
+import {getCustom, getDepartment, getProductData,getStaffInfo, getStaffList, ygjbzledit} from '@/api/yunyin/yunying'
 import {ElMessage} from "element-plus";
 defineOptions({name: 'Company'})
 // =========== 导出Excel表格 ===========
@@ -238,10 +252,30 @@ getDepartmentdata();
 
 //点击左侧树形 获取右侧table列表
 const tableData = reactive([]);
+const _u8 = ref(null);  // U8系统的值
+const _mes = ref(null); // MES系统的值
 const handleNodeClick = async (node) => {
-  _department_code.value = node['编号'];
-  searchInfo.value = '';
-  _getStaffList()
+  // 如果节点名称为 '离职工资结算中'
+  if (node['名称'] === '离职工资结算中') {
+    _u8.value = 1;
+    _mes.value = 2;
+    _department_code.value = '';
+  }
+  // 如果节点名称为 '离职清单'
+  else if (node['名称'] === '离职清单') {
+    _u8.value = 2;
+    _mes.value = 2;
+    _department_code.value = '';
+  }
+  // 对于其他情况
+  else {
+    _department_code.value = node['编号'];  // 设置部门编号
+    _u8.value = 1;  // 设置U8系统的值
+    _mes.value = 1;  // 设置MES系统的值
+  }
+
+  searchInfo.value = '';  // 清空搜索信息
+  _getStaffList();  // 执行获取员工列表的函数
 };
 
 //点击管理中心 显示部门的全部数据
@@ -256,7 +290,11 @@ const searchInfo = ref('')
 //点击【查询】按钮
 const onSubmit = () => {
   _department_code.value = '';
-  _getStaffList();
+  if(searchInfo.value === ''){
+    tableData.length = 0;
+  }else{
+    _getStaffList();
+  }
 };
 
 //获取员工信息列表
@@ -264,9 +302,9 @@ const _getStaffList = async ()=>{
   let params = {}
   params.search = searchInfo.value;
   params.department_code = _department_code.value;
-  params.mes_online = 1;
-  params.u8_online = 1;
-  params.limit = 100;
+  params.mes_online = _u8.value;
+  params.u8_online = _mes.value ;
+  params.limit = 200;
   params.page = 1;
   // console.log(params)
     try {
@@ -301,12 +339,9 @@ const dialogFormVisible = ref(false)
 //修改
 let formDataTest = reactive({})
 const updateCompanyFunc = async (row) => {
-  Object.assign(formDataTest,row);
-  // formDataTest['部门编号'] = _department_code.value;
-  // 判断是否为 undefined，建议使用 typeof
-  if (typeof formDataTest['扣减司龄'] === "undefined") {
-    formDataTest['扣减司龄'] = "0";
-  }
+  let code = row['员工编号'];
+  const getStaffInfo_data = await getStaffInfo({code:code});
+  formDataTest = getStaffInfo_data.data;
   dialogFormVisible.value = true;
 };
 
@@ -324,30 +359,30 @@ const _ygjbzledit = async ()=>{
     '员工姓名': formDataTest['员工姓名'],
     '性别': formDataTest['性别'],
     '出生日期': formDataTest['出生日期'],
-    '身份证': formDataTest['身份证号'],
+    '身份证号': formDataTest['身份证号'],
     '职称职务': formDataTest['职称职务'],
     '所在部门': formDataTest['所在部门'],
-    '部门编号': formDataTest['部门编号'],
-    '入职日期': formDataTest['聘用日期'],
+    '聘用日期': formDataTest['聘用日期'],
     '转正日期': formDataTest['转正日期'],
-    '扣减司龄': formDataTest['扣减司龄'],
+    '扣减司龄': formDataTest['扣减司龄'] ? formDataTest['扣减司龄'] : '0',
     '人员类别': formDataTest['人员类别'],
     '人员性质': formDataTest['人员性质'],
     '班次类型': formDataTest['班次类型'],
-    '工资核算分组': formDataTest['薪酬核算分组'],
+    '薪酬核算分组': formDataTest['薪酬核算分组'],
     '工资表类别': formDataTest['工资表类别'],
     'U8在职': formDataTest['U8在职'],
     '在职状态': formDataTest['在职状态'],
+    '部门编码': formDataTest['部门编码'],
   };
-  console.log(formattedData);
   try {
-    // const ygjbzleditdata = await ygjbzledit(formattedData);
-    // console.log(ygjbzleditdata);
-    // if (ygjbzleditdata.code === 0) {
-    //   ElMessage({type: 'success',message: '更新成功'})
-    // } else {
-    //   ElMessage({ type: 'error',message: '更新失败'})
-    // }
+    const ygjbzledit_eddt = await ygjbzledit(formattedData);
+    if (ygjbzledit_eddt .code === 0) {
+      dialogFormVisible.value = false;
+      ElMessage({type: 'success',message: '更新成功'})
+    } else {
+      console.log(ygjbzledit_eddt);
+      ElMessage({ type: 'error',message: '更新失败'})
+    }
   } catch (error) {
     console.error(error);
   }
@@ -356,9 +391,9 @@ const _ygjbzledit = async ()=>{
 </script>
 
 <style scoped>
-:deep(.el-table td .cell) {
-  line-height: 30px !important;
-}
+/*:deep(.el-table td .cell) {*/
+/*  line-height: 30px !important;*/
+/*}*/
 .JKWTree-container {
   display: flex;
 }
@@ -407,4 +442,30 @@ const _ygjbzledit = async ()=>{
 :deep(.el-table__body tr.current-row) > td {
   background: #ff80ff !important;
 }
-</style>
+</style>
+<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;
+}
+.mab{
+  margin-bottom: 5px;
+}
+</style>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -1,16 +1,16 @@
 <template>
   <div>
-    <el-container>
+    <layout>
       <!-- 左侧树形结构 -->
-      <el-aside width="170px">
+      <layout-sider :resize-directions="['right']" :width="300">
         <div class="JKWTree-tree" style="width: 100%;height: 746px">
           <h3>工单管理</h3>
           <el-tree :data="treeData.data" title=""  @node-click="handleNodeClick"></el-tree>
         </div>
-      </el-aside>
+      </layout-sider>
 
       <!-- 右侧内容区域 -->
-      <el-container>
+      <layout-content >
         <el-main>
           <div class="gva-search-box">
 
@@ -20,7 +20,7 @@
                 <el-input v-model="searchInfo" placeholder="搜索工单编号" style="width: 200px;margin: 5px"></el-input>
                 <el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
                 <el-button type="primary"  icon="edit" @click="ontlssclick" style="margin: 5px">U8投料试算</el-button>
-                <el-button type="primary" icon="edit" @click="onyycpzlclick" style="margin: 5px">印用产品资料</el-button>
+                <el-button type="primary" icon="edit" @click="onyycpzlclick" style="margin: 5px">引用产品资料</el-button>
                 <el-button type="primary"  icon="edit" @click="oneditgxclhsclick" style="margin: 5px">工序产量核算</el-button>
                 <el-button type="primary"  icon="edit" @click="oneditgylctzclick" style="margin: 5px">工艺流程调整</el-button>
                 <el-button type="primary"  icon="edit" @click="oneditugdclick" style="margin: 5px">查改U8工单</el-button>
@@ -35,7 +35,7 @@
             <!--U8投料试算-->
             <el-dialog v-model="tlsslist" title="U8投料试算"  style="height: 100%;width: 100%;margin: 0;padding: 0">
               <el-button type="primary" icon="" disabled @click="ontlssclicks" style="margin: 5px">投料试算</el-button>
-              <el-button type="primary" icon="" disabled @click="onbxgxclicks" style="margin: 5px">必选工序</el-button>
+              <el-button type="primary" icon="" disabled @click="onbxgxclicks" style="margin: 5px">备选工序</el-button>
               <el-button type="primary" icon="" disabled @click="onsjgxclicks" style="margin: 5px">实际工序</el-button>
               <el-button type="primary" icon="" @click="oncloneclick" style="margin: 5px">退出</el-button>
               <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
@@ -173,23 +173,19 @@
 
             <!--工艺流程调整-->
             <el-dialog v-model="gylctzlist" title="工艺方案附加"  style="width: 100%;height: 100%;margin: 0px;padding: 0px">
-              <el-button type="primary"  @click="gylctz_fjbzgx" >附加标准工序</el-button>
+              <el-button type="primary" disabled @click="gylctz_gxdqcpgx" style="margin: 5px;">更新当前产品工序</el-button>
+              <el-button type="primary"  @click="gylctz_fjbzgx" style="margin: 5px;">附加标准工序</el-button>
               <!--工艺流程调整中 附加标准工序-->
               <el-dialog v-model="gdzlfjxx" title="工单工艺流程附加选择"  style="width: 80%;height:80%;bottom: 3%;">
-                <el-button type="primary" disabled @click="gylctz_gxdqcpgx" style="margin: 5px;display: none">更新当前产品工序</el-button>
-
+                <div><el-button  type="primary" @click="addGongyiAttach" :disabled="attachList.length === 0">执行</el-button></div>
                 <div>
                   <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
-<!--                    <el-form-item label="参照工单 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">-->
-<!--                      <el-input v-model="gdzlfjxxformData['gdbh']"-->
-<!--                                @keyup.enter="gdzlfjxxgetProductValue"  placeholder="" />-->
-<!--                    </el-form-item>-->
                     <el-form-item label="产品代号 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
                       <el-input v-model="gdzlfjxxformData['cpdh']" disabled placeholder="" />
                       <el-input v-model="gdzlfjxxformData['cpmc']" disabled placeholder="" />
                     </el-form-item>
                     <el-form-item label="工单编号:" prop="originalName"  style="margin-left: 20px;">
-                      <el-select v-model="gdzlfjxxformData.cpgyfan" placeholder="请选择" >
+                      <el-select v-model="gdzlfjxxformData.cpgyfan" placeholder="请选择" allow-create filterable >
                         <el-option v-for="option in gdzlfjxxformData.cpgyfans" @click="ongdzlfanclick" :key="option" :label="option" :value="option" />
                       </el-select>
                     </el-form-item>
@@ -201,7 +197,8 @@
                             :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
                             :header-cell-style="{ padding: '0px' }"
                             style="width: 100%; height: 57vh" border tooltip-effect="dark"
-                            :data="gdzlfjxxtableData" row-key="ID" @selection-change="handleSelectionChange">
+                            :data="gdzlfjxxtableData" row-key="ID" @selection-change="attachChange">
+                    <el-table-column type="selection" width="55" />
                     <el-table-column v-slot="scope" align="left" label="方案" width="80">
                       <el-input disabled v-model="scope.row.方案" :clearable="false"/>
                     </el-table-column>
@@ -360,7 +357,7 @@
             <!--修正核算参数-->
             <el-dialog v-model="xzhscslist" title="修正核算参数" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
 
-              <el-button type="primary" disabled  @click="xzhscsConfirm">更新</el-button>
+              <el-button type="primary"  @click="xzhscsConfirm">更新</el-button>
               <el-button type="" @click="sxzhscsCancel">退出</el-button>
 
               <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
@@ -401,7 +398,7 @@
                   <el-input disabled  v-model="scope.row.损耗率" :clearable="false"/>
                 </el-table-column>
                 <el-table-column v-slot="scope" align="left" label=新损耗代号 width="150" >
-                  <el-input   v-model="scope.row.损耗代号" :clearable="false"/>
+                  <el-input  v-model="scope.row.损耗代号" :clearable="false"/>
                 </el-table-column>
                 <el-table-column v-slot="scope" align="left" label=原印刷方式 width="100" >
                   <el-input disabled  v-model="scope.row.sxzhscsold_印刷方式" :clearable="false"/>
@@ -506,7 +503,7 @@
           <!-- 表格列表 -->
           <div class="gva-table-box">
             <el-table ref="multipleTable"
-                      style="width: 100%;height: 40vh"
+                      style="width: 100%;height: 30vh"
                       :row-style="{ height: '20px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :header-cell-style="{ padding: '0px' }"
@@ -559,7 +556,7 @@
                         :show-overflow-tooltip="true"
                         highlight-current-row="true"
                         @row-dblclick="gdyjupdateCompanyFunc"
-                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
+                        style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                <el-table-column type="selection" width="55" />-->
                 <el-table-column align="left" label="印件号" prop="印件号"  width="80"/>
                 <el-table-column align="left" label="印件代号" prop="印件代号"  width="120"/>
@@ -585,8 +582,10 @@
                         :show-overflow-tooltip="true"
                         size="small"
                         @row-dblclick="gdgyupdateCompanyFunc"
-                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" />
+                        @row-click="clickybupdate2"
+                        :row-class-name="rowClassStyle2"
+                        style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
+<!--                <el-table-column type="selection" width="55" />-->
                 <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"/>
@@ -602,13 +601,17 @@
                 <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="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="70"/>
+                <el-table-column align="left" label="联数" prop="联数"  width="70"/>
                 <el-table-column align="left" label="备注" prop="备注"  width="450"/>
                 <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="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="160"/>
+
               </el-table>
             </el-tab-pane>
 
@@ -620,7 +623,7 @@
                         :show-overflow-tooltip="true"
                         highlight-current-row="true"
                         @row-dblclick="gdbomupdateCompanyFunc"
-                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
+                        style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="bomtableData" 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="100"/>
@@ -637,15 +640,15 @@
 
          <!-- 修改工单资料弹窗 -->
          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog"
-                    style="width: 1300px;height: 750px;; bottom: 7%"
+                    style="width: 80%;height: 750px;; bottom: 7%"
                     :title="'修改工单资料'" destroy-on-close>
            <el-row>
-             <el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" label-width="120px">
+             <el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >
 				        <!-- 第一排 -->
                 <el-row :gutter="24">
                   <el-col :span="6">
                     <el-form-item label="重点工单:" prop="keyOrder">
-                      <el-input v-model="scgdformData['重点工单']"  placeholder="" style="width: 140px;"/>
+                      <el-input v-model="scgdformData['重点工单']"  placeholder="" style="width: 180px;"/>
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
@@ -655,7 +658,7 @@
                   </el-col>
                   <el-col :span="5">
                     <el-form-item label="工单编号:" prop="orderNumber">
-                      <el-input v-model="scgdformData.工单编号"  placeholder="" style="width: 140px;"/>
+                      <el-input v-model="scgdformData['工单编号']"  placeholder="" style="width: 140px;"/>
                     </el-form-item>
                   </el-col>
                   <el-col :span="5">
@@ -668,7 +671,7 @@
               <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="客户代号:" prop="customerCode">
-                <el-input v-model="scgdformData['客户代号']"  placeholder="" style="width: 140px;" />
+                <el-input v-model="scgdformData['客户代号']"  placeholder="" style="width: 180px;" />
                 </el-form-item>
               </el-col>
               <el-col :span="16">
@@ -681,7 +684,7 @@
               <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="产品代码:" prop="productCode">
-                <el-input v-model="scgdformData['产品代号']"  placeholder="" style="width: 140px;"/>
+                <el-input v-model="scgdformData['产品代号']"  placeholder="" style="width: 180px;"/>
                 </el-form-item>
               </el-col>
               <el-col :span="16">
@@ -694,7 +697,7 @@
               <el-row :gutter="24">
                 <el-col :span="6">
                   <el-form-item label="印件代码:" prop="customerCode">
-                    <el-input v-model="scgdformData['印件代号']"  placeholder="" style="width: 140px;"/>
+                    <el-input v-model="scgdformData['印件代号']"  placeholder="" style="width: 180px;"/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="16">
@@ -707,7 +710,7 @@
                <el-row :gutter="24">
                  <el-col :span="6">
                    <el-form-item label="订单数量:" prop="orderQuantity">
-                     <el-input v-model="scgdformData['订单数量']"  placeholder="" style="width: 140px;" />
+                     <el-input v-model="scgdformData['订单数量']"  placeholder="" style="width: 180px;" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="6">
@@ -731,7 +734,7 @@
               <el-row :gutter="24">
                 <el-col :span="6">
                   <el-form-item label="平张投料:" prop="flatFeed">
-                    <el-input v-model="scgdformData['平张投料']" placeholder="" style="width: 140px;" />
+                    <el-input v-model="scgdformData['平张投料']" placeholder="" style="width: 180px;" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -810,7 +813,7 @@
              <template #footer>
                  <div class="dialog-footer" style="text-align: right;">
                  <el-button @click="closeDialog">取 消</el-button>
-                 <el-button type="primary" disabled @click="enterDialog">确 定</el-button>
+                 <el-button type="primary"  @click="enterDialog">确 定</el-button>
                  </div>
              </template>
 		   </el-dialog>
@@ -849,41 +852,41 @@
               </el-form-item>
               <div style="display: flex; gap: 0px;">
                 <el-form-item label="订单数量:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['订单数量']" placeholder="" style="width: 140px;"/>
+                  <el-input v-model="gdyjformData['订单数量']" placeholder="" style="width: 100px;"/>
                 </el-form-item>
                 <el-form-item label="平张投料:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['平张投料']" placeholder="" style="width: 140px;"/>
+                  <el-input v-model="gdyjformData['平张投料']" placeholder="" style="width: 100px;"/>
                 </el-form-item>
                 <el-form-item label="万小张:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['万小张']" placeholder="" style="width: 140px;"/>
+                  <el-input v-model="gdyjformData['万小张']" placeholder="" style="width: 100px;"/>
                 </el-form-item>
                 <el-form-item label="纸张规格:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['投料规格']" placeholder="" style="width: 140px;"/>
+                  <el-input disabled v-model="gdyjformData['投料规格']" placeholder="" style="width: 240px;"/>
                 </el-form-item>
               </div>
               <div style="display: flex; gap: 0px;">
                 <el-form-item label="投料规格:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['开料规格']" placeholder="" style="width: 140px;"/>
+                  <el-input v-model="gdyjformData['开料规格']" placeholder="" style="width: 100px;"/>
                 </el-form-item>
                 <el-form-item label="开料开数:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['开料开数']" placeholder="" style="width: 140px;"/>
+                  <el-input v-model="gdyjformData['开数']" placeholder="" style="width: 100px;"/>
                 </el-form-item>
                 <el-form-item label="开料联数:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['开料联数']" placeholder="" style="width: 140px;"/>
+                  <el-input v-model="gdyjformData['联数']" placeholder="" style="width: 100px;"/>
                 </el-form-item>
                 <el-form-item label="核算规格:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['核算规格']" placeholder="" style="width: 140px;"/>
+                  <el-input v-model="gdyjformData['核算规格']" placeholder="" style="width: 100px;"/>
                 </el-form-item>
               </div>
               <el-form-item label="备注说明:" prop="remark">
-                <el-input type="textarea" v-model="gdyjformData['备注说明']" rows="4" clearable placeholder="请输入备注说明"  />
+                <el-input type="textarea" v-model="gdyjformData['备注说明']" rows="4" clearable placeholder=""  />
               </el-form-item>
             </el-form>
 
             <template #footer>
               <div class="dialog-footer" style="text-align: right;">
                 <el-button @click="gdyjcloseDialog">取消</el-button>
-                <el-button type="primary" disabled @click="gdyjenterDialog">确定</el-button>
+                <el-button type="primary"  @click="gdyjenterDialog">确定</el-button>
               </div>
             </template>
           </el-dialog>
@@ -896,73 +899,90 @@
               <el-form label-width=" 90px">
                 <div style="display: flex; gap: 0px;">
                   <el-form-item label="印件编号:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['印件-工序']" placeholder="" style="width: 70px;"/>
+                    <el-input disabled v-model="gdgyformData['印件']" placeholder="" style="width: 70px;"/>
                   </el-form-item>
-                  <el-form-item label="工序编号:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['工序编号']" placeholder="" style="width: 70px;"/>
+                  <el-form-item label="工序编号:" prop="keyOrder" label-width=" 110">
+                    <el-input disabled v-model="gdgyformData['工序']" placeholder="" style="width: 70px;"/>
                   </el-form-item>
-                  <el-form-item label="重点工序:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['重点工序']" placeholder="" style="width: 100px;"/>
+                  <el-form-item label="重点工序:" prop="keyOrder" label-width=" 120">
+                    <el-input  v-model="gdgyformData['重点工序']" placeholder="" style="width: 130px;"/>
                   </el-form-item>
-                  <el-form-item label="备选工序" prop="keyOrder">
-                    <el-input v-model="gdgyformData['备选工序']" placeholder="" style="width: 70px;"/>
+                  <el-form-item label="备选工序：" prop="isBanciSelected" label-width=" 130px">
+                    <el-checkbox v-model="gdgyformData['备选工序']"></el-checkbox>
                   </el-form-item>
-                  <el-form-item label="加工开数:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['加工开数']" placeholder="" style="width: 70px;"/>
+                  <el-form-item label="加工开数:" prop="keyOrder" label-width=" 130">
+                    <el-input disabled v-model="gdgyformData['开数']" placeholder="" style="width: 70px;"/>
                   </el-form-item>
                   <el-form-item label="加工联数:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['加工联数']" placeholder="" style="width: 70px;"/>
+                    <el-input disabled v-model="gdgyformData['联数']" placeholder="" style="width: 70px;"/>
                   </el-form-item>
                 </div>
 
                 <div style="display: flex; gap: 0px;">
                   <el-form-item label="车间名称:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['车间名称']" placeholder="" style="width: 100px;"/>
+                    <el-input disabled v-model="gdgyformData['车间名称']" placeholder="" style="width: 90px;"/>
                   </el-form-item>
+
                   <el-form-item label="工艺名称:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['工艺名称']" placeholder="" style="width: 100px;"/>
+                    <el-input disabled v-model="gdgyformData['工艺名称']" placeholder="" style="width: 100px;"/>
                   </el-form-item>
                   <el-form-item label="工序名称:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['工序名称']" placeholder=""  style="width: 500px;"/>
+                    <el-input disabled v-model="gdgyformData['工序名称']" placeholder=""  style="width: 450px;"/>
                   </el-form-item>
                   <el-form-item label="计损色数" prop="keyOrder">
-                    <el-input v-model="gdgyformData['计损色数']" placeholder="" style="width: 100px;"/>
+                    <el-input disabled v-model="gdgyformData['计损色数']" placeholder="" style="width: 100px;"/>
                   </el-form-item>
                 </div>
 
                 <el-form-item label="设备编号:" prop="remark">
-                  <el-input type="textarea" v-model="gdyjformData['设备编号']" rows="4" clearable placeholder="请输入备注说明"  />
+                  <el-select v-model="gdgyformData['设备编号']" multiple collapse-tags placeholder="请选择设备编号" style="width: 600px; height: auto;">
+                    <el-option
+                        v-for="(item, index) in gdzl_MachineList_address.data"
+                        :key="index"
+                        :label="item"
+                        :value="item.split('-->')[0].trim()">
+                    </el-option>
+                  </el-select>
                 </el-form-item>
 
                 <div style="display: flex; gap: 0px;">
-                  <el-form-item label="工序损耗:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['损耗率']" placeholder="" style="width: 100px;"/>
-                    <el-input v-model="gdgyformData['工序损耗']" placeholder="" style="width: 170px;margin-left: 10px"/>
+                  <el-form-item label="工序损耗:" prop="keyOrder" >
+                    <el-input v-model="gdgyformData['shdh']" placeholder="" style="width: 100px;"/>
+                    <el-input disabled v-model="gdgyformData['工序名称']" placeholder="" style="width: 800px;margin-left: 10px"/>
                   </el-form-item>
+                </div>
+
+                <div style="display: flex; gap: 0px;">
                   <el-form-item label="损耗系数:" prop="keyOrder">
-                    <el-input v-model="gdgyformData['损耗系数']" placeholder="" style="width: 100px;"/>
+                    <el-input v-model="gdgyformData['损耗系数']" placeholder="" style="width: 90px;"/>
                   </el-form-item>
                   <el-form-item label="难度系数" prop="keyOrder">
-                    <el-input v-model="gdgyformData['难度系数']" placeholder="" style="width: 100px;"/>
+                    <el-input v-model="gdgyformData['难度系数']" placeholder="" style="width: 90px;"/>
+                  </el-form-item>
+                  <el-form-item label="装版工时:" prop="keyOrder">
+                    <el-input disabled v-model="gdgyformData['装版工时']" placeholder="" style="width: 90px;"/>
+                  </el-form-item>
+                  <el-form-item label="排产小时产能:" prop="keyOrder" label-width=" 120px">
+                    <el-input disabled v-model="gdgyformData['小时产能']" placeholder="" style="width: 90px;"/>
                   </el-form-item>
                   <el-form-item label="印刷方式" prop="keyOrder">
-                    <el-input v-model="gdgyformData['印刷方式']" placeholder="" style="width: 100px;"/>
+                    <el-input disabled v-model="gdgyformData['印刷方式']" placeholder="" style="width: 100px;"/>
                   </el-form-item>
                   <el-form-item label="版距" prop="keyOrder">
-                    <el-input v-model="gdgyformData['版距']" placeholder="" style="width: 100px;"/>
+                    <el-input disabled v-model="gdgyformData['版距']" placeholder="" style="width: 100px;"/>
                   </el-form-item>
                 </div>
 
                 <el-form-item label="工序备注:" prop="remark">
-                  <el-input type="textarea" v-model="gdyjformData['备注']" rows="3" clearable placeholder=""  />
+                  <el-input disabled type="textarea" v-model="gdgyformData['备注']" rows="3" clearable placeholder=""  />
                 </el-form-item>
 
-                <el-form-item label="质量要求:" prop="remark">
-                  <el-input type="textarea" v-model="gdyjformData['质量要求']" rows="3" clearable placeholder=""  />
+                <el-form-item  label="质量要求:" prop="remark">
+                  <el-input disabled type="textarea" v-model="gdgyformData['质量要求']" rows="3" clearable placeholder=""  />
                 </el-form-item>
 
                 <el-form-item label="质量隐患:" prop="remark">
-                  <el-input type="textarea" v-model="gdyjformData['质量隐患']" rows="3" clearable placeholder=""  />
+                  <el-input disabled type="textarea" v-model="gdgyformData['质量隐患']" rows="3" clearable placeholder=""  />
                 </el-form-item>
 
 
@@ -989,8 +1009,8 @@
           </el-dialog>
 
         </el-main>
-      </el-container>
-    </el-container>
+      </layout-content>
+    </layout>
   </div>
 </template>
 <script>
@@ -1014,12 +1034,13 @@ export default {
 </script>
 <script setup>
 // 全量引入格式化工具 请按需保留
+import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import {
   DataList,
-  WorkList,
-  Craft, U8workOrder,
+  WorkList,gdzl_MachineList,
+  Craft, U8workOrder,ProcessDetailEdit,PrintedEdit,PrintJobOrder,
   Printed,WorkOrderEdit,ReferenceWorkOrder,
   Bom,editGyWaste,U8DataCorrection,AccountingParameterEdit,
   ProductInformation, TestCoefficient,
@@ -1073,50 +1094,26 @@ const _AccountingParameterdata = async ()=>{
 
 //修正核算参数【更新】
 const xzhscsConfirm = async () => {
-  console.log(sxzhscstableData)
-  if (sxzhscstableData._rawValue) {
-    const rawValueArray = sxzhscstableData._rawValue;
-    const formattedData = rawValueArray.map(item => {
+  if (sxzhscstableData.value) {
+    const formattedData = sxzhscstableData.value.map(item => {
       return {
-        difficulty: item.难度系数 !== null ? item.难度系数 : "",
-        loss: item.损耗代号 !== null ? item.损耗代号 : "",
-        printMode: item.印刷方式 !== null ? item.印刷方式 : "",
-        plate: item.版距 !== null ? item.版距 : "",
-        chromatic: item.计损色数 !== null ? item.计损色数 : "",
-        wastage: item.损耗系数 !== null ? item.损耗系数 : "",
-        Uniqid: item.UniqId
+        Uniqid: parseInt(item.UniqId),
+        chromatic: parseFloat(item.计损色数),
+        difficulty: parseFloat(item.难度系数),
+        loss: item.损耗代号 ??'',
+        plate: parseInt(item.版距),
+        printMode: item.印刷方式 ?? '',
+        wastage: parseFloat(item.损耗系数),
       }
     });
-    // const  formattedData = [
-    //   {
-    //     "difficulty": 1.000,
-    //     "loss": "001001",
-    //     "printMode": "",
-    //     "plate": 550,
-    //     "chromatic": 4.50,
-    //     "wastage": 1.100,
-    //     "Uniqid":265159
-    //   },
-    //   {
-    //     "difficulty": 1.100,
-    //     "loss": "004003002",
-    //     "printMode": "卷对张",
-    //     "plate": 50,
-    //     "chromatic": 1.50,
-    //     "wastage": 1.000,
-    //     "Uniqid":265160
-    //   }
-    // ]
-
-    console.log(formattedData);
-    const AccountingParameterEditdata = await AccountingParameterEdit(formattedData);
-    console.log(AccountingParameterEditdata);
-    if (AccountingParameterEditdata.code === 0) {
-      ElMessage({ type: 'success', message: '更新成功' });
-    } else {
-      ElMessage({ type: 'error', message: '更新失败' });
-    }
-    // xzhscslist.value = false;
+      const AccountingParameterEditdata = await AccountingParameterEdit(formattedData);
+      console.log(AccountingParameterEditdata);
+      if (AccountingParameterEditdata.code === 0) {
+        ElMessage({ type: 'success', message: '更新成功' });
+      } else {
+        ElMessage({ type: 'error', message: '更新失败' });
+      }
+      // xzhscslist.value = false;
   } else {
     console.error("数据错误");
   }
@@ -1139,10 +1136,7 @@ const scfjfpxstableData = ref([]);
 const onzjfpxsclick = () => {
   if(_Gd_gdbh.value == null){
     scfjfpxslist.value = false;
-    ElMessage({
-      type: 'warning',
-      message: '请选择具体的工单后，再操作此功能'
-    })
+    ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'});
   }else{
     scfjfpxsformData['cpdh'] = _Gd_gdbh.value;
     _TestCoefficient();
@@ -1152,6 +1146,11 @@ const onzjfpxsclick = () => {
 
 //质检废品系数【回车】
 const scfjfpxsgetProductValue = () => {
+  if(scfjfpxsformData['cpdh'] === ''){
+    scfjfpxstableData.value = [];
+    ElMessage({type: 'warning',message: '输入框为空'});
+    return false;
+  }
   _TestCoefficient();
 };
 //修正工单核算参数->数据获取
@@ -1177,7 +1176,6 @@ const _TestCoefficient = async ()=>{
 //质检废品系数【更新】
 const scfjfpxsConfirm = async () => {
   const rawValueArray = scfjfpxstableData._rawValue;
-  // console.log(rawValueArray)
   const formattedData = rawValueArray.map(item => {
     return {
       UniqID: item.Uniqid,
@@ -1189,14 +1187,13 @@ const scfjfpxsConfirm = async () => {
       machine_fj: item.机检废检 !== null ? item.机检废检 : ""
     }
   });
-  console.log(formattedData)
   const editGyWastes = await editGyWaste(formattedData);
   if (editGyWastes.code === 0) {
+    scfjfpxslist.value = false;
     ElMessage({type: 'success',message: '更新成功'})
   } else {
     ElMessage({type: 'error',message: '更新失败'})
   }
-  scfjfpxslist.value = false;
 };
 
 //质检废品系数【退出】
@@ -1237,10 +1234,10 @@ const cgugdProductValue = () => {
 //查改U8工单->工单列表
 const _U8workOrder = async ()=>{
   let workOrder = cgugdformData['gdbh'];
-  console.log(workOrder)
+  // console.log(workOrder)
   try {
     const U8workOrderdata = await U8workOrder({workOrder:workOrder});
-    console.log(U8workOrderdata)
+    // console.log(U8workOrderdata)
     cgugdtableData.value = U8workOrderdata.data;
   } catch (error) {
     console.error(error);
@@ -1252,21 +1249,26 @@ const multipleSelection = ref([]);
 
 // 多选
 const cguzlgd_del = (val) => {
-  multipleSelection.value.push(...val.map(item => item.序号));
+  if (Array.isArray(val) && val.length === 0) {
+    multipleSelection.value = [];
+  } else {
+    multipleSelection.value.push(...val.map(item => item.序号));
+  }
 }
 
 //查改U8工单（工单删除）
 const oncgugdclickdel = async ()=>{
   const Uniqid = multipleSelection.value.join(',');
+  // console.log(Uniqid)
   try {
     const U8DataCorrection_del = await U8DataCorrection({Uniqid:Uniqid});
     if (U8DataCorrection_del.code === 0) {
+      multipleSelection.value = [];
       ElMessage({type: 'success',message: '删除成功'})
     } else {
       ElMessage({type: 'error',message: '删除失败'})
     }
     // 清空 multipleSelection 为空数组，只有在处理完数据后清空
-    multipleSelection.value = [];
   } catch (error) {
     console.error(error);
   }
@@ -1362,12 +1364,12 @@ const _ProcessFlow_xiala = async (workOrder)=>{
   }
 }
 //点击附加标准工序【按钮】
-const gylctz_fjbzgx = () => {
+const gylctz_fjbzgx = async () => {
   gdzlfjxxformData['cpdh'] = _Gd_cpdh.value;
   gdzlfjxxformData['gdbh'] = _Gd_gdbh.value;
   gdzlfjxxformData['cpmc'] = _Gd_cpmc.value;
   gdzlfjxxtableData.value = [];
-  _ReferenceWorkOrder();
+  await _ReferenceWorkOrder();
   gdzlfjxx.value = true;
 };
 // 工艺流程调整->参照工单列表获取【展示下拉框的数据】
@@ -1389,6 +1391,8 @@ const _ReferenceWorkOrder = async ()=>{
       }
       //默认获取下拉框第一个值
       const workOrder = gdzlfjxxformData.cpgyfan[0]
+      console.log(gdzlfjxxformData.cpgyfans)
+      gdzlfjxxformData.cpgyfan = gdzlfjxxformData.cpgyfans[0]
       _ProcessFlow_xiala(workOrder)
     }else{
       console.log("该产品下没有工单")
@@ -1495,7 +1499,7 @@ const _U8Trial = async ()=>{
 //U8投料试算【退出】
 const oncloneclick = () => {tlsslist.value = false;};
 
-// =========== 印用产品资料 ===========
+// =========== 引用产品资料 ===========
 const yycpzlformData = reactive({
   gdbh: '',
   khdh: '',
@@ -1507,7 +1511,7 @@ const yycpzlformData = reactive({
   gyfa: '',
 });
 const onyycpzllist = ref(false);
-//点击【印用产品资料】按钮
+//引用产品资料【按钮】
 const onyycpzlclick = () => {
   if(_Gd_gdbh.value == null){
     onyycpzllist.value = false;
@@ -1521,7 +1525,7 @@ const onyycpzlclick = () => {
     onyycpzllist.value = true;
   }
 };
-//印用产品资料【回车】
+//引用产品资料【回车】
 const yycpzlProductValue = async () => {
   _ProductInformations();
 };
@@ -1540,7 +1544,7 @@ const _ProductInformations = async ()=>{
     console.error(error);
   }
 }
-//印用产品资料执行
+//引用产品资料【执行】
 const yycpzlhandleConfirm = async () => {
   // console.log(yycpzlformData)
   _ProductInformationEdit();
@@ -1569,7 +1573,7 @@ const _ProductInformationEdit = async ()=>{
   }
   onyycpzllist.value = false;
 }
-//印用产品资料放弃
+//引用产品资料【放弃】
 const yycpzlhandleCancel = () => {onyycpzllist.value = false;};
 
 // =========== 左侧树侧形结构 ===========
@@ -1607,7 +1611,6 @@ const handleNodeClick = async (node) => {
   gytableData.value = [];
   yjtableData.value = [];
   bomtableData.value = [];
-
   const Gd_khdh = node.label.substring(0, 4);
   try {
     const WorkListdata = await WorkList({ Gd_khdh:Gd_khdh,limit:100,page:1});//接口调用函数
@@ -1668,6 +1671,13 @@ const onSubmit = () => {
     _cha_WorkList();
 };
 const _cha_WorkList = async (node) => {
+  if(searchInfo.value === ''){
+    ElMessage({
+      type: 'warning',
+      message: '请输入搜索的信息'
+    })
+    return false;
+  }
   const search = searchInfo.value;
   try {
     const WorkListdata = await WorkList({ search:search,limit:1,page:1});//接口调用函数
@@ -1691,58 +1701,60 @@ const type = ref('')
 
 
 //=========表格列表修改========
-// let scgdformData = reactive({})
 let scgdformData = ref([])
-//表格工单编号
-const _gdbhcode = ref(null)
 //双击修改
 const updateCompanyFunc = async(row) => {
-  // console.log(row)
-  // Object.assign(scgdformData,row);
-  // _gdbhcode.value = row['工单编号'];
   const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
+  console.log(DataCorrection_list)
   scgdformData.value = DataCorrection_list.data;
-  console.log(scgdformData.value.工单编号)
   dialogFormVisible.value = true
 }
 // 弹窗控制标记
 const dialogFormVisible = ref(false)
 // 弹窗确定
 const enterDialog = async () => {
+  const zdgx = /^[A-Za-z0-9\u4e00-\u9fa5\s]*$/.test(scgdformData.value['重点工单']);
+  if (!zdgx) {
+    ElMessage({ type: 'warning', message: '重点工单数据中 只允许出现中文、数字、空格' });
+    return false;
+  }
   const formattedData = {
-    //重点工单
-    'lx': scgdformData._rawValue['重点工单'],
-    'kdrq': scgdformData._rawValue['开单日期'],
-    'gdbh': scgdformData._rawValue['工单编号'],
-    'scfl': scgdformData._rawValue['生产分类'],
-    'khdh': scgdformData._rawValue['客户代号'],
-    'khmc': scgdformData._rawValue['客户名称'],
-    'cpdh': scgdformData._rawValue['产品代号'],
-    'cpmc': scgdformData._rawValue['产品名称'],
-    // 'yjdh': scgdformData._rawValue['印件代号'],
-    // 'yjmc': scgdformData._rawValue['印件名称'],
-    'ddsl': scgdformData._rawValue['订单数量'],
-    'jhrq': scgdformData._rawValue['交货日期'],
-    'tll': scgdformData._rawValue['投料率'],
-    // 'avg': scgdformData._rawValue['平均合格率'],
-    'jhtl': scgdformData._rawValue['平张投料'],
-    'sjtl': scgdformData._rawValue['万小张'],
-    'jldw': scgdformData._rawValue['单位'],
-    'tldx': scgdformData._rawValue['投料大箱'],
-    // 'kc': scgdformData._rawValue['库存大箱'],
-    'xsddh': scgdformData._rawValue['销售订单号'],
-    'jymb': scgdformData._rawValue['警语版面'],
-    'bbh': scgdformData._rawValue['版本号'],
-    'erp': scgdformData._rawValue['客户ERP编码'],
-    'ymsl': scgdformData._rawValue['码源数量'],
-    'jcbz': scgdformData._rawValue['进程备注'],
-    'desc': scgdformData._rawValue['备注'],
-    'printID': scgdformData._rawValue['印件ID'],
-
+    lx: scgdformData.value['重点工单'],
+    kdrq: scgdformData.value['开单日期'],
+    gdbh: scgdformData.value['工单编号'],
+    scfl: scgdformData.value['生产类型'],
+    khdh: scgdformData.value['客户代号'],
+    khmc: scgdformData.value['客户名称'],
+    cpdh: scgdformData.value['产品代号'],
+    cpmc: scgdformData.value['产品名称'],
+    ddsl: scgdformData.value['订单数量'],
+    jhrq: scgdformData.value['交货日期'],
+    tll: scgdformData.value['投料率'],
+    jhtl: scgdformData.value['平张投料'],
+    sjtl: scgdformData.value['万小张'],
+    jldw: scgdformData.value['单位'],
+    tldx: scgdformData.value['投料大箱'],
+    xsddh: scgdformData.value['销售订单号'],
+    jymb: scgdformData.value['警语版面'],
+    bbh: scgdformData.value['版本号'],
+    erp: scgdformData.value['客户ERP编码'],
+    ymsl: scgdformData.value['码源数量'],
+    jcbz: scgdformData.value['进程备注'],
+    desc: scgdformData.value['备注'],
+    Uniqid: scgdformData.value['Uniqid'],
+    yjdh: scgdformData.value['印件代号'],
+    yjmc: scgdformData.value['印件名称'],
+    kc: scgdformData.value['库存大箱'],
+    avg:scgdformData.value['平均合格率'] === undefined ? '' : scgdformData.value['平均合格率'],
+    printID: scgdformData.value['印件ID'],
   };
-  console.log(formattedData)
-  const WorkOrderEdit_edit = await WorkOrderEdit(formattedData);//接口调用函数
-  console.log(WorkOrderEdit_edit)
+  const WorkOrderEdit_edit = await WorkOrderEdit(formattedData);
+  if (WorkOrderEdit_edit.code === 0) {
+    dialogFormVisible.value = false
+    ElMessage({type: 'success',message: '更新成功' })
+  } else {
+    ElMessage({type: 'error', message: '更新失败'})
+  }
 }
 // 关闭弹窗
 const closeDialog = () => {dialogFormVisible.value = false}
@@ -1753,13 +1765,45 @@ const gdyjdialogFormVisible = ref(false)
 const gdyjformData = reactive({})
 //双击打开印件列表修改
 const gdyjupdateCompanyFunc = async(row) => {
-  console.log(row)
+  gdyjformData['开数'] = row['开数'];
+  gdyjformData['联数'] = row['联数'];
   Object.assign(gdyjformData,row);
   gdyjdialogFormVisible.value = true
 }
 //印件列表修改【确定】
-const gdyjenterDialog = () => {
-  gdyjdialogFormVisible.value = false
+const gdyjenterDialog = async () => {
+  const formattedData = {
+    Uniqid: gdyjformData['Uniqid'],
+    yjno: gdyjformData['印件号'] ? gdyjformData['印件号'] : "",
+    yjdh: gdyjformData['印件代号'] ? gdyjformData['印件代号'] : "",
+    yjmc: gdyjformData['印件名称'] ? gdyjformData['印件名称'] : "",
+    zzdh:gdyjformData['纸张代号'] ? gdyjformData['纸张代号'] : "",
+    zzmc:gdyjformData['纸张名称'] ? gdyjformData['纸张名称'] : "",
+    zzdh1:gdyjformData['zzdh1'] ? gdyjformData['zzdh1'] : "",
+    zzdh2:gdyjformData['zzdh2'] ? gdyjformData['zzdh2'] : "",
+    zzdh3:gdyjformData['zzdh3'] ? gdyjformData['zzdh3'] : "",
+    zzdh4:gdyjformData['zzdh4'] ? gdyjformData['zzdh4'] : "",
+    zzmc1:gdyjformData['zzmc1'] ? gdyjformData['zzmc1'] : "",
+    zzmc2:gdyjformData['zzmc2'] ? gdyjformData['zzmc2'] : "",
+    zzmc3:gdyjformData['zzmc3'] ? gdyjformData['zzmc3'] : "",
+    zzmc4:gdyjformData['zzmc4'] ? gdyjformData['zzmc4'] : "",
+    cpsl:gdyjformData['订单数量'] ? gdyjformData['订单数量'] : "",
+    pztl:gdyjformData['平张投料'] ? gdyjformData['平张投料'] : "",
+    sjtl:gdyjformData['万小张'] ? gdyjformData['万小张'] : "",
+    tlgg:gdyjformData['投料规格'] ? gdyjformData['投料规格'] : "",
+    klgg:gdyjformData['开料规格'] ? gdyjformData['开料规格'] : "",
+    ks:gdyjformData['开数'] ? gdyjformData['开数'] : "",
+    ls:gdyjformData['联数'] ? gdyjformData['联数'] : "",
+    hsgg:gdyjformData['核算规格'] ? gdyjformData['核算规格'] : "",
+    desc:gdyjformData['备注'] ? gdyjformData['备注'] : "",
+  };
+  const PrintedEdit_edit = await PrintedEdit(formattedData);
+  if (PrintedEdit_edit.code === 0) {
+    gdyjdialogFormVisible.value = false
+    ElMessage({type: 'success',message: '更新成功' })
+  } else {
+    ElMessage({type: 'error', message: '更新失败'})
+  }
 }
 // 印件列表修改【关闭弹窗】
 const gdyjcloseDialog = () => {
@@ -1770,15 +1814,95 @@ const gdyjcloseDialog = () => {
 //=========工艺列表修改========
 const gdgydialogFormVisible = ref(false)
 const gdgyformData = reactive({})
+
+const gdzl_MachineList_address = reactive({
+  data: []
+});
+const _cjmc = ref(null);
 //双击修改
 const gdgyupdateCompanyFunc = async(row) => {
+  console.log("双击了")
+  console.log(row)
+
+  if(row['车间名称']){
+    _cjmc.value = row['车间名称']
+  }else{
+    _cjmc.value = '';
+  }
+  // console.log(_cjmc.value);
+  const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
+  gdzl_MachineList_address.data = MachineList_jitai.data;
+  // console.log(gdzl_MachineList_address)
+  // console.log(gdzl_MachineList.data)
+
+  // 示例字符串
+  const processName = row['工序名称'];
+  // 初始化工艺名称和工序名称
+  let technologyName = '';
+  let operationName = '';
+  // 检查字符串中是否包含【】
+  const bracketIndex = processName.indexOf('【');
+  if (bracketIndex !== -1) {
+    // 如果包含【】，则分割字符串
+    technologyName = processName.substring(0, bracketIndex).trim();
+    operationName = processName.substring(bracketIndex + 1, processName.indexOf('】')).trim();
+  } else {
+    // 如果没有【】，则整个字符串是工艺名称，工序名称为空
+    technologyName = processName.trim();
+  }
+
+  // 示例字符串
+  const printProcess = row['印件-工序'];
+  // 初始化印件和工序
+  let yinjian = '';
+  let gongxu = '';
+  // 检查字符串中是否包含 "-"
+  const dashIndex = printProcess.indexOf('-');
+  if (dashIndex !== -1) {
+    // 如果包含 "-"，则分割字符串
+    yinjian = printProcess.substring(0, dashIndex).trim();
+    gongxu = printProcess.substring(dashIndex + 1).trim();
+  } else {
+    // 如果没有 "-"，则整个字符串是印件，工序为空
+    yinjian = printProcess.trim();
+  }
+  gdgyformData['印件'] = yinjian;
+  gdgyformData['工序'] = gongxu;
+  gdgyformData['工艺名称'] = technologyName;
+  gdgyformData['工序名称'] = operationName;
+
   Object.assign(gdgyformData,row);
   gdgydialogFormVisible.value = true
 }
 
 //工艺列表修改【确定】
-const gdgyenterDialog = () => {
-  gdgydialogFormVisible.value = false
+const gdgyenterDialog = async () => {
+  if(_Gd_gdbh.value){
+    const selectedValuesAsString = gdgyformData['设备编号'].join(' ');
+    if(gdgyformData['shdh'] === ''){
+      ElMessage({type: 'warning', message: '工序损耗不能为空'})
+    }
+    const formattedData = {
+      sbbh: selectedValuesAsString ? selectedValuesAsString : "",
+      shdh: gdgyformData['shdh'] ? gdgyformData['shdh'] : "",
+      shxs:gdgyformData['损耗系数'] ? gdgyformData['损耗系数'] : "",
+      ndxs:gdgyformData['难度系数'] ? gdgyformData['难度系数'] : "",
+      zdgx: gdgyformData['重点工序'] ? gdgyformData['重点工序'] : "",
+      bxgx: gdgyformData['备选工序'] ? 1 : "",
+      UniqId: gdgyformData['UniqId'],
+      workOrder: _Gd_gdbh.value,
+    };
+    console.log(formattedData)
+    const ProcessDetailEdit_edit = await ProcessDetailEdit(formattedData);
+    if (ProcessDetailEdit_edit.code === 0) {
+      gdgydialogFormVisible.value = false
+      ElMessage({type: 'success',message: '更新成功' })
+    } else {
+      ElMessage({type: 'error', message: '更新失败'})
+    }
+  }else{
+    ElMessage({type: 'error', message: '更新失败'})
+  }
 }
 
 //工艺列表修改【关闭弹窗】
@@ -1789,6 +1913,32 @@ const gdgycloseDialog = () => {
 
 
 
+
+//颜色变黄
+const currentGy0_yjno = ref(null)
+const rowClassStyle2 = ({row,rowIndex}) =>{
+  // debugger
+  // console.log(row.Gy0_yjno, this.currentGy0_yjno)
+  if(row['印件-工序'].substr(0, 2)==currentGy0_yjno.value){
+    return "warning-row"
+  }
+  return "warning-row"
+}
+const clickybupdate2 = (row,column,event) => {
+  currentGy0_yjno.value = row['印件-工序'].substr(0, 2)
+}
+
+const attachList = ref([])
+const attachChange = (val) => {
+  attachList.value = val
+}
+
+const addGongyiAttach = () =>
+{
+  attachList.value.map(row => gylctztableData.value.push(row))
+  gdzlfjxx.value = false
+}
+
 //=========BOM列表修改========
 // const bomdialogFormVisible = ref(false)
 // //双击修改
@@ -1808,6 +1958,10 @@ const gdgycloseDialog = () => {
 
 </script>
 <style scoped>
+
+:deep(.el-table__body .warning-row) {
+  background: #FFFF80 !important;
+}
 :deep(.el-table td .cell) {
   line-height: 30px !important;
 }
@@ -1839,4 +1993,6 @@ const gdgycloseDialog = () => {
 :deep(.el-table__body tr.current-row) > td {
   background: #ff80ff !important;
 }
+
+
 </style>

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -6,6 +6,7 @@
 			<el-button type="primary" @click="onDel">删除</el-button>
 			<el-button type="primary" @click="onSMB">入仓末板数据统计</el-button>
 			<el-button type="primary" @click="ondianjian">设备点检</el-button>
+			<el-button type="primary" @click="onyinban">印版领退</el-button>
 		</header>
 		
 		
@@ -28,13 +29,13 @@
 			<div style="flex: 1; border: 1px magenta solid; margin: 0; padding: 0;">
 
 			  <el-row :gutter="20">
-				<el-col :span="6">
+				<el-col :span="24">
 				  <el-form-item label="工单编号" prop="name">
 					<el-row :gutter="20">
-					  <el-col :span="12">
+					  <el-col :span="6">
 						<el-input v-model="formData.工单编号" :clearable="true" placeholder="ZT01733" />							
 					  </el-col>
-					  <el-col :span="12">
+					  <el-col :span="18">
 						<el-input v-model="formData.产品名称" :clearable="true" placeholder="ZT01733" />
 					  </el-col>
 					</el-row>
@@ -44,12 +45,12 @@
 			  </el-row>
 			  
 			  <el-row :gutter="20">
-				<el-col :span="4">
+				<el-col :span="6">
 				 <el-form-item label="印件编号" prop="id">
 				   <el-input v-model="formData.印件编号" :clearable="true" placeholder="2023.12.14" />
 				 </el-form-item>
 				</el-col>
-			  <el-col :span="3">
+			  <el-col :span="17">
 				 <el-form-item label="工序名称" prop="name">
 				   <el-input v-model="formData.工序名称" :clearable="true" placeholder="A班" />
 				 </el-form-item>
@@ -65,23 +66,23 @@
                                  				  
 <el-row :gutter="1">
 			 
-			 <el-col :span="3">
+			 <el-col :span="4">
 			   <el-input v-model="formData.sczl_bh1" :clearable="true" placeholder="ZT01733" />
 			 </el-col>
-			<el-col :span="3">
+			<el-col :span="4">
 			  <el-input v-model="formData.sczl_bh2" :clearable="true" placeholder="ZT01733" />
 			</el-col>
-			  <el-col :span="3">			  			
+			  <el-col :span="4">			  			
 				<el-input v-model="formData.sczl_bh3" :clearable="true" placeholder="ZT01733" />
 			  </el-col>
 			  
-			 <el-col :span="3">
+			 <el-col :span="4">
 				<el-input v-model="formData.sczl_bh4" :clearable="true" placeholder="ZT01733" />
 			  </el-col>
-			  <el-col :span="3">
+			  <el-col :span="4">
 				<el-input v-model="formData.sczl_bh5" :clearable="true" placeholder="ZT01733" />
 			  </el-col>
-			  <el-col :span="3">
+			  <el-col :span="4">
 				<el-input v-model="formData.sczl_bh6" :clearable="true" placeholder="ZT01733" />
 			  </el-col> 
 			<!-- <el-col :span="1">
@@ -100,37 +101,24 @@
 		   
 		   <el-row :gutter="1">
 		 
-		 <el-col :span="3">
+		 <el-col :span="4">
 		   <el-input v-model="formData.sczl_name1" :clearable="true" placeholder="ZT01733" />
 		 </el-col>
-		<el-col :span="3">
+		<el-col :span="4">
 		  <el-input v-model="formData.sczl_name2" :clearable="true" placeholder="ZT01733" />
 		</el-col>
-		  <el-col :span="3">			  			
+		  <el-col :span="4">			  			
 			<el-input v-model="formData.sczl_name3" :clearable="true" placeholder="ZT01733" />
 		  </el-col>
-		  
-		  <!-- <el-col :span="3">
-			<el-input v-model="formData.name4" :clearable="true" placeholder="ZT01733" />
-		  </el-col>
-		 <!-- <el-col :span="1">
-			<el-input v-model="formData.name5" :clearable="true" placeholder="ZT01733" />
+		  <el-col :span="4">
+		  			<el-input v-model="formData.sczl_name4" :clearable="true" placeholder="ZT01733" />
 		  </el-col>
-		  <el-col :span="1">
-			<el-input v-model="formData.name6" :clearable="true" placeholder="ZT01733" />
+		  <el-col :span="4">
+		  			<el-input v-model="formData.sczl_name5" :clearable="true" placeholder="ZT01733" />
 		  </el-col>
-		  <el-col :span="1">
-			<el-input v-model="formData.name7" :clearable="true" placeholder="ZT01733" />
+		  <el-col :span="4">
+		  			<el-input v-model="formData.sczl_name6" :clearable="true" placeholder="ZT01733" />
 		  </el-col>
-		  <el-col :span="1">
-			<el-input v-model="formData.name8" :clearable="true" placeholder="ZT01733" />
-		  </el-col>
-		  <el-col :span="1">
-			<el-input v-model="formData.name9" :clearable="true" placeholder="ZT01733" />
-		  </el-col>
-		   <el-col :span="1">
-		   <el-input v-model="formData.name10" :clearable="true" placeholder="2023.12.14" />
-		   </el-col> -->
 	   </el-row>
                                  		                    
 </div>
@@ -143,16 +131,16 @@
 	   row-key="ID"
 	   highlight-current-row="true"
 	   border
-	   style="width:100%"
+	   style="width:100%;height: 30vh;"
 	   @row-dblclick="handleSelectClick"
 	 >
 	   <el-table-column
-	     prop="Gd_cpmc"
+	     prop="process"
 	     label="印件及工序"
 	     width="340"
 	   />
 	   <el-table-column
-	     prop="jyGx"
+	     prop="completed"
 	     label="已完成板数"
 	     width="150"
 	   />			 
@@ -184,20 +172,20 @@
                                     :row-style="{ height: '20px' }"
                                     :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                                     :header-cell-style="{ padding: '0px' }"
-                                    @row-dblclick="yjupdateCompanyFunc"
-                                    style="width: 100%;height: 330px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
+                                    @row-click="yjupdateCompanyFunc"
+                                    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="yj_yjno"  width="80"/>
-                            <el-table-column align="left" label="工单编号|质量信息" prop="yj_yjdh" width="180" />
-							<el-table-column align="left" label="印件资料" prop="yj_yjdh" width="240" />
-                            <el-table-column align="left" label="工序名称" prop="yj_yjmc" width="100" />
-                            <el-table-column align="left" label="计划产量/已完成" prop="yj_zzdh" width="180"/>
-                            <el-table-column align="left" label="装版时数" prop="yj_zzmc" width="100"/>
-                            <el-table-column align="left" label="工序产能" prop="yj_tlgg" width="100"/>
-                            <el-table-column align="left" label="计划工时" prop="yj_klgg" width="100"/>
-                            <el-table-column align="left" label="计划生产时段" prop="yj_ks" width="240" />
-                            <el-table-column align="left" label="排产备注" prop="yj_ls" width="100" />
-                            <el-table-column align="left" label="产品名称" prop="yj_desc" width="240" />
+                            <el-table-column align="left" label="选择" prop="bh"  width="80"/>
+                            <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="180" />
+							<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="180"/>
+                            <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="240" />
+                            <el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
+                            <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
                           </el-table>
                         </el-tab-pane>
             
@@ -210,21 +198,21 @@
                                     :header-cell-style="{ padding: '0px' }"
                                     @row-dblclick="gyupdateCompanyFunc"
                                     :row-class-name="rowClassStyle"
-                                    style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange"
+                                    style="width: 100%;height: 400px" border tooltip-effect="dark" :data="FPData" row-key="ID" @selection-change="handleSelectionChange"
                                     @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="Gy0_yjno" width="80" />
-                            <el-table-column align="left" label="组员1" prop="Gy0_gxh" width="240" />
-                            <el-table-column align="left" label="组员2" prop="gy0_gxmc" width="240" />
-                            <el-table-column align="left" label="组员3" prop="add_gxmc" width="240" />
-                            <el-table-column align="left" label="组员4" prop="Gy0_Ks" width="240" />
-                            <el-table-column align="left" label="组员5" prop="Gy0_ls" width="100" />
-                            <el-table-column align="left" label="组员6" prop="备注" width="100" />
-                            <el-table-column align="left" label="组员7" prop="工价系数" width="100" />
-                            <el-table-column align="left" label="组员8" prop="损耗系数" width="100" />
-                            <el-table-column align="left" label="组员9" prop="Gy0_Ms" width="100" />
-                            <el-table-column align="left" label="组员10" prop="人工检_正品版" width="120" />
+                            <el-table-column align="left" label="班组号" prop="班组号" width="80" />
+                            <el-table-column align="left" label="组员1" prop="0" width="240" />
+                            <el-table-column align="left" label="组员2" prop="1" width="240" />
+                            <el-table-column align="left" label="组员3" prop="2" width="240" />
+                            <el-table-column align="left" label="组员4" prop="3" width="240" />
+                            <el-table-column align="left" label="组员5" prop="4" width="100" />
+                            <el-table-column align="left" label="组员6" prop="5" width="100" />
+                            <el-table-column align="left" label="组员7" prop="6" width="100" />
+                            <el-table-column align="left" label="组员8" prop="7" width="100" />
+                            <el-table-column align="left" label="组员9" prop="8" width="100" />
+                            <el-table-column align="left" label="组员10" prop="9_正品版" width="120" />
                           </el-table>
                         </el-tab-pane>
             
@@ -236,30 +224,30 @@
                                   :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                                   :header-cell-style="{ padding: '0px' }"
                                   @row-dblclick="ybupdateCompanyFunc"
-                                  style="width: 100%;height: 400px" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange"
+                                  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="YB_方案"  width="180"/>
-                          <el-table-column align="left" label="工单编号" prop="YB_Yjno" width="120" />
-                          <el-table-column align="left" label="产品名称" prop="印版类别" width="240" />
-                          <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="Sys_id" 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="YB_方案"  width="100"/>
-						  <el-table-column align="left" label="装版工时" prop="YB_Yjno" 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="Sys_id" 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="YB_方案"  width="100"/>
-						  <el-table-column align="left" label="辅电表" prop="YB_Yjno" width="100" />
-						  <el-table-column align="left" label="色度数" prop="印版类别" width="100" />
+                          <el-table-column align="left" label="生产时段" prop="生产时间段"  width="180"/>
+                          <el-table-column align="left" label="工单编号" prop="工单编号" width="120" />
+                          <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
+                          <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>
                         </el-tab-pane>
             
@@ -270,16 +258,20 @@
                                   :header-cell-style="{ padding: '0px' }"
                                   :show-overflow-tooltip="true"
                                   highlight-current-row="true"
-                                  style="width: 100%;height: 400px" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="handleSelectionChange">
+                                  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="120"/>
-                          <el-table-column align="left" label="印件号" prop="适用工序" width="120" />
-                          <el-table-column align="left" label="工序名称" prop="备注" width="330" />
-                          <el-table-column align="left" label="检验项目" prop="文件类型" width="120"/>
-                          <el-table-column align="left" label="12:39" prop="关联产品"  width="100"/>
-                          <el-table-column align="left" label="13:08" prop="建档用户" width="100"/>
-                          <el-table-column align="left" label="13:25" prop="建档日期" width="100" />
-                          <el-table-column align="left" label="14:31" prop="更新日期" 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="330" />
+                          <el-table-column align="left" label="检验项目" prop="检验项目" width="120"/>
+                          <el-table-column
+                             v-for="time in columnNames"
+                             :key="time"
+                             :label="time"
+                             :prop="time"
+                             align="center"
+                             width="120"
+                           ></el-table-column>
                         </el-table>
                         </el-tab-pane>
             
@@ -643,24 +635,25 @@
                   width="80"
                 >
                   
-                 <el-checkbox v-model="checked1" :indeterminate="isIndeterminate" @change="handleCheckAllChange"  ></el-checkbox>
+                 <el-checkbox v-model="dianjianselectData.zc" :indeterminate="isIndeterminate" @change="handleCheckAllChange"  ></el-checkbox>
                 
                 </el-table-column>
                 <el-table-column
                   label="异常"
                   width="80"
                 >
-                  <el-checkbox v-model="checked2" :indeterminate="isIndeterminate" @change="handleCheckAllChange"></el-checkbox>
+                  <el-checkbox v-model="dianjianselectData.yc" :indeterminate="isIndeterminate" @change="handleCheckAllChange"></el-checkbox>
                 </el-table-column>
                 <el-table-column
                   label="备注说明"
                   width="180"
                 />
                 <el-table-column
+				  v-slot="scope"
                   label="不检测" 
                   width="80"
                 >
-                   <el-checkbox v-model="checked3" :indeterminate="isIndeterminate" @change="handleCheckAllChange" ></el-checkbox>
+                   <el-checkbox v-model="scope.row.notjc" :indeterminate="isIndeterminate" @change="handleCheckAllChange" ></el-checkbox>
                 </el-table-column>
               </el-table>
 			  <el-row :gutter="20">
@@ -672,6 +665,128 @@
           </div>
         </el-dialog>
 		
+		<el-dialog
+		  v-model="yinbanVisible"
+		  title="选择"
+		  destroy-on-close
+		  width="1300px"
+		  style="height: 110%;"
+		>
+		  <el-row :gutter="0">
+		    <el-col :span="4">
+		      <el-form-item label="工单编号" prop="id">
+		        <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="2023.12.14" />
+		      </el-form-item>
+		    </el-col>
+		    <el-col :span="20">
+		      <el-row :gutter="20">
+		        <el-col :span="5">
+		          <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
+		        </el-col>
+		      </el-row>
+		    </el-col>
+		  </el-row>
+		
+		  <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="yinbantreeData" :props="defaultProps" highlight-current="true"
+		            @node-click="yinbanNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
+		        </div>
+		      </el-aside>
+		    </div>
+		    <div style="flex: 1; margin: 0;">
+		      <el-table
+		        tooltip-effect="dark"
+		        :data="yinbanselectData"
+		        row-key="ID"
+		        highlight-current-row="true"
+		        border  @row-click="dianjianhandle"
+		        style="width:1000px; height:400px;"
+		        @row-dblclick="handleSelectClick"
+		        :row-class-name="rowClassName"
+		      >
+		        <el-table-column
+		          prop="存货编码"
+		          label="存货编码"
+		          width="180"
+		        />
+		        <el-table-column
+		          prop="存货名称"
+		          label="存货名称"
+		          width="180"
+		        />
+		        
+		        <el-table-column
+				  prop="印版名称"
+		          label="印版名称"
+		          width="180"
+		        />
+				<el-table-column
+				  prop="供方批号"
+				  label="供方批号"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="制造日期"
+				  label="制造日期"
+				  width="180"
+				/>
+				
+				<el-table-column
+				  prop="印数"
+				  label="印数"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="印版类别"
+				  label="印版类别"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="客户编号"
+				  label="客户编号"
+				  width="180"
+				/>
+				
+				<el-table-column
+				  prop="客户名称"
+				  label="客户名称"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="产品编号"
+				  label="产品编号"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="产品名称"
+				  label="产品名称"
+				  width="180"
+				/>
+				
+				<el-table-column
+				  prop="点检方法"
+				  label="备注说明"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="点检方法"
+				  label="备注说明"
+				  width="180"
+				/>
+		        
+		      </el-table>
+			  <!-- <el-row :gutter="20">
+			    <el-col :span="20">			      
+			        <el-input v-model="pandingfangfa"  style="height: 50px;" :clearable="true"  />			      
+			    </el-col>
+			  </el-row> -->
+		    </div>
+		  </div>
+		</el-dialog>
+		
         </el-main>
 
       </el-container>
@@ -702,7 +817,20 @@ import {
   facilityTeam,
   facilityMachineList,
   facilitySpotCheckItem,
-  facilityInspectionItem
+  facilityInspectionItem,
+  reportProduceInfo,
+  reportName,
+  reportInfo,
+  reportMachineMac,
+  facilityWorklist,
+  setProcessStatus,
+  submitDailyProduction,
+  facilityDetail,
+  inspectionRecord,
+  getYg,
+  facilityProcedure,
+  facilityPrintGetTab,
+  facilityPrintDetail
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -722,8 +850,15 @@ let checked2=ref(false)
 let checked3=ref(false)
 const detailData = reactive([])
 const treeData=ref([])
+const yinbantreeData=ref([])
 let  dianjiantreeData;
 let JTMC=ref()
+let productCode=ref(104601001)
+const sbzyData = reactive([])
+const FPData = reactive([])
+const CLMXData = reactive([])
+let JYData = reactive([])
+const selectData = ref([])
 const handleNodeClick = (nodeData,node) => {
   //存放当前节点的nodeId
    if (nodeData.level === 1) {
@@ -743,11 +878,12 @@ const FacilityProduction = async () => {
   if (response.code === 0) {
 	console.log(response)
 	// 填充formData对象的基本字段
-	    formData.value.工单编号 = response.data.工单编号;
-	    formData.value.印件编号 = response.data.印件编号;
-	    formData.value.工序名称 = response.data.工序名称;
-	    formData.value.产品名称 = response.data.产品名称;
-	
+	    formData.value.工单编号 = response.data[0].工单编号;
+	    formData.value.印件编号 = response.data[0].印件号;
+	    formData.value.工序名称 = response.data[0].工序名称;
+	    formData.value.产品名称 = response.data[0].产品名称;
+	    FacilityTeam(JTMC)
+		
 	       // 填充sczl_bh和sczl_name字段
 	        for (let i = 1; i <= 10; i++) {
 	          const sczl_bh = `sczl_bh${i}`;
@@ -767,13 +903,97 @@ const FacilityProduction = async () => {
 				// console.log(sczl_name)
 	          }
 	        }
-	    
 	        // 输出填充后的formData对象
 	        // console.log(formData.value);
   }
   // getTableData()
 }
 
+//设备工作清单
+const FacilityWorklist = async () => {
+  const response = await facilityWorklist({machine:JTMC});
+  if (response.code === 0) {
+	console.log(response)
+	sbzyData.splice(0, sbzyData.length, ...response.data);
+	const res = await facilityProcedure({ Gd_gdbh: sbzyData[0]['工单编号|质量信息'].substring(0, 7) })
+	console.log(res)
+	if (res.code === 0) {
+	    selectData.value = res.data
+	}
+  }
+}
+//检验记录
+const InspectionRecord = async () => {
+	console.log(formData.value.班组)
+  const response = await inspectionRecord({machine:JTMC,Gd_gdbh:formData.value.工单编号,team:formData.value.班组});
+  console.log(response)
+  if(response.code==0){
+	 // 提取 inspectiontime 作为列名
+	        // Extract inspectiontime as columnNames
+	  columnNames = response.data.inspectiontime;
+
+	  // Populate drzcData with row data
+	  for (const key in response.data) {
+		if (key !== 'inspectiontime') {
+		  const item = response.data[key];
+		  const rowData = {
+			'工单编号': item['工单编号'],
+			'印件号': item['印件号'],
+			'工序名称': item['工序名称'],
+			'检验项目': item['检验项目']
+		  };
+
+		  // Initialize time columns with '—'
+		 columnNames.forEach(time => {
+			rowData[time] = '';
+		  });
+
+		  // Split inspectresult and fill the corresponding time columns
+		  const results = item['inspectresult'].split(',');
+		  results.forEach(result => {
+			if (columnNames.includes(result)) {
+			  rowData[result] = '√';
+			}else{rowData[result] = ''}
+		  });
+
+		  // Add the row data to drzcData
+		  JYData.push(rowData);
+		}
+	  }
+	  console.log(JYData);
+  }
+}
+//当班产量明细
+const FacilityDetail = async () => {
+  const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: formData.value.班组 });
+  if (response.code === 0) {
+    console.log(response);
+    CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
+  }
+};
+//员工编号回车事件
+const getygsubmit = (event, inputName) => {
+
+	  console.log(inputName)
+	 
+		  let combinedString = 'sczl_bh' + inputName;
+		   console.log(combinedString)
+		  //  let variableName = 'sczl_gdbh'+inputName;
+		   let variableValue = eval('formData3.value.' + combinedString);
+		   console.log(variableValue)
+		   GetYg(variableValue,inputName)  
+}
+//获取员工信息
+const GetYg = async (value,inputName) => {
+  const response = await getYg({sczl_bh:value});
+  console.log(response) 
+  if (response.code === 0) {
+	console.log(response.data.ygxm) 
+	let Bname = 'sczl_name' + inputName;
+	formData3.value[Bname]=response.data.ygxm
+	// console.log(formData.value[Bname])
+  }
+}
 
 // 验证规则
 const rule = reactive({
@@ -917,6 +1137,44 @@ function ondianjian() {
   });
   
 }
+
+const onyinban = async() => {
+	const res = await facilityPrintGetTab({productCode:productCode.value})
+	if(res.code===0){
+		yinbantreeData.value=[{
+			label:'产品印版库',
+			children:res.data.map(item=>({
+			label:item.印版分类,
+			code:item.编号
+		}))
+		}]
+		console.log(res.data.map(item=>({
+			label:item.印版分类,
+			code:item.编号
+		})))
+		yinbanVisible.value = true;
+	}
+}
+// function onyinban() {
+	
+//   getSpotCheckItem(productCode).then(treeData  => {
+//     if (treeData) {
+//       // 如果获取成功，treeData 就是我们需要的树形结构数据
+//       dianjiantreeData = treeData;
+//       console.log('222');
+//       console.log(dianjiantreeData);
+//       // 使用 nextTick 来确保在更新 dianjianVisible 后立即刷新视图
+//       nextTick(() => {
+//         dianjianVisible.value = true;
+//       });
+//       // 这里可以处理treeData，例如将其赋值给某个状态管理变量或者用于渲染界面
+//     } else {
+//       // 如果获取失败，则treeData为null
+//       console.log('获取巡检项目树形结构数据失败');
+//     }
+//   });
+  
+// }
 //获取设备点检->检验项目
 const FacilityInspectionItem = async (value) => {
   try {
@@ -924,8 +1182,13 @@ const FacilityInspectionItem = async (value) => {
     const response = await facilityInspectionItem({ unitName: value });
     // 检查接口返回的状态码
     if (response.code === 0) {
-     console.log(response)
-	 dianjianselectData.splice(0, dianjianselectData.length, ...response.data)
+	 dianjianselectData.splice(0, dianjianselectData.length, ...response.data.map(item=>{
+		 item.notjc=true;
+		 item.zc=true;
+		 item.yc=true;
+		 return item
+	 }))
+	 console.log(dianjianselectData)
     }
   } catch (error) {
     // 捕获并打印异常
@@ -934,8 +1197,27 @@ const FacilityInspectionItem = async (value) => {
   }
 };
 
+//机台印版领用->右侧详情
+const facilityPrintDetailItem = async (value) => {
+  try {
+    // 调用接口获取巡检项目数据
+    // const response = await facilityPrintDetail({ workOrder: formData.value.工单编号,code:value,productCode:productCode.value });
+	const response = await facilityPrintDetail({ workOrder: '2312165',code:'0521',productCode:'104601001' });
+    // 检查接口返回的状态码
+    if (response.code === 0) {
+     console.log(response)
+	 yinbanselectData.value=response.data
+    }
+  } catch (error) {
+    // 捕获并打印异常
+    console.error("获取数据出错：" + error);
+    return null;
+  }
+};
+
 //树形结构单机
 const dianjianselectData = reactive([])
+const yinbanselectData = ref([])
 const dianjianNodeClick = (node, check, nodeData) => {
   if (node.children && node.children.length > 0) {
     // 点击的是父节点，且有子节点
@@ -947,6 +1229,17 @@ const dianjianNodeClick = (node, check, nodeData) => {
      FacilityInspectionItem(node.label)
   }
 };
+const yinbanNodeClick = (node, check, nodeData) => {
+  if (node.children && node.children.length > 0) {
+    // 点击的是父节点，且有子节点
+    // 执行相应的父节点单击事件处理逻辑
+    // 这里可以添加你想要的处理逻辑，比如展开/折叠节点等
+  } else {
+    // 点击的是子节点，或者没有子节点
+    // 执行相应的子节点单击事件处理逻辑
+     facilityPrintDetailItem(node.code)
+  }
+};
 let pandingfangfa=ref()
 //检验项目单击
 const dianjianhandle = async (val, row) => {
@@ -1023,8 +1316,52 @@ const getSpotCheckItem = async (machineName) => {
 const FacilityTeam = async (value) => {
   const response = await facilityTeam({ machine: value });
   if (response.code === 0) {
-    console.log(response);
+	formData.value.班组 = response.data[0]['班组号'];
+	if(response.data[0][2]){
+		// console.log(response.data[0][2].split(' '));
+		for (let i = 1; i <= 3; i++) {
+		  const sczl_bh = `sczl_bh${i}`;
+		  const sczl_name = `sczl_name${i}`;
+		  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
+		  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
+		 
+		}
+	}
+	if(response.data[0][0]){
+		// console.log(response.data[0][2].split(' '));
+		for (let i = 1; i <= 1; i++) {
+		  const sczl_bh = `sczl_bh${i}`;
+		  const sczl_name = `sczl_name${i}`;
+		  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
+		  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
+		 
+		}
+	}
+	if(response.data[0][1]){
+		// console.log(response.data[0][2].split(' '));
+		for (let i = 1; i <= 2; i++) {
+		  const sczl_bh = `sczl_bh${i}`;
+		  const sczl_name = `sczl_name${i}`;
+		  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
+		  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
+		 
+		}
+	}
+	if(response.data[0][3]){
+		// console.log(response.data[0][2].split(' '));
+		for (let i = 1; i <= 4; i++) {
+		  const sczl_bh = `sczl_bh${i}`;
+		  const sczl_name = `sczl_name${i}`;
+		  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
+		  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
+		 
+		}
+	}
 
+	
+	FacilityWorklist()
+	InspectionRecord()
+	FacilityDetail()
     // 清空 bzData 数组
     bzData.splice(0, bzData.length);
 
@@ -1035,6 +1372,8 @@ const FacilityTeam = async (value) => {
 
     // 将更新后的数据添加到 bzData 数组
     bzData.push(...updatedData);
+	FPData.push(...updatedData)
+	return 1
   }
 };
 //班组维护
@@ -1239,6 +1578,13 @@ const updateCompanyFunc = async(row) => {
     }
 }
 
+const yjupdateCompanyFunc = async(row) => {
+    const res = await facilityProcedure({ Gd_gdbh: row['工单编号|质量信息'].substring(0, 7) })
+	console.log(res)
+    if (res.code === 0) {
+        selectData.value = res.data
+    }
+}
 
 // 删除行
 const deleteCompanyFunc = async (row) => {
@@ -1258,6 +1604,7 @@ const deleteCompanyFunc = async (row) => {
 // 弹窗控制标记
 const dialogFormVisible = ref(false)
 const dianjianVisible = ref(false)
+const yinbanVisible = ref(false)
 // 查看详情控制标记
 const detailShow = ref(false)
 const bzData = reactive([])