优化

src/view/performance/Manualdocuments.vue

@@ -55,8 +55,8 @@
 					<!-- 弹出框 -->
 					<el-dialog v-model="dialogFormVisible" :before-close="closeDialog"
 						:title="type === 'create' ? '添加' : '修改'" destroy-on-close width="1000px">
-						<el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule"
-							label-width="70px">
+						<el-form :model="formData"  label-position="right" ref="elFormRef" :rules="rule"
+							label-width="70px" @keyup="moveFocus">
 							<el-row :gutter="24">
 								<el-col :span="4">
 									<el-form-item label="日期" prop="id" class="mab">
@@ -72,10 +72,16 @@
 								</el-col>
 								<el-col :span="8">
 									<el-form-item label="组长" prop="name" class="mab" label-width="50px">
-										<el-input v-model="formData.sczl_bh0" id="bh0" @keydown="ent1($event)"
-											@blur="getygsubmit($event, '0')" style="width: 100px; margin-right: 5px;" />
-										<el-input v-model="formData.sczl_bh0_name" id="name0" :readonly=true
+										
+										<!-- <el-input v-model="formData.sczl_bh0" id="bh0" @keydown="ent1($event,'组别','bh0','name0')"
+											@blur="getygsubmit($event, '0')" style="width: 100px; margin-right: 5px;" /> -->
+
+										<el-input v-model="formData.sczl_bh0" id="bh0" @keydown="ent1($event,'组别','bh0','name0')"
+										style="width: 100px; margin-right: 5px;" />
+
+										<el-input v-model="formData.sczl_bh0_name" id="name0" disabled
 											@keydown="ent1($event)" style="width: 100px; " />
+
 									</el-form-item>
 								</el-col>
 								<el-col :span="4">
@@ -235,6 +241,16 @@
 
 						</el-form>
 
+						<el-dialog v-model="blModel" title="选择" destroy-on-close width="300px"  @keydown="selectygbh($event)">
+								<el-table :data="employeeData" ref="tableygbh" border :show-overflow-tooltip="true" 
+									:cell-class-name="blplanUsageCellClass"  
+									highlight-current-row="true"
+									@row-dblclick="SelectClickygbh">
+									<el-table-column prop="员工编号" label="员工编号"></el-table-column>
+									<el-table-column prop="ygxm" label="员工姓名"></el-table-column>
+								</el-table>
+						</el-dialog>
+
 						<el-dialog v-model="BzVisible" title="选择" destroy-on-close width="200px"
 							@keydown="selectBZ($event)">
 							<el-table tooltip-effect="dark" :data="selectDataBz" row-key="ID"
@@ -598,8 +614,85 @@
 		}
 	}
 
+
+	//员工弹窗
+	const blModel = ref(false)
+	const employeeData = ref('')
+	const maxygnum = ref('')
+	//员工列表接口
+	const getyglist = async ()=>{
+		if(formData.value.sczl_bh0 === ''){
+			return;
+		}
+		const response = await getYg({sczl_bh: formData.value.sczl_bh0});
+		if (response.code === 0) {
+			if(response.data.length === 1){
+				formData.value.sczl_bh0 = response.data[0].员工编号;			;
+				formData.value.sczl_bh0_name = response.data[0].ygxm;
+			}else{
+				blModel.value = true;
+				employeeData.value = response.data
+				tableygbh_setCurrent(employeeData.value[0])
+				maxygnum.value = response.data.length-1
+			}
+		}
+	}
+	//默认高亮
+	const tableygbh = ref()
+	const tableygbh_setCurrent = (row) => {
+		setTimeout(() => {
+			tableygbh.value?.setCurrentRow(row)
+			const {
+				ygxm,
+				员工编号
+			} = row
+			formData.value.sczl_bh0 = row.员工编号
+			formData.value.sczl_bh0_name = row.ygxm
+
+		})
+	}
+	let ygnum = 0
+	const selectygbh = (event) => {
+		if (event.keyCode === 40) { // 向下箭头
+			ygnum = Math.min(ygnum + 1, maxygnum.value); // 增加 ygnum，但不超过 maxygnum
+			tableygbh_setCurrent(employeeData.value[ygnum]);	
+		} else if (event.keyCode === 38) { // 向上箭头
+			ygnum = Math.max(ygnum - 1, 0); // 减少 ygnum，但不小于 0
+			tableygbh_setCurrent(employeeData.value[ygnum]);
+		} else if (event.keyCode === 13) { // Enter
+			blModel.value = false;
+			setTimeout(() => {
+			const inputElement = document.getElementById('箱数');
+			if (inputElement) {
+				inputElement.focus();		
+			}
+		}, 100);
+		}
+	}
+	//员工选择
+	const SelectClickgdbh = reactive([])
+	const SelectClickygbh = (row, column, event) => {
+		const {
+				ygxm,
+				员工编号
+			} = row
+			formData.value.sczl_bh0 = row.员工编号
+			formData.value.sczl_bh0_name = row.ygxm
+		blModel.value = false
+		setTimeout(() => {
+		const inputElement = document.getElementById('箱数');
+			if (inputElement) {
+				inputElement.focus();		
+			}
+		}, 100);
+	}
+	
+
 	//键盘 input框跳转
-	const ent1 = (event) => {
+	const ent1 = (event,id1,id2,id3) => {
+		if(id2 === 'bh0' && event.keyCode === 13){
+			getyglist()
+		}
 		const inputs = document.getElementsByTagName('input');
 		const currentIndex = Array.from(inputs).indexOf(event.target);
 		if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
@@ -727,6 +820,8 @@
 		BzVisible.value = true
 		setCurrent(data[0])
 	}
+
+	
 	const table = ref()
 	const setCurrent = (row) => {
 		setTimeout(() => {
@@ -737,6 +832,8 @@
 			formData.value.sczl_bzdh = row.sczl_bzdh
 		})
 	}
+
+
 	//班组选择
 	const selectDataBz = reactive([])
 	const BzVisible = ref(false)
@@ -801,27 +898,6 @@
 		}
 	}
 
-	//员工编号失去焦点事件
-	const getygsubmit = async (event, inputName) => {
-		let combinedString = 'sczl_bh' + inputName;
-		let value = eval('formData.value.' + combinedString);
-		if (value) {
-			const response = await getYg({
-				sczl_bh: value
-			});
-			console.log(response)
-			if (response.code === 0) {
-				let Bname = 'sczl_bh' + inputName + '_name';
-				formData.value[Bname] = response.data[0].ygxm;
-				//设置姓名样式
-
-				if (inputName > 0) {
-					unsetColorReadonly('cl' + inputName)
-					unsetColorReadonly('fp' + inputName)
-				}
-			}
-		}
-	}
 
 	const ent_sum = () => {
 		let sum = 0;
@@ -1361,6 +1437,13 @@
 	const ADD = ref('0')
 	//新增
 	function onAdd() {
+		dialogFormVisible.value = true
+		setTimeout(() => {
+		const inputElement = document.getElementById('日期');
+			if (inputElement) {
+				inputElement.focus();		
+			}
+		}, 100);
 		ADD.value = '新增'
 		type.value = 'create'
 		if (typeof(lastCellValue) == 'number') {
@@ -1395,9 +1478,11 @@
 				}
 			});
 		}
-		dialogFormVisible.value = true
-		// Productionadd()
 	}
+
+
+
+
 	const ScrapFactor = {
 		gdbh: '',
 		yjno: '',

src/view/performance/chejianbaogong.vue

@@ -540,7 +540,7 @@
 		      </el-table>
 			  <el-row :gutter="24">
 			    <el-col :span="17">
-			        <el-input v-model="pandingfangfa" style="margin-top=0px; height: 40px; margin-bottom: 0px;"   />
+			        <el-input v-model="pandingfangfa" style="margin-top:0px; height: 40px; margin-bottom: 0px;"   />
 			    </el-col>
 			  </el-row>
 		    </div>
@@ -554,36 +554,36 @@
 		</el-dialog>
 
 		<el-dialog v-model="zhichengVisible" title="制程检验记录" destroy-on-close fullscreen style="font-size: 3.5vh;font-weight: bold;" >
-		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-		    <el-col :span="5" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-form-item label="工单编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-		        <el-input v-model="xunchaData.order"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		  <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+		    <el-col :span="5" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-form-item label="工单编号" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+		        <el-input v-model="xunchaData.order"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		      </el-form-item>
 		    </el-col>
 
-		    <el-col :span="15" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-row style="margin-top=0px; margin-bottom: 0px;">
-		        <el-col style="margin-top=0px; margin-bottom: 0px;">
-		          <el-input v-model="xunchaData.product_name"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		    <el-col :span="15" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-row style="margin-top:0px; margin-bottom: 0px;">
+		        <el-col style="margin-top:0px; margin-bottom: 0px;">
+		          <el-input v-model="xunchaData.product_name"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		        </el-col>
 		      </el-row>
 		    </el-col>
-				<el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
-				  <el-form-item label="流程单" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-					<el-input v-model="xunchaData.lcdh"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+				<el-col :span="4" style="margin-top:0px; margin-bottom: 0px;">
+				  <el-form-item label="流程单" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+					<el-input v-model="xunchaData.lcdh"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 				  </el-form-item>
 				</el-col>
 
 		  </el-row>
 
-		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-		    <el-col :span="5" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-form-item label="印件编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-		        <el-input v-model="xunchaData.yjno"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		  <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+		    <el-col :span="5" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-form-item label="印件编号" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+		        <el-input v-model="xunchaData.yjno"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		      </el-form-item>
 		    </el-col>
-		    <el-col :span="15" style="margin-top=0px; margin-bottom: 0px;">
-		          <el-input v-model="xunchaData.gxmc"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		    <el-col :span="15" style="margin-top:0px; margin-bottom: 0px;">
+		          <el-input v-model="xunchaData.gxmc"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		    </el-col>
 		  </el-row>
 
@@ -713,24 +713,24 @@
 						  <el-descriptions-item :span="9">
 							  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
-							      <el-form-item label="日期:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-									<el-input v-model="huanxingData.日期"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+							      <el-form-item label="日期:" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+									<el-input v-model="huanxingData.日期"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 							      </el-form-item>
 							    </el-col>
 								<el-col :span="2" style="margin-bottom: 0px;margin-top: 0px;">
 
 								</el-col>
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
-									<el-form-item label="机台编号:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-									 <el-input v-model="huanxingData.机台编号"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+									<el-form-item label="机台编号:" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+									 <el-input v-model="huanxingData.机台编号"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 									</el-form-item>
 							    </el-col>
 								<el-col :span="1" style="margin-bottom: 0px;margin-top: 0px;">
 
 								</el-col>
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
-							      <el-form-item label="班组:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-									<el-input v-model="huanxingData.班组"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+							      <el-form-item label="班组:" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+									<el-input v-model="huanxingData.班组"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 							      </el-form-item>
 							    </el-col>
 							  </el-row>
@@ -1110,58 +1110,58 @@
 		  fullscreen
 		  style="font-size: 3.5vh;font-weight: bold;"
 		>
-		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-form-item label="工单编号" prop="id" style="margin-top=0px; margin-bottom: 0px; color: red;">
-		        <el-input v-model="xunchaData.order"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		  <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+		    <el-col :span="4" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-form-item label="工单编号" prop="id" style="margin-top:0px; margin-bottom: 0px; color: red;">
+		        <el-input v-model="xunchaData.order"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		      </el-form-item>
 		    </el-col>
 
-		    <el-col :span="9" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-row style="margin-top=0px; margin-bottom: 0px;">
-		        <el-col style="margin-top=0px; margin-bottom: 0px;">
-		          <el-input v-model="xunchaData.product_name"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		    <el-col :span="9" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-row style="margin-top:0px; margin-bottom: 0px;">
+		        <el-col style="margin-top:0px; margin-bottom: 0px;">
+		          <el-input v-model="xunchaData.product_name"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		        </el-col>
 		      </el-row>
 		    </el-col>
-			<el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
-			  <el-form-item label="工号 " prop="id" style="margin-top=0px; margin-bottom: 0px;">
-			    <el-input v-model="xunchaData.sczl_bh"  @keyup.enter.native="getxunchayg($event)"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+			<el-col :span="4" style="margin-top:0px; margin-bottom: 0px;">
+			  <el-form-item label="工号 " prop="id" style="margin-top:0px; margin-bottom: 0px;">
+			    <el-input v-model="xunchaData.sczl_bh"  @keyup.enter.native="getxunchayg($event)"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 			  </el-form-item>
 			</el-col>
-			<el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
-			  <el-form-item label="流程单" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-			    <el-input v-model="xunchaData.lcdh"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+			<el-col :span="4" style="margin-top:0px; margin-bottom: 0px;">
+			  <el-form-item label="流程单" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+			    <el-input v-model="xunchaData.lcdh"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 			  </el-form-item>
 			</el-col>
 
 		  </el-row>
 
-		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-		    <el-col :span="3" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-form-item label="印件编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-		        <el-input v-model="xunchaData.yjno"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		  <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+		    <el-col :span="3" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-form-item label="印件编号" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+		        <el-input v-model="xunchaData.yjno"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		      </el-form-item>
 		    </el-col>
-		    <el-col :span="10" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-row style="margin-top=0px; margin-bottom: 0px;">
-		        <el-col style="margin-top=0px; margin-bottom: 0px;">
-		          <el-input v-model="xunchaData.gxmc"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		    <el-col :span="10" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-row style="margin-top:0px; margin-bottom: 0px;">
+		        <el-col style="margin-top:0px; margin-bottom: 0px;">
+		          <el-input v-model="xunchaData.gxmc"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		        </el-col>
 		      </el-row>
 		    </el-col>
-			<el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
-			  <el-form-item label="姓名" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-			    <el-input v-model="xunchaData.sczl_name"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+			<el-col :span="4" style="margin-top:0px; margin-bottom: 0px;">
+			  <el-form-item label="姓名" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+			    <el-input v-model="xunchaData.sczl_name"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 			  </el-form-item>
 			</el-col>
 		  </el-row>
 
 
-		<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-		  <el-col :span="13" style="margin-top=0px; margin-bottom: 0px;">
-		    <el-form-item label="检验备注" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-input v-model="xunchaData.remark"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		<el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+		  <el-col :span="13" style="margin-top:0px; margin-bottom: 0px;">
+		    <el-form-item label="检验备注" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-input v-model="xunchaData.remark"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		    </el-form-item>
 		  </el-col>
 
@@ -1264,66 +1264,66 @@
 
 		<el-dialog v-model="chanliangVisible" title="日产量上报" fullscreen :show-close="false" style="font-size: 2vh;font-weight: bold;padding: 0px 16px 10px 16px" >
 		<div style="font-size: 1.5vh; font-weight: bold;color: red;">
-			<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-        <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-          <el-form-item label="工单编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-            <el-input style="margin-top=0px; margin-bottom: 1px;" v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')"  placeholder="" />
+			<el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+        <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+          <el-form-item label="工单编号" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+            <el-input style="margin-top:0px; margin-bottom: 1px;" v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')"  placeholder="" />
           </el-form-item>
         </el-col>
-			  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
-          <el-form-item label="产品名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-            <el-input v-model="formData3.product_name" id="产品名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '工单编号', '产品名称', '工序名称')"  placeholder="" />
+			  <el-col :span="10" style="margin-top:0px; margin-bottom: 1px;">
+          <el-form-item label="产品名称" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+            <el-input v-model="formData3.product_name" id="产品名称" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '工单编号', '产品名称', '工序名称')"  placeholder="" />
           </el-form-item>
 			  </el-col>
-			  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
-          <el-form-item label="工序名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-            <el-input v-model="formData3.gxmc" id="工序名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产品名称', '工序名称', '印件号')"  placeholder="" />
+			  <el-col :span="10" style="margin-top:0px; margin-bottom: 1px;">
+          <el-form-item label="工序名称" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+            <el-input v-model="formData3.gxmc" id="工序名称" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '产品名称', '工序名称', '印件号')"  placeholder="" />
           </el-form-item>
 			  </el-col>
       </el-row>
-			<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-          <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-            <el-form-item label="印件号" prop="id" label-width="60" style="margin-top=0px; margin-bottom: 1px;">
-              <el-input v-model="formData3.yjno" style="margin-top=0px; margin-bottom: 1px;" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')"  placeholder="" />
+			<el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+          <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+            <el-form-item label="印件号" prop="id" label-width="60" style="margin-top:0px; margin-bottom: 1px;">
+              <el-input v-model="formData3.yjno" style="margin-top:0px; margin-bottom: 1px;" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')"  placeholder="" />
             </el-form-item>
           </el-col>
-				  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
-            <el-form-item label="印件名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-            <el-input v-model="formData3.yj_name" id="印件名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '印件号', '印件名称', '工艺名称')"  placeholder="" />
+				  <el-col :span="10" style="margin-top:0px; margin-bottom: 1px;">
+            <el-form-item label="印件名称" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+            <el-input v-model="formData3.yj_name" id="印件名称" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '印件号', '印件名称', '工艺名称')"  placeholder="" />
             </el-form-item>
 				  </el-col>
-				  <el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
-            <el-form-item label="工艺名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-            <el-input v-model="formData3.gy_name" id="工艺名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '印件名称', '工艺名称', 'gxh')"  placeholder="" />
+				  <el-col :span="8" style="margin-top:0px; margin-bottom: 1px;">
+            <el-form-item label="工艺名称" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+            <el-input v-model="formData3.gy_name" id="工艺名称" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '印件名称', '工艺名称', 'gxh')"  placeholder="" />
             </el-form-item>
 				  </el-col>
-				  <el-col :span="2" style="margin-top=0px; margin-bottom: 1px;">
-            <el-form-item label="" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-              <el-input v-model="formData3.gxh" id="gxh" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '工艺名称', 'gxh', '日期')"  placeholder="" />
+				  <el-col :span="2" style="margin-top:0px; margin-bottom: 1px;">
+            <el-form-item label="" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+              <el-input v-model="formData3.gxh" id="gxh" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '工艺名称', 'gxh', '日期')"  placeholder="" />
             </el-form-item>
 				  </el-col>
       </el-row>
-			  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-				  <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+			  <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+				  <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;">
 				  </el-col>
-            <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-              <el-form-item label="日期" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                <el-input v-model="formData3.日期" id="日期" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')"  placeholder="" />
+            <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+              <el-form-item label="日期" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                <el-input v-model="formData3.日期" id="日期" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')"  placeholder="" />
               </el-form-item>
             </el-col>
-			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-              <el-form-item label="流程标牌" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-              <el-input v-model="formData3.流程标牌" id="流程标牌" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')"  placeholder="" />
+			  	  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+              <el-form-item label="流程标牌" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+              <el-input v-model="formData3.流程标牌" id="流程标牌" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')"  placeholder="" />
               </el-form-item>
 			  	  </el-col>
-			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-              <el-form-item label="上机时间" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-              <el-input v-model="formData3.上机时间" id="上机时间" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '流程标牌', '上机时间', '下机时间')"  placeholder="" />
+			  	  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+              <el-form-item label="上机时间" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+              <el-input v-model="formData3.上机时间" id="上机时间" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '流程标牌', '上机时间', '下机时间')"  placeholder="" />
               </el-form-item>
 			  	  </el-col>
-			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-              <el-form-item label="下机时间" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                <el-input v-model="formData3.下机时间" style="margin-top=0px; margin-bottom: 1px;" id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')"  placeholder="" />
+			  	  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+              <el-form-item label="下机时间" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                <el-input v-model="formData3.下机时间" style="margin-top:0px; margin-bottom: 1px;" id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')"  placeholder="" />
               </el-form-item>
 			  	  </el-col>
 				 <el-col :span="3">
@@ -1332,87 +1332,87 @@
       </div>
 <!--               <div style="margin-top: 20px;">-->
                <div style="margin-top: 5px;">
-               	<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;"></el-col>
-                  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                    <el-form-item label="产量" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.产量" id="产量" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')"  placeholder="" />
+               	<el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;"></el-col>
+                  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="产量" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-input v-model="formData3.产量" id="产量" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')"  placeholder="" />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                    <el-form-item label="制程废品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.制程废品" id="制程废品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产量', '制程废品', '制程次品')"  placeholder="" />
+                  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="制程废品" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-input v-model="formData3.制程废品" id="制程废品" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '产量', '制程废品', '制程次品')"  placeholder="" />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-                    <el-form-item label="制程次品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.制程次品" id="制程次品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程废品', '制程次品', '前工序废')"  placeholder="" />
+                  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="制程次品" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-input v-model="formData3.制程次品" id="制程次品" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '制程废品', '制程次品', '前工序废')"  placeholder="" />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-                    <el-form-item label="前工序废" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.前工序废" id="前工序废" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程次品', '前工序废', '来料异常')"  placeholder="" />
+                  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="前工序废" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-input v-model="formData3.前工序废" id="前工序废" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '制程次品', '前工序废', '来料异常')"  placeholder="" />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-                    <el-form-item label="来料异常" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.来料异常" id="来料异常" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '前工序废', '来料异常', '联数')"  placeholder="" />
+                  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="来料异常" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-input v-model="formData3.来料异常" id="来料异常" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '前工序废', '来料异常', '联数')"  placeholder="" />
                     </el-form-item>
                   </el-col>
                 </el-row>
 
 
-                <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-								  <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;"></el-col>
-								  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                    <el-form-item label="联数" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.Gy0_ls" id="联数" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"   placeholder="" />
+                <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+								  <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;"></el-col>
+								  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="联数" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-input v-model="formData3.Gy0_ls" id="联数" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"   placeholder="" />
                     </el-form-item>
 								  </el-col>
-								  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                    <el-form-item label="墨色" prop="" label-width="60" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.Gy0_ms" id="墨色" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"   placeholder="" />
+								  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="墨色" prop="" label-width="60" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-input v-model="formData3.Gy0_ms" id="墨色" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"   placeholder="" />
                     </el-form-item>
 								  </el-col>
-                  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                    <el-form-item label="装版总时长"  prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.装版总时长" disabled id="装版总时长" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"   placeholder="" />
+                  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="装版总时长"  prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-input v-model="formData3.装版总时长" disabled id="装版总时长" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"   placeholder="" />
                     </el-form-item>
                   </el-col>
-                    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-form-item label="打样总工时" label-width="100" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                        <el-input v-model="formData3.打样总工时" disabled style="margin-top=0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')"  placeholder="" />
+                    <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-form-item label="打样总工时" label-width="100" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                        <el-input v-model="formData3.打样总工时" disabled style="margin-top:0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')"  placeholder="" />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-form-item label="通电工时"  prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                        <el-input v-model="formData3.通电工时" style="margin-top=0px; margin-bottom: 1px;" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')"  placeholder="" />
+                    <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-form-item label="通电工时"  prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                        <el-input v-model="formData3.通电工时" style="margin-top:0px; margin-bottom: 1px;" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')"  placeholder="" />
                       </el-form-item>
                     </el-col>
                   </el-row>
-					<el-row :gutter="20" style="margin-top=0px; margin-bottom: 1vh;">
-					<el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+					<el-row :gutter="20" style="margin-top:0px; margin-bottom: 1vh;">
+					<el-col :span="1" style="margin-top:0px; margin-bottom: 1px;">
 					</el-col>
-					<el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-					<el-form-item label="定额代号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-					  <el-input v-model="formData3.定额代号" id="定额代号" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')"  placeholder="" />
+					<el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+					<el-form-item label="定额代号" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-input v-model="formData3.定额代号" id="定额代号" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')"  placeholder="" />
 					</el-form-item>
 					</el-col>
-					<el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					<el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
 					</el-col>
-					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-					  <el-form-item label="码包" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-						<el-input v-model="formData3.码包" style="margin-top=0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
+					  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-form-item label="码包" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.码包" style="margin-top:0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
 					  </el-form-item>
 					  </el-col>
-					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-					  <el-form-item label="主电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-						<el-input v-model="formData3.主电表" style="margin-top=0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')"  placeholder="" />
+					  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-form-item label="主电表" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.主电表" style="margin-top:0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')"  placeholder="" />
 					  </el-form-item>
 					  </el-col>
-					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-					  <el-form-item label="辅电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-						<el-input v-model="formData3.辅电表" id="辅电表" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')"  placeholder="" />
+					  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-form-item label="辅电表" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.辅电表" id="辅电表" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')"  placeholder="" />
 					  </el-form-item>
 					  </el-col>
 				  </el-row>
@@ -1760,74 +1760,74 @@
               width="140vh"
               style="height: 60vh;"
           >
-            <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="工单编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-                  <el-input style="margin-top=0px; margin-bottom: 1px;" v-model="dbformData.order" id="工单编号" disabled @keydown="ent($event, 'rate10', '工单编号', '产品名称')"  placeholder="" />
+            <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="工单编号" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+                  <el-input style="margin-top:0px; margin-bottom: 1px;" v-model="dbformData.order" id="工单编号" disabled @keydown="ent($event, 'rate10', '工单编号', '产品名称')"  placeholder="" />
                 </el-form-item>
               </el-col>
 
-              <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="产品名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.product_name" id="产品名称" style="margin-top=0px; margin-bottom: 1px;" disabled @keydown="ent($event, '工单编号', '产品名称', '工序名称')"  placeholder="" />
+              <el-col :span="10" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="产品名称" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.product_name" id="产品名称" style="margin-top:0px; margin-bottom: 1px;" disabled @keydown="ent($event, '工单编号', '产品名称', '工序名称')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="工序名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.gxmc" id="工序名称" style="margin-top=0px; margin-bottom: 1px;" disabled @keydown="ent($event, '产品名称', '工序名称', '印件号')"  placeholder="" />
+              <el-col :span="10" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="工序名称" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.gxmc" id="工序名称" style="margin-top:0px; margin-bottom: 1px;" disabled @keydown="ent($event, '产品名称', '工序名称', '印件号')"  placeholder="" />
                 </el-form-item>
               </el-col>
 
             </el-row>
 
-            <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="印件号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.yjno" style="margin-top=0px; margin-bottom: 1px;" id="印件号" disabled @keydown="ent($event, '工序名称', '印件号', '印件名称')"  placeholder="" />
+            <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="印件号" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.yjno" style="margin-top:0px; margin-bottom: 1px;" id="印件号" disabled @keydown="ent($event, '工序名称', '印件号', '印件名称')"  placeholder="" />
                 </el-form-item>
               </el-col>
 
-              <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="印件名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.yj_name" id="印件名称" style="margin-top=0px; margin-bottom: 1px;" disabled @keydown="ent($event, '印件号', '印件名称', '工艺名称')"  placeholder="" />
+              <el-col :span="10" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="印件名称" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.yj_name" id="印件名称" style="margin-top:0px; margin-bottom: 1px;" disabled @keydown="ent($event, '印件号', '印件名称', '工艺名称')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="工艺名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.gy_name" id="工艺名称" style="margin-top=0px; margin-bottom: 1px;" disabled @keydown="ent($event, '印件名称', '工艺名称', 'gxh')"  placeholder="" />
+              <el-col :span="8" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="工艺名称" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.gy_name" id="工艺名称" style="margin-top:0px; margin-bottom: 1px;" disabled @keydown="ent($event, '印件名称', '工艺名称', 'gxh')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="2" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.gxh" id="gxh" style="margin-top=0px; margin-bottom: 1px;" disabled @keydown="ent($event, '工艺名称', 'gxh', '日期')"  placeholder="" />
+              <el-col :span="2" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.gxh" id="gxh" style="margin-top:0px; margin-bottom: 1px;" disabled @keydown="ent($event, '工艺名称', 'gxh', '日期')"  placeholder="" />
                 </el-form-item>
               </el-col>
             </el-row>
 
 
 
-            <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-              <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+            <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+              <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;">
               </el-col>
-              <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="日期" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.日期" id="日期" readonly style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')"  placeholder="" />
+              <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="日期" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.日期" id="日期" readonly style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')"  placeholder="" />
                 </el-form-item>
               </el-col>
 
-              <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="流程标牌" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.流程标牌" id="流程标牌" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')"  placeholder="" />
+              <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="流程标牌" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.流程标牌" id="流程标牌" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="上机时间" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.上机时间" id="上机时间" disabled style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '流程标牌', '上机时间', '下机时间')"  placeholder="" />
+              <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="上机时间" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.上机时间" id="上机时间" disabled style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '流程标牌', '上机时间', '下机时间')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="下机时间" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.下机时间" style="margin-top=0px; margin-bottom: 1px;" id="下机时间" disabled @keydown="ent($event, '上机时间', '下机时间', '产量')"  placeholder="" />
+              <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="下机时间" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.下机时间" style="margin-top:0px; margin-bottom: 1px;" id="下机时间" disabled @keydown="ent($event, '上机时间', '下机时间', '产量')"  placeholder="" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -1836,87 +1836,87 @@
 
 
 
-            <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-              <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+            <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+              <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;">
               </el-col>
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="产量" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.产量" id="产量" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')"  placeholder="" />
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="产量" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.产量" id="产量" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="制程废品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.制程废品" id="制程废品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产量', '制程废品', '制程次品')"  placeholder="" />
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="制程废品" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.制程废品" id="制程废品" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '产量', '制程废品', '制程次品')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="制程次品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.制程次品" id="制程次品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程废品', '制程次品', '前工序废')"  placeholder="" />
+              <el-col :span="3" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="制程次品" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.制程次品" id="制程次品" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '制程废品', '制程次品', '前工序废')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="前工序废" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.前工序废" id="前工序废" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程次品', '前工序废', '来料异常')"  placeholder="" />
+              <el-col :span="3" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="前工序废" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.前工序废" id="前工序废" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '制程次品', '前工序废', '来料异常')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="来料异常" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.来料异常" id="来料异常" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '前工序废', '来料异常', '联数')"  placeholder="" />
+              <el-col :span="3" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="来料异常" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.来料异常" id="来料异常" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '前工序废', '来料异常', '联数')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="联数" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.联数" id="联数" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"   placeholder="" />
+              <el-col :span="3" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="联数" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.联数" id="联数" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"   placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="墨色" prop="" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.墨色" id="墨色" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"   placeholder="" />
+              <el-col :span="3" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="墨色" prop="" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.墨色" id="墨色" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"   placeholder="" />
                 </el-form-item>
               </el-col>
             </el-row>
 
 
-            <el-row :gutter="20" style="margin-top=0px; margin-bottom: 1px;">
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="装版总时长" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.装版总时长" id="装版总时长" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"   placeholder="" />
+            <el-row :gutter="20" style="margin-top:0px; margin-bottom: 1px;">
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="装版总时长" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.装版总时长" id="装版总时长" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"   placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="打样总工时" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.打样总工时" style="margin-top=0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')"  placeholder="" />
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="打样总工时" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.打样总工时" style="margin-top:0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="通电工时" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.通电工时" style="margin-top=0px; margin-bottom: 1px;" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')"  placeholder="" />
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="通电工时" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.通电工时" style="margin-top:0px; margin-bottom: 1px;" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')"  placeholder="" />
                 </el-form-item>
               </el-col>
             </el-row>
 
 
-            <el-row :gutter="20" style="margin-top=0px; margin-bottom: 1vh;">
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="定额代号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.定额代号" id="定额代号" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')"  placeholder="" />
+            <el-row :gutter="20" style="margin-top:0px; margin-bottom: 1vh;">
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="定额代号" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.定额代号" id="定额代号" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
+              <el-col :span="8" style="margin-top:0px; margin-bottom: 1px;">
               </el-col>
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="码包" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.码包" style="margin-top=0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="码包" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.码包" style="margin-top:0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="主电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.主电表" style="margin-top=0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')"  placeholder="" />
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="主电表" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.主电表" style="margin-top:0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')"  placeholder="" />
                 </el-form-item>
               </el-col>
-              <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-                <el-form-item label="辅电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                  <el-input v-model="dbformData.辅电表" id="辅电表" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')"  placeholder="" />
+              <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                <el-form-item label="辅电表" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                  <el-input v-model="dbformData.辅电表" id="辅电表" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')"  placeholder="" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -2568,6 +2568,10 @@ const bzonRightClick = async (row) => {
 	if(roww.value === null || roww.value === ''){
 		   ElMessage({type: 'warning',message: '请选择 设备作业清单工单后，再操作此功能' })
 	}else{
+		if(roww.value['班组号'] === '' || roww.value['班组号'] === null){
+			ElMessage({type: 'warning',message: '请在班组维护中选择 班组A班或B班后，再切换班组' })
+			return;
+		}
 		  ElMessageBox.confirm('确定切换班组吗?', '提示', {
 			confirmButtonText: '确定',
 			cancelButtonText: '取消',
@@ -2581,30 +2585,23 @@ const bzonRightClick = async (row) => {
 //数据接口调用
 const SetMachineTeams = async(row) => {
 	 console.log(formData.value.工单编号)
-	 	 console.log(row)
-		  console.log(55555555)
-		  
-		  
-		  
-  const res = await setMachineTeam({
-    machine: JTMC.split("#")[0],
-    order: formData.value.工单编号,
-    yjno: formData.value.印件号,
-    gy_name:formData.value.工序名称,
-    sczl_bzdh:row.班组号,
-    status:'生产',
-    production_now:0,
-    production_all:0,
-    team_id:row.ID
-  })
-  console.log(res)
-  if (res.code === 0) {
-    FacilityProduction()
-    ElMessage({
-      type: 'success',
-      message: '成功'
-    })
-  }
+	 console.log(row)
+	const res = await setMachineTeam({
+		machine: JTMC.split("#")[0],
+		order: formData.value.工单编号,
+		yjno: formData.value.印件号,
+		gy_name:formData.value.工序名称,
+		sczl_bzdh:row.班组号,
+		status:'生产',
+		production_now:0,
+		production_all:0,
+		team_id:row.ID
+	})
+  	console.log(res)
+	if (res.code === 0) {
+		FacilityProduction()
+		ElMessage({type: 'success',message: '成功'})
+	}
 }
 
 const setTeams = async(row) => {
@@ -2690,7 +2687,6 @@ const FacilityDetail = async () => {
 	}
 	const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team:BZMC.value });
 	console.log(response)
-	console.log("↑↑↑↑facilityDetail_01 ↑↑↑↑↑↑")
 	
 	// 日产量上报上机时间
 	if (response.code === 0) {
@@ -2790,7 +2786,9 @@ const llclickedlist = ref(false);
 
 const blModel = ref(false)
 const employeeData = ref('')
+const Special = ref('')
 const getbzyg = async (value,key) => {
+  Special.value = key
   let bzyg=''
   bzyg=`code${key}`
   let bzxm=''
@@ -2816,6 +2814,7 @@ const tablebllickHandler = async (row, column, event) => {
     // 如果已经点击过一次，则不再执行操作
     return;
   }
+  console.log("Special",Special.value)
   let nextIndex = 1;
   while (formDatas.value[`code${nextIndex}`] !== '' && formDatas.value[`name${nextIndex}`] !== '') {
     nextIndex++;
@@ -2824,11 +2823,21 @@ const tablebllickHandler = async (row, column, event) => {
       return;
     }
   }
+  if(Special.value === "8"){
+	formDatas.value.code8 = row.员工编号;
+	formDatas.value.name8= row.ygxm;
+	console.log(787878)
+	blModel.value = false;
+	clicked.value = true;
+  }else{
+	formDatas.value[`code${nextIndex}`] = row.员工编号;
+	formDatas.value[`name${nextIndex}`] = row.ygxm;
+	console.log(12345)
+	blModel.value = false;
+	clicked.value = true;
+  }
   // 将选定的值分配给下一个空的代码和名称字段
-  formDatas.value[`code${nextIndex}`] = row.员工编号;
-  formDatas.value[`name${nextIndex}`] = row.ygxm;
-  blModel.value = false;
-  clicked.value = true;
+
   setTimeout(() => {
     clicked.value = false;
   }, 300); // 300毫秒内再次点击将不会触发事件，你可以根据需要调整这个延迟时间
@@ -4951,21 +4960,26 @@ function updateTotal() {
 //机台班组维护新增按钮
 const addBz = async() => {
   updateTotal()
-  console.log(997666,fpsum.value)
-  if(fpsum.value > 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能大于1",
-    });
-	return;
-  }
-  if(fpsum.value < 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能小于1",
-    });
-	return;
-  }
+  const jt = selectedOption.value.split('|')[0]//获取车间数据
+	//判断车间分配比例【SY、PM、WY】	
+	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
+	console.log(fpsum.value)
+	if (fpsum.value > 1) {
+		ElMessage({
+		type: "error",
+		message: "分配系数相加不能大于1",
+	});
+		return;
+	}
+
+	// 只有当 shouldCheckLessThanOne 为 true 时才检查 fpsum.value < 1
+	if (shouldCheckLessThanOne && fpsum.value < 1) {
+		ElMessage({
+		type: "error",
+		message: "分配系数相加不能小于1",
+		});
+		return;
+	}
   // console.log(selectedOption.value)
   console.log("机台编号"+selectedOption.value.split('|')[0])
   console.log("班组编号"+BZMC.value)
@@ -5086,21 +5100,26 @@ const addBz = async() => {
 //机台班组维护更新当前班组
 const selectBz = async() => {
 	updateTotal()
-  console.log(997666,fpsum.value)
-  if(fpsum.value > 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能大于1",
-    });
-	return;
-  }
-  if(fpsum.value < 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能小于1",
-    });
-	return;
-  }
+	const jt = selectedOption.value.split('|')[0]//获取车间数据
+	//判断车间分配比例【SY、PM、WY】	
+	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
+
+	if (fpsum.value > 1) {
+		ElMessage({
+		type: "error",
+		message: "分配系数相加不能大于1",
+	});
+		return;
+	}
+
+	// 只有当 shouldCheckLessThanOne 为 true 时才检查 fpsum.value < 1
+	if (shouldCheckLessThanOne && fpsum.value < 1) {
+		ElMessage({
+		type: "error",
+		message: "分配系数相加不能小于1",
+		});
+		return;
+	}
   // console.log(currentBz.value)
   // return false;
 	if(currentBz.value){

src/view/performance/yuangongrigongzi.vue

@@ -427,8 +427,6 @@ const getTabdata = async () => {
 	      })),
 	    }));
 	    treeData.splice(0, treeData.length, ...transformedData);
-
-	
 	}
 	
 
@@ -567,14 +565,21 @@ const generateSummaryData = (data) => {
 
   return summaryData;
 };
+const rq_date = ref('')
 const handleNodeClick = (node, check) => {
   //存放当前节点的nodeId
+  console.log(node) 
+  if (node.label) {
+    rq_date.value = node.label;
+    console.log(rq_date.value)
+  }
   if (node.params) {
     params.date = node.params.date;
     params.sys_id = node.params.sys_id;
     total.value = node.params.total;
     getTableData();
   }
+ 
 }
 
 // 定位
@@ -593,35 +598,26 @@ const enterpositioning = async () => {
  positioningVisibleshow.value=false
 }
 let positionvalue=ref()
+
 const Getlocate = async () => {
-  const response = await dailysearch({
-    date: params.date,
-    search:searchInfo.value
-  })
-  if (response.code === 0) {
-	  if(response.data.length == 0){
+const responses=ref('')
+//是否点击车间
+const dateToUse = (params.date === undefined || params.date === '') ? rq_date.value : params.date;
+ 
+const response = await dailysearch({
+  date: dateToUse,
+  search: searchInfo.value
+});
+ 
+responses.value = response;
+  console.log(responses.value)
+  if (responses.value.code === 0) {
+	  if(responses.value.data.length == 0){
 		  const originalData = []
 		  tableData.splice(0, tableData.length, ...originalData)
 		  return
 	  }
-	  const originalData = response.data;
-	  
-	  // // 将合计数据插入到原始数据中
-	  // const combinedData = [];
-	  // originalData.forEach((item, index) => {
-	  //   combinedData.push(item);
-	  //   const nextItem = originalData[index + 1];
-	  //   if (nextItem && nextItem['员工姓名'] !== item['员工姓名']) {
-	  //     // 如果下一个员工姓名与当前不同，插入合计数据
-	  //     const currentSummary = summaryData.shift();
-	  //     combinedData.push(currentSummary);
-	  			 
-	  //   }
-	  // });
-	  // //插入最后一个员工的合计
-	  // combinedData.push(summaryData[0]);
-	  // // 更新表格数据
-	  // tableData.splice(0, tableData.length, ...combinedData);
+	  const originalData = responses.value.data;
 	  const summaryData = generateSummaryData(originalData);
 	  originalData.push(summaryData[0]);
     tableData.splice(0, tableData.length, ...originalData)
@@ -630,13 +626,13 @@ const Getlocate = async () => {
 
 // 搜索
 function onSearch() {
-	if(!params.date){
-		ElMessage({
-		  type: 'warning',
-		  message: '请先选择车间'
-		})
-		return
-	}
+	// if(!params.date){
+	// 	ElMessage({
+	// 	  type: 'warning',
+	// 	  message: '请先选择日期'
+	// 	})
+	// 	return
+	// }
 	if(searchInfo.value){
 		getYg({sczl_bh:searchInfo.value}).then(res=>{
 			if (res.code === 0) {
@@ -808,8 +804,8 @@ const enterDialog = async () => {
 // 单击表格操作
 function ontable(row, column, event) {
   currentRow.value = row
-  let parts = params.date.split('-')
-  
+  let parts = (params.date ? params.date : rq_date.value).split('-');
+  console.log(122,params.date)
   // # 截取第一个"-"之前的内容并赋值给新变量1
   let new_variable1 = parts[0]
   // # 截取第一个"-"之后到第二个"-"之前的内容并赋值给新变量2
@@ -884,7 +880,7 @@ const exportExcelFile = (tableData, tableCols) => {
 
   const worksheet = XLSX.utils.json_to_sheet(data);
   const workbook = XLSX.utils.book_new();
-  XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+  XLSX.utils.book_append_sheet(workbook, worksheet, params.sys_id);
   XLSX.writeFile(workbook, 'exported_table.xlsx');
 };
 const currentRow = ref()

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -3698,27 +3698,7 @@ const apiData = await getDepartName()
   const res = await PrintDetailList({workOrder: _Gd_gdbh.value})
   yjList.value = res.data
   
-  if(row['车间名称']){
-    _cjmc.value = row['车间名称']
-  }else{
-    _cjmc.value = '';
-  }
-  gdgyformData['设备编号'] = []
-  //通过车间名称查询机台
-  const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
-  if(MachineList_jitai.data === null || MachineList_jitai.data === ''){
-    ElMessage({type: 'warning', message: '未找到该车间机台'})
-    return false;
-  }
-  const jitai = row['机台编号'].split(' ')
-  jitai.map(item => {
-    MachineList_jitai.data.map(jt => {
-      if (jt.indexOf(item) > -1 && item !== '') {
-        gdgyformData['设备编号'].push(item)
-      }
-    })
-  })
-  gdzl_MachineList_address.data = MachineList_jitai.data;
+ 
   // 示例字符串
   const processName = row['工序名称'];
   // 初始化工艺名称和工序名称
@@ -3758,6 +3738,27 @@ const apiData = await getDepartName()
   if(row.备选工序==1){
 	  gdgyformData.备选工序 = true
   }
+  if(row['车间名称']){
+    _cjmc.value = row['车间名称']
+  }else{
+    _cjmc.value = '';
+  }
+  gdgyformData['设备编号'] = []
+  //通过车间名称查询机台
+  const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
+  if(MachineList_jitai.data === null || MachineList_jitai.data === ''){
+    ElMessage({type: 'warning', message: '未找到该车间机台'})
+    return false;
+  }
+  const jitai = row['机台编号'].split(' ')
+  jitai.map(item => {
+    MachineList_jitai.data.map(jt => {
+      if (jt.indexOf(item) > -1 && item !== '') {
+        gdgyformData['设备编号'].push(item)
+      }
+    })
+  })
+  gdzl_MachineList_address.data = MachineList_jitai.data;
 }
 
 //工艺列表修改【确定】

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -3883,6 +3883,7 @@ const JPent = async (event,key,val) => {
  
  const JPclickedlist = ref(false);
  const JPtablebllickHandlerlist = async (row, column, event) => {
+	console.log(1212121215)
      if (JPclickedlist.value) {
        // 如果已经点击过一次，则不再执行操作
        return;
@@ -3890,14 +3891,15 @@ const JPent = async (event,key,val) => {
      let nextIndex = 1;
      while (JPformdata[`组员${nextIndex}`]['编号'] !== '') {
        nextIndex++;
+	   console.log(nextIndex)
        if (nextIndex > 10) {
          // 如果所有字段都已经填满，则不做任何事情并退出函数
          return;
        }
      }
      // 将选定的值分配给下一个空的代码和名称字段
-     JPformdata[`组员${nextIndex-1}`]['编号'] = row.员工编号;
-     JPformdata[`组员${nextIndex-1}`]['姓名'] = row.ygxm;
+     JPformdata[`组员${nextIndex}`]['编号'] = row.员工编号;
+     JPformdata[`组员${nextIndex}`]['姓名'] = row.ygxm;
      JPblModellist.value = false;
      JPclickedlist.value = true;
      setTimeout(() => {
@@ -3920,8 +3922,8 @@ const JPent = async (event,key,val) => {
        }
      }
      // 将选定的值分配给下一个空的代码和名称字段
-     JPformdataedit[`组员${nextIndex-1}`]['编号'] = row.员工编号;
-     JPformdataedit[`组员${nextIndex-1}`]['姓名'] = row.ygxm;
+     JPformdataedit[`组员${nextIndex}`]['编号'] = row.员工编号;
+     JPformdataedit[`组员${nextIndex}`]['姓名'] = row.ygxm;
      JPblModellistedit.value = false;
      JPclickedlistedit.value = true;
      setTimeout(() => {
@@ -4665,8 +4667,10 @@ const selectBz_rcl = () => {
 
 const blModel = ref(false)
 const employeeData = ref('')
+const bz_Special = ref('')
 const getbzyg = async (value,key) => {
 	console.log(12)
+	bz_Special.value = key
   let bzyg=''
   bzyg=`code${key}`
   let bzxm=''
@@ -4699,11 +4703,20 @@ const tablebllickHandler = async (row, column, event) => {
       return;
     }
   }
+  if(bz_Special.value === "8"){
+	formDatas.value.code8 = row.员工编号;
+	formDatas.value.name8= row.ygxm;
+	blModel.value = false;
+	clicked.value = true;
+  }else{
+	formDatas.value[`code${nextIndex}`] = row.员工编号;
+	formDatas.value[`name${nextIndex}`] = row.ygxm;
+	console.log(12345)
+	blModel.value = false;
+	clicked.value = true;
+  }
   // 将选定的值分配给下一个空的代码和名称字段
-  formDatas.value[`code${nextIndex}`] = row.员工编号;
-  formDatas.value[`name${nextIndex}`] = row.ygxm;
-  blModel.value = false;
-  clicked.value = true;
+
   setTimeout(() => {
     clicked.value = false;
   }, 300); // 300毫秒内再次点击将不会触发事件，你可以根据需要调整这个延迟时间
@@ -4730,10 +4743,10 @@ const fpsum2 = ref();
 //自动计算分配系数和
 function updateTotal() {
   // 直接指定要累加的属性名  
-  const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7', 'percentage8'];  
+  const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7',];  
   const values = relevantKeys.map(key => parseFloat(formDatas.value[key], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
   fpsum.value = values.reduce((sum, value) => sum + value, 0);
-  const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组员6','组员7','组员8','组员9','组员10',];  
+  const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组员6','组员7','组员8','组员9',];  
   const valuess = relevantKeys2.map(key => parseFloat(formdata3.value[key]['比例'], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
   fpsum2.value = valuess.reduce((sum, value) => sum + value, 0);  
 }
@@ -4743,23 +4756,28 @@ const addBz = async() => {
   // console.log(selectedOption.value)
   // console.log(BZMC.value)
   // console.log(selectedOption.value.split('|')[0])
-  initfordata3()
-  updateTotal()
-  console.log(997666,fpsum.value)
-  if(fpsum.value > 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能大于1",
-    });
-	return;
-  }
-  if(fpsum.value < 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能小于1",
-    });
-	return;
-  }
+	initfordata3()
+	updateTotal()
+	const jt = selectedOption.value.split('|')[0]//获取车间数据
+	//判断车间分配比例【SY、PM、WY】	
+	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
+	console.log(fpsum.value)
+	if (fpsum.value > 1) {
+		ElMessage({
+		type: "error",
+		message: "分配系数相加不能大于1",
+	});
+		return;
+	}
+
+	// 只有当 shouldCheckLessThanOne 为 true 时才检查 fpsum.value < 1
+	if (shouldCheckLessThanOne && fpsum.value < 1) {
+		ElMessage({
+		type: "error",
+		message: "分配系数相加不能小于1",
+		});
+		return;
+	}
   const response = await MachineTeamAdd({
     sczl_jtbh:  selectedOption.value.split('|')[0],
     sczl_bzdh:  BZMC.value,
@@ -4798,22 +4816,27 @@ const addBz = async() => {
 const currentBz ={}
 const selectBz = async() => {
 	initfordata3()
-  updateTotal()
-  console.log(997666,fpsum.value)
-  if(fpsum.value > 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能大于1",
-    });
-	return;
-  }
-  if(fpsum.value < 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能小于1",
-    });
-	return;
-  }
+	updateTotal()
+	const jt = selectedOption.value.split('|')[0]//获取车间数据
+	//判断车间分配比例【SY、PM、WY】	
+	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
+
+	if (fpsum.value > 1) {
+		ElMessage({
+		type: "error",
+		message: "分配系数相加不能大于1",
+	});
+		return;
+	}
+
+	// 只有当 shouldCheckLessThanOne 为 true 时才检查 fpsum.value < 1
+	if (shouldCheckLessThanOne && fpsum.value < 1) {
+		ElMessage({
+		type: "error",
+		message: "分配系数相加不能小于1",
+		});
+		return;
+	}
 	if(currentBz.value){
 		BZMC.value=currentBz.value.班组号
 		let sczl_bhkey=''
@@ -4990,7 +5013,7 @@ const formDatas = ref({
   name2:'',
   name3:'',
   name4:'',
-  name5L:'',
+  name5:'',
   name6:'',
   name7:'',
   name8:'',
@@ -5475,8 +5498,11 @@ const GetLl = (falg) => {
 	}
 }
  //获取员工信息
- // const GetYg = (event,inputName) => {
+const blModellist = ref(false)
+const employeeDatalist = ref('')
+const Special = ref('')
 const GetYg = async (value,key) => {
+	Special.value = key
   let bzyg=''
   bzyg=`组员${key}`
   let bzxm=''
@@ -5499,11 +5525,7 @@ const GetYg = async (value,key) => {
 }
  
 const clickedlist = ref(false);
-const blModellist = ref(false)
-const employeeDatalist = ref('')
 const tablebllickHandlerlist = async (row, column, event) => {
-  // console.log(row.员工编号)
-  // console.log(row.ygxm)
     if (clickedlist.value) {
       // 如果已经点击过一次，则不再执行操作
       return;
@@ -5515,16 +5537,24 @@ const tablebllickHandlerlist = async (row, column, event) => {
         // 如果所有字段都已经填满，则不做任何事情并退出函数
         return;
       }
-    }
+    } 
     // 将选定的值分配给下一个空的代码和名称字段
-    formdata3.value[`组员${nextIndex-1}`]['编号'] = row.员工编号;
-    formdata3.value[`组员${nextIndex-1}`]['姓名'] = row.ygxm;
+	if(Special.value === "10"){
+	formdata3.value.组员10['编号'] = row.员工编号;
+	formdata3.value.组员10['姓名']= row.ygxm;
+    blModellist.value = false;
+    clickedlist.value = true;
+  }else{
+    formdata3.value[`组员${nextIndex}`]['编号'] = row.员工编号;
+    formdata3.value[`组员${nextIndex}`]['姓名'] = row.ygxm;
     blModellist.value = false;
     clickedlist.value = true;
+  }
     setTimeout(() => {
       clickedlist.value = false;
     }, 300); // 300毫秒内再次点击将不会触发事件，你可以根据需要调整这个延迟时间
   };
+  
 
 
  //追加字体颜色和不可输入
@@ -5543,21 +5573,27 @@ const tablebllickHandlerlist = async (row, column, event) => {
  //日报表修改弹窗确定
  const chanliangenterDialog = async () => {
 	updateTotal()
-	console.log(156,fpsum2.value)
-	if(fpsum2.value > 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能大于1",
-    });
-	return;
-  }
-  if(fpsum2.value < 1){
-    ElMessage({
-      type: "error",
-      message: "分配系数相加不能小于1",
-    });
-	return;
-  }
+  const jt = formdata3.value.sczl_jtbh
+ // 定义一个变量来决定是否应该检查 fpsum2.value < 1
+const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
+ 
+ if (fpsum2.value > 1) {
+	 ElMessage({
+		 type: "error",
+		 message: "分配系数相加不能大于1",
+	 });
+	 return;
+ }
+  
+ // 只有当 shouldCheckLessThanOne 为 true 时才检查 fpsum2.value < 1
+ if (shouldCheckLessThanOne && fpsum2.value < 1) {
+	 ElMessage({
+		 type: "error",
+		 message: "分配系数相加不能小于1",
+	 });
+	 return;
+ }
+
   // SubmitDailyProduction()
   if (type2.value === 'update') {
   	  SubmitDailyProduction()

src/view/yunyin/shengchanguanli/shengchanjincheng.vue

@@ -393,6 +393,7 @@ const gxbgCellClass = ({row, column, rowIndex, columnIndex}) =>{
   return 'lan-plan-usage-lows';  
 }
 
+//进程导出按钮（过滤模切完工数据）
 const jcToExcel = () => {
   const tableCols1 = [
     { label: '工单编号', prop: '工单编号', width: '110', sortable: 'sortable', fixed: 'fixed', align: 'left' },
@@ -401,7 +402,7 @@ const jcToExcel = () => {
     { label: '联数', prop: '联数', width: '110', sortable: 'sortable', fixed: 'fixed', align: 'left' },
     { label: '投料大箱', prop: '投料大箱', width: '110', sortable: 'sortable', fixed: 'fixed', align: 'left' },
     { label: '计划投料', prop: '计划投料', width: '110', sortable: 'sortable', fixed: 'fixed', align: 'left' },
-    { label: '生产进度', prop: '生产进度', width: '2000', sortable: 'sortable', fixed: 'fixed', align: 'center' }, // 增加了宽度以适应可能的长文本
+    { label: '生产进度', prop: '生产进度', width: '2000', sortable: 'sortable', fixed: 'fixed', align: 'center' },
   ];
  
   const headers = tableCols1.map(item => ({
@@ -409,66 +410,33 @@ const jcToExcel = () => {
     prop: item.prop,
   }));
  
-  // 假设工序的键是从 '工序1' 到 '工序10'
+  // 设置工序键名
   const processSteps = ['工序1', '工序2', '工序3', '工序4', '工序5', '工序6', '工序7', '工序8', '工序9', '工序10','工序11','工序12','工序13','工序14','工序15','工序16','工序17',];
  
   // 处理数据
-  const data = tableData.map(item => {
-    let productionProgress = '';
-    processSteps.forEach(step => {
+  const filteredAndProcessedData = tableData.map(item => {
+    let productionProgress = processSteps.reduce((acc, step) => {
       if (item[step]) {
-        productionProgress += item[step] + ' --> ';
+        return acc + item[step] + ' --> ';
       }
-    });
-    // 移除最后一个 ' --> '
-    if (productionProgress.endsWith(' --> ')) {
-      productionProgress = productionProgress.slice(0, -5);
+      return acc;
+    }, '').trimEnd(' --> '); // 移除最后一个' --> '
+ 
+    const regex = /模切.*?完工/; 
+    if (!productionProgress.match(regex)) {
+      const row = {};
+      headers.forEach(({ prop }) => {
+        row[prop] = prop === '生产进度' ? productionProgress : item[prop];
+      });
+      return row;
     }
+    // 如果包含匹配的模式，则不返回任何值（即过滤掉该项）
+  }).filter(row => row !== undefined);
  
-    const row = {};
-    headers.forEach(({ prop }) => {
-      if (prop === '生产进度') {
-        row[prop] = productionProgress;
-      } else {
-        row[prop] = item[prop];
-      }
-    });
-    return row;
-  });
 
-  exportExcelFile(data, headers.map(h => h.label)); // 可能需要传递列名作为第二个参数
+  exportExcelFile(filteredAndProcessedData, headers.map(h => h.label));
 };
 
-// //导出excel表
-// const jcToExcel = () => {
-// 	const tableCols1 = [
-// 		{ label: '工单编号', prop: '工单编号',  width: '110',sortable:'sortable',fixed:'fixed',align:'left'},
-// 		{ label: '印件代号', prop: '印件代号',  width: '110',sortable:'sortable',fixed:'fixed',align:'left'},
-// 		{ label: '印件名称', prop: '印件名称',  width: '600',sortable:'sortable',fixed:'fixed',align:'left'},
-// 		{ label: '联数', prop: '联数',  width: '110',sortable:'sortable',fixed:'fixed',align:'left'},
-// 		{ label: '投料大箱', prop: '投料大箱',  width: '110',sortable:'sortable',fixed:'fixed',align:'left'},
-// 		{ label: '计划投料', prop: '计划投料',  width: '110',sortable:'sortable',fixed:'fixed',align:'left'},
-// 		{ label: '生产进度', prop: 'jjcp_sls',  width: '110',sortable:'sortable',fixed:'fixed',align:'left'},
-// 	]
- 
-// 	const headers = tableCols1.map(item => ({
-// 		label: item.label,
-// 		prop: item.prop
-// 	}));
-
-// 	//tableData._value table中data属性
-//   const data = tableData._value.map(item => {
-//     const row = {};
-//     headers.forEach(({ prop }) => {
-//       row[headers.find(h => h.prop === prop).label] = item[prop];
-//     });
-//     return row;
-//   });
-// 	//引入import { exportExcelFile } from '@/utils/excel'
-//   exportExcelFile(data);
-// };
-
-
 // 搜索默认为空
 const searchInfo = ref('')
 //点击【查询】按钮