zck 3 miesięcy temu
rodzic
commit
09c99c89e3

+ 0 - 0
src/assets/css/print-lock.css → public/luckysheet/css/print-lock.css


+ 10 - 0
src/api/mes/huhejob.js

@@ -230,6 +230,16 @@ export const RcDel = (data) => {
   })
 }
 
+// 糊盒成品获取工单信息
+export const getGd = (params) => {
+  return service({
+    url: '/mes_server/glu_finished_product_warehousing/getGd',
+    method: 'get',
+    params
+  })
+}
+
+
 // 糊盒报工计时左侧菜单
 export const GcgetTab = (params) => {
   return service({

+ 18 - 0
src/api/mes/job.js

@@ -370,6 +370,24 @@ export const StaProcessAnomaly = (params) => {
   })
 }
 
+//物料批次信息
+export const MaterialsBatch = (params) => {
+  return service({
+    url: '/mes_server/Production_lot/MaterialsBatch',
+    method: 'get',
+    params
+  })
+}
+
+//印版记录
+export const PrintingPlateList = (params) => {
+  return service({
+    url: '/mes_server/Production_lot/PrintingPlateList',
+    method: 'get',
+    params
+  })
+}
+
 
 /*
 	工序大废品统计

+ 23 - 291
src/view/performance/09-workOrderVerification/index.vue

@@ -26,7 +26,7 @@
 								<el-button type="primary" icon="copy-document" class="bt"@click="dialogMrhjtj = true">每日核检统计</el-button>
 								<el-button type="primary" icon="copy-document" class="bt" @click="showGdzjfptj">工单质检废品统计</el-button>
 								<el-button type="primary" icon="edit"   @click="gdlcdcxconlick"    class="bt" title="流程单查询">流程单查询</el-button>
-								<el-button type="primary" icon="edit"   @click="scpconClick"    class="bt" title="工单生产批次信息查询">工单生产批次信息查询</el-button>
+								<el-button type="primary" icon="edit"   @click="scpconClick"    class="bt" title="工单生产批次信息查询">工单生产批次质量档案查询</el-button>
 								<el-button type="primary" icon="delete" class="bt" @click="handleDelete">删除</el-button>
 								<el-button type="primary" icon="edit" class="bt" @click="showHjfpfb">核检废品分布</el-button>
 								<div style="margin-left: auto;">			
@@ -193,154 +193,21 @@
 					
 					
 					<!--工单生产批次信息查询【弹窗】-->
-					<el-dialog v-model="scpconlist" title="工单生产批次信息查询" style="width: 100%;height: 100%;margin: 0px;padding: 0px;">
-					  <el-button type="primary"   @click="ontuicclicks" style="color: white;margin-left: 20px;" title="退出">退出</el-button>
-					  <div 
-						style="
-						  width: 60%; 
-						  height: 470px; 
-						  position: fixed; 
-						  left: 25%; 
-						  padding: 20px; 
-						  border-radius: 8px; 
-						  background-color: #fff; 
-						  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);">
-						<div style="margin-top: 10px;">
-						  <!-- 提示信息 -->
-						  <hr>
-						  <p style="font-size: 14px; color: red; margin: 10px 0;">搜索栏目为空,则从最近2周完工的工单中选择</p>
-						  <p style="font-size: 14px; color: red; margin: 10px 0;">否则,以栏目值为关键字,从工单编号、产品名称、客户名称中选择</p>
-						  <hr>
-						  
-						  <!-- 输入框和按钮 -->
-						  <div style="display: flex; align-items: center; margin-top: 10px;">
-							<el-input v-model="searchInfolcd" placeholder="Enter回车搜索工单编号" @keydown="Enterkeysearch" id="searchInfo" style="height: 40px;flex: 1;"></el-input>
-							<el-button type="primary" title="搜索"  icon="el-icon-search" style="width: 70px;height: 40px;font-size: 18px;"  @click="onSubmitlcd" >搜索</el-button>
-							<el-button type="primary" title="查看"  icon="el-icon-search" style="width: 110px;height: 40px;font-size: 18px;"  @click="onstatsuclick" >查看流程单</el-button>
-						  </div>
-						  
-						  <!-- 表格展示区域 -->
-						  <div class="gva-table-box" style="margin-top: 15px;">
-							<el-table 
-								ref="multipleTable"
-								style="width: 100%; height: 30vh; verflow: auto;" 
-								:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
-								:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-								:data="tableDatalcd" 
-								:border="true" 
-								:tooltip-effect="'dark'"
-								row-key="ID"
-								highlight-current-row
-								@row-click="tableRowClicklcd"
-								@row-dblclick="updateCompanyFunclcd"
-								@selection-change="handleSelectionChange">
-							<el-table-column align="left"  label="工单编号" 	  width="115"	prop="Gd_gdbh" />
-							<el-table-column align="left"  label="行号" 	  width="60"	prop="行号" />
-							<el-table-column align="left"  label="工序名称" 	 	prop="Gd_cpmc"  />
-							  <!-- <el-table-column prop="工单" label="工单编号-行号-工序名称" align="left" sortable show-overflow-tooltipmin-width="300"/> -->
-							</el-table>
-						  </div>
-						</div>
-					  </div>
-					  <!-- 机台生产日报表维护弹窗 -->
-					  <el-dialog v-model="popdialog" title="机台生产日报表维护" destroy-on-close width="90%" style="height: 92%; margin-left: 5%; margin-top: 1%;">
-						<div>
-						  <!-- 顶层布局 -->
-						  <layout>
-							<!-- 顶部的搜索区域 -->
-							<layout-header>
-							  <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule">
-								<!-- 添加按钮 -->
-							  <el-button type="primary" icon="edit" style="color: white;margin-left: 20px;"   @click="ontuicclick"  class="bt" title="退出">退出</el-button>
-							  </el-form>
-							</layout-header>
-					  
-							<!-- 左右布局 -->
-							<layout style="height: calc(100% - 50px); display: flex;">
-							  <!-- 左侧树形区域 -->
-							  <layout-sider style="width: 140px; margin-right: 10px; overflow: hidden;height: 584px;">
-								<div class="JKWTree-tree" style="height: 100%; max-height: 100vh; overflow-y: auto;">
-								  <h3></h3>
-								  <el-tree
-									:data="treeDatalcd"
-									node-key="num"
-									highlight-current
-									:props="defaultProps"
-									@node-click="handleNodeClicklcd"
-								  />
-								</div>
-							  </layout-sider>
-					  
-					  
-							  <!-- 右侧表格区域 -->
-							  <layout-content style="flex: 1; overflow: auto;">
-								<el-main>
-								 <div style="width: 100%; font-family: Arial, sans-serif; font-size: 14px;">
-									 <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-									   <p style="flex: 0.4; margin: 0;">工单编号:<span style="color: red;">{{ _GetorderDetail['Gd_gdbh'] }}</span></p>
-									   <p style="flex: 0.3; margin: 0;">产品代号:<span style="color: red;">{{ _GetorderDetail['Gd_cpdh'] }}</span></p>
-									   <p style="flex: 1; margin: 0;">产品名称:<span style="color: red;">{{ _GetorderDetail['Gd_cpmc'] }}</span></p>
-									 </div>
-									 <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-									   <p style="flex: 0.4; margin: 0;">订单数量:<span style="color: red;">{{ _GetorderDetail['订单数量'] }}</span></p>
-									   <p style="flex: 0.3; margin: 0;">实际投料:<span style="color: red;">{{ _GetorderDetail['实际投料'] }}</span></p>
-									   <p style="flex: 1; margin: 0;">
-										 单位:<span style="color: red;">{{ _GetorderDetail['计量单位'] }}</span> 
-										 目标合格率:<span style="color: red;">{{ _GetorderDetail['投料率'] }}</span>
-									   </p>
-									 </div>
-								   </div>
-								  
-								  <el-tabs v-model="activeName" @tab-click="handleClick">
-										<el-tab-pane label="工艺及生产班组"  @click="showTable('工艺及生产班组')"  name="first">
-										  <el-table tooltip-effect="dark" :data="lcdtableData" row-key="ID"
-											highlight-current-row="true"
-											:row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
-											:cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-											border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-											style="width: 100%;height: 56vh" ref="tablesczl_gxmc"
-											@row-dblclick="gyscbzSelectClick">
-											<el-table-column align="left"  label="流程单号" 	  width="81"	prop="流程单号" />
-											<el-table-column align="left"  label="工序号" 	  width="68"	prop="工序号" />
-											<el-table-column align="left"  label="工序名称" 	  width="240"	prop="工序名称"  />
-											<el-table-column align="left"  label="生产日期" 	  width="120"	prop="生产日期"  />
-											<el-table-column align="left"  label="机台编号" 	  width="81"	prop="机台编号"  />
-											<el-table-column align="left"  label="班组人员01"  width="105"  :formatter="(row) => `${row.sczl_bh1 || ''} ${row.name1 || ''}`"/>
-											<el-table-column align="left"  label="班组人员02"  width="105"  :formatter="(row) => `${row.sczl_bh2 || ''} ${row.name2 || ''}`"/>
-											<el-table-column align="left"  label="班组人员03"  width="105"  :formatter="(row) => `${row.sczl_bh3 || ''} ${row.name3 || ''}`"/>
-											<el-table-column align="left"  label="班组人员04"  width="105"  :formatter="(row) => `${row.sczl_bh4 || ''} ${row.name4 || ''}`"/>
-											<el-table-column align="left"  label="班组人员05"  width="105"  :formatter="(row) => `${row.sczl_bh5 || ''} ${row.name5 || ''}`"/>
-											<el-table-column align="left"  label="班组人员06"  width="105"  :formatter="(row) => `${row.sczl_bh6 || ''} ${row.name6 || ''}`"/>
-											<el-table-column align="left"  label="班组人员07"  width="105"  :formatter="(row) => `${row.sczl_bh7 || ''} ${row.name7 || ''}`"/>
-											<el-table-column align="left"  label="班组人员08"  width="105"  :formatter="(row) => `${row.sczl_bh8 || ''} ${row.name8 || ''}`"/>
-											<el-table-column align="left"  label="班组人员09"  width="105"  :formatter="(row) => `${row.sczl_bh9 || ''} ${row.name9 || ''}`"/>
-											<el-table-column align="left"  label="班组人员10"  width="105"  :formatter="(row) => `${row.sczl_bh10 || ''} ${row.name10 || ''}`"/>
-										  </el-table>
-										</el-tab-pane>
-										
-										<el-tab-pane label="制程异常记录"  @click="showTable('制程异常记录')"  name="second">
-										  <el-table tooltip-effect="dark" :data="zcycjltableData" row-key="ID"
-											highlight-current-row="true"
-											:row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
-											:cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-											border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-											style="width: 100%;height: 65vh" ref="tablzcycjl_gxmc"
-											@row-dblclick="zcycjlSelectClick">
-											<el-table-column align="left"  label="流程单号" 	  width="100"	prop="流程单号" />
-											<el-table-column align="left"  label="数量" 	  	  width="100"	prop="数量" />
-											<el-table-column align="left"  label="异常备注" 	  width="400"	prop="缺陷备注"  />
-											<el-table-column align="left"  label="用户" 	  	  width="160"	prop="用户"  />
-										  </el-table>
-										</el-tab-pane>
-					  
-								  </el-tabs>
-								</el-main>
-							  </layout-content>
-							</layout>
-						  </layout>
-						</div>
-					  </el-dialog>
-					</el-dialog>
+					<el-dialog
+			v-model="scpconlist"
+			title=""
+			width="80%"
+			height="80%"
+			:before-close="handleClose"
+			destroy-on-close
+			>
+			<!-- 在弹窗中使用Onderstatus组件 -->
+			<Onderstatus :default-search-value="_Gd_gdbh" />
+
+				<template #footer>
+				<el-button @click="scpconlist = false">关闭</el-button>
+		</template>
+		</el-dialog>
 					
 					
 					<!-- 废品类别弹出 -->
@@ -480,6 +347,7 @@
 	import Gongdanzhijianfeipintongji from '@/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue'
 	import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
 	import Hjfpfb from '@/view/performance/12-orderAccounting/componets/hjfpfb.vue'
+	import Onderstatus from '@/view/quality/orderstatus.vue'
 	import {
 	  StaGetOrderList,
 	  StaGetList,
@@ -745,156 +613,20 @@ const gd_lcdCancel = async () => {
 }
 
 
-
-/*
-	工单生产批次信息查询
-		console.log(currentRow.gdbh)
-*/ 
-
-
 /*
 	工单生产批次信息查询
 */
 const scpconlist = ref(false);
-const scpconClick = async () => {
-  console.log(currentRow.gdbh)
-  searchInfolcd.value = currentRow.gdbh
-  scpconlist.value = true;
-  tableDatalcd.splice(0,tableDatalcd.length,...[]);//表格数据
-  onSubmitlcd()//调用接口
+// 实现scpconClick方法,控制弹窗显示
+const scpconClick = () => {
+	scpconlist.value = true
 }
-//进入页面默认光标加载
-setTimeout(() => {
-	const inputElement = document.getElementById('searchInfo');
-	if (inputElement) {
-		inputElement.focus();		
-	}
-}, 100);
-			
-//搜索
-const searchInfolcd = ref('');
-const tableDatalcd = reactive([])
-//查询按钮
-const onSubmitlcd = () => {
-  _StaGetOrderList()
-};
-//搜索回车
-const Enterkeysearch = (event) => {
-   if (event.key === 'Enter') {
-      _StaGetOrderList();
-    }
-};
-//调用接口
-const _StaGetOrderList = async (node) => {
-  const StaGetOrderListdata = await StaGetOrderList({search:searchInfolcd.value});
-  console.log(StaGetOrderListdata)
-	if (StaGetOrderListdata.data === null) {
-	  ElMessage({
-		type: 'warning',
-		message: '未搜索具体查询条件',
-		customClass: 'custom-message', // 添加自定义类名
-		duration: 3000 // 可选:设置消息显示的持续时间(单位:毫秒)
-	  });
-	}
-  tableDatalcd.splice(0,tableDatalcd.length,...StaGetOrderListdata.data);//表格数据
-};
-
-// 树形节点属性映射
-const treeDatalcd = reactive([]);
-const defaultProps = {
-  label: '流程单',
-  children: 'children',
-};
-//全局调用工单编号、印件号
-const _Gd_gdbhlcd = ref(null)
-const _Gd_yjnolcd = ref(null)
-const _GetorderDetail = ref(null)
-
-
-/*
-	弹窗页面
-*/
-const popdialog = ref(false);
-const currentRows = ref('');
-// 获取当前行数据
-const tableRowClicklcd = (row) => {
-  currentRows.value = row; // 保存当前选中行
-};
 
-// 按钮点击逻辑
-const onstatsuclick  = async () => {
-	console.log(currentRows)
-  if (!currentRows.value) {
-	ElMessage({
-	  type: "warning",
-	  message: "请先点击选择一行数据",
-	});
-	return;
-  }
-  await updateCompanyFunclcd(currentRows.value);
-};
-//双击
-const updateCompanyFunclcd = async (row) => {
-	console.log("双击",row)
-	_Gd_gdbhlcd.value = row['Gd_gdbh']
-	_Gd_yjnolcd.value =row['行号']
-	
-	const StaGetOrderDetaildata = await StaGetOrderDetail({ gdbh: row['Gd_gdbh'], yjno: row['行号'] });
-	let resultData = StaGetOrderDetaildata.data;
-	// 遍历对象,将 null 值替换为空字符串
-	Object.keys(resultData).forEach((key) => {
-	  if (resultData[key] === null) {
-	    resultData[key] = '';
-	  }
-	});
-	_GetorderDetail.value = resultData;
-	// console.log("_GetorderDetail.value", _GetorderDetail.value);
-	_StaGetList(row)
+// 弹窗关闭前的处理函数
+const handleClose = () => {
+	scpconlist.value = false
 }
 
-//左侧树形节点点击事件
-const handleNodeClicklcd = (node) => {
-  _StaProcessList(node['num'])
-  _StaProcessAnomaly()
-};
-
-//获取左侧菜单栏
-const _StaGetList = async (row) => {
-  const StaGetListdata = await StaGetList({gdbh:row['Gd_gdbh'],yjno:row['行号']});
-  console.log(StaGetListdata.msg)
-  if(StaGetListdata.msg === '成功'){
-	  treeDatalcd.splice(0, treeDatalcd.length, ...StaGetListdata.data);
-	  popdialog.value = true
-  }else{
-	  console.log(StaGetListdata.msg)
-	  ElMessage({type: 'warning',message: StaGetListdata.msg})
-  }
-};
-
-//工艺及生产班组
-const lcdtableData = reactive([])
-const _StaProcessList = async (node) => {
-  const StaProcessListdata = await StaProcessList({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value,num:node});
-  lcdtableData.splice(0,lcdtableData.length,...StaProcessListdata.data);
-};
-
-//制程异常记录
-const zcycjltableData = reactive([])
-const _StaProcessAnomaly = async () => {
-  const StaProcessAnomalydata = await StaProcessAnomaly({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value});
-  zcycjltableData.splice(0,zcycjltableData.length,...StaProcessAnomalydata.data);
-};
-
-//退出按钮
-const ontuicclick = async () => {
-  popdialog.value = false
-};
-
-//退出按钮
-const ontuicclicks = async () => {
-  scpconlist.value = false
-};
-
 
 
 

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

@@ -15,7 +15,7 @@
 			  <el-button type="primary" size="large" class="bt" style="color:white;font-size: 16px;font-weight: bold;width: 70px"  @click="oncomplaints" >客诉记录</el-button>
 			  <el-button type="primary" size="large" class="bt" style="color:white;font-size: 16px;font-weight: bold;width: 120px" @click="deldbcl_onclick" :disabled="dbclSelection === ''"   title="当班产量明细" >当班产量明细删除</el-button>
 			  <el-button type="primary" size="large" class="bt" style="color:white;font-size: 16px;font-weight: bold;width: 85px"  @click="pd_lcdlistonClick" >流程单查询</el-button>
-			  <el-button type="primary" size="large" class="bt" style="color:white;font-size: 16px;font-weight: bold;width: 165px" @click="scpconClick" >工单生产批次信息查询</el-button>
+			  <el-button type="primary" size="large" class="bt" style="color:white;font-size: 16px;font-weight: bold;width: 165px" @click="scpconClick" >工单生产批次质量档案查询</el-button>
 			  <el-button type="primary" size="large" class="bt" style="color:white;font-size: 20px;font-weight: bold;width: 70px"  @click="onOver" title="完工按钮" >完工</el-button>
 		  </div>
 	  </header>
@@ -1891,155 +1891,21 @@
 			  </el-dialog>
 			
 				  
-			  <!--工单生产批次信息查询【弹窗】-->
-			  <el-dialog v-model="scpconlist" title="工单生产批次信息查询" style="width: 100%;height: 100%;margin: 0px;padding: 0px;">
-				<el-button type="primary"   @click="ontuicclicks" style="color: white;margin-left: 20px;"  class="bt" title="退出">退出</el-button>
-				<div 
-				  style="
-					width: 60%; 
-					height: 470px; 
-					position: fixed; 
-					left: 25%; 
-					padding: 20px; 
-					border-radius: 8px; 
-					background-color: #fff; 
-					box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);">
-				  <div style="margin-top: 10px;">
-					<!-- 提示信息 -->
-					<hr>
-					<p style="font-size: 14px; color: red; margin: 10px 0;">搜索栏目为空,则从最近2周完工的工单中选择</p>
-					<p style="font-size: 14px; color: red; margin: 10px 0;">否则,以栏目值为关键字,从工单编号、产品名称、客户名称中选择</p>
-					<hr>
-					
-					<!-- 输入框和按钮 -->
-					<div style="display: flex; align-items: center; margin-top: 10px;">
-					  <el-input v-model="searchInfolcd" placeholder="Enter回车搜索工单编号" @keydown="Enterkeysearch" id="searchInfo" style="height: 40px;flex: 1;"></el-input>
-					  <el-button type="primary" title="搜索"  icon="el-icon-search" style="width: 70px;height: 40px;font-size: 18px;"  @click="onSubmitlcd" >搜索</el-button>
-					  <el-button type="primary" title="查看"  icon="el-icon-search" style="width: 110px;height: 40px;font-size: 18px;"  @click="onstatsuclick" >查看流程单</el-button>
-					</div>
-					
-					<!-- 表格展示区域 -->
-					<div class="gva-table-box" style="margin-top: 15px;">
-					  <el-table 
-						  ref="multipleTable"
-						  style="width: 100%; height: 30vh; verflow: auto;" 
-						  :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
-						  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-						  :data="tableDatalcd" 
-						  :border="true" 
-						  :tooltip-effect="'dark'"
-						  row-key="ID"
-						  highlight-current-row
-						  @row-click="tableRowClicklcd"
-						  @row-dblclick="updateCompanyFunclcd"
-						  @selection-change="handleSelectionChange">
-						<el-table-column align="left"  label="工单编号" 	  width="115"	prop="Gd_gdbh" />
-						<el-table-column align="left"  label="行号" 	  width="60"	prop="行号" />
-						<el-table-column align="left"  label="工序名称" 	 	prop="Gd_cpmc"  />
-						<!-- <el-table-column prop="工单" label="工单编号-行号-工序名称" align="left" sortable show-overflow-tooltipmin-width="300"/> -->
-					  </el-table>
-					</div>
-				  </div>
-				</div>
-				<!-- 机台生产日报表维护弹窗 -->
-				<el-dialog v-model="popdialog" title="机台生产日报表维护" destroy-on-close width="90%" style="height: 92%; margin-left: 5%; margin-top: 1%;">
-				  <div>
-					<!-- 顶层布局 -->
-					<layout>
-					  <!-- 顶部的搜索区域 -->
-					  <layout-header>
-						<el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule">
-						  <!-- 添加按钮 -->
-						  <el-button type="primary" icon="edit" style="color: white;margin-left: 20px;"   @click="ontuicclick"  class="bt" title="退出">退出</el-button>
-						</el-form>
-					  </layout-header>
-				
-					  <!-- 左右布局 -->
-					  <layout style="height: calc(100% - 50px); display: flex;">
-						<!-- 左侧树形区域 -->
-						<layout-sider style="width: 140px; margin-right: 10px; overflow: hidden;height: 584px;">
-						  <div class="JKWTree-tree" style="height: 100%; max-height: 100vh; overflow-y: auto;">
-							<h3></h3>
-							<el-tree
-							  :data="treeDatalcd"
-							  node-key="num"
-							  highlight-current
-							  :props="defaultProps"
-							  @node-click="handleNodeClicklcd"
-							/>
-						  </div>
-						</layout-sider>
-				
-				
-						<!-- 右侧表格区域 -->
-						<layout-content style="flex: 1; overflow: auto;">
-						  <el-main>
-							 <div style="width: 100%; font-family: Arial, sans-serif; font-size: 14px;">
-								 <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-								   <p style="flex: 0.4; margin: 0;">工单编号:<span style="color: red;">{{ _GetorderDetail['Gd_gdbh'] }}</span></p>
-								   <p style="flex: 0.3; margin: 0;">产品代号:<span style="color: red;">{{ _GetorderDetail['Gd_cpdh'] }}</span></p>
-								   <p style="flex: 1; margin: 0;">产品名称:<span style="color: red;">{{ _GetorderDetail['Gd_cpmc'] }}</span></p>
-								 </div>
-								 <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-								   <p style="flex: 0.4; margin: 0;">订单数量:<span style="color: red;">{{ _GetorderDetail['订单数量'] }}</span></p>
-								   <p style="flex: 0.3; margin: 0;">实际投料:<span style="color: red;">{{ _GetorderDetail['实际投料'] }}</span></p>
-								   <p style="flex: 1; margin: 0;">
-									 单位:<span style="color: red;">{{ _GetorderDetail['计量单位'] }}</span> 
-									 目标合格率:<span style="color: red;">{{ _GetorderDetail['投料率'] }}</span>
-								   </p>
-								 </div>
-							   </div>
-							  
-							  <el-tabs v-model="activeName" @tab-click="handleClick">
-									<el-tab-pane label="工艺及生产班组"  @click="showTable('工艺及生产班组')"  name="first">
-									  <el-table tooltip-effect="dark" :data="lcdtableData" row-key="ID"
-										highlight-current-row="true"
-										:row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
-										:cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-										border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-										style="width: 100%;height: 56vh" ref="tablesczl_gxmc"
-										@row-dblclick="gyscbzSelectClick">
-										<el-table-column align="left"  label="流程单号" 	  width="81"	prop="流程单号" />
-										<el-table-column align="left"  label="工序号" 	  width="68"	prop="工序号" />
-										<el-table-column align="left"  label="工序名称" 	  width="240"	prop="工序名称"  />
-										<el-table-column align="left"  label="生产日期" 	  width="120"	prop="生产日期"  />
-										<el-table-column align="left"  label="机台编号" 	  width="81"	prop="机台编号"  />
-										<el-table-column align="left"  label="班组人员01"  width="105"  :formatter="(row) => `${row.sczl_bh1 || ''} ${row.name1 || ''}`"/>
-										<el-table-column align="left"  label="班组人员02"  width="105"  :formatter="(row) => `${row.sczl_bh2 || ''} ${row.name2 || ''}`"/>
-										<el-table-column align="left"  label="班组人员03"  width="105"  :formatter="(row) => `${row.sczl_bh3 || ''} ${row.name3 || ''}`"/>
-										<el-table-column align="left"  label="班组人员04"  width="105"  :formatter="(row) => `${row.sczl_bh4 || ''} ${row.name4 || ''}`"/>
-										<el-table-column align="left"  label="班组人员05"  width="105"  :formatter="(row) => `${row.sczl_bh5 || ''} ${row.name5 || ''}`"/>
-										<el-table-column align="left"  label="班组人员06"  width="105"  :formatter="(row) => `${row.sczl_bh6 || ''} ${row.name6 || ''}`"/>
-										<el-table-column align="left"  label="班组人员07"  width="105"  :formatter="(row) => `${row.sczl_bh7 || ''} ${row.name7 || ''}`"/>
-										<el-table-column align="left"  label="班组人员08"  width="105"  :formatter="(row) => `${row.sczl_bh8 || ''} ${row.name8 || ''}`"/>
-										<el-table-column align="left"  label="班组人员09"  width="105"  :formatter="(row) => `${row.sczl_bh9 || ''} ${row.name9 || ''}`"/>
-										<el-table-column align="left"  label="班组人员10"  width="105"  :formatter="(row) => `${row.sczl_bh10 || ''} ${row.name10 || ''}`"/>
-									  </el-table>
-									</el-tab-pane>
-									
-									<el-tab-pane label="制程异常记录"  @click="showTable('制程异常记录')"  name="second">
-									  <el-table tooltip-effect="dark" :data="zcycjltableData" row-key="ID"
-										highlight-current-row="true"
-										:row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
-										:cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-										border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-										style="width: 100%;height: 65vh" ref="tablzcycjl_gxmc"
-										@row-dblclick="zcycjlSelectClick">
-										<el-table-column align="left"  label="流程单号" 	  width="100"	prop="流程单号" />
-										<el-table-column align="left"  label="数量" 	  	  width="100"	prop="数量" />
-										<el-table-column align="left"  label="异常备注" 	  width="400"	prop="缺陷备注"  />
-										<el-table-column align="left"  label="用户" 	  	  width="160"	prop="用户"  />
-									  </el-table>
-									</el-tab-pane>
-				
-							  </el-tabs>
-						  </el-main>
-						</layout-content>
-					  </layout>
-					</layout>
-				  </div>
-				</el-dialog>
-			  </el-dialog>
+			  <el-dialog
+			v-model="scpconlist"
+			title=""
+			width="80%"
+			height="80%"
+			:before-close="handleClose"
+			destroy-on-close
+			>
+			<!-- 在弹窗中使用Onderstatus组件 -->
+			<Onderstatus :default-search-value="formData.工单编号" />
+
+				<template #footer>
+				<el-button @click="scpconlist = false">关闭</el-button>
+		</template>
+		</el-dialog>
   
   
 			<el-dialog
@@ -2540,6 +2406,7 @@
   import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
   import { useUserStore } from '@/pinia/modules/user'
   import PrintPage from '../yunyin/shengchanguanli/components/print.vue'
+  import Onderstatus from '@/view/quality/orderstatus.vue'
   import {
 	StaGetOrderList,
 	StaGetList,
@@ -6241,145 +6108,20 @@ onMounted(() => {
   
   
   
+
   /*
-	  工单生产批次信息查询
-  */
-  const scpconlist = ref(false);
-  const scpconClick = async () => {
-	console.log(formData.value.工单编号)
-	searchInfolcd.value = formData.value.工单编号
-	scpconlist.value = true;
-	tableDatalcd.splice(0,tableDatalcd.length,...[]);//表格数据
-	onSubmitlcd()//调用接口
-  }
-  //进入页面默认光标加载
-  setTimeout(() => {
-	  const inputElement = document.getElementById('searchInfo');
-	  if (inputElement) {
-		  inputElement.focus();		
-	  }
-  }, 100);
-			  
-  //搜索
-  const searchInfolcd = ref('');
-  const tableDatalcd = reactive([])
-  //查询按钮
-  const onSubmitlcd = () => {
-	_StaGetOrderList()
-  };
-  //搜索回车
-  const Enterkeysearch = (event) => {
-	 if (event.key === 'Enter') {
-		_StaGetOrderList();
-	  }
-  };
-  //调用接口
-  const _StaGetOrderList = async (node) => {
-	const StaGetOrderListdata = await StaGetOrderList({search:searchInfolcd.value});
-	console.log(StaGetOrderListdata)
-	  if (StaGetOrderListdata.data === null) {
-		warningres('未搜索具体查询条件')
-	  }
-	tableDatalcd.splice(0,tableDatalcd.length,...StaGetOrderListdata.data);//表格数据
-  };
-  
-  // 树形节点属性映射
-  const treeDatalcd = reactive([]);
-  const defaultProps = {
-	label: 'label',
-	children: 'children',
-  };
-  //全局调用工单编号、印件号
-  const _Gd_gdbhlcd = ref(null)
-  const _Gd_yjnolcd = ref(null)
-  const _GetorderDetail = ref(null)
-  
-  
-  /*
-	  弹窗页面
-  */
-  const popdialog = ref(false);
-  const currentRow = ref('');
-  // 获取当前行数据
-  const tableRowClicklcd = (row) => {
-	currentRow.value = row; // 保存当前选中行
-  };
-  
-  // 按钮点击逻辑
-  const onstatsuclick  = async () => {
-	  console.log(currentRow)
-	if (!currentRow.value) {
-	  warningres("请先点击选择一行数据")
-	  return;
-	}
-	await updateCompanyFunclcd(currentRow.value);
-  };
-  //双击
-  const updateCompanyFunclcd = async (row) => {
-	  console.log("双击",row)
-	  _Gd_gdbhlcd.value = row['Gd_gdbh']
-	  _Gd_yjnolcd.value =row['行号']
-	  
-	  const StaGetOrderDetaildata = await StaGetOrderDetail({ gdbh: row['Gd_gdbh'], yjno: row['行号'] });
-	  let resultData = StaGetOrderDetaildata.data;
-	  // 遍历对象,将 null 值替换为空字符串
-	  Object.keys(resultData).forEach((key) => {
-		if (resultData[key] === null) {
-		  resultData[key] = '';
-		}
-	  });
-	  _GetorderDetail.value = resultData;
-	  // console.log("_GetorderDetail.value", _GetorderDetail.value);
-	  _StaGetList(row)
-  }
-  
-  //左侧树形节点点击事件
-  const handleNodeClicklcd = (node) => {
-	_StaProcessList(node['num'])
-	_StaProcessAnomaly()
-  };
-  
-//获取左侧菜单栏
-const _StaGetList = async (row) => {
-  const StaGetListdata = await StaGetList({ gdbh: row['Gd_gdbh'], yjno: row['行号'] });
-  
-  if (StaGetListdata.msg === '成功') {
-    // 转换数据:确保每个节点有 label 属性
-    const formattedData = StaGetListdata.data.map(item => ({
-      ...item,
-      label: item.流程单 || `流程单-${item.num}`, 
-    }));
-    
-    treeDatalcd.splice(0, treeDatalcd.length, ...formattedData);
-    popdialog.value = true;
-  } else {
-    ElMessage({ type: 'warning', message: StaGetListdata.msg });
-  }
-};
-  
-  //工艺及生产班组
-  const lcdtableData = reactive([])
-  const _StaProcessList = async (node) => {
-	const StaProcessListdata = await StaProcessList({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value,num:node});
-	lcdtableData.splice(0,lcdtableData.length,...StaProcessListdata.data);
-  };
-  
-  //制程异常记录
-  const zcycjltableData = reactive([])
-  const _StaProcessAnomaly = async () => {
-	const StaProcessAnomalydata = await StaProcessAnomaly({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value});
-	zcycjltableData.splice(0,zcycjltableData.length,...StaProcessAnomalydata.data);
-  };
-  
-  //退出按钮
-  const ontuicclick = async () => {
-	popdialog.value = false
-  };
-  
-  //退出按钮
-  const ontuicclicks = async () => {
+	工单生产批次信息查询
+*/
+const scpconlist = ref(false);
+// 实现scpconClick方法,控制弹窗显示
+const scpconClick = () => {
+	scpconlist.value = true
+}
+
+// 弹窗关闭前的处理函数
+const handleClose = () => {
 	scpconlist.value = false
-  };
+}
   
   
   

+ 314 - 64
src/view/quality/orderstatus.vue

@@ -1,16 +1,7 @@
 <template>
-	<h3>工单生产批次信息查询</h3>
+	<h3>工单生产批次质量档案查询</h3>
 	
-	<div
-	  style="
-	    width: 60%; 
-	    height: 470px; 
-	    position: fixed; 
-	    left: 25%; 
-	    padding: 20px; 
-	    border-radius: 8px; 
-	    background-color: #fff; 
-	    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);">
+	<div style="padding: 20px; height: 100%; overflow: auto;">
 	  <div style="margin-top: 10px;">
 	    <!-- 提示信息 -->
 	    <hr>
@@ -28,38 +19,60 @@
 	    <!-- 表格展示区域 -->
 	    <div class="gva-table-box" style="margin-top: 15px;">
 	      <el-table 
-							ref="multipleTable"
-							style="width: 100%; height: 30vh; verflow: auto;" 
-							:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
-							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-							:data="tableDatalcd" 
-							:border="true" 
-							:tooltip-effect="'dark'"
-							row-key="ID"
-							highlight-current-row
-							@row-click="tableRowClicklcd"
-							@row-dblclick="updateCompanyFunclcd"
-							@selection-change="handleSelectionChange">
+				ref="multipleTable"
+				style="width: 100%; max-height: 350px; overflow: auto;" 
+				:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
+				:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+				:data="tableDatalcd" 
+				:border="true" 
+				:tooltip-effect="'dark'"
+				row-key="ID"
+				highlight-current-row
+				@row-click="tableRowClicklcd"
+				@row-dblclick="updateCompanyFunclcd"
+				@selection-change="handleSelectionChange">
 			<el-table-column align="left"  label="工单编号" 	  width="115"	prop="Gd_gdbh" />
 			<el-table-column align="left"  label="行号" 	  width="60"	prop="行号" />
 			<el-table-column align="left"  label="工序名称" 	 	prop="Gd_cpmc"  />
 	        <!-- <el-table-column prop="工单" label="工单编号-行号-工序名称" align="left" sortable show-overflow-tooltipmin-width="300"/> -->
 	      </el-table>
+
+		  <div class="gva-pagination">
+				<el-pagination
+					@size-change="OShandleSizeChange"
+					@current-change="OShandleCurrentChange"
+					:current-page="OSpage"
+					:page-size="OSpageSize"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="OStotal">
+				</el-pagination>
+		  </div>
 	    </div>
 	  </div>
 	</div>
 	<!-- 机台生产日报表维护弹窗 -->
-	<el-dialog v-model="popdialog" title="机台生产日报表维护" destroy-on-close width="90%" style="height: 92%; margin-left: 5%; margin-top: 1%;">
+	<el-dialog 
+    v-model="popdialog" 
+    destroy-on-close 
+    width="90%" 
+    style="height: 92%; margin-left: 5%; margin-top: 1%;">
 	  <div>
 	    <!-- 顶层布局 -->
 	    <layout>
 	      <!-- 顶部的搜索区域 -->
 	      <layout-header>
+			<div style="display: flex; justify-content: center; width: 100%;">
+  <h3 style="font-size: 24px; font-weight: bold;">工单批次质量档案</h3>
+</div>
+			<div style="display: flex; justify-content: right;margin-right: 100px;">			
+						<el-button type="primary" class="bt" style="margin-left: 20px;" @click="pd_gdprintonClick" >工单打印</el-button>
+			</div>
 	        <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule">
 	          <!-- 添加按钮 -->
 			  <el-button type="primary" icon="edit" style="color: white;margin-left: 20px;"   @click="ontuicclick"  class="bt" title="退出">退出</el-button>
 	        </el-form>
 	      </layout-header>
+
 	
 	      <!-- 左右布局 -->
 	      <layout style="height: calc(100% - 50px); display: flex;">
@@ -100,7 +113,8 @@
 				  <el-tabs v-model="activeName" @tab-click="handleClick">
 						<el-tab-pane label="工艺及生产班组"  @click="showTable('工艺及生产班组')"  name="first">
 						  <el-table tooltip-effect="dark" :data="lcdtableData" row-key="ID"
-						    highlight-current-row="true"
+						    highlight-current-row="true"  empty-text="没有找到工艺生产数据"
+							class="custom-table"
 						    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
 						    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
 						    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
@@ -122,16 +136,20 @@
 						    <el-table-column align="left"  label="班组人员09"  width="105"  :formatter="(row) => `${row.sczl_bh9 || ''} ${row.name9 || ''}`"/>
 						    <el-table-column align="left"  label="班组人员10"  width="105"  :formatter="(row) => `${row.sczl_bh10 || ''} ${row.name10 || ''}`"/>
 						  </el-table>
+						  <div style="text-align: right; margin-top: 10px; font-size: 14px; color: #606266;">
+		共 {{ lcdTableTotal }} 条记录
+		</div>
 						</el-tab-pane>
 
 						<el-tab-pane label="制程检验记录"  @click="showTable('制程检验记录')"  name="second">
 						  <el-table tooltip-effect="dark" :data="zcjyjltableData" row-key="ID"
-						    highlight-current-row="true"
+						    highlight-current-row="true"  empty-text="未找到该流程制程检验记录"
+							class="custom-table"
 						    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
 						    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
 						    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-						    style="width: 100%;height: 65vh" ref="tablzcycjl_gxmc"
-						    @row-dblclick="zcycjlSelectClick">
+						    style="width: 100%;height: 56vh" ref="tablzcycjl_gxmc"
+						    @row-dblclick="zcjyjlSelectClick">
 						    <el-table-column align="left"  label="流程单号" width="100"	prop="流程单号" />
 						    <el-table-column align="left"  label="工序名称" width="260"	prop="工序名称" />
 						    <el-table-column align="left"  label="班组编号" width="100"	prop="班组编号"  />
@@ -141,21 +159,70 @@
 						    <el-table-column align="left"  label="项目备注" width="160"	prop="项目备注"  />
 						    <el-table-column align="left"  label="修改标准" width="160"	prop="修改标准"  />
 						  </el-table>
+						  <div style="text-align: right; margin-top: 10px; font-size: 14px; color: #606266;">
+		共 {{ zcjyjlTotal }} 条记录
+		</div>
 						</el-tab-pane>
 						
 						<el-tab-pane label="制程异常记录"  @click="showTable('制程异常记录')"  name="third">
 						  <el-table tooltip-effect="dark" :data="zcycjltableData" row-key="ID"
-						    highlight-current-row="true"
+						    highlight-current-row="true"  empty-text="该流程未存在制程异常记录"
+							class="custom-table"
 						    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
 						    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
 						    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-						    style="width: 100%;height: 65vh" ref="tablzcycjl_gxmc"
+						    style="width: 100%;height: 56vh" ref="tablzcycjl_gxmc"
 						    @row-dblclick="zcycjlSelectClick">
 						    <el-table-column align="left"  label="流程单号" 	  width="100"	prop="流程单号" />
 						    <el-table-column align="left"  label="数量" 	  	  width="100"	prop="数量" />
 						    <el-table-column align="left"  label="异常备注" 	  width="400"	prop="缺陷备注"  />
 						    <el-table-column align="left"  label="用户" 	  	  width="160"	prop="用户"  />
 						  </el-table>
+						  <div style="text-align: right; margin-top: 10px; font-size: 14px; color: #606266;">
+		共 {{ zcycjlTotal }} 条记录
+		</div>
+						</el-tab-pane>
+
+						<el-tab-pane label="物料批次信息"  @click="showTable('物料批次信息')"  name="fourth">
+						  <el-table tooltip-effect="dark" :data="wlpcxxtableData" row-key="ID"
+						    highlight-current-row="true"  empty-text="未找到该流程物料批次信息"
+							class="custom-table"
+						    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
+						    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
+						    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
+						    style="width: 100%;height: 56vh" ref="tablzcycjl_gxmc"
+						    @row-dblclick="wlpcxxSelectClick">
+						    <el-table-column align="left"  label="流程单号"  width="100"	prop="流程单号" />
+						    <el-table-column align="left"  label="物料编号"  width="100"	prop="物料编号" />
+						    <el-table-column align="left"  label="物料名称"  width="400"	prop="物料名称"  />
+						    <el-table-column align="left"  label="供方批次"  width="160"	prop="供方批次"  />
+							<el-table-column align="left"  label="工序名称"  width="160"	prop="工序名称"  />
+						  </el-table>
+						  <div style="text-align: right; margin-top: 10px; font-size: 14px; color: #606266;">
+		共 {{ wlpcxxTotal }} 条记录
+		</div>
+						</el-tab-pane>
+
+						<el-tab-pane label="印版记录"  @click="showTable('印版记录')"  name="fifth">
+						  <el-table tooltip-effect="dark" :data="ybtableData" row-key="ID"
+						    highlight-current-row="true"  empty-text="未找到该流程印版记录"
+							class="custom-table"
+						    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
+						    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
+						    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
+						    style="width: 100%;height: 56vh" ref="tablzcycjl_gxmc"
+						    @row-dblclick="ybSelectClick">
+						    <el-table-column align="left"  label="流程单号"  width="100"	prop="流程单号" />
+						    <el-table-column align="left"  label="存货编码"  width="100"	prop="存货编码" />
+						    <el-table-column align="left"  label="供方批号"  width="400"	prop="供方批号"  />
+							<el-table-column align="left"  label="物料名称"  width="160"	prop="物料名称"  />
+						    <el-table-column align="left"  label="领用机台"  width="160"	prop="领用机台"  />
+							<el-table-column align="left"  label="工序名称"  width="160"	prop="工序名称"  />
+							<el-table-column align="left"  label="用户" 	 width="160"	prop="用户"  />
+						  </el-table>
+						  <div style="text-align: right; margin-top: 10px; font-size: 14px; color: #606266;">
+		共 {{ ybTotal }} 条记录
+		</div>
 						</el-tab-pane>
 	
 				  </el-tabs>
@@ -166,7 +233,8 @@
 	  </div>
 	</el-dialog>
 
-	
+	<PrintPage ref="printPageRef" />
+
 </template>
 <script>
 //点击按钮显示下方表格
@@ -180,7 +248,7 @@ export default {
   },
   methods: {
     
-  }
+  },
 };
 </script>
 <script setup>
@@ -196,10 +264,11 @@ import {
   findCompany,
   getCompanyList
 } from '@/api/company'
+import PrintPage from '@/view/yunyin/shengchanguanli/components/print.vue'
 // 全量引入格式化工具 请按需保留
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { ref, reactive } from 'vue'
+import { ref, reactive,watch,onMounted,nextTick } from 'vue'
 import {
   StaGetOrderList,
   StaGetList,
@@ -207,6 +276,8 @@ import {
   StaGetOrderDetail,
   StaProcessAnomaly,
   StaProcessInspection,
+  MaterialsBatch,
+  PrintingPlateList
 } from '@/api/mes/job'
 //获取当前登录用户信息
 import { useUserStore } from '@/pinia/modules/user'
@@ -214,7 +285,7 @@ const userStore = useUserStore()
 const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 
 defineOptions({
-    name: 'Company'
+    name: 'Onderstatus'
 })
 
 //进入页面默认光标加载
@@ -226,7 +297,7 @@ setTimeout(() => {
 }, 100);
 			
 /*
-	工单生产批次信息查询
+	工单生产批次质量档案查询
 */
 const scpconlist = ref(false);
 const scpconClick = async () => {
@@ -259,9 +330,9 @@ const Enterkeysearch = (event) => {
 };
 //调用接口
 const _StaGetOrderList = async (node) => {
-  const StaGetOrderListdata = await StaGetOrderList({search:searchInfolcd.value});
+  const StaGetOrderListdata = await StaGetOrderList({search:searchInfolcd.value,page:OSpage.value,pageSize:OSpageSize.value});
   console.log(StaGetOrderListdata)
-	if (StaGetOrderListdata.data === null) {
+	if (StaGetOrderListdata.data.data === null) {
 	  ElMessage({
 		type: 'warning',
 		message: '未搜索具体查询条件',
@@ -269,7 +340,8 @@ const _StaGetOrderList = async (node) => {
 		duration: 3000 // 可选:设置消息显示的持续时间(单位:毫秒)
 	  });
 	}
-  tableDatalcd.splice(0,tableDatalcd.length,...StaGetOrderListdata.data);//表格数据
+  tableDatalcd.splice(0,tableDatalcd.length,...StaGetOrderListdata.data.data);//表格数据
+  OStotal.value = StaGetOrderListdata.data.total
 };
 
 // 树形节点属性映射
@@ -330,53 +402,171 @@ const handleNodeClicklcd = (node) => {
   _StaProcessList(node['num'])
   _StaProcessInspection(node['num'])
   _StaProcessAnomaly(node['num'])
+  _MaterialsBatch(node['num'])
+  _PrintingPlateList(node['num'])
 };
 
-//获取左侧菜单栏
+// 获取左侧菜单栏
 const _StaGetList = async (row) => {
   const StaGetListdata = await StaGetList({gdbh:row['Gd_gdbh'],yjno:row['行号']});
   console.log(StaGetListdata.msg)
+  
   if(StaGetListdata.msg === '成功'){
-	  treeDatalcd.splice(0, treeDatalcd.length, ...StaGetListdata.data);
-	  popdialog.value = true
-  }else{
-	  console.log(StaGetListdata.msg)
-	  ElMessage({type: 'warning',message: StaGetListdata.msg})
+    treeDatalcd.splice(0, treeDatalcd.length, ...StaGetListdata.data);
+    popdialog.value = true
+    
+    // 使用 nextTick 等待 DOM 更新完成后自动选择第一条
+    await nextTick()
+    
+    // 方法1:直接触发点击事件
+    if (treeDatalcd.length > 0) {
+      // 自动点击第一条数据
+      const firstNode = treeDatalcd[0]
+      // 等待一个微小的延迟确保树已渲染
+      setTimeout(() => {
+        handleNodeClicklcd(firstNode)
+      }, 50)
+    }
+  } else {
+    console.log(StaGetListdata.msg)
+    ElMessage({type: 'warning',message: StaGetListdata.msg})
   }
 };
 
-//工艺及生产班组
 const lcdtableData = reactive([])
+const lcdTableTotal = ref(0) // 添加总数变量
+
 const _StaProcessList = async (node) => {
-  const StaProcessListdata = await StaProcessList({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value,num:node});
-  if(StaProcessListdata.code === 0){
-	lcdtableData.splice(0,lcdtableData.length,...StaProcessListdata.data);
-  }else{
-	lcdtableData.splice(0,lcdtableData.length,...[]);
+  try {
+    const StaProcessListdata = await StaProcessList({gdbh: _Gd_gdbhlcd.value,yjno: _Gd_yjnolcd.value,num: node});
+    console.log('接口返回数据:', StaProcessListdata)
+    if (StaProcessListdata.code === 0) {
+      // 正确获取数据数组和总数
+      const tableData = StaProcessListdata.data?.data || []
+      const total = StaProcessListdata.data?.total || 0
+      lcdtableData.splice(0, lcdtableData.length, ...tableData)
+      lcdTableTotal.value = total
+      console.log('加载数据条数:', tableData.length, '总数:', total)
+    } else {
+      lcdtableData.splice(0, lcdtableData.length, ...[])
+      lcdTableTotal.value = 0
+      console.warn('接口返回错误:', StaProcessListdata.msg)
+    }
+  } catch (error) {
+    console.error('获取工艺生产数据失败:', error)
+    lcdtableData.splice(0, lcdtableData.length, ...[])
+    lcdTableTotal.value = 0
   }
-};
+}
 
-//制程异常记录
+//制程检验记录
 const zcjyjltableData = reactive([])
+const zcjyjlTotal = ref(0) // 添加总数变量
+
 const _StaProcessInspection = async (node) => {
-  const StaProcessInspectiondata = await StaProcessInspection({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value,num:node});
-  if(StaProcessInspectiondata.code === 0){
-	zcjyjltableData.splice(0,zcjyjltableData.length,...StaProcessInspectiondata.data);
-  }else{
-	zcjyjltableData.splice(0,zcjyjltableData.length,...[]);
+  try {
+    const StaProcessInspectiondata = await StaProcessInspection({gdbh: _Gd_gdbhlcd.value,yjno: _Gd_yjnolcd.value,num: node});
+    
+    
+    if (StaProcessInspectiondata.code === 0) {
+      const tableData = StaProcessInspectiondata.data?.data || []
+      const total = StaProcessInspectiondata.data?.total || 0
+      zcjyjltableData.splice(0, zcjyjltableData.length, ...tableData)
+      zcjyjlTotal.value = total
+      console.log('制程检验加载数据:', tableData.length, '条,总数:', total)
+    } else {
+      zcjyjltableData.splice(0, zcjyjltableData.length, ...[])
+      zcjyjlTotal.value = 0
+      console.warn('制程检验接口返回错误:', StaProcessInspectiondata.msg)
+    }
+  } catch (error) {
+    console.error('获取制程检验数据失败:', error)
+    zcjyjltableData.splice(0, zcjyjltableData.length, ...[])
+    zcjyjlTotal.value = 0
   }
-};
+}
 
 //制程异常记录
 const zcycjltableData = reactive([])
+const zcycjlTotal = ref(0) // 添加总数变量
 const _StaProcessAnomaly = async (node) => {
-  const StaProcessAnomalydata = await StaProcessAnomaly({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value,num:node});
-  if(StaProcessAnomalydata.code === 0){
-	zcycjltableData.splice(0,zcycjltableData.length,...StaProcessAnomalydata.data);
-  }else{
-	zcycjltableData.splice(0,zcycjltableData.length,...[]);
+  try {
+    const StaProcessAnomalydata = await StaProcessAnomaly({gdbh: _Gd_gdbhlcd.value,yjno: _Gd_yjnolcd.value,num: node});
+    console.log('制程异常接口返回:', StaProcessAnomalydata)
+    
+    if (StaProcessAnomalydata.code === 0) {
+      const tableData = StaProcessAnomalydata.data?.data || []
+      const total = StaProcessAnomalydata.data?.total || 0
+      zcycjltableData.splice(0, zcycjltableData.length, ...tableData)
+      zcycjlTotal.value = total
+      console.log('制程异常加载数据:', tableData.length, '条,总数:', total)
+    } else {
+      zcycjltableData.splice(0, zcycjltableData.length, ...[])
+      zcycjlTotal.value = 0
+      console.warn('制程异常接口返回错误:', StaProcessAnomalydata.msg)
+    }
+  } catch (error) {
+    console.error('获取制程异常数据失败:', error)
+    zcycjltableData.splice(0, zcycjltableData.length, ...[])
+    zcycjlTotal.value = 0
   }
-};
+}
+
+//物料批次信息
+const wlpcxxtableData = reactive([])
+const wlpcxxTotal = ref(0) // 添加总数变量
+const _MaterialsBatch = async (node) => {
+  try {
+    const MaterialsBatchdata = await MaterialsBatch({gdbh: _Gd_gdbhlcd.value,yjno: _Gd_yjnolcd.value,num: node,cpdh:_GetorderDetail.value['Gd_cpdh']});
+    console.log('物料批次接口返回:', MaterialsBatchdata)
+    
+    if (MaterialsBatchdata.code === 0) {
+      const tableData = MaterialsBatchdata.data?.data || []
+      const total = MaterialsBatchdata.data?.total || 0
+      wlpcxxtableData.splice(0, wlpcxxtableData.length, ...tableData)
+      wlpcxxTotal.value = total
+      console.log('物料批次加载数据:', tableData.length, '条,总数:', total)
+    } else {
+      wlpcxxtableData.splice(0, wlpcxxtableData.length, ...[])
+      wlpcxxTotal.value = 0
+      console.warn('物料批次接口返回错误:', MaterialsBatchdata.msg)
+    }
+  } catch (error) {
+    console.error('获取物料批次数据失败:', error)
+    wlpcxxtableData.splice(0, wlpcxxtableData.length, ...[])
+    wlpcxxTotal.value = 0
+  }
+}
+
+//印版记录
+const ybtableData = reactive([])
+const ybTotal = ref(0) // 添加总数变量
+const _PrintingPlateList = async (node) => {
+  try {
+    const PrintingPlateListdata = await PrintingPlateList({gdbh: _Gd_gdbhlcd.value,yjno: _Gd_yjnolcd.value});
+    console.log('印版记录接口返回:', PrintingPlateListdata)
+    
+    if (PrintingPlateListdata.code === 0) {
+      const tableData = PrintingPlateListdata.data?.data || []
+      const total = PrintingPlateListdata.data?.total || 
+	  
+	  
+	  0
+      ybtableData.splice(0, ybtableData.length, ...tableData)
+	  console.log('印版记录接口返回数据:', ybtableData)
+      ybTotal.value = total
+      console.log('印版记录加载数据:', tableData.length, '条,总数:', total)
+    } else {
+      ybtableData.splice(0, ybtableData.length, ...[])
+      ybTotal.value = 0
+      console.warn('印版记录接口返回错误:', PrintingPlateListdata.msg)
+    }
+  } catch (error) {
+    console.error('获取印版记录数据失败:', error)
+    ybtableData.splice(0, ybtableData.length, ...[])
+    ybTotal.value = 0
+  }
+}
 
 //退出按钮
 const ontuicclick = async () => {
@@ -388,6 +578,49 @@ const ontuicclicks = async () => {
   scpconlist.value = false
 };
 
+// 2. 添加 props 定义
+const props = defineProps({
+  defaultSearchValue: {
+    type: String,
+    default: ''
+  }
+})
+
+// 3. 监听默认搜索值变化,自动触发搜索
+watch(() => props.defaultSearchValue, (newVal) => {
+  if (newVal) {
+    searchInfolcd.value = newVal;
+    onSubmitlcd(); // 自动调用搜索方法
+  }
+}, { immediate: true }) // immediate: true 表示组件挂载时就执行一次
+
+
+// 分页
+const OSpage = ref(1)
+const OStotal = ref(0)
+const OSpageSize = ref(15)
+const OShandleCurrentChange = (val) => {
+  OSpage.value = val;
+  _StaGetOrderList();
+};
+
+// 修改页面容量 点击多少条/页
+const OShandleSizeChange = (val) => {
+  // page.value = 10;
+  OSpageSize.value = val;
+  _StaGetOrderList();
+};
+
+
+//工单打印
+const printPageRef = ref()
+const pd_gdprintonClick = () => {
+	if( _GetorderDetail.value['Gd_gdbh']==''){
+		ElMessage({ type: 'warning', message: '未获取到工单' });
+		return
+	}
+  printPageRef.value.open(_GetorderDetail.value['Gd_gdbh'])
+}
 
 
 
@@ -472,4 +705,21 @@ const ontuicclicks = async () => {
 	:deep(.el-tree-node:focus > .el-tree-node__content){
 			background: #ff80ff !important;
 		}
+
+	/* 如果使用 scoped */
+ :deep(.center-title-dialog.el-dialog__header) {
+  text-align: center;
+}
+
+:deep(.center-title-dialog .el-dialog__title) {
+  width: 100%;
+  text-align: center;
+  display: block;
+}
+.custom-table ::v-deep .el-table__empty-text {
+  color: #ff6b6b;
+  font-size: 32px;
+  font-weight: bold;
+  padding: 30px 0;
+}
 </style>

+ 5 - 8
src/view/yunyin/huheguanli/huhechengpinrucang.vue

@@ -40,7 +40,7 @@
               <el-table-column align="left"   label="仓库名称" prop="仓库名称" width="110"/>
               <el-table-column align="left" sortable  label="入仓单号" prop="jjcp_num" width="120"/>
               <el-table-column align="left" sortable  label="工单编号" prop="jjcp_gdbh" width="105"/>
-              <el-table-column align="left"   label="印件号" prop="jjcp_yjno" width="70"/>
+              <!-- <el-table-column align="left"   label="印件号" prop="jjcp_yjno" width="70"/> -->
               <el-table-column align="left"   label="入仓数量" prop="jjcp_sl" width="90"/>
 			  <el-table-column align="left"   label="累计入仓数量" prop="jjcp_sls" width="110"/>
 			  <el-table-column align="left"  label="订单数量" prop="订单数量" width="90"/>
@@ -111,11 +111,11 @@
 				 <el-input v-model="formData.jjcp_gdbh" id="工单编号"  @keydown="ent($event, '单据编号', '工单编号', '客户料号')" :clearable="true"  style="width: 120px;"  />
 			   </el-form-item>
 			 </el-col>
-			 <el-col :span="5">
+			 <!-- <el-col :span="5">
 			   <el-form-item label="印件号" prop="name" label-width="55px">
 					<el-input v-model="formData.jjcp_yjno" id="印件号" disabled :clearable="true"   style="width: 50px;" />
 			   </el-form-item>	   
-			 </el-col>
+			 </el-col> -->
 			 <el-col :span="12">
 			   <el-form-item label="订单编号" prop="name">
 					 <el-input v-model="formData.订单编号" id="订单编号" disabled :clearable="true"  style="width: 120px;"  />
@@ -585,7 +585,7 @@ import { exportExcelFile } from '@/utils/excel'
 import { useUserStore } from '@/pinia/modules/user'
 import { getOrderProcessCount,PrintDetailList,getOrderProcessLeft,getOrderProcessRight } from "@/api/yunyin/yunying";
 import { StaGetOrderList,StaGetList,StaProcessList,StaGetOrderDetail,StaProcessAnomaly,} from '@/api/mes/job'
-import { RcgetTab,RcgetList,RcgetInfo,RcAdd,RcEdit,RcDel } from '@/api/mes/huhejob'
+import { RcgetTab,RcgetList,RcgetInfo,RcAdd,RcEdit,RcDel,getGd } from '@/api/mes/huhejob'
 
 const userStore = useUserStore() 
 const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
@@ -633,7 +633,6 @@ const formData = ref({
 	仓库名称: "",
 	jjcp_num: "",
 	jjcp_gdbh: "",
-	jjcp_yjno: "",
 	订单编号: "",
 	jjcp_cpdh: "",
 	jjcp_cpmc: "",
@@ -658,7 +657,6 @@ const initFormData = () => {
 		仓库名称: "",
 		jjcp_num: "",
 		jjcp_gdbh: "",
-		jjcp_yjno: "",
 		订单编号: "",
 		jjcp_cpdh: "",
 		jjcp_cpmc: "",
@@ -1413,7 +1411,7 @@ const GDVisible = ref(false)
 const GDselectData = reactive([])
 //获取工单信息
 const GetGD = async () => {
-  const response = await finishedgetGd({gdbh:formData.value.jjcp_gdbh});
+  const response = await getGd({gdbh:formData.value.jjcp_gdbh});
   if (response.code === 0) {
   GDselectData.splice(0, GDselectData.length, ...response.data)
   setGDCurrent(GDselectData[0])
@@ -1675,7 +1673,6 @@ const enterDialog = async () => {
 		 仓库名称:formData.value.仓库名称,
 		 jjcp_num:formData.value.jjcp_num,
 		 jjcp_gdbh:formData.value.jjcp_gdbh,
-		 jjcp_yjno:formData.value.jjcp_yjno,
 		 订单编号:formData.value.订单编号,
 		 jjcp_cpdh:formData.value.jjcp_cpdh,
 		 jjcp_cpmc:formData.value.jjcp_cpmc,

+ 2 - 2
src/view/yunyin/huheguanli/huhetiming.vue

@@ -785,8 +785,8 @@ import LuckyExcel from 'luckyexcel';
 	const selectData_Yg = reactive([])
 	// 处理选择框
 	const handleSelectClick_Yg = (row, column, event) => {
-		detailData[`name${(index_Yg - 1) / 5 + 1}`] = row.ygxm
-		detailData[`wgjs_bh${(index_Yg - 1) / 5 + 1}`] = row.员工编号
+		detailData[`name${(index_Yg - 1) / 4 + 1}`] = row.ygxm
+		detailData[`wgjs_bh${(index_Yg - 1) / 4 + 1}`] = row.员工编号
 		dialogSelectVisible_Yg.value = false
 	}
 	const currentIndex_Yg = ref(0);

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

@@ -22,7 +22,7 @@
 			  <el-button type="primary" class="bt" @click="onSMB">入仓末板数据统计</el-button>
 			  <el-button type="primary" class="bt" @click="onDay">各日统计</el-button>
 			  <el-button type="primary" class="bt" @click="onAdd">新增</el-button>
-        <el-button type="primary" class="bt" @click="scpconClick" >工单生产批次信息查询</el-button>
+        <el-button type="primary" class="bt" @click="scpconClick" >工单生产批次质量档案查询</el-button>
 			  
               <div style="margin-left: auto;">			
                 <el-button type="primary" class="bt" icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -400,154 +400,21 @@
           </el-dialog>
 
           			<!--工单生产批次信息查询【弹窗】-->
-			<el-dialog v-model="scpconlist" title="工单生产批次信息查询" style="width: 100%;height: 100%;margin: 0px;padding: 0px;">
-			  <el-button type="primary"   @click="ontuicclicks" style="color: white;margin-left: 20px;"  class="bt" title="退出">退出</el-button>
-			  <div 
-			    style="
-			      width: 60%; 
-			      height: 470px; 
-			      position: fixed; 
-			      left: 25%; 
-			      padding: 20px; 
-			      border-radius: 8px; 
-			      background-color: #fff; 
-			      box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);">
-			    <div style="margin-top: 10px;">
-			      <!-- 提示信息 -->
-			      <hr>
-			      <p style="font-size: 14px; color: red; margin: 10px 0;">搜索栏目为空,则从最近2周完工的工单中选择</p>
-			      <p style="font-size: 14px; color: red; margin: 10px 0;">否则,以栏目值为关键字,从工单编号、产品名称、客户名称中选择</p>
-			      <hr>
-			      
-			      <!-- 输入框和按钮 -->
-			      <div style="display: flex; align-items: center; margin-top: 10px;">
-			        <el-input v-model="searchInfolcd" placeholder="Enter回车搜索工单编号" @keydown="Enterkeysearch" id="searchInfo" style="height: 40px;flex: 1;"></el-input>
-			        <el-button type="primary" title="搜索"  icon="el-icon-search" style="width: 70px;height: 40px;font-size: 18px;"  @click="onSubmitlcd" >搜索</el-button>
-					<el-button type="primary" title="查看"  icon="el-icon-search" style="width: 110px;height: 40px;font-size: 18px;"  @click="onstatsuclick" >查看流程单</el-button>
-			      </div>
-			      
-			      <!-- 表格展示区域 -->
-			      <div class="gva-table-box" style="margin-top: 15px;">
-			        <el-table 
-						ref="multipleTable"
-						style="width: 100%; height: 30vh; verflow: auto;" 
-						:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
-						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-						:data="tableDatalcd" 
-						:border="true" 
-						:tooltip-effect="'dark'"
-						row-key="ID"
-						highlight-current-row
-						@row-click="tableRowClicklcd"
-						@row-dblclick="updateCompanyFunclcd"
-						@selection-change="handleSelectionChange">
-			  		<el-table-column align="left"  label="工单编号" 	  width="115"	prop="Gd_gdbh" />
-			  		<el-table-column align="left"  label="行号" 	  width="60"	prop="行号" />
-			  		<el-table-column align="left"  label="工序名称" 	 	prop="Gd_cpmc"  />
-			          <!-- <el-table-column prop="工单" label="工单编号-行号-工序名称" align="left" sortable show-overflow-tooltipmin-width="300"/> -->
-			        </el-table>
-			      </div>
-			    </div>
-			  </div>
-			  <!-- 机台生产日报表维护弹窗 -->
-			  <el-dialog v-model="popdialog" title="机台生产日报表维护" destroy-on-close width="90%" style="height: 92%; margin-left: 5%; margin-top: 1%;">
-			    <div>
-			      <!-- 顶层布局 -->
-			      <layout>
-			        <!-- 顶部的搜索区域 -->
-			        <layout-header>
-			          <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule">
-			            <!-- 添加按钮 -->
-			  		  <el-button type="primary" icon="edit" style="color: white;margin-left: 20px;"   @click="ontuicclick"  class="bt" title="退出">退出</el-button>
-			          </el-form>
-			        </layout-header>
-			  
-			        <!-- 左右布局 -->
-			        <layout style="height: calc(100% - 50px); display: flex;">
-			          <!-- 左侧树形区域 -->
-			          <layout-sider style="width: 140px; margin-right: 10px; overflow: hidden;height: 584px;">
-			            <div class="JKWTree-tree" style="height: 100%; max-height: 100vh; overflow-y: auto;">
-			              <h3></h3>
-			              <el-tree
-			                :data="treeDatalcd"
-			                node-key="num"
-			                highlight-current
-			                :props="defaultProps"
-			                @node-click="handleNodeClicklcd"
-			              />
-			            </div>
-			          </layout-sider>
-			  
-			  
-			          <!-- 右侧表格区域 -->
-			          <layout-content style="flex: 1; overflow: auto;">
-			            <el-main>
-			  			 <div style="width: 100%; font-family: Arial, sans-serif; font-size: 14px;">
-			  				 <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-			  				   <p style="flex: 0.4; margin: 0;">工单编号:<span style="color: red;">{{ _GetorderDetail['Gd_gdbh'] }}</span></p>
-			  				   <p style="flex: 0.3; margin: 0;">产品代号:<span style="color: red;">{{ _GetorderDetail['Gd_cpdh'] }}</span></p>
-			  				   <p style="flex: 1; margin: 0;">产品名称:<span style="color: red;">{{ _GetorderDetail['Gd_cpmc'] }}</span></p>
-			  				 </div>
-			  				 <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-			  				   <p style="flex: 0.4; margin: 0;">订单数量:<span style="color: red;">{{ _GetorderDetail['订单数量'] }}</span></p>
-			  				   <p style="flex: 0.3; margin: 0;">实际投料:<span style="color: red;">{{ _GetorderDetail['实际投料'] }}</span></p>
-			  				   <p style="flex: 1; margin: 0;">
-			  					 单位:<span style="color: red;">{{ _GetorderDetail['计量单位'] }}</span> 
-			  					 目标合格率:<span style="color: red;">{{ _GetorderDetail['投料率'] }}</span>
-			  				   </p>
-			  				 </div>
-			  			   </div>
-			  			  
-			  			  <el-tabs v-model="activeName" @tab-click="handleClick">
-			  					<el-tab-pane label="工艺及生产班组"  @click="showTable('工艺及生产班组')"  name="first">
-			  					  <el-table tooltip-effect="dark" :data="lcdtableData" row-key="ID"
-			  					    highlight-current-row="true"
-			  					    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
-			  					    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-			  					    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-			  					    style="width: 100%;height: 56vh" ref="tablesczl_gxmc"
-			  					    @row-dblclick="gyscbzSelectClick">
-			  					    <el-table-column align="left"  label="流程单号" 	  width="81"	prop="流程单号" />
-			  					    <el-table-column align="left"  label="工序号" 	  width="68"	prop="工序号" />
-			  					    <el-table-column align="left"  label="工序名称" 	  width="240"	prop="工序名称"  />
-			  					    <el-table-column align="left"  label="生产日期" 	  width="120"	prop="生产日期"  />
-			  					    <el-table-column align="left"  label="机台编号" 	  width="81"	prop="机台编号"  />
-			  					    <el-table-column align="left"  label="班组人员01"  width="105"  :formatter="(row) => `${row.sczl_bh1 || ''} ${row.name1 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员02"  width="105"  :formatter="(row) => `${row.sczl_bh2 || ''} ${row.name2 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员03"  width="105"  :formatter="(row) => `${row.sczl_bh3 || ''} ${row.name3 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员04"  width="105"  :formatter="(row) => `${row.sczl_bh4 || ''} ${row.name4 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员05"  width="105"  :formatter="(row) => `${row.sczl_bh5 || ''} ${row.name5 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员06"  width="105"  :formatter="(row) => `${row.sczl_bh6 || ''} ${row.name6 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员07"  width="105"  :formatter="(row) => `${row.sczl_bh7 || ''} ${row.name7 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员08"  width="105"  :formatter="(row) => `${row.sczl_bh8 || ''} ${row.name8 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员09"  width="105"  :formatter="(row) => `${row.sczl_bh9 || ''} ${row.name9 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员10"  width="105"  :formatter="(row) => `${row.sczl_bh10 || ''} ${row.name10 || ''}`"/>
-			  					  </el-table>
-			  					</el-tab-pane>
-			  					
-			  					<el-tab-pane label="制程异常记录"  @click="showTable('制程异常记录')"  name="second">
-			  					  <el-table tooltip-effect="dark" :data="zcycjltableData" row-key="ID"
-			  					    highlight-current-row="true"
-			  					    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
-			  					    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-			  					    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-			  					    style="width: 100%;height: 65vh" ref="tablzcycjl_gxmc"
-			  					    @row-dblclick="zcycjlSelectClick">
-			  					    <el-table-column align="left"  label="流程单号" 	  width="100"	prop="流程单号" />
-			  					    <el-table-column align="left"  label="数量" 	  	  width="100"	prop="数量" />
-			  					    <el-table-column align="left"  label="异常备注" 	  width="400"	prop="缺陷备注"  />
-			  					    <el-table-column align="left"  label="用户" 	  	  width="160"	prop="用户"  />
-			  					  </el-table>
-			  					</el-tab-pane>
-			  
-			  			  </el-tabs>
-			            </el-main>
-			          </layout-content>
-			        </layout>
-			      </layout>
-			    </div>
-			  </el-dialog>
-			</el-dialog>
+                <el-dialog
+			v-model="scpconlist"
+			title=""
+			width="80%"
+			height="80%"
+			:before-close="handleClose"
+			destroy-on-close
+			>
+			<!-- 在弹窗中使用Onderstatus组件 -->
+			<Onderstatus :default-search-value="_Gd_gdbh" />
+
+				<template #footer>
+				<el-button @click="scpconlist = false">关闭</el-button>
+		</template>
+		</el-dialog>
       
         </el-main>
       </el-container>
@@ -585,6 +452,7 @@ import { exportExcelFile } from '@/utils/excel'
 import { useUserStore } from '@/pinia/modules/user'
 import { getOrderProcessCount,PrintDetailList,getOrderProcessLeft,getOrderProcessRight } from "@/api/yunyin/yunying";
 import { StaGetOrderList,StaGetList,StaProcessList,StaGetOrderDetail,StaProcessAnomaly,} from '@/api/mes/job'
+import Onderstatus from '@/view/quality/orderstatus.vue'
 const userStore = useUserStore() 
 const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
@@ -828,7 +696,7 @@ const GetDayList = async (value) => {
 }
 const SMVisible = ref(false)
 const SMselectData = ref([]);
-const _Gd_gdbh = ref(null)
+const _Gd_gdbh = ref('')
 const _Gd_yjno = ref(null)
 const MBRowClick = async (row) => {
 	console.log(row)
@@ -1132,144 +1000,18 @@ const pd_lcdCancel = async () => {
 /*
 	工单生产批次信息查询
 */
-//搜索
-const searchInfolcd = ref('');
-const tableDatalcd = reactive([])
 const scpconlist = ref(false);
-const scpconClick = async () => {
-  scpconlist.value = true;
-  tableDatalcd.splice(0,tableDatalcd.length,...[]);//表格数据
-  onSubmitlcd()//调用接口
-}
-//进入页面默认光标加载
-setTimeout(() => {
-	const inputElement = document.getElementById('searchInfo');
-	if (inputElement) {
-		inputElement.focus();		
-	}
-}, 100);
-			
-
-//查询按钮
-const onSubmitlcd = () => {
-  _StaGetOrderList()
-};
-//搜索回车
-const Enterkeysearch = (event) => {
-   if (event.key === 'Enter') {
-      _StaGetOrderList();
-    }
-};
-//调用接口
-const _StaGetOrderList = async (node) => {
-  const StaGetOrderListdata = await StaGetOrderList({search:searchInfolcd.value});
-  console.log(StaGetOrderListdata)
-	if (StaGetOrderListdata.data === null) {
-	  ElMessage({
-		type: 'warning',
-		message: '未搜索具体查询条件',
-		customClass: 'custom-message', // 添加自定义类名
-		duration: 3000 // 可选:设置消息显示的持续时间(单位:毫秒)
-	  });
-	}
-  tableDatalcd.splice(0,tableDatalcd.length,...StaGetOrderListdata.data);//表格数据
-};
-
-// 树形节点属性映射
-const treeDatalcd = reactive([]);
-const defaultProps = {
-  label: '流程单',
-  children: 'children',
-};
-//全局调用工单编号、印件号
-const _Gd_gdbhlcd = ref(null)
-const _Gd_yjnolcd = ref(null)
-const _GetorderDetail = ref(null)
-
-
-/*
-	弹窗页面
-*/
-const popdialog = ref(false);
-const currentRow = ref('');
-// 获取当前行数据
-const tableRowClicklcd = (row) => {
-  currentRow.value = row; // 保存当前选中行
-};
-
-// 按钮点击逻辑
-const onstatsuclick  = async () => {
-	console.log(currentRow)
-  if (!currentRow.value) {
-	ElMessage({
-	  type: "warning",
-	  message: "请先点击选择一行数据",
-	});
-	return;
-  }
-  await updateCompanyFunclcd(currentRow.value);
-};
-//双击
-const updateCompanyFunclcd = async (row) => {
-	console.log("双击",row)
-	_Gd_gdbhlcd.value = row['Gd_gdbh']
-	_Gd_yjnolcd.value =row['行号']
-	
-	const StaGetOrderDetaildata = await StaGetOrderDetail({ gdbh: row['Gd_gdbh'], yjno: row['行号'] });
-	let resultData = StaGetOrderDetaildata.data;
-	// 遍历对象,将 null 值替换为空字符串
-	Object.keys(resultData).forEach((key) => {
-	  if (resultData[key] === null) {
-	    resultData[key] = '';
-	  }
-	});
-	_GetorderDetail.value = resultData;
-	// console.log("_GetorderDetail.value", _GetorderDetail.value);
-	_StaGetList(row)
-}
-
-//左侧树形节点点击事件
-const handleNodeClicklcd = (node) => {
-  _StaProcessList(node['num'])
-  _StaProcessAnomaly()
-};
-
-//获取左侧菜单栏
-const _StaGetList = async (row) => {
-  const StaGetListdata = await StaGetList({gdbh:row['Gd_gdbh'],yjno:row['行号']});
-  console.log(StaGetListdata.msg)
-  if(StaGetListdata.msg === '成功'){
-	  treeDatalcd.splice(0, treeDatalcd.length, ...StaGetListdata.data);
-	  popdialog.value = true
-  }else{
-	  console.log(StaGetListdata.msg)
-	  ElMessage({type: 'warning',message: StaGetListdata.msg})
-  }
-};
-
-//工艺及生产班组
-const lcdtableData = reactive([])
-const _StaProcessList = async (node) => {
-  const StaProcessListdata = await StaProcessList({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value,num:node});
-  lcdtableData.splice(0,lcdtableData.length,...StaProcessListdata.data);
-};
+// 实现scpconClick方法,控制弹窗显示
+const scpconClick = () => {
+	scpconlist.value = true
+}
 
-//制程异常记录
-const zcycjltableData = reactive([])
-const _StaProcessAnomaly = async () => {
-  const StaProcessAnomalydata = await StaProcessAnomaly({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value});
-  zcycjltableData.splice(0,zcycjltableData.length,...StaProcessAnomalydata.data);
-};
+// 弹窗关闭前的处理函数
+const handleClose = () => {
+	scpconlist.value = false
+}
 
-//退出按钮
-const ontuicclick = async () => {
-  popdialog.value = false
-};
 
-//退出按钮
-const ontuicclicks = async () => {
-  scpconlist.value = false
-};
 
 //定位
 const GetmachineLocate = async () => {
@@ -1762,10 +1504,9 @@ function doubleClick(row, column, event) {
 }
 // 单击表格操作
 function Click(row, column, event) {
-  searchInfolcd.value =row.jjcp_gdbh
     lastCellValue= row['UniqId'];
    console.log(lastCellValue)
-  
+  _Gd_gdbh.value=row.jjcp_gdbh
 }
 //获取详细信息
 const GetInfo = async (value) => {

+ 1 - 1
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -1610,7 +1610,7 @@ const _EquipmentSchedulingdata = async ()=>{
     if (EquipmentSchedulingdata.code === 0) {
       paichengData.value = EquipmentSchedulingdata.data
       paichengData.value.map((item, index) => {
-        item['优先次序'] = 50 + index
+        item['优先次序'] = 1 + index
       })
 
       handleDataSortAndSettingDate()

+ 25 - 295
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -20,7 +20,7 @@
 		<el-button type="primary" icon="edit"   @click="deldbcl_onclick" :disabled="dbclSelection === ''"   class="bt" title="当班产量明细" >当班产量明细删除</el-button>
 		<el-button type="primary" class="bt" @click="onRCL">日产量批量维护</el-button>
 		<el-button type="primary"  class="bt"   @click="pd_lcdlistonClick" >流程单查询</el-button>
-		<el-button type="primary"  class="bt"   @click="scpconClick" >工单生产批次信息查询</el-button>
+		<el-button type="primary"  class="bt"   @click="scpconClick" >工单生产批次质量档案查询</el-button>
 		<el-button type="primary" icon="Download" class="bt"   @click="llexporttoExcel" >拉料导出Excel</el-button>
 		<el-button @click="selectSameWorkOrder" type="success">全选同工单</el-button>
 		<el-button @click="invertSelection" type="info">反选</el-button>
@@ -491,156 +491,22 @@
           </el-dialog>
 
 
-		  <!--工单生产批次信息查询【弹窗】-->
-			<el-dialog v-model="scpconlist" title="工单生产批次信息查询" style="width: 100%;height: 100%;margin: 0px;padding: 0px;">
-			  <el-button type="primary"   @click="ontuicclicks" style="color: white;margin-left: 20px;"  class="bt" title="退出">退出</el-button>
-			  <div 
-			    style="
-			      width: 60%; 
-			      height: 470px; 
-			      position: fixed; 
-			      left: 25%; 
-			      padding: 20px; 
-			      border-radius: 8px; 
-			      background-color: #fff; 
-			      box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);">
-			    <div style="margin-top: 10px;">
-			      <!-- 提示信息 -->
-			      <hr>
-			      <p style="font-size: 14px; color: red; margin: 10px 0;">搜索栏目为空,则从最近2周完工的工单中选择</p>
-			      <p style="font-size: 14px; color: red; margin: 10px 0;">否则,以栏目值为关键字,从工单编号、产品名称、客户名称中选择</p>
-			      <hr>
-			      
-			      <!-- 输入框和按钮 -->
-			      <div style="display: flex; align-items: center; margin-top: 10px;">
-			        <el-input v-model="searchInfolcd" placeholder="Enter回车搜索工单编号" @keydown="Enterkeysearch" id="searchInfo" style="height: 40px;flex: 1;"></el-input>
-			        <el-button type="primary" title="搜索"  icon="el-icon-search" style="width: 70px;height: 40px;font-size: 18px;"  @click="onSubmitlcd" >搜索</el-button>
-					<el-button type="primary" title="查看"  icon="el-icon-search" style="width: 110px;height: 40px;font-size: 18px;"  @click="onstatsuclick" >查看流程单</el-button>
-			      </div>
-			      
-			      <!-- 表格展示区域 -->
-			      <div class="gva-table-box" style="margin-top: 15px;">
-			        <el-table 
-						ref="PCmultipleTable"
-						style="width: 100%; height: 30vh; verflow: auto;" 
-						:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
-						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-						:data="tableDatalcd" 
-						:border="true" 
-						:tooltip-effect="'dark'"
-						row-key="ID"
-						highlight-current-row
-						@row-click="tableRowClicklcd"
-						@row-dblclick="updateCompanyFunclcd"
-						@selection-change="handleSelectionChange">
-			  		<el-table-column align="left"  label="工单编号" 	  width="115"	prop="Gd_gdbh" />
-			  		<el-table-column align="left"  label="行号" 	  width="60"	prop="行号" />
-			  		<el-table-column align="left"  label="工序名称" 	 	prop="Gd_cpmc"  />
-			          <!-- <el-table-column prop="工单" label="工单编号-行号-工序名称" align="left" sortable show-overflow-tooltipmin-width="300"/> -->
-			        </el-table>
-			      </div>
-			    </div>
-			  </div>
-			  <!-- 机台生产日报表维护弹窗 -->
-			  <el-dialog v-model="popdialog" title="机台生产日报表维护" destroy-on-close width="90%" style="height: 92%; margin-left: 5%; margin-top: 1%;">
-			    <div>
-			      <!-- 顶层布局 -->
-			      <layout>
-			        <!-- 顶部的搜索区域 -->
-			        <layout-header>
-			          <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule">
-			            <!-- 添加按钮 -->
-			  		  <el-button type="primary" icon="edit" style="color: white;margin-left: 20px;"   @click="ontuicclick"  class="bt" title="退出">退出</el-button>
-			          </el-form>
-			        </layout-header>
-			  
-			        <!-- 左右布局 -->
-			        <layout style="height: calc(100% - 50px); display: flex;">
-			          <!-- 左侧树形区域 -->
-			          <layout-sider style="width: 140px; margin-right: 10px; overflow: hidden;height: 584px;">
-			            <div class="JKWTree-tree" style="height: 100%; max-height: 100vh; overflow-y: auto;">
-			              <h3></h3>
-			              <el-tree
-			                :data="treeDatalcd"
-			                node-key="num"
-			                highlight-current
-			                :props="defaultProps"
-			                @node-click="handleNodeClicklcd"
-			              />
-			            </div>
-			          </layout-sider>
-			  
-			  
-			          <!-- 右侧表格区域 -->
-			          <layout-content style="flex: 1; overflow: auto;">
-			            <el-main>
-			  			 <div style="width: 100%; font-family: Arial, sans-serif; font-size: 14px;">
-			  				 <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-			  				   <p style="flex: 0.4; margin: 0;">工单编号:<span style="color: red;">{{ _GetorderDetail['Gd_gdbh'] }}</span></p>
-			  				   <p style="flex: 0.3; margin: 0;">产品代号:<span style="color: red;">{{ _GetorderDetail['Gd_cpdh'] }}</span></p>
-			  				   <p style="flex: 1; margin: 0;">产品名称:<span style="color: red;">{{ _GetorderDetail['Gd_cpmc'] }}</span></p>
-			  				 </div>
-			  				 <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-			  				   <p style="flex: 0.4; margin: 0;">订单数量:<span style="color: red;">{{ _GetorderDetail['订单数量'] }}</span></p>
-			  				   <p style="flex: 0.3; margin: 0;">实际投料:<span style="color: red;">{{ _GetorderDetail['实际投料'] }}</span></p>
-			  				   <p style="flex: 1; margin: 0;">
-			  					 单位:<span style="color: red;">{{ _GetorderDetail['计量单位'] }}</span> 
-			  					 目标合格率:<span style="color: red;">{{ _GetorderDetail['投料率'] }}</span>
-			  				   </p>
-			  				 </div>
-			  			   </div>
-			  			  
-			  			  <el-tabs v-model="activeName" @tab-click="handleClick">
-			  					<el-tab-pane label="工艺及生产班组"  @click="showTable('工艺及生产班组')"  name="first">
-			  					  <el-table tooltip-effect="dark" :data="lcdtableData" row-key="ID"
-			  					    highlight-current-row="true"
-			  					    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
-			  					    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-			  					    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-			  					    style="width: 100%;height: 56vh" ref="tablesczl_gxmc"
-			  					    @row-dblclick="gyscbzSelectClick">
-			  					    <el-table-column align="left"  label="流程单号" 	  width="81"	prop="流程单号" />
-			  					    <el-table-column align="left"  label="工序号" 	  width="68"	prop="工序号" />
-			  					    <el-table-column align="left"  label="工序名称" 	  width="240"	prop="工序名称"  />
-			  					    <el-table-column align="left"  label="生产日期" 	  width="120"	prop="生产日期"  />
-			  					    <el-table-column align="left"  label="机台编号" 	  width="81"	prop="机台编号"  />
-			  					    <el-table-column align="left"  label="班组人员01"  width="105"  :formatter="(row) => `${row.sczl_bh1 || ''} ${row.name1 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员02"  width="105"  :formatter="(row) => `${row.sczl_bh2 || ''} ${row.name2 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员03"  width="105"  :formatter="(row) => `${row.sczl_bh3 || ''} ${row.name3 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员04"  width="105"  :formatter="(row) => `${row.sczl_bh4 || ''} ${row.name4 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员05"  width="105"  :formatter="(row) => `${row.sczl_bh5 || ''} ${row.name5 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员06"  width="105"  :formatter="(row) => `${row.sczl_bh6 || ''} ${row.name6 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员07"  width="105"  :formatter="(row) => `${row.sczl_bh7 || ''} ${row.name7 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员08"  width="105"  :formatter="(row) => `${row.sczl_bh8 || ''} ${row.name8 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员09"  width="105"  :formatter="(row) => `${row.sczl_bh9 || ''} ${row.name9 || ''}`"/>
-			  					    <el-table-column align="left"  label="班组人员10"  width="105"  :formatter="(row) => `${row.sczl_bh10 || ''} ${row.name10 || ''}`"/>
-			  					  </el-table>
-			  					</el-tab-pane>
-			  					
-			  					<el-tab-pane label="制程异常记录"  @click="showTable('制程异常记录')"  name="second">
-			  					  <el-table tooltip-effect="dark" :data="zcycjltableData" row-key="ID"
-			  					    highlight-current-row="true"
-			  					    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
-			  					    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-			  					    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-			  					    style="width: 100%;height: 65vh" ref="tablzcycjl_gxmc"
-			  					    @row-dblclick="zcycjlSelectClick">
-			  					    <el-table-column align="left"  label="流程单号" 	  width="100"	prop="流程单号" />
-			  					    <el-table-column align="left"  label="数量" 	  	  width="100"	prop="数量" />
-			  					    <el-table-column align="left"  label="异常备注" 	  width="400"	prop="缺陷备注"  />
-			  					    <el-table-column align="left"  label="用户" 	  	  width="160"	prop="用户"  />
-			  					  </el-table>
-			  					</el-tab-pane>
-			  
-			  			  </el-tabs>
-			            </el-main>
-			          </layout-content>
-			        </layout>
-			      </layout>
-			    </div>
-			  </el-dialog>
-			</el-dialog>
-
+		<el-dialog
+			v-model="scpconlist"
+			title=""
+			width="80%"
+			height="80%"
+			:before-close="handleClose"
+			destroy-on-close
+			>
+			<!-- 在弹窗中使用Onderstatus组件 -->
+			<Onderstatus :default-search-value="_Gd_gdbh" />
+
+				<template #footer>
+				<el-button @click="scpconlist = false">关闭</el-button>
+		</template>
+		</el-dialog>
+		 
           <!-- 组员及分配比例         -->
           <el-dialog v-model="blModel" :before-close="() => blModel = false" style="width: 20%" @keydown="selectBZRR($event)">
             <el-form>
@@ -2720,6 +2586,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive,watch,onMounted, registerRuntimeCompiler } from 'vue'
 import { useUserStore } from '@/pinia/modules/user'
 import PrintPage from './components/print.vue'
+import Onderstatus from '@/view/quality/orderstatus.vue'
 
 const userStore = useUserStore()
 const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
@@ -6068,152 +5935,15 @@ const pd_lcdCancel = async () => {
 	工单生产批次信息查询
 */
 const scpconlist = ref(false);
-const scpconClick = async () => {
-  console.log(formData.value.工单编号)
-  if(lcd_Gd_gdbh.value){
-	  searchInfolcd.value = lcd_Gd_gdbh.value
-  }else{
-	  searchInfolcd.value = formData.value.工单编号
-  }
-	  
-  scpconlist.value = true;
-  tableDatalcd.splice(0,tableDatalcd.length,...[]);//表格数据
-  onSubmitlcd()//调用接口
-}
-//进入页面默认光标加载
-setTimeout(() => {
-	const inputElement = document.getElementById('searchInfo');
-	if (inputElement) {
-		inputElement.focus();		
-	}
-}, 100);
-			
-//搜索
-const searchInfolcd = ref('');
-const tableDatalcd = reactive([])
-//查询按钮
-const onSubmitlcd = () => {
-  _StaGetOrderList()
-};
-//搜索回车
-const Enterkeysearch = (event) => {
-   if (event.key === 'Enter') {
-      _StaGetOrderList();
-    }
-};
-//调用接口
-const _StaGetOrderList = async (node) => {
-  const StaGetOrderListdata = await StaGetOrderList({search:searchInfolcd.value});
-  console.log(StaGetOrderListdata)
-	if (StaGetOrderListdata.data === null) {
-	  ElMessage({
-		type: 'warning',
-		message: '未搜索具体查询条件',
-	  });
-	}
-  tableDatalcd.splice(0,tableDatalcd.length,...StaGetOrderListdata.data);//表格数据
-};
-
-// 树形节点属性映射
-const treeDatalcd = reactive([]);
-const defaultProps = {
-  label: 'label',
-  children: 'children',
-};
-//全局调用工单编号、印件号
-const _Gd_gdbhlcd = ref(null)
-const _Gd_yjnolcd = ref(null)
-const _GetorderDetail = ref(null)
-
-
-/*
-	弹窗页面
-*/
-const popdialog = ref(false);
-const currentRow = ref('');
-// 获取当前行数据
-const tableRowClicklcd = (row) => {
-  currentRow.value = row; // 保存当前选中行
-};
-
-// 按钮点击逻辑
-const onstatsuclick  = async () => {
-	console.log(currentRow)
-  if (!currentRow.value) {
-	ElMessage({
-	  type: "warning",
-	  message: "请先点击选择一行数据",
-	});
-	return;
-  }
-  await updateCompanyFunclcd(currentRow.value);
-};
-//双击
-const updateCompanyFunclcd = async (row) => {
-	console.log("双击",row)
-	_Gd_gdbhlcd.value = row['Gd_gdbh']
-	_Gd_yjnolcd.value =row['行号']
-	
-	const StaGetOrderDetaildata = await StaGetOrderDetail({ gdbh: row['Gd_gdbh'], yjno: row['行号'] });
-	let resultData = StaGetOrderDetaildata.data;
-	// 遍历对象,将 null 值替换为空字符串
-	Object.keys(resultData).forEach((key) => {
-	  if (resultData[key] === null) {
-	    resultData[key] = '';
-	  }
-	});
-	_GetorderDetail.value = resultData;
-	// console.log("_GetorderDetail.value", _GetorderDetail.value);
-	_StaGetList(row)
+// 实现scpconClick方法,控制弹窗显示
+const scpconClick = () => {
+	scpconlist.value = true
 }
 
-//左侧树形节点点击事件
-const handleNodeClicklcd = (node) => {
-  _StaProcessList(node['num'])
-  _StaProcessAnomaly()
-};
-
-//获取左侧菜单栏
-const _StaGetList = async (row) => {
-  const StaGetListdata = await StaGetList({ gdbh: row['Gd_gdbh'], yjno: row['行号'] });
-  
-  if (StaGetListdata.msg === '成功') {
-    // 转换数据:确保每个节点有 label 属性
-    const formattedData = StaGetListdata.data.map(item => ({
-      ...item,
-      label: item.流程单 || `流程单-${item.num}`, 
-    }));
-    
-    treeDatalcd.splice(0, treeDatalcd.length, ...formattedData);
-    popdialog.value = true;
-  } else {
-    ElMessage({ type: 'warning', message: StaGetListdata.msg });
-  }
-};
-
-//工艺及生产班组
-const lcdtableData = reactive([])
-const _StaProcessList = async (node) => {
-  const StaProcessListdata = await StaProcessList({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value,num:node});
-  lcdtableData.splice(0,lcdtableData.length,...StaProcessListdata.data);
-};
-
-//制程异常记录
-const zcycjltableData = reactive([])
-const _StaProcessAnomaly = async () => {
-  const StaProcessAnomalydata = await StaProcessAnomaly({gdbh:_Gd_gdbhlcd.value,yjno:_Gd_yjnolcd.value});
-  zcycjltableData.splice(0,zcycjltableData.length,...StaProcessAnomalydata.data);
-};
-
-//退出按钮
-const ontuicclick = async () => {
-  popdialog.value = false
-};
-
-//退出按钮
-const ontuicclicks = async () => {
-  scpconlist.value = false
-};
+// 弹窗关闭前的处理函数
+const handleClose = () => {
+	scpconlist.value = false
+}
 
 
 /*