优化

src/view/job/rewards/rewards.vue

@@ -1503,53 +1503,53 @@ import LuckyExcel from 'luckyexcel';
 		}
 	}
 
-  //导出到Excel按钮
-    const jcToExcel = () => {
-    const el = document.getElementById('Exceltable');
-        if (!el) {
-            console.error('Table element not found!');
-            return;
-        }
-    const filename = '工序大废品.xlsx';
-    const wb = XLSX.utils.table_to_book(el, { raw: true });
-    const ws = wb.Sheets[wb.SheetNames[0]]; // 获取第一个工作表
-
-    // 获取工作表的范围
-    const range = XLSX.utils.decode_range(ws['!ref']);
-
-    // 遍历每一行（从第二行开始）
-    for (let R = range.s.r + 1; R <= range.e.r + 1; ++R) {
-    // 直接通过单元格地址访问F列和H列的单元格
-    const cellF = ws[`F${R}`];
-    const cellH = ws[`H${R}`];
-
-    // 检查F列的单元格是否存在且其值是字符串类型
-    if (cellF && typeof cellF.v === 'string') {
-        const numF = Number(cellF.v);
-        if (!isNaN(numF)) {
-            // 修改单元格类型为数字，并更新值
-            cellF.t = 'n';
-            cellF.v = numF;
-        }
-    }
-    // 检查H列的单元格是否存在且其值是字符串类型
-    if (cellH && typeof cellH.v === 'string') {
-        console.log(`H${R}: ${cellH.v}, Type before: ${cellH.t}`);
-        const numH = Number(cellH.v);
-        if (!isNaN(numH)) {
-            // 修改单元格类型为数字，并更新值
-            cellH.t = 'n';
-            cellH.v = numH;
-        }
-    }
-    }
-    const wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' });
-    try {
-    FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), filename);
-    } catch (e) {
-    console.error('Error saving file:', e);
-    }
-    };
+	//导出到Excel按钮
+	const jcToExcel = () => {
+		const el = document.getElementById('Exceltable');
+		if (!el) {
+			console.error('Table element not found!');
+			return;
+		}
+	const filename = '工序大废品.xlsx';
+	const wb = XLSX.utils.table_to_book(el, { raw: true });
+	const ws = wb.Sheets[wb.SheetNames[0]]; // 获取第一个工作表
+
+	// 获取工作表的范围
+	const range = XLSX.utils.decode_range(ws['!ref']);
+
+	// 遍历每一行（从第二行开始）
+	for (let R = range.s.r + 1; R <= range.e.r + 1; ++R) {
+	// 直接通过单元格地址访问F列和H列的单元格
+	const cellF = ws[`F${R}`];
+	const cellH = ws[`H${R}`];
+
+	// 检查F列的单元格是否存在且其值是字符串类型
+	if (cellF && typeof cellF.v === 'string') {
+		const numF = Number(cellF.v);
+	if (!isNaN(numF)) {
+	// 修改单元格类型为数字，并更新值
+		cellF.t = 'n';
+		cellF.v = numF;
+	}
+	}
+	// 检查H列的单元格是否存在且其值是字符串类型
+	if (cellH && typeof cellH.v === 'string') {
+		console.log(`H${R}: ${cellH.v}, Type before: ${cellH.t}`);
+		const numH = Number(cellH.v);
+	if (!isNaN(numH)) {
+	// 修改单元格类型为数字，并更新值
+		cellH.t = 'n';
+		cellH.v = numH;
+	}
+	}
+	}
+	const wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' });
+		try {
+		FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), filename);
+		} catch (e) {
+	console.error('Error saving file:', e);
+		}
+	};
 
 	//日报表上传
 	const SubmitDailyProduction = async () => {

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -1023,15 +1023,18 @@ const onztwgClick = async () => {
   }
 }
 //工序完工按钮
+  
 const ongxwgClick = async () => {
   searchInfo.value = '';
-  if(_ZC_gdbh.value == null || _ZC_gdbh.value == ''){
+  if(_WG_gdbh.value == null || _WG_gdbh.value == ''){
     onstatuslist.value = false;
     ElMessage({type: 'warning',message: '请勾选制程中工单'})
   }else{
     let params = {}
-    params.workOrder = _ZC_gdbh.value;
-    params.processCode = _ZC_gxh.value;
+    params.workOrder = _WG_gdbh.value;
+    params.yjno = _WG_yjno.value;
+    params.processCode = _WG_gxh.value;
+    console.log(params)
     const complete_get = await complete(params);
     if (complete_get.code === 0) {
       const  pc_zc_table = await MachineWorkOrderList({ machine:_machine.value});
@@ -1093,11 +1096,22 @@ const _ZC_gxh = ref(null)
 const _ZC_yjno = ref(null)
 const _ZC_gdbh = ref(null)
 const _ZC_xscn = ref(null)
+// 完工获取数据
+const _WG_gdbh = ref(null)
+const _WG_gxh = ref(null)
+const _WG_yjno = ref(null)
 const ZP_handleChange = (arr) => {
   _ZC_gxh.value = arr.map(val => val['gxh'])
   _ZC_yjno.value = arr.map(val => val['yjno'])
   _ZC_gdbh.value = arr.map(val => val['工单编号'])
   _ZC_xscn.value = arr.map(val => val['小时产能'])
+  let gxh = arr.map((val) => val['gxh']).join(",");
+  let yjno = arr.map((val) => val['yjno']).join(",");
+  let str = arr.map((val) => val['工单编号']).join(",");
+  console.log(gxh,yjno,str)
+  _WG_gdbh.value = str;
+  _WG_gxh.value = gxh;
+  _WG_yjno.value = yjno;
 }
 
 //=========工序产量核查===========