Преглед изворни кода

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

Lexie пре 1 година
родитељ
комит
b86710e05a
2 измењених фајлова са 287 додато и 126 уклоњено
  1. 7 0
      src/api/jixiaoguanli/baogong.js
  2. 280 126
      src/view/performance/chejianbaogong.vue

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

@@ -34,4 +34,11 @@ export const setMachineTeam = (data) => {
     method: 'post',
     data
   })
+}
+export const ModelChangeRecord = (params) => {
+  return service({
+    url: '/mes_server/facility/ModelChangeRecord',
+    method: 'get',
+    params
+  })
 }

+ 280 - 126
src/view/performance/chejianbaogong.vue

@@ -10,6 +10,7 @@
 			<el-button type="primary" @click="ondianjian"  >设备点检</el-button>			
 			<el-button type="primary" @click="onxuncha" >管理巡查</el-button>
 			<el-button type="primary" @click="onstatus" >设置机台状态</el-button>
+			<el-button type="primary" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" @click="onClear" >换型清场</el-button>
 			
 			
@@ -90,18 +91,18 @@
 	   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"
+	     width="450"
 	   />
 	   <el-table-column
-	     prop="jyGx"
+	     prop="completed"
 	     label="已完成板数"
-	     width="150"
+	     width="125"
 	   />			 
 	 </el-table>
 
@@ -842,85 +843,31 @@
 		    </div>
 		    <div v-if="huanxingstatus" style="flex: 0; margin: 0;">
 		      <el-tabs v-model="activNames" type="card" @tab-click="handleClick">
-		        <el-tab-pane label="指标检验"  @click="showTable('指标检验')"  name="first">
-		          <el-table
-		            tooltip-effect="dark"
-		            :data="zhibiaoselectData"
-		            row-key="ID"
-		            highlight-current-row="true"
-		          				:show-overflow-tooltip="true"
-		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:310px;"
-		            @row-dblclick="handleSelectClick"
-		            :row-class-name="rowClassName"
-		          >
-		            <el-table-column
-		              prop="检验项目"
-		              label="检验项目"
-		              width="270"
-		            />
-					<el-table-column
-					  v-slot="scope"
-					  label="不检测" 
-					  width="70"
-					>
-					   <el-checkbox v-model="scope.row.notjc" @click="notjcClick(scope.row)"></el-checkbox>
-					</el-table-column>
-		            <el-table-column
-		              v-slot="scope"
-		              label="合格"
-		              width="60"
-		            >
-		              
-		             <el-checkbox v-model="scope.row.zc" @click="zcClick(scope.row)"></el-checkbox>
-		            
-		            </el-table-column>
-		            <el-table-column
-		              v-slot="scope"
-		              label="不合格" 
-		              width="70"
-		            >
-		               <el-checkbox v-model="scope.row.yc" @click="ycClick(scope.row)"></el-checkbox>
-		            </el-table-column>
-					<el-table-column
-					  prop="检测方法"
-					  label="检测方法"
-					  width="90"
-					/>
-					<el-table-column
-					  prop="检验频率"
-					  label="检验频率"
-					  width="150"
-					/>
-					<el-table-column
-					  prop="相关标准"
-					  label="相关标准"
-					  width="180"
-					/>
-		          </el-table>
+		        <el-tab-pane label="换型清场明细信息"  @click="showTable('换型清场明细信息')"  name="first">
+		          
 		        </el-tab-pane>
 		      
 		        <el-tab-pane label="当前设备换型记录"  @click="showTable('当前设备换型记录')"  name="second">
 		          <el-table
 		            tooltip-effect="dark"
-		            :data="fujiaselectData"
+		            :data="huanxingselectData"
 		            row-key="ID"
 		            highlight-current-row="true"
-		          				:show-overflow-tooltip="true"
+		          	:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:320px;"
+		            style="width:115vh; height:50vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
 		            <el-table-column
 		              prop="日期"
 		              label="日期"
-		              width="100"
+		              width="160"
 		            />
 		            <el-table-column
 		              prop="机台编号"
 		              label="机台编号"
-		              width="80"
+		              width="90"
 		            />
 					<el-table-column
 					  prop="班组"
@@ -930,17 +877,17 @@
 					<el-table-column
 					  prop="工单编号A"
 					  label="工单编号A"
-					  width="80"
+					  width="95"
 					/>
 					<el-table-column
 					  prop="印件名称A"
 					  label="印件名称A"
-					  width="120"
+					  width="130"
 					/>
 					<el-table-column
 					  prop="印件工序A"
 					  label="印件工序A"
-					  width="80"
+					  width="150"
 					/>
 					<el-table-column
 					  prop="码包号A"
@@ -950,17 +897,17 @@
 					<el-table-column
 					  prop="工单编号B"
 					  label="工单编号B"
-					  width="80"
+					  width="100"
 					/>
 					<el-table-column
 					  prop="印件名称B"
 					  label="印件名称B"
-					  width="80"
+					  width="100"
 					/>
 					<el-table-column
 					  prop="印件工序B"
 					  label="印件工序B"
-					  width="100"
+					  width="150"
 					/>
 					<el-table-column
 					  prop="码包号B"
@@ -970,27 +917,27 @@
 					<el-table-column
 					  prop="清场项目A"
 					  label="菲林_标样_签样品_留样品"
-					  width="120"
+					  width="190"
 					/>
 					<el-table-column
 					  prop="清场项目B"
 					  label="版材_纸张_电化铝_油墨"
-					  width="120"
+					  width="190"
 					/>
 					<el-table-column
 					  prop="清场项目C"
 					  label="过版纸_废品_次品"
-					  width="120"
+					  width="170"
 					/>
 					<el-table-column
 					  prop="清场项目D"
 					  label="半成品_成品_零头"
-					  width="120"
+					  width="170"
 					/>
 					<el-table-column
 					  prop="清场项目E"
 					  label="操作台桌面_抽屉_地面"
-					  width="120"
+					  width="180"
 					/>
 					<el-table-column
 					  prop="机长"
@@ -1005,7 +952,7 @@
 					<el-table-column
 					  prop="质量巡查员"
 					  label="质量巡查员"
-					  width="80"
+					  width="100"
 					/>
 					<el-table-column
 					  prop="创建时间"
@@ -1024,6 +971,127 @@
 		  </div>
 		</el-dialog>
 		
+		<el-dialog
+		  v-model="yinbanVisible"
+		  title="印版领退"
+		  destroy-on-close
+		  width="180vh"
+		  style="height: 78vh;"
+		>
+		  <el-row :gutter="24">
+		    <el-col :span="4">
+		      <el-form-item label="工单编号" prop="id">
+		        <el-input v-model="formData.工单编号" :clearable="true" />
+		      </el-form-item>
+		    </el-col>
+			<el-col :span="6">
+			  <el-form-item prop="id">
+			    <el-input v-model="formData.productCode" :clearable="true"  />
+			  </el-form-item>
+			</el-col>
+			<el-col :span="14">
+			  <el-form-item prop="id">
+			    <el-input v-model="formData.产品名称" :clearable="true" />
+			  </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="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"
+				:show-overflow-tooltip="true"
+		        border  @row-click="dianjianhandle"
+		        style="width:1000px; height:400px;"
+		        @row-dblclick="handleSelectClick"
+		        :row-class-name="rowClassName"
+		      >
+		        <el-table-column
+		          prop="存货编码"
+		          label="存货编码"
+		          width="100"
+		        />
+		        <el-table-column
+		          prop="存货名称"
+		          label="存货名称"
+		          width="180"
+		        />
+		        
+		        <el-table-column
+				  prop="印版名称"
+		          label="印版名称"
+		          width="180"
+		        />
+				<el-table-column
+				  prop="供方批号"
+				  label="供方批号"
+				  width="150"
+				/>
+				<el-table-column
+				  prop="制造日期"
+				  label="制造日期"
+				  width="170"
+				/>
+				
+				<el-table-column
+				  prop="印数"
+				  label="印数"
+				  width="80"
+				/>
+				<el-table-column
+				  prop="印版类别"
+				  label="印版类别"
+				  width="90"
+				/>
+				<el-table-column
+				  prop="客户编号"
+				  label="客户编号"
+				  width="90"
+				/>
+				
+				<el-table-column
+				  prop="客户名称"
+				  label="客户名称"
+				  width="180"
+				/>
+				<el-table-column
+				  prop="产品编号"
+				  label="产品编号"
+				  width="100"
+				/>
+				<el-table-column
+				  prop="产品名称"
+				  label="产品名称"
+				  width="180"
+				/>
+				
+				<el-table-column
+				  prop="点检方法"
+				  label="备注说明"
+				  width="90"
+				/>
+				<!-- <el-table-column
+				  prop="点检方法"
+				  label="备注说明"
+				  width="180"
+				/> -->
+		        
+		      </el-table>
+		    </div>
+		  </div>
+		</el-dialog>
+		
 		<el-dialog
 		  v-model="xunchaVisible"
 		  title="管理人员现场巡查记录"
@@ -1185,7 +1253,7 @@
 		
 		<el-dialog
 		  v-model="chanliangVisible"
-		  title="选择"
+		  title="日产量上报"
 		  destroy-on-close
 		  width="1300px"
 		  style="height: 115%;"
@@ -1193,19 +1261,19 @@
 		  <el-row :gutter="20">
 		        <el-row :gutter="20">
 		          <el-col :span="15">
-		          <el-form-item label="工单编号" prop="id" style="margin-top: 10px;">
+		          <el-form-item label="工单编号" prop="id">
 		            <el-input v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')" :clearable="true" placeholder="" />
 		          </el-form-item>
 		          </el-col>
 		        </el-row>
 
 			  <el-col :span="8">
-			  <el-form-item label="产品名称" prop="id" style="margin-top: 10px;">
+			  <el-form-item label="产品名称" prop="id">
 			    <el-input v-model="formData3.product_name" id="产品名称"  @keydown="ent($event, '工单编号', '产品名称', '工序名称')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
 			  <el-col :span="8">
-			  <el-form-item label="工序名称" prop="id" style="margin-top: 10px;">
+			  <el-form-item label="工序名称" prop="id">
 			    <el-input v-model="formData3.gxmc" id="工序名称"  @keydown="ent($event, '产品名称', '工序名称', '印件号')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
@@ -1219,24 +1287,24 @@
 			<el-row :gutter="20">
 			      <el-row :gutter="20">
 			        <el-col :span="15">
-			        <el-form-item label="印件号" prop="id" style="margin-top: 10px;">
+			        <el-form-item label="印件号" prop="id">
 			          <el-input v-model="formData3.yjno" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			        </el-col>
 			      </el-row>
 			
 				  <el-col :span="8">
-				  <el-form-item label="印件名称" prop="id" style="margin-top: 10px;">
+				  <el-form-item label="印件名称" prop="id">
 					<el-input v-model="formData3.yj_name" id="印件名称"  @keydown="ent($event, '印件号', '印件名称', '工艺名称')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
 				  <el-col :span="8">
-				  <el-form-item label="工艺名称" prop="id" style="margin-top: 10px;">
+				  <el-form-item label="工艺名称" prop="id">
 					<el-input v-model="formData3.gy_name" id="工艺名称"  @keydown="ent($event, '印件名称', '工艺名称', 'gxh')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
 				  <el-col :span="2">
-				  <el-form-item label="" prop="id" style="margin-top: 10px;">
+				  <el-form-item label="" prop="id">
 				    <el-input v-model="formData3.gxh" id="gxh"  @keydown="ent($event, '工艺名称', 'gxh', '日期')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>						  
@@ -1247,24 +1315,24 @@
 			  <el-row :gutter="20">
 			        <el-row :gutter="20">
 			          <el-col :span="15">
-			          <el-form-item label="日期" prop="id" style="margin-top: 10px;">
+			          <el-form-item label="日期" prop="id">
 			            <el-input v-model="formData3.日期" id="日期"  @keydown="ent($event, 'gxh', '日期', '流程标牌')" :clearable="true" placeholder="" />
 			          </el-form-item>
 			          </el-col>
 			        </el-row>
 			  
 			  	  <el-col :span="5">
-			  	  <el-form-item label="流程标牌" prop="id" style="margin-top: 10px;">
+			  	  <el-form-item label="流程标牌" prop="id">
 			  		<el-input v-model="formData3.流程标牌" id="流程标牌"  @keydown="ent($event, '日期', '流程标牌', '上机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
 			  	  <el-col :span="5">
-			  	  <el-form-item label="上机时间" prop="id" style="margin-top: 10px;">
+			  	  <el-form-item label="上机时间" prop="id">
 			  		<el-input v-model="formData3.上机时间" id="上机时间"  @keydown="ent($event, '流程标牌', '上机时间', '下机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
 			  	  <el-col :span="5">
-			  	  <el-form-item label="下机时间" prop="" style="margin-top: 10px;">
+			  	  <el-form-item label="下机时间" prop="">
 			  	    <el-input v-model="formData3.下机时间"  id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>						  
@@ -1275,37 +1343,37 @@
 			<el-row :gutter="20">
 			      
 			    <el-col :span="3">
-			    <el-form-item label="产量" prop="id" style="margin-top: 10px;">
+			    <el-form-item label="产量" prop="id">
 			      <el-input v-model="formData3.产量" id="产量"  @keydown="ent($event, '下机时间', '产量', '制程废品')" :clearable="true" placeholder="" />
 			    </el-form-item>
 			    </el-col>
 				  <el-col :span="3">
-				  <el-form-item label="制程废品" prop="id" style="margin-top: 10px;">
+				  <el-form-item label="制程废品" prop="id">
 					<el-input v-model="formData3.制程废品" id="制程废品"  @keydown="ent($event, '产量', '制程废品', '制程次品')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
 				  <el-col :span="3">
-				  <el-form-item label="制程次品" prop="id" style="margin-top: 10px;">
+				  <el-form-item label="制程次品" prop="id">
 					<el-input v-model="formData3.制程次品" id="制程次品"  @keydown="ent($event, '制程废品', '制程次品', '前工序废')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
 				  <el-col :span="3">
-				  <el-form-item label="前工序废" prop="" style="margin-top: 10px;">
+				  <el-form-item label="前工序废" prop="">
 				    <el-input v-model="formData3.前工序废" id="前工序废"  @keydown="ent($event, '制程次品', '前工序废', '来料异常')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>	
 				<el-col :span="3">
-				<el-form-item label="来料异常" prop="" style="margin-top: 10px;">
+				<el-form-item label="来料异常" prop="">
 				  <el-input v-model="formData3.来料异常" id="来料异常"  @keydown="ent($event, '前工序废', '来料异常', '联数')" :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
 				<el-col :span="3">
-				<el-form-item label="联数" prop="" style="margin-top: 10px;">
+				<el-form-item label="联数" prop="">
 				  <el-input v-model="formData3.联数" id="联数"  @keydown="ent($event, '来料异常', '联数', '墨色')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
 				<el-col :span="3">
-				<el-form-item label="墨色" prop="" style="margin-top: 10px;">
+				<el-form-item label="墨色" prop="">
 				  <el-input v-model="formData3.墨色" id="墨色"  @keydown="ent($event, '联数', '墨色', '装版总时长')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
@@ -1314,17 +1382,17 @@
 			  
 			  <el-row :gutter="20">			        
 			      <el-col :span="3">
-			      <el-form-item label="装版总时长" prop="id" style="margin-top: 10px;">
+			      <el-form-item label="装版总时长" prop="id">
 			        <el-input v-model="formData3.装版总时长" id="装版总时长"  @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"  :clearable="true" placeholder="" />
 			      </el-form-item>
 			      </el-col>
 			  	  <el-col :span="3">
-			  	  <el-form-item label="打样总工时" prop="id" style="margin-top: 10px;">
+			  	  <el-form-item label="打样总工时" prop="id">
 			  		<el-input v-model="formData3.打样总工时" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
 			  	  <el-col :span="3">
-			  	  <el-form-item label="通电工时" prop="id" style="margin-top: 10px;">
+			  	  <el-form-item label="通电工时" prop="id">
 			  		<el-input v-model="formData3.通电工时" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
@@ -1333,27 +1401,31 @@
 				
 				<el-row :gutter="20">      
 				    <el-col :span="3">
-				    <el-form-item label="定额代号" prop="id" style="margin-top: 10px;">
+				    <el-form-item label="定额代号" prop="id">
 				      <el-input v-model="formData3.定额代号" id="定额代号"  @keydown="ent($event, '通电工时', '定额代号', '码包')" :clearable="true" placeholder="" />
 				    </el-form-item>
 				    </el-col>
 					  <el-col :span="3">
-					  <el-form-item label="码包" prop="id" style="margin-top: 10px;">
+					  <el-form-item label="码包" prop="id">
 						<el-input v-model="formData3.码包" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')" :clearable="true" placeholder="" />
 					  </el-form-item>
 					  </el-col>
 					  <el-col :span="3">
-					  <el-form-item label="主电表" prop="id" style="margin-top: 10px;">
+					  <el-form-item label="主电表" prop="id">
 						<el-input v-model="formData3.主电表"  id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>					  
 					  <el-col :span="3">
-					  <el-form-item label="辅电表" prop="id" style="margin-top: 10px;">
+					  <el-form-item label="辅电表" prop="id">
 						<el-input v-model="formData3.辅电表" id="辅电表"  @keydown="ent($event, '主电表', '辅电表', 'bzdh')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>
 				  </el-row>
-		  
+		  <div style="display: flex;">
+			  <div style="width: 136vh;">组员及分配比例</div>
+			  <div style="width: 15vh;">特殊组员</div>
+			  <div>拉料人员</div>
+		  </div>
 		  <el-row :gutter="10" style="margin-top: 10px;">
 		  	 <el-col :span="1">
 		  	   <el-input v-model="formData3.sczl_bzdh" id="bzdh"  @keydown="ent($event, '辅电表', 'bzdh', 'bh1')" :clearable="true" placeholder="ZI00401" />
@@ -1529,7 +1601,7 @@
 		
 		<el-dialog
 		  v-model="ClearVisible"
-		  title="选择"
+		  title="换型清场"
 		  destroy-on-close
 		  width="1300px"
 		  style="height: 115%;"
@@ -1642,7 +1714,8 @@ import {
   AdditionalInspectionRecordAdd,
   getMac,
   remodelGetTab,
-  setMachineTeam
+  setMachineTeam,
+  ModelChangeRecord
 } from '@/api/jixiaoguanli/baogong'
 
 import {
@@ -1670,7 +1743,10 @@ import {
   fieldInspectionRecord,
   InspectionItemAdd,
   ProcessInspectionRecordsItem,
-  MachineDetailList
+  MachineDetailList,
+  facilityPrintGetTab,
+  facilityPrintDetail,
+  facilityProcedure
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -1685,6 +1761,7 @@ import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/compone
 
 const dialogSbyxgl=ref(false)
 const zhichengstatus=ref(false)
+const yinbanselectData = ref([])
 defineOptions({
     name: 'Company'
 })
@@ -1695,6 +1772,7 @@ let checked3=ref(false)
 const detailData = reactive([])
 const treeData=ref([])
 const huanxingtreeData=ref([])
+const huanxingselectData = ref([])
 const huanxingstatus=ref(false)
 const zhichengtreeData=ref([{
 	label: '首件与过程确认'
@@ -1757,11 +1835,17 @@ const huanxingNodeClick = (node) => {
   //存放当前节点的nodeId
   if(node.machine){
 	  huanxingstatus.value=true
-	  console.log(node)
+	  modelChangeRecord(node.machine)
   }else{
 	  console.log('2')
   }
 }
+const modelChangeRecord = async (val) => {
+  const response = await ModelChangeRecord({machine:val});
+  if (response.code === 0) {
+	huanxingselectData.value=response.data
+  }
+}
 const handleNodeClick = (nodeData,node) => {
   //存放当前节点的nodeId
   if(nodeData.level === 1){
@@ -1812,12 +1896,12 @@ const FacilityProduction = async () => {
 		   let sczl_bhkey=''
 		   let sczl_namekey=''
 		   if (response.data.班组成员) {
-		     for (let i = 1; i <= Math.min(Object.keys(response.data.班组成员).length, 6); i++) {
-				 sczl_bhkey=`sczl_bh${i}`
-				 sczl_namekey=`sczl_name${i}`
+		     for (let i = 0; i < Math.min(Object.keys(response.data.班组成员).length, 9); i++) {
+				 sczl_bhkey=`sczl_bh${i+1}`
+				 sczl_namekey=`sczl_name${i+1}`
 		       formData.value[sczl_bhkey] = response.data.班组成员[i]['编号'];
 		       formData.value[sczl_namekey] = response.data.班组成员[i]['姓名'];
-			   classbz.value[i-1]=response.data.班组成员[i]['编号']
+			   classbz.value[i]=response.data.班组成员[i]['编号']
 		     }
 		   }
 		   formData.value.class=classbz.value.join(',')
@@ -1847,11 +1931,14 @@ const FacilityProduction = async () => {
 				   formData.value.status=item.状态
 			   }
 		   })
+	   }
+	   if(response.data.工单编号){
+		   InspectionRecord()
+		   FacilityDetail()
 	   }
 		FacilityWorklist()
 		FacilityTeam(JTMC)
-	    InspectionRecord()
-	    FacilityDetail()
+	    
   }
 }
 //设备工作清单
@@ -1860,11 +1947,19 @@ const FacilityWorklist = async () => {
   if (response.code === 0) {
 	// console.log(response)
 	sbzyData.splice(0, sbzyData.length, ...response.data);
+	formData.value.productCode= response.data[0]['产品代号']
+	selectData.value=[]
+	const res = await facilityProcedure({ Gd_gdbh: sbzyData[0]['工单编号|质量信息'].substring(0, 7) })
+	formData.value.productCode= response.data[0]['产品代号']
+	console.log(res)
+	if (res.code === 0) {
+	    selectData.value = res.data
+	}
   }
 }
 //检验记录
 const InspectionRecord = async () => {
-  const response = await inspectionRecord({machine:'JY01#',Gd_gdbh:'2312191',team:'A班'});
+  const response = await inspectionRecord({machine:JTMC,Gd_gdbh:formData.value.工单编号,team:BZMC.value});
   if(response.code==0){
 	 // 提取 inspectiontime 作为列名
 	        // Extract inspectiontime as columnNames
@@ -1903,7 +1998,7 @@ const InspectionRecord = async () => {
 }
 //当班产量明细
 const FacilityDetail = async () => {
-  const response = await facilityDetail({ machine: JTMC, Gd_gdbh: '2311114', team:'A班' });
+  const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team:BZMC.value });
   if (response.code === 0) {
     CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
 	formData.value.production_now=response.data[0].产量
@@ -1962,6 +2057,8 @@ const total = ref(0)
 const pageSize = ref(10)
 const tableData = ref([])
 const zhibiaoselectData=ref([])
+const yinbanVisible = ref(false)
+const yinbantreeData=ref([])
 const fujiaselectData=ref([])
 const searchInfo = ref({})
 
@@ -2071,7 +2168,7 @@ const SetProcessStatus = async () => {
   console.log(formData.value.工单编号,formData.value.印件号,formData.value.工序号)
   const response = await setProcessStatus({order:formData.value.工单编号,yjno:formData.value.印件号,gxh:formData.value.工序号});
   if (response.code === 0) {
-	
+	FacilityProduction
   }
   console.log(response)
 }
@@ -2097,6 +2194,52 @@ function ondianjian() {
   });
   
 }
+//机台印版领用->右侧详情
+const facilityPrintDetailItem = async (value) => {
+  try {
+    // 调用接口获取巡检项目数据
+    const response = await facilityPrintDetail({ workOrder: formData.value.工单编号,code:value,productCode:formData.value.productCode });
+	// 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 yinbanNodeClick = (node, check, nodeData) => {
+  if (node.children && node.children.length > 0) {
+    // 点击的是父节点,且有子节点
+    // 执行相应的父节点单击事件处理逻辑
+    // 这里可以添加你想要的处理逻辑,比如展开/折叠节点等
+  } else {
+    // 点击的是子节点,或者没有子节点
+    // 执行相应的子节点单击事件处理逻辑
+	yinbanselectData.value=[]
+     facilityPrintDetailItem(node.code)
+  }
+};
+const onyinban = async() => {
+	const res = await facilityPrintGetTab({productCode:formData.value.productCode})
+	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;
+	}
+}
 const onzhicheng = async () => {
 	zhichengstatus.value=false
 	xunchaData.value=[]
@@ -2355,7 +2498,13 @@ const GetMachineMac = async () => {
 	xmlhttp.open("get", "http://127.0.0.1:8090/init")
 	// 5. 发送
 	xmlhttp.send();
-  const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
+  // const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
+  const response = await getMachineMac({ addr: '68-ED-A4-26-60-C8' });
+  // const response = await getMachineMac({ addr: '40-62-31-21-4E-15' });
+  // const response = await getMachineMac({ addr: '68-ED-A4-26-5F-42' });
+  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-E5' });
+  // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-4E' });
+  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-D1' });
   console.log(response);
   if (response.code === 0) {
     // 将接口返回的数据添加到树型结构中
@@ -2423,7 +2572,7 @@ const ReportInfo = async () => {
       product_name: order_info.product_name,
       yj_name: order_info.yj_name,
       gy_name: order_info.gy_name,
-      sczl_jtbh: classInfo.sczl_jtbh,
+      sczl_jtbh: classInfo.sczl_jtbh.split('#')[0],
       sczl_bzdh: classInfo.sczl_bzdh,
       sys_id: classInfo.sys_id,
       sys_rq: classInfo.sys_rq,
@@ -2501,7 +2650,7 @@ const SubmitDailyProduction = async () => {
 	sczl_rate8: formData3.value.sczl_rate8,
 	sczl_rate9: formData3.value.sczl_rate9,
 	sczl_rate10: formData3.value.sczl_rate10,
-	sczl_jtbh: 'JY01',
+	sczl_jtbh: formData3.value.sczl_jtbh,
 	sczl_rq: formData3.value.日期,
 	sczl_num: formData3.value.流程标牌,
 	sczl_sj1: formData3.value.上机时间,
@@ -2513,7 +2662,7 @@ const SubmitDailyProduction = async () => {
 	less_sl: formData3.value.来料异常,
 	sczl_ls: formData3.value.联数,
 	sczl_ms: formData3.value.墨色,
-	zb_time: formData3.value.装版总时,
+	zb_time: formData3.value.装版总时,
 	dy_time: formData3.value.打样总工时,
 	run_time: formData3.value.通电工时,
 	sczl_dedh: formData3.value.定额代号,
@@ -2527,8 +2676,12 @@ const SubmitDailyProduction = async () => {
   const response = await submitDailyProduction(restoredData);
   console.log(response)
   if (response.code === 0) {
-   FacilityDetail()
-   chanliangVisible.value=false
+	  ElMessage({
+	    type: 'success',
+	    message: '成功'
+	  })
+      FacilityDetail()
+      chanliangVisible.value=false
   }
 }
 // let formattedArray 
@@ -3030,6 +3183,7 @@ const handleSelectionChange = (val) => {
     multipleSelection.value = val
 }
 const zdtreeType = ref(false)
+const selectData = ref([])
 const showsTable = (val,tab) => {
 	
 }
@@ -3092,11 +3246,10 @@ const updateCompanyFunc = async(row) => {
 }
 
 const yjupdateCompanyFunc = async(row) => {
-	console.log(row)
     const res = await setMachineTeam({
 			machine: JTMC.split("#")[0],
 			order:row['工单编号|质量信息'].split('|')[0],
-			yjno:row['工序名称'].split('-')[0],
+			yjno:row['印件资料'].split('-')[0],
 			gy_name:row['工序名称'],
 			sczl_bzdh:BZMC.value,
 			status:formData.value.状态,
@@ -3106,6 +3259,7 @@ const yjupdateCompanyFunc = async(row) => {
 			})
     if (res.code === 0) {
 		FacilityProduction()
+		
 		ElMessage({
 		        type: 'success',
 		        message: '成功'