first commit

src/view/performance/chejianbaogong.vue

@@ -4506,7 +4506,7 @@ const yinbaninvertSelection = () => {
 	  ma_start: formData3.value.码开始行,
 	  ma_end: formData3.value.码结束行,
 	  换版类型:formData3.value.换版类型,
-	  sczl_换版联拼数:formData3.value.Gy0_ls + '/' + formData3.value.换版联拼数,
+	  sczl_换版联拼数:formData3.value.换版联拼数,
 	}
 	console.log(restoredData)
   // return;

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1861,11 +1861,93 @@
          </el-row>
 		  <template #footer>
 		    <div class="dialog-footer">
+				<el-button 
+				      v-if="type2 !== 'create'" 
+				      type="primary" 
+				      @click="banzuzhang"
+				    >
+				      班组长审核
+				    </el-button>
+				    
+				    <el-button 
+				      v-if="type2 !== 'create'" 
+				      type="primary" 
+				      @click="tongjiyuan"
+				    >
+				      统计员审核
+				    </el-button>
+					
 		      <el-button @click="closeDialog">取 消</el-button>
 		      <el-button type="primary" @click="chanliangenterDialog">确 定</el-button>
 		    </div>
 		  </template>
 		</el-dialog>
+		
+		
+		<!-- 班组长审核 -->
+		<el-dialog v-model="leaderAuditDialog" title="班组长审核" width="700px" @close="closeLeaderAudit">
+		  <div class="detail-form">
+			<el-row :gutter="20">
+			
+			<el-col :span="12">
+			  <el-form-item label="系数"  label-width="80px">
+				<el-input v-model="leaderForm.coefficient" placeholder="请输入系数" />
+			  </el-form-item>
+			</el-col>
+			<el-col :span="12">
+			  <el-form-item label="换版联拼数">
+				<el-input v-model="leaderForm.换版联拼数" placeholder="" />
+			  </el-form-item>
+			</el-col>
+			<el-col :span="12">
+			  <el-form-item label="换版总工时">
+				<el-input v-model="leaderForm.换版总工时" placeholder="" />
+			  </el-form-item>
+			</el-col>
+			<el-col :span="12">
+			  <el-form-item label="换版类型" label-width="80px">
+				<el-select v-model="leaderForm.换版类型" placeholder="请选择换版类型">
+				  <el-option label="装新版" value="装新版" />
+				  <el-option label="装旧版" value="装旧版" />
+				  <el-option label="换版" value="换版" />
+				</el-select>
+			  </el-form-item>
+			</el-col>
+		
+		  </el-row>
+		  </div>
+		  <template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="closeLeaderAudit">取消</el-button>
+			  <el-button type="primary" @click="submitLeaderAudit">确认</el-button>
+			</span>
+		  </template>
+		</el-dialog>
+		
+		<!-- 统计员审核 -->
+		<el-dialog v-model="statAuditDialog" title="统计员审核" width="700px" @close="closeStatAudit">
+		  <div class="detail-form">
+			<el-row :gutter="20">
+			<el-col :span="12">
+			  <el-form-item label="装版补产工时">
+				<el-input v-model="statForm.装版补产工时" placeholder="" />
+			  </el-form-item>
+			</el-col>
+		  </el-row>
+		  </div>
+		  <template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="closeStatAudit">取消</el-button>
+			  <el-button type="primary" @click="submitStatAudit">确认</el-button>
+			</span>
+		  </template>
+		</el-dialog>
+		
+	
+		
+		
+		
+		
 
 						<!-- JP机新增定额代号弹窗 -->
 						<el-dialog v-model="FJPGetDedhVisible" id="tableFplb" @keydown="FJPent($event)" style="margin-top: 5%;"  >
@@ -2611,18 +2693,22 @@ import{
 	getProductData
   }  from "@/api/yunyin/yunying";
 import {
-MachineTeamAdd,
-  setMachineTeam,
-  PrintDetailAdd,
-  PrintDetailEdit
+	MachineTeamAdd,
+	setMachineTeam,
+	PrintDetailAdd,
+	PrintDetailEdit
 } from '@/api/jixiaoguanli/baogong'
 import {
-  FieldInspectionRecord,
-  StaGetOrderList,
-  StaGetList,
-  StaProcessList,
-  StaGetOrderDetail,
-  StaProcessAnomaly,
+	FieldInspectionRecord,
+	StaGetOrderList,
+	StaGetList,
+	StaProcessList,
+	StaGetOrderDetail,
+	StaProcessAnomaly,
+	Mount_Hours_getTab,
+	getMountList,
+	leaderConfirm,
+	statisticsConfirm,
 } from "@/api/mes/job";
 import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
 // 全量引入格式化工具 请按需保留
@@ -6881,19 +6967,99 @@ const qita_jitaidata = async () => {
 	formdata3.value.rq = qita_jitaidata.data.date
 }
 
+	
+//班组长审核
+const leaderAuditDialog = ref(false)
+const leaderForm = reactive({
+	coefficient: '',
+	leader: '',
+	Uniqid: '',
+	换版联拼数: '',
+	换版总工时: '',
+	换版类型: ''
+})
+const banzuzhang = async () => {
+ leaderAuditDialog.value = true
+}
+
+//统计员审核
+const statAuditDialog = ref(false)
+ const statForm = reactive({
+    装版补产工时: '',
+    statistics: '',
+    Uniqid: '',
+    yieldUid: ''
+  })
+const tongjiyuan = async () => {
+ statAuditDialog.value = true
+}
+
+// 班组长审核提交
+const submitLeaderAudit = async () => {
+	console.log('提交班组长审核参数:', leaderForm)
+	// return;
+	const res = await leaderConfirm(leaderForm)
+  
+  if (res.code === 0) {
+	ElMessage.success('班组长审核成功')
+	leaderAuditDialog.value = false
+  } else {
+	ElMessage.error(res.msg || '班组长审核失败')
+  }
+
+}
+
+// 统计员审核提交
+const submitStatAudit = async () => {
+  console.log('提交统计员审核参数:', statForm)
+  // return;
+  const res = await statisticsConfirm(statForm)
+  if (res.code === 0) {
+	ElMessage.success('统计员审核成功')
+	statAuditDialog.value = false
+  } else {
+	ElMessage.error(res.msg || '统计员审核失败')
+  }
 
+}
+
+// 关闭班组长审核
+const closeLeaderAudit = () => {
+leaderAuditDialog.value = false
+}
+
+// 关闭统计员审核
+const closeStatAudit = () => {
+statAuditDialog.value = false
+}
+		
+		
 //获取详细信息
 const MachineChanliang = async(value) => {
 	//打开新增按钮获取
 	qita_jitaidata();
-	
+
 	if(uid.value == undefined){
 		initfordata3()
 		chanliangVisible.value=true
 		return
 	}
- const response = await MachineChanliangDetail({UniqId:value});
- console.log('装新版',response)
+	const response = await MachineChanliangDetail({UniqId:value});
+	console.log('MachineChanliangDetail',response)
+	leaderForm.coefficient = response.data['系数']
+	leaderForm.leader = sys_id
+	leaderForm.Uniqid = response.data['Uid']
+	leaderForm.换版联拼数 = response.data['换版联拼数']
+	leaderForm.换版总工时 = response.data['装版总工时']
+	leaderForm.换版类型 = response.data['换版类型']
+
+	statForm.装版补产工时 = response.data['装版补产工时']
+	statForm.statistics = sys_id
+	statForm.Uniqid = response.data['Uid']
+	statForm.yieldUid = response.data['UniqId']
+
+ 
+ 
    if (response.code === 0) {
 	 chanliangVisible.value=true
 	 formdata3.value=response.data
@@ -7821,6 +7987,10 @@ const handleFplbClickedit = (nodeData, node, component) => {
  	newInput.style.color = 'black';
  	newInput.removeAttribute('readonly');
  }
+
+ 
+ 
+ 
  //日报表修改弹窗确定
  const chanliangenterDialog = async () => {
 	// console.log(formdata3.value.换版类型)
@@ -7944,7 +8114,7 @@ const handleFplbClickedit = (nodeData, node, component) => {
 		辅电表: formdata3.value.辅电表,
 		主电表:formdata3.value.主电表,
 		换版类型:formdata3.value.换版类型,
-		sczl_换版联拼数:formdata3.value.联数 + '/' + formdata3.value.换版联拼数,
+		sczl_换版联拼数:formdata3.value.换版联拼数,
 	}
 
    if(restoredData.开工时间==undefined){
@@ -8031,7 +8201,7 @@ const handleFplbClickedit = (nodeData, node, component) => {
 	主电表:formdata3.value.主电表,
 	UniqId:uid.value,
 	换版类型:formdata3.value.换版类型,
-	sczl_换版联拼数:formdata3.value.联数 + '/' + formdata3.value.换版联拼数,
+	sczl_换版联拼数:formdata3.value.换版联拼数,
    }
    const response = await MachineChanliangDetailEdit(restoredData);
    if (response.code === 0) {