优化

src/api/mes/job.js

@@ -285,6 +285,16 @@ export const getTab = (params) => {
     params
   })
 }
+
+//记录颜色报工历史记录日志
+export const getTabByGdbh = (data) => {
+  return service({
+    url: '/mes_server/work_order_verification/getTabByGdbh',
+    method: 'post',
+    data
+  })
+}
+
 // //获取物理地址
 // export const getMac = (params) => {
 //   return service({

src/pinia/modules/user.js

@@ -76,7 +76,7 @@ const GetAddr = async () => {
     // await getMachineMaclist(macAddress);
     
 	const response = await getMachineMac({ sys_sbID: macAddress });
-		console.log("获取数据库列表：", response);
+	console.log("获取数据库列表：", response);
 	
 		// if (response.code === 7) {
 		//   return;
@@ -92,7 +92,7 @@ const GetAddr = async () => {
 	  console.log("获取到的机台号:", Machine.value);
 	} else {
 		Machine.value = 'CF01';
-	  console.log("该电脑未绑定 MAC 地址");
+		console.log("该电脑未绑定 MAC 地址");
 	}
 	
     //默认值

src/view/performance/baozhuangbaogong.vue

@@ -64,7 +64,7 @@
 						<el-text style="font-size: 30px;">上报数量</el-text>
 					</el-col>
 					<!--上报数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['上报数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" style="width: 100%; height: 40px;"/></el-col>
 						
 				
 					<!-- 是否尾包文本 -->
@@ -146,7 +146,7 @@
 					</el-main>
 				</layout-content>
 					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">确认</el-button>
+						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
 						<el-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">工单预览</el-button>
 					</div>
 			</div>
@@ -315,21 +315,25 @@ const jstableData = reactive([])
 	
 //查询按钮
 const add_onSubmit = async ()=>{
+	
+	if(add_formData['机台号'] === ''){
+		ElMessage({type: 'warning',message: '未获取到机台'})
+		return false;
+	}
+	
   if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
     const WorkListdata = [];
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	ElMessage({type: 'warning',message: '请扫描小票二维码' })
   }else{
-	  //订单编号 获取 技术附件数据Excel
-	  const searchValue = add_searchInfo.value.split('-')[0];
-	  const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
-	  console.log(jsOrderAttachments)
-	  jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
-	  
+		//技术附件
+		const searchValue = add_searchInfo.value.split('-')[0];
+		const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
+		jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
+
 		add_formData['尺码'] = ''
 		add_formData['总数量'] = ''
 		add_formData['剩余数量'] = ''
-		add_formData['上报数量'] = ''
 	// if(searcs.value === ''){
 		 _order.value = add_searchInfo.value;
 		 const sys_sbID = add_formData['机台号']
@@ -344,15 +348,12 @@ const add_onSubmit = async ()=>{
 		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 		 setTimeout(() => {
-		const inputElement = document.getElementById('sbsl');
-		if (add_formData['剩余数量']) {
-			inputElement.focus();		
-		}
-	}, 100); // 延迟100毫秒
+			const inputElement = document.getElementById('sbsl');
+			if (add_formData['剩余数量']) {
+				inputElement.focus();		
+			}
+		 }, 100); // 延迟100毫秒
 		 
-	// }else{
-	// 	 add_Dialog();
-	// }
   }
 }
 
@@ -439,26 +440,35 @@ const add_formData = reactive({
 
 });
 const add_Dialogonclick = ref(false)
+
+//获取input事件
 function baogongslpd() {    
   // 将字符串转换为数字  
-  const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0; // 使用10作为基数表示十进制，如果转换失败则返回0  
-  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; // 同样处理  
+  const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0;  
+  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; 
+  
   if (reportedQuantity > totalQuantity) {  
     ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
-  }else if(reportedQuantity === 0){
+  }else if(reportedQuantity === ''){
 	add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
   }  
 }
 const currentSlValue=ref('')
-//后道确认按钮
+//报工
 const add_Dialog = async ()=>{
+
+ if(add_formData['上报数量'] === ''){
+    ElMessage({type: 'warning',message: '上报数量为空，请填写上报数量'})
+	return;
+  }
+  
   if(_order.value === ''){
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
+	return;
   }else{
-		console.log(_order.value.split(',')[0])
 		let params ={}
 		params.code = _code
 		params.order = _order.value.split(',')[0].split('-')[0]

src/view/performance/caiqiebaogong.vue

@@ -88,7 +88,7 @@
 						<el-col :span="1"><el-input v-model="scsformdata.sctotal" id="sctotal" readonly style="width: 65px;height: 40px;" /></el-col>
 						
 						<el-button type="primary" @click="add_Dialog"
-							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 20px">确认</el-button>
+							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 20px">报工</el-button>
 						<el-button type="primary" @click="gd_yulan"
 							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 15px">工单预览</el-button>
 					</el-row>
@@ -237,7 +237,7 @@ import LuckyExcel from 'luckyexcel';
 
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue';
-import {getSpotList,getInfo,OrderAttachments} from '@/api/mes/job';
+import {getSpotList,getInfo,OrderAttachments,getTabByGdbh} from '@/api/mes/job';
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import {ElMessage} from "element-plus";
@@ -393,6 +393,7 @@ const _UniqId = ref('');
 const sizeDatas = reactive([])
 //技术附件
 const jstableData = reactive([])
+const _list = ref('');
 
 //点击【查询】按钮
 const add_onSubmit = async ()=>{
@@ -403,27 +404,28 @@ const add_onSubmit = async ()=>{
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
       ElMessage({type: 'warning',message: '搜索内容不能为空' })
   }else{
+	  
 	if (!add_searchInfo.value.startsWith('DC')) {
 		// 如果没有以"DC"开头，自动补充添加DC 
 		add_searchInfo.value = 'DC' + add_searchInfo.value;  
 	} 
-	//订单编号 获取 技术附件数据Excel
+	
+	//技术附件
 	const searchValue = add_searchInfo.value.split('-')[0];
 	const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
-	console.log(jsOrderAttachments)
+	// console.log(jsOrderAttachments)
 	jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
 	
-	
-	
-	_order.value =add_searchInfo.value;
+	_order.value = add_searchInfo.value;
     const getSpotLists = await getSpotList({order:_order.value,code:'裁切'});
-	
+	console.log(getSpotLists)
+	//将 list 数据存到全局变量中
+	_list.value = getSpotLists.data.list
     if(getSpotLists.data.total === 0){
       ElMessage({type: 'warning',message: '请先出库此订单再使用裁切报工' })
       return false
     }
 	
-	console.log(getSpotLists)
 	sizeDatas.splice(0, getSpotLists.data.headers.length, ...getSpotLists.data.headers); //表格尺码数据
 	add_tableData.splice(0, add_tableData.length, ...getSpotLists.data.table); //表格数据
 	
@@ -545,11 +547,53 @@ const handleSelectionChange = (selection, type) => {
   console.log(ckSelection.value)
 }
 
-//确认出库按钮
+//确认
 const add_Dialog = async ()=>{
-  if(_order.value === ''){
-    ElMessage({type: 'warning',message: '请扫描子订单后，再操作此功能'})
-  }else{
+	if (!add_formData['机台号']) {
+	    ElMessage({ type: 'warning', message: '未获取到机台' });
+	    return false;
+	}
+	if (!_order.value) {
+	    ElMessage({ type: 'warning', message: '请扫描子订单（条码）后，在进行报工' });
+	    return;
+	}
+	// 检查 scs1 到 scs10 是否都为空
+	const isAllEmpty = Array.from({ length: 10 }, (_, i) => scsformdata[`scs${i + 1}`]).every(value => !value);
+	if (isAllEmpty) {
+	    ElMessage({ type: 'warning', message: '请至少填写一个报工数据' });
+	    return;
+	}
+	// 记录每一次上报数据信息日志
+	let datalog = {};
+	datalog.code = '裁切';
+	datalog.订单编号 = _list.value[0].订单编号;
+	datalog.子订单编号 = _list.value[0].子订单编号;
+	datalog.款号 = _list.value[0].款号;
+	datalog.款式 = _list.value[0].款式;
+	datalog.颜色 = _list.value[0].颜色;
+	datalog.上报时间 = currentDate;
+	//循环生成 cm1 到 cm20 的字段
+	for (let i = 1; i <= 10; i++) {
+	    datalog[`cm${i}`] = _list.value[0][`cm${i}`];
+	}
+	//循环生成 scsl1 到 scsl20 的字段
+	for (let i = 1; i <= 10; i++) {
+	    datalog[`scsl${i}`] = scsformdata[`scs${i}`];
+	}
+	// 记录总实裁数
+	datalog.sctotal = scsformdata.sctotal;
+	console.log(datalog)
+	const getTabByGdbhs = await getTabByGdbh(datalog);
+	
+	//光标跳转input框
+	setTimeout(() => {
+		const inputElement = document.getElementById('searchInput');
+		if (inputElement) {
+			inputElement.focus();		
+		}
+	}, 100); // 延迟100毫秒
+	  
+	//报工
 	if (_order.value.indexOf('-') !== -1) {
 	    let params = {}
 		params.scsl1 = scsformdata.scs1
@@ -569,17 +613,25 @@ const add_Dialog = async ()=>{
 	    console.log(params)
 	    //裁切完工报工接口
 	    const baogong_getInfo = await getInfo(params);
-	    if (baogong_getInfo.code === 0) {
-          ElMessage({type: 'success',message: '报工成功'});
-          const getSpotToLists = await getSpotList({order:_order.value,code:_code});
-          add_tableData.value = getSpotToLists.data.data;
-	        add_searchInfo.value = ''
-	    } else {
-	      ElMessage({ type: 'error',message: '出库失败'})
-	    }
-	} else {
-		ElMessage({type: 'warning',message: '请扫描子订单后，再操作此功能'})
-	}
+	   if (baogong_getInfo.code === 0) {
+	           ElMessage({ type: 'success', message: '报工成功' });
+	           // 清空表单数据
+	           if (scsformdata) {
+	               // 批量清空 scs1 到 scs10 和总和字段
+	               for (let i = 1; i <= 10; i++) {
+	                   scsformdata[`scs${i}`] = '';
+	               }
+	               scsformdata.sctotal = '';
+	           } else {
+	               console.error('scsformdata 未定义');
+	           }
+	           // 获取列表数据并更新表格
+	           const { data: { data: spotListData } } = await getSpotList({ order: _order.value, code: _code });
+	           add_tableData.value = spotListData;
+	           add_searchInfo.value = ''; // 清空搜索信息
+	       } else {
+	           ElMessage({ type: 'error', message: '报工失败' });
+	       }
   }
 }
 

src/view/performance/chafengbaogong.vue

@@ -78,7 +78,7 @@
 						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm4" id="cm4" readonly style="width: 65px;height: 40px;" /></el-col>
 						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm5" id="cm5" readonly style="width: 65px;height: 40px;" /></el-col>
 						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm6" id="cm6" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm7" id="cm7" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style=	"padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm7" id="cm7" readonly style="width: 65px;height: 40px;" /></el-col>
 						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm8" id="cm8" readonly style="width: 65px;height: 40px;" /></el-col>
 						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm9" id="cm9" readonly style="width: 65px;height: 40px;" /></el-col>
 						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 65px;height: 40px;" /></el-col>
@@ -201,7 +201,6 @@
 							      </el-table>
 							    </el-tab-pane>
 							</el-tabs>
-					</el-row>
 					
 
 				</div>
@@ -493,8 +492,12 @@
 	//技术附件
 	const jstableData = reactive([])
 	
-	//查询事件
+	//查询
 	const add_onSubmit = async () => {
+		if(add_formData['机台号'] === ''){
+			ElMessage({type: 'warning',message: '未获取到机台'})
+			return false;
+		}
 		sizeDatas.length = 0;
 		add_tableData.length = 0;
 		if (!add_searchInfo.value.startsWith('DC')) {
@@ -762,11 +765,23 @@ const luckyexcelCloseDialog = () => {
 			add_tableData.splice(0, add_tableData.length, ...getSpotLists.data.records); //表格数据
 			add_printxp();
 			searcs.value = '';
-			add_searchInfo.value = ''; // 清除选择  
+			add_searchInfo.value = ''; 
 			ElMessage({
 				type: 'success',
 				message: '报工成功'
 			});
+			
+			// 上报成功后 清空所有输入框上报数量
+			  if (slformdata) {
+			    for (let i = 1; i <= 10; i++) {
+			      slformdata['sl' + i] = '';
+			    }
+			    // 清空总和
+			    slformdata.sctotal = '';
+			  } else {
+			    console.error('未定义');
+			  }
+			  
 		}
 	}
 

src/view/performance/datangbaogong.vue

@@ -64,7 +64,7 @@
 						<el-text style="font-size: 30px;">上报数量</el-text>
 					</el-col>
 					<!--上报数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['上报数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" style="width: 100%; height: 40px;"/></el-col>
 						
 				
 					<!-- 是否尾包文本 -->
@@ -146,7 +146,7 @@
 					</el-main>
 				</layout-content>
 					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">确认</el-button>
+						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
 						<el-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">工单预览</el-button>
 					</div>
 			</div>
@@ -315,21 +315,25 @@ const jstableData = reactive([])
 	
 //查询按钮
 const add_onSubmit = async ()=>{
+	
+	if(add_formData['机台号'] === ''){
+		ElMessage({type: 'warning',message: '未获取到机台'})
+		return false;
+	}
+	
   if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
     const WorkListdata = [];
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	ElMessage({type: 'warning',message: '请扫描小票二维码' })
   }else{
-	  //订单编号 获取 技术附件数据Excel
-	  const searchValue = add_searchInfo.value.split('-')[0];
-	  const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
-	  console.log(jsOrderAttachments)
-	  jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
-	  
+		//技术附件
+		const searchValue = add_searchInfo.value.split('-')[0];
+		const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
+		jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
+
 		add_formData['尺码'] = ''
 		add_formData['总数量'] = ''
 		add_formData['剩余数量'] = ''
-		add_formData['上报数量'] = ''
 	// if(searcs.value === ''){
 		 _order.value = add_searchInfo.value;
 		 const sys_sbID = add_formData['机台号']
@@ -344,15 +348,12 @@ const add_onSubmit = async ()=>{
 		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 		 setTimeout(() => {
-		const inputElement = document.getElementById('sbsl');
-		if (add_formData['剩余数量']) {
-			inputElement.focus();		
-		}
-	}, 100); // 延迟100毫秒
+			const inputElement = document.getElementById('sbsl');
+			if (add_formData['剩余数量']) {
+				inputElement.focus();		
+			}
+		 }, 100); // 延迟100毫秒
 		 
-	// }else{
-	// 	 add_Dialog();
-	// }
   }
 }
 
@@ -439,26 +440,35 @@ const add_formData = reactive({
 
 });
 const add_Dialogonclick = ref(false)
+
+//获取input事件
 function baogongslpd() {    
   // 将字符串转换为数字  
-  const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0; // 使用10作为基数表示十进制，如果转换失败则返回0  
-  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; // 同样处理  
+  const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0;  
+  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; 
+  
   if (reportedQuantity > totalQuantity) {  
     ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
-  }else if(reportedQuantity === 0){
+  }else if(reportedQuantity === ''){
 	add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
   }  
 }
 const currentSlValue=ref('')
-//后道确认按钮
+//报工
 const add_Dialog = async ()=>{
+
+ if(add_formData['上报数量'] === ''){
+    ElMessage({type: 'warning',message: '上报数量为空，请填写上报数量'})
+	return;
+  }
+  
   if(_order.value === ''){
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
+	return;
   }else{
-		console.log(_order.value.split(',')[0])
 		let params ={}
 		params.code = _code
 		params.order = _order.value.split(',')[0].split('-')[0]

src/view/performance/houdaoshougong.vue

@@ -64,7 +64,7 @@
 						<el-text style="font-size: 30px;">上报数量</el-text>
 					</el-col>
 					<!--上报数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['上报数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" style="width: 100%; height: 40px;"/></el-col>
 						
 				
 					<!-- 是否尾包文本 -->
@@ -146,7 +146,7 @@
 					</el-main>
 				</layout-content>
 					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">确认</el-button>
+						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
 						<el-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">工单预览</el-button>
 					</div>
 			</div>
@@ -315,21 +315,25 @@ const jstableData = reactive([])
 	
 //查询按钮
 const add_onSubmit = async ()=>{
+	
+	if(add_formData['机台号'] === ''){
+		ElMessage({type: 'warning',message: '未获取到机台'})
+		return false;
+	}
+	
   if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
     const WorkListdata = [];
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	ElMessage({type: 'warning',message: '请扫描小票二维码' })
   }else{
-	  //订单编号 获取 技术附件数据Excel
-	  const searchValue = add_searchInfo.value.split('-')[0];
-	  const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
-	  console.log(jsOrderAttachments)
-	  jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
-	  
+		//技术附件
+		const searchValue = add_searchInfo.value.split('-')[0];
+		const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
+		jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
+
 		add_formData['尺码'] = ''
 		add_formData['总数量'] = ''
 		add_formData['剩余数量'] = ''
-		add_formData['上报数量'] = ''
 	// if(searcs.value === ''){
 		 _order.value = add_searchInfo.value;
 		 const sys_sbID = add_formData['机台号']
@@ -344,15 +348,12 @@ const add_onSubmit = async ()=>{
 		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 		 setTimeout(() => {
-		const inputElement = document.getElementById('sbsl');
-		if (add_formData['剩余数量']) {
-			inputElement.focus();		
-		}
-	}, 100); // 延迟100毫秒
+			const inputElement = document.getElementById('sbsl');
+			if (add_formData['剩余数量']) {
+				inputElement.focus();		
+			}
+		 }, 100); // 延迟100毫秒
 		 
-	// }else{
-	// 	 add_Dialog();
-	// }
   }
 }
 
@@ -439,26 +440,35 @@ const add_formData = reactive({
 
 });
 const add_Dialogonclick = ref(false)
+
+//获取input事件
 function baogongslpd() {    
   // 将字符串转换为数字  
-  const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0; // 使用10作为基数表示十进制，如果转换失败则返回0  
-  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; // 同样处理  
+  const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0;  
+  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; 
+  
   if (reportedQuantity > totalQuantity) {  
     ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
-  }else if(reportedQuantity === 0){
+  }else if(reportedQuantity === ''){
 	add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
   }  
 }
 const currentSlValue=ref('')
-//后道确认按钮
+//报工
 const add_Dialog = async ()=>{
+
+ if(add_formData['上报数量'] === ''){
+    ElMessage({type: 'warning',message: '上报数量为空，请填写上报数量'})
+	return;
+  }
+  
   if(_order.value === ''){
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
+	return;
   }else{
-		console.log(_order.value.split(',')[0])
 		let params ={}
 		params.code = _code
 		params.order = _order.value.split(',')[0].split('-')[0]

src/view/performance/zongjianbaogong.vue

@@ -64,7 +64,7 @@
 						<el-text style="font-size: 30px;">上报数量</el-text>
 					</el-col>
 					<!--上报数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['上报数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" style="width: 100%; height: 40px;"/></el-col>
 						
 				
 					<!-- 是否尾包文本 -->
@@ -96,45 +96,79 @@
 
 				<layout-content >
 					<el-main>
-						<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
-							<div @contextmenu.prevent>
-								<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
-									:row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
-									:cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
-									:data="add_tableData" border row-key="ID" size="small"
-									highlight-current-row="true" tooltip-effect="dark"
-									@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
-									:show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
-								<!-- <el-table-column type="selection" width="70" /> -->
-								<el-table-column sortable align="left" label="流水号" prop="serial" width="100"/>
-								<el-table-column sortable align="left" label="报工时间" prop="sys_rq" width="160"/>
-								<el-table-column sortable align="left" label="订单编号" prop="订单编号" width="130"/>
-								<el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
-								<!-- <el-table-column sortable align="left" label="款式" prop="款式" width="140"/> -->
-								<el-table-column sortable align="left" label="色系名称" prop="颜色" width="130"/>
-								<el-table-column sortable align="left" label="尺码" prop="尺码" width="110"/>
-								<el-table-column sortable align="left" label="数量" prop="数量" width="110"/>
-								<el-table-column sortable align="left" label="上报数量" prop="上报数量" width="110"/>
-								<el-table-column sortable align="left" label="是否尾包" prop="尾包" width="130"/>
-								<el-table-column sortable align="left" label="组别" prop="组别" width="130"/>
-								</el-table>
-						</div>
+						<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 8px;">
+							<!-- 表格数据 -->
+							  <el-tabs v-model="activeName">
+								<el-tab-pane label="报工历史记录"   @click="showTable('报工历史记录')" name="first">
+									<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
+										:row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
+										:cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
+										:data="add_tableData" border row-key="ID" size="small"
+										highlight-current-row="true" tooltip-effect="dark"
+										@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+										:show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
+									<!-- <el-table-column type="selection" width="70" /> -->
+									<el-table-column sortable align="left" label="流水号" prop="serial" width="100"/>
+									<el-table-column sortable align="left" label="报工时间" prop="sys_rq" width="160"/>
+									<el-table-column sortable align="left" label="订单编号" prop="订单编号" width="130"/>
+									<el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
+									<!-- <el-table-column sortable align="left" label="款式" prop="款式" width="140"/> -->
+									<el-table-column sortable align="left" label="色系名称" prop="颜色" width="130"/>
+									<el-table-column sortable align="left" label="尺码" prop="尺码" width="110"/>
+									<el-table-column sortable align="left" label="数量" prop="数量" width="110"/>
+									<el-table-column sortable align="left" label="上报数量" prop="上报数量" width="110"/>
+									<el-table-column sortable align="left" label="是否尾包" prop="尾包" width="130"/>
+									<el-table-column sortable align="left" label="组别" prop="组别" width="130"/>
+									</el-table>
+								</el-tab-pane>
+								
+							  <el-tab-pane label="技术附件" @click="showTable('技术附件')" name="fourth">
+								<el-table ref="multipleTable"
+										  :row-style="{ height: '20px' }"
+										  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+										  :header-cell-style="{ padding: '0px' }"
+										  :show-overflow-tooltip="true"
+										  :cell-class-name="planUsageCellClass"
+										  highlight-current-row="true"
+										  @row-dblclick="ExcelShow"
+										  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="handleSelectionChange">
+								  <!-- <el-table-column type="selection" width="55" /> -->
+								  <el-table-column align="left" label="备注" prop="附件备注"  width="120"/>
+								  <el-table-column align="left" label="文件类型" prop="附件类型"  width="120"/>
+								  <el-table-column align="left" label="关联产品" prop="关联编号"  width="120"/>
+								  <el-table-column align="left" label="建档用户" prop="sys_id"  width="120"/>
+								  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+								  <el-table-column align="left" label="更新时间" prop="mod_rq"  width="120"/>
+								  </el-table>
+								</el-tab-pane>
+							</el-tabs>
 						</el-row>
 					</el-main>
 				</layout-content>
 					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">确认</el-button>
+						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
 						<el-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">工单预览</el-button>
 					</div>
 			</div>
 		  <!-- </el-main> -->
 		</layout-content>
 	  </layout>
+	  <!-- 技术附件预览弹窗 -->
+	  <el-dialog v-model="luckyexcelVisible" :before-close="luckyexcelCloseDialog" width="100%" top="0vh">
+	    <div id="luckyexcel" style="width: 100%;height: 100vh;"></div>
+	  </el-dialog>
+	  
 	  <PrintPage ref="printPageRef" />
 	</div>
   </template>
 <script>
 export default {
+	data() {
+	  return {
+			currentTable: '', // 当前展示的表格
+			activeName: 'first',
+	  };
+	}, 
 	methods: {
     handleKeyDown(event, prevId, currentId, nextId) {
       const currentElement = document.getElementById(currentId);
@@ -178,10 +212,13 @@ export default {
 </script>
 <script setup>
 // 全量引入格式化工具 请按需保留
+import $script from 'scriptjs'
+import $ from 'jquery';
+import LuckyExcel from 'luckyexcel';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {hiprint} from "vue-plugin-hiprint";
 import {ref, reactive,nextTick,watch, setBlockTracking } from 'vue'
-import {getSpotList,search,getTab} from '@/api/mes/job'
+import {getSpotList,search,getTab,OrderAttachments} from '@/api/mes/job'
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
@@ -202,7 +239,6 @@ const seconds = String(today.getSeconds()).padStart(2, '0');
 const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 const currentDates = `${year}-${month}-${day}`;
 
-
 //全局获取code，接口接收code
 const _code = '总检'
 //全局接口接受的物理地址
@@ -213,9 +249,11 @@ const UniqId = ref('')
 const _gx = '6'
 //全局获取工序名称
 const _gxmc = '总检'
+
+
 //物理地址获取机台编号
 const getMachineMacdata = async () => {
-  console.log("总检机台获取物理地址",Machine.value)
+  console.log(_code,"机台获取物理地址",Machine.value)
   try {
     const data  = await getMachineMac({sys_sbID:Machine.value});
 	add_formData['机台号'] = data.data['机台号']
@@ -272,17 +310,30 @@ const activeButtonValue = ref('')
 //代表扫描两次自动保存
 const searcs = ref('')
 const _order = ref('')
-//查询询钮
+//技术附件
+const jstableData = reactive([])
+	
+//查询按钮
 const add_onSubmit = async ()=>{
+	
+	if(add_formData['机台号'] === ''){
+		ElMessage({type: 'warning',message: '未获取到机台'})
+		return false;
+	}
+	
   if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
     const WorkListdata = [];
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	ElMessage({type: 'warning',message: '请扫描小票二维码' })
   }else{
-	add_formData['尺码'] = ''
-	add_formData['总数量'] = ''
-	add_formData['剩余数量'] = ''
-	add_formData['上报数量'] = ''
+		//技术附件
+		const searchValue = add_searchInfo.value.split('-')[0];
+		const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
+		jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
+
+		add_formData['尺码'] = ''
+		add_formData['总数量'] = ''
+		add_formData['剩余数量'] = ''
 	// if(searcs.value === ''){
 		 _order.value = add_searchInfo.value;
 		 const sys_sbID = add_formData['机台号']
@@ -297,17 +348,78 @@ const add_onSubmit = async ()=>{
 		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 		 setTimeout(() => {
-		const inputElement = document.getElementById('sbsl');
-		if (inputElement) {
-			inputElement.focus();		
-		}
-	}, 100); // 延迟100毫秒
+			const inputElement = document.getElementById('sbsl');
+			if (add_formData['剩余数量']) {
+				inputElement.focus();		
+			}
+		 }, 100); // 延迟100毫秒
 		 
-	// }else{
-	// 	 add_Dialog();
-	// }
   }
 }
+
+//技术资料excel展示
+const ExcelShow = (row) =>{
+	console.log("技术资料excel展示")
+	console.log(row)
+	if(!row.附件内容) return
+	$.getScript('/luckysheet/plugins/js/plugin.js', () => {
+		$script('/luckysheet/luckysheet.umd.js', () => {
+					function dataURLtoBlob(dataUrl) {
+					    const byteString = atob(dataUrl.split(',')[1]);
+					    const ab = new ArrayBuffer(byteString.length);
+					    const ia = new Uint8Array(ab);
+
+					    for (let i = 0; i < byteString.length; i++) {
+					        ia[i] = byteString.charCodeAt(i);
+					    }
+
+					    return new Blob([ab], { type: 'application/octet-stream' });
+					}
+
+					const blob = dataURLtoBlob(row.附件内容);
+					luckyexcelVisible.value = true
+					LuckyExcel.transformExcelToLucky(blob, function(exportJson, luckysheetfile){
+						if(exportJson.sheets==null || exportJson.sheets.length==0){
+							alert("Failed to read the content of the excel file, currently does not support xls files!");
+							return;
+						}
+						if(luckyExcel) luckyExcel.destroy();
+						luckysheet.create({
+							container: 'luckyexcel', //容器的ID
+							data: exportJson.sheets,
+							title: exportJson.info.name, // 工作簿名称
+							lang: "zh", // 设定表格语言 国际化设置，允许设置表格的语言，支持中文("zh")和英文("en")
+							showtoolbar: false, // 是否显示工具栏
+							showinfobar: false, // 是否显示顶部信息栏
+							allowEdit: false, // 是否允许前台编辑
+							enableAddRow: false, // 允许增加行
+							enableAddCol: false, // 允许增加列
+							userInfo: false, // 右上角的用户信息展示样式
+							showRowBar: false, // 是否显示行号区域
+							showColumnBar: false, // 是否显示列号区域
+							sheetFormulaBar: false, // 是否显示公式栏
+							enableAddBackTop: false,//返回头部按钮
+						});
+						luckyExcel = luckysheet;
+					})
+		})
+	})
+	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/css/pluginsCss.css'));
+	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/plugins.css'));
+	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/css/luckysheet.css'));
+	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/assets/iconfont/iconfont.css'));
+
+}
+
+let luckyExcel = null
+
+const luckyexcelVisible = ref(false)
+const luckyexcelCloseDialog = () => {
+  luckyexcelVisible.value = false
+}	
+
+
+
 const AttendanceVisible=ref(false)
 //清空对象的属性值
 const gd_clearFormData = () => {
@@ -328,26 +440,35 @@ const add_formData = reactive({
 
 });
 const add_Dialogonclick = ref(false)
+
+//获取input事件
 function baogongslpd() {    
   // 将字符串转换为数字  
-  const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0; // 使用10作为基数表示十进制，如果转换失败则返回0  
-  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; // 同样处理  
+  const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0;  
+  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; 
+  
   if (reportedQuantity > totalQuantity) {  
     ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
-  }else if(reportedQuantity === 0){
+  }else if(reportedQuantity === ''){
 	add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
   }  
 }
 const currentSlValue=ref('')
-//后道确认按钮
+//报工
 const add_Dialog = async ()=>{
+
+ if(add_formData['上报数量'] === ''){
+    ElMessage({type: 'warning',message: '上报数量为空，请填写上报数量'})
+	return;
+  }
+  
   if(_order.value === ''){
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
+	return;
   }else{
-		console.log(_order.value.split(',')[0])
 		let params ={}
 		params.code = _code
 		params.order = _order.value.split(',')[0].split('-')[0]
@@ -403,7 +524,6 @@ const gd_yulan = () => {
       printPageRef.value.open(order) 
   }
 }
-//单机
 //单击
 const add_tableRowClick = async (row) => {
 	const orderString = `${row['子订单编号']},${row['组别']},3,${row['尺码']},${row['数量']},${row['尾包']}`;

src/view/yunyin/shengchanguanli/baogongshuju.vue

@@ -38,13 +38,13 @@
                 <!-- <el-table-column type="selection" width="55" /> -->
 				<el-table-column sortable align="left" label="订单编号" prop="订单编号" width="120"/>
 				<el-table-column sortable align="left" label="子订单编号" prop="子订单编号" width="140"/>
-				<el-table-column sortable align="left" label="款号" prop="款号" width="120"/>
-				<el-table-column sortable align="left" label="色系名称" prop="颜色" width="120"/>
-				<el-table-column sortable align="left" label="船样" prop="船样" width="120"/>
-				<el-table-column sortable align="left" label="尺码" prop="尺码" width="120"/>
-				<el-table-column sortable align="left" label="上报时间" prop="上报时间" width="130"/>
-				<el-table-column sortable align="left" label="制单数" prop="制单数" width="120"/>
-				<el-table-column sortable align="left" label="上报数量" prop="已完成" width="120"/>
+				<el-table-column sortable align="left" label="款号" prop="款号" width="125"/>
+				<el-table-column sortable align="left" label="色系名称" prop="颜色" width="127"/>
+				<el-table-column sortable align="left" label="船样" prop="船样" width="80"/>
+				<el-table-column sortable align="left" label="尺码" prop="尺码" width="80"/>
+				<el-table-column sortable align="left" label="上报数量" prop="已完成" width="105"/>
+				<el-table-column sortable align="left" label="制单总数" prop="制单数" width="105"/>
+				<el-table-column sortable align="left" label="上报时间" prop="上报时间" width="160"/>
               </el-table>
               <!-- 分页 -->
               <div class="gva-pagination">
@@ -274,6 +274,7 @@ const formatTreeData = (data) => {
   const _Machine = ref('');
   const _Machine_riqi = ref('');
   let parentGroup = '';
+  //左侧
   const handleNodeClick = async (node) => {
 	  // 取消所有节点的颜色
 	  const allNodes = document.querySelectorAll('.treecolor .el-tree-node');
@@ -300,42 +301,49 @@ const formatTreeData = (data) => {
 	  console.log(_Machine.value);
 	  console.log( _Machine_riqi.value);
 	  
-		_getStaffList(); // 执行获班组生产数据
+		_getStaffList();
   };
   
-  //点击管理中心 显示部门的全部数据
-  const handleNodeExpand = async (node) => {
-    // _department_code.value = node['编号'];
-    searchInfo.value = '';
-   _getStaffList(); // 执行获班组生产数据
-  }
+
+  // const handleNodeExpand = async (node) => {
+  //   // _department_code.value = node['编号'];
+  //   searchInfo.value = '';
+  //  _getStaffList();
+  // }
   
   // =========== 搜索 ===========
   const searchInfo = ref('')
   const _department_code = ref(null)
-  //点击【查询】按钮
+  //查询
   const onSubmit = () => {
     _department_code.value = '';
     if(searchInfo.value === ''){
       tableData.length = 0;
     }else{
-     _getStaffList(); // 执行获班组生产数据
+     _getStaffList();
     }
   };
-  
-  //班组生产数据
+  //调用报工数据接口
   const _getStaffList = async ()=>{
       try {
 		  if(_Machine_riqi.value === ''){
-			  const WorkListdata = await MachineDetail({machine:_Machine.value});
-			  console.log(WorkListdata)
-			  tableData.splice(0,tableData.length,...WorkListdata.data);//表格数据
+			 const WorkListdata = await MachineDetail({ machine: _Machine.value });
+			 console.log(WorkListdata);
+			 // 遍历数据，将 "船样" 由 0/1 转换为 "否"/"是"
+			 WorkListdata.data.forEach(item => {
+			     item.船样 = item.船样 === 1 ? '是' : '否';  // 将 1 转换为 "是"，0 转换为 "否"
+			 });
+			 // 更新表格数据
+			 tableData.splice(0, tableData.length, ...WorkListdata.data);
 		  }else{
 			  const WorkListdata = await MachineDetail({machine:_Machine.value,date:_Machine_riqi.value});
 			  console.log(WorkListdata)
+			  // 遍历数据，将 "船样" 由 0/1 转换为 "否"/"是"
+			  WorkListdata.data.forEach(item => {
+			      item.船样 = item.船样 === 1 ? '是' : '否';  // 将 1 转换为 "是"，0 转换为 "否"
+			  });
 			  tableData.splice(0,tableData.length,...WorkListdata.data);//表格数据
 		  }
-         
           // total.value =WorkListdata.data.total;//共多少条
     } catch (error) {
       console.error(error);

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -40,22 +40,22 @@
 							 :show-overflow-tooltip="true"
 							style="width: 100%;height: 65vh" border  :data="tableData1" row-key="ID" @selection-change="handleSelectionChange">
 						<el-table-column align="center" type="selection" width="40"/>
-						<el-table-column  sortable align="left" label="订单编号" prop="订单编号"  width="110" />
 						<el-table-column  sortable align="left" label="客户" prop="客户编号"  width="80" />
-						<el-table-column  sortable align="left" label="生产款号" prop="生产款号"  width="200" />
-						<el-table-column  sortable align="left" label="款式" prop="款式"  width="80" />
+						<el-table-column  sortable align="left" label="订单编号" prop="订单编号"  width="110" />
+						<el-table-column  sortable align="left" label="生产款号" prop="生产款号"  width="150" />
+						<el-table-column  sortable align="left" label="款式" prop="款式"  width="110" />
 						<el-table-column  sortable align="left" label="工单状态" prop="gd_statu"  width="105" />
-						<el-table-column  sortable align="left" label="船样描述" prop="船样描述"  width="200" />
-						<el-table-column  sortable align="left" label="船样合计" prop="船样合计"  width="105" />
 						<el-table-column  sortable align="left" label="订单数量" prop="订单数量"  width="120" />
+						<el-table-column  sortable align="left" label="船样合计" prop="船样合计"  width="105" />
+						<el-table-column  sortable align="left" label="船样描述" prop="船样描述"  width="200" />
 						<el-table-column  sortable align="left" label="单位" prop="单位"  width="80" />
 						<el-table-column  sortable align="left" label="粘衬" prop="粘衬"  width="80" />
 						<el-table-column  sortable align="left" label="要求" prop="要求"  width="360" />
 						<el-table-column  sortable align="left" label="箱唛要求" prop="箱唛要求"  width="360" />
 						<el-table-column  sortable align="left" label="工单完工数量" prop="工单完工数量"  width="140" />
 						<el-table-column  sortable align="left" label="工单完工日期" prop="工单完工日期"  width="140" />
-						<el-table-column  sortable align="left" label="建档用户" prop="Sys_id"  width="120" />
-						<el-table-column  sortable align="left" label="建档日期" prop="Sys_rq"  width="120" />
+						<el-table-column  sortable align="left" label="制单人" prop="Sys_id"  width="120" />
+						<el-table-column  sortable align="left" label="制单日期" prop="Sys_rq"  width="120" />
 						<el-table-column  sortable align="left" label="接单日期" prop="接单日期"  width="120" />
 						<el-table-column  sortable align="left" label="出库日期" prop="出库日期"  width="120" />
 						<el-table-column  sortable align="left" label="落货日期" prop="落货日期"  width="120" />
@@ -280,13 +280,13 @@ const searchInfo = ref('')
 const table_Selection = ref(false)
 //查询按钮
 const onSubmit = async ()  => {
-	if(searchInfo.value === ''){
-		ElMessage({type: 'warning',message: '请输入搜索的订单编号' })
-		return false;
-	}else{
+	// if(searchInfo.value === ''){
+		// ElMessage({type: 'warning',message: '请输入搜索的订单编号' })
+		// return false;
+	// }else{
 		const UnapprovalListtable = await UnapprovalList({search:searchInfo.value});
 		tableData1.splice(0,tableData1.length,...UnapprovalListtable.data);
-	}
+	// }
 };
 
 //表格复选框

src/view/yunyin/shengchanguanli/yuedudahuoshengchanjindu.vue

@@ -59,8 +59,9 @@
 			 			<el-table-column  sortable align="left" label="总检" prop="总检"  width="80" />
 			 			<el-table-column  sortable align="left" label="包装" prop="包装"  width="100" />
 			 			<el-table-column  sortable align="left" label="制单总数" prop="制单总数"  width="100" />
-			 			<el-table-column  sortable align="left" label="裁切总数" prop="裁切数量"  width="100" />	
-			 			<el-table-column  sortable align="left" label="出库日期" prop="出库日期"  width="110" />
+			 			<el-table-column  sortable align="left" label="裁切总数" prop="裁切总数"  width="100" />	
+						<el-table-column  sortable align="left" label="上报时间" prop="sys_rq"  width="160" />
+						<el-table-column  sortable align="left" label="出库日期" prop="出库日期"  width="160" />
 			  </el-table>
   
 			  <!-- 分页 -->
@@ -140,26 +141,33 @@ getDepartmentdata();
   const _Gd_gdbh = ref(null)
   //全局调用印件代号
   const _Gd_cpdh = ref(null)
+  //点击表格行
   const tableRowClick = async (row) => {
-	console.log(row.工单编号)
-	_Gd_gdbh.value = row.工单编号;
-	_Gd_yjdh.value = row.印件代号;
+	console.log(row)
   };
   
   
-  // 搜索默认为空
+  // 搜索框
   const searchInfo = ref('')
-  //点击【查询】按钮
+  //查询
   const onSubmit = () => {
-	_department_code.value = '';
 	if(searchInfo.value === ''){
 	  tableData.length = 0;
 	}else{
-		_code.value = '';
-		console.log(searchInfo.value)
+		//调用查询接口
 	  _workOrderDetailList();
 	}
   };
+  //查询接口
+  const _workOrderDetailList = async ()=>{
+  	const OrderYieldListtable = await OrderYieldList({client:_khbh.value,search:searchInfo.value});
+  	try {
+  		const workOrderDetaildata = OrderYieldListtable
+  		tableData.splice(0,tableData.length,...workOrderDetaildata.data);
+  	} catch (error) {
+  		console.error(error);
+  	}
+  }
   
   //导出到Excel
   const exportToExcel2 = () => {
@@ -182,17 +190,7 @@ getDepartmentdata();
       }
       return wbout;
   };
-  
-  const _workOrderDetailList = async ()=>{
-	const OrderYieldListtable = await OrderYieldList({client:_khbh.value,search:'',mouth:''});
-	console.log(OrderYieldListtable)
-	try {
-		const workOrderDetaildata = OrderYieldListtable
-		tableData.splice(0,tableData.length,...workOrderDetaildata.data);
-	} catch (error) {
-		console.error(error);
-	}
-  }
+
   
   // 分页相关的响应式变量
   const page = ref(1)