优化

src/view/job/rewards/rewards.vue

@@ -10,7 +10,7 @@
 			</layout-sider>
 
 			<el-container>
-				<el-main>
+				<el-main style="padding: 0px;">
 					<div class="gva-table-box">
 						<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline"
 							:rules="searchRule">
@@ -33,23 +33,28 @@
 							@selection-change="handleSelectionChange" @row-dblclick="handleDoubleClick"
 							@row-click="Click">
 							<el-table-column type="selection" width="45" />
-							<el-table-column align="left" label="工单编号" prop="sczl_gdbh" width="120" sortable />
-							<el-table-column align="left" label="印件名称" prop="yj_yjmc" width="210" sortable />
-							<el-table-column align="left" label="日期" prop="sczl_rq" width="100" sortable />
-							<el-table-column align="left" label="流程单备注" prop="sczl_numDesc" width="110"  />
-							<el-table-column align="left" label="联数" prop="sczl_ls" width="60"  />
-							<el-table-column align="left" label="责任部门" prop="责任部门" width="110" sortable />
-							<el-table-column align="left" label="大废品数" prop="sczl_cl" width="110" sortable />
-							<el-table-column align="left" label="废品类型" prop="sczl_fplxA" width="110" sortable />
-							<el-table-column align="left" label="废品来源" prop="sczl_fplxB" width="110" sortable />
-							<el-table-column align="left" label="奖励班组" prop="Jl_bzdh" width="110" sortable />
-							<el-table-column align="left" label="检验员工" prop="JL_bh1" width="110" sortable />
-							<el-table-column align="left" label="责任班组" prop="sczl_bzdh" width="120" sortable />
-							<el-table-column align="left" label="责任员工1" prop="sczl_bh1" width="130" sortable />
-							<el-table-column align="left" label="责任员工2" prop="sczl_bh2" width="130" sortable />
-							<el-table-column align="left" label="创建用户" prop="sys_id" width="120" sortable />
-							<el-table-column align="left" label="创建时间" prop="sys_rq" width="160" sortable />
-							<el-table-column align="left" label="UNIQID" prop="UniqId" width="90" />
+							<el-table-column align="left" label="工单编号" prop="sczl_gdbh" width="100"  />
+							<el-table-column align="left" label="印件名称" prop="yj_yjmc" width="210"  />
+							<el-table-column align="left" label="日期" prop="sczl_rq" width="100" sortable  s/>
+							<el-table-column align="left" label="流程单备注" prop="sczl_numDesc" width="105"  />
+							<el-table-column align="left" label="联数" prop="sczl_ls" width="55"  />
+							<el-table-column align="left" label="责任部门" prop="责任部门" width="100"  />
+							<el-table-column align="left" label="大废品数" prop="sczl_cl" width="100"  />
+							<el-table-column align="left" label="废品类型" prop="sczl_fplxA" width="100"  />
+							<el-table-column align="left" label="废品来源" prop="sczl_fplxB" width="100"  />
+							<el-table-column align="left" label="奖励班组" prop="Jl_bzdh" width="90"  />
+							<el-table-column align="left" label="检验员工1" prop="JL_bh1" width="150"  />
+							<el-table-column align="left" label="检验员工2" prop="JL_bh2" width="150"  />
+							<el-table-column align="left" label="检验员工3" prop="JL_bh3" width="150"  />
+							<el-table-column align="left" label="检验员工4" prop="JL_bh4" width="150"  />
+							<el-table-column align="left" label="责任班组" prop="sczl_bzdh" width="90"  />
+							<el-table-column align="left" label="责任员工1" prop="sczl_bh1" width="150"  />
+							<el-table-column align="left" label="责任员工2" prop="sczl_bh2" width="150"  />
+							<el-table-column align="left" label="责任员工3" prop="sczl_bh3" width="150"  />
+							<el-table-column align="left" label="责任员工4" prop="sczl_bh4" width="150"  />
+							<el-table-column align="left" label="创建用户" prop="sys_id" width="160"  />
+							<el-table-column align="left" label="创建时间" prop="sys_rq" width="160"  />
+							<!-- <el-table-column align="left" label="UNIQID" prop="UniqId" width="90" /> -->
 						</el-table>
 						<div class="gva-pagination">
 							<el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"
@@ -1490,10 +1495,11 @@ import LuckyExcel from 'luckyexcel';
 	const enterDialog = async () => {
 		if (type.value === 'update') {
 			SubmitDailyProduction()
+			RewardTab()
 
 		} else if (type.value === 'create') {
 			add()
-
+			RewardTab()
 		}
 	}
 
@@ -1616,12 +1622,12 @@ import LuckyExcel from 'luckyexcel';
 		.filter(key => key.startsWith('JL_Je')) // 过滤奖励金额的值
 		.every(key => restoredData[key] <= 200); // 判断每个值是否小于等于200
 
-		if (!isValid) {
-		ElMessage({
-			type: 'warning',
-			message: '请确保所有的奖励金额都小于或等于 200'
-		});
-		} else {
+		// if (!isValid) {
+		// ElMessage({
+		// 	type: 'warning',
+		// 	message: '请确保所有的奖励金额都小于或等于 200'
+		// });
+		// } else {
 			const response = await JunkDetailEdit(restoredData);
 			console.log(response)
 			if (response.code === 0) {
@@ -1632,7 +1638,7 @@ import LuckyExcel from 'luckyexcel';
 				dialogFormVisible.value = false
 			}
 			getTableData()
-		}
+		// }
 		
 	}
 	const add = async () => {

src/view/performance/chejianbaogong.vue

@@ -2478,6 +2478,18 @@ import {
   StaProcessAnomaly,
 } from '@/api/mes/job'
 
+   // 获取当前日期
+   const today = new Date();
+    const year = today.getFullYear();
+    const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
+    const day = String(today.getDate()).padStart(2, '0');
+    const hours = String(today.getHours()).padStart(2, '0');
+    const minutes = String(today.getMinutes()).padStart(2, '0');
+    const seconds = String(today.getSeconds()).padStart(2, '0');
+    const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    const currentDates = `${year}-${month}-${day}`;
+
+
 const printPageRef = ref()
 const userStore = useUserStore()
 const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
@@ -4929,6 +4941,7 @@ const processInspectionRecordsItem = async (value) => {
 		 item.team=BZMC.value
 		 item.machine=JTMC.split("#")[0]
 		 item.selected = '不检测';
+		 item.rq = currentDate;
 		 return item
 	 })
 	 fujiaselectData.value=response.data.首件.附加.map(item=>{