Quellcode durchsuchen

Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

曹鹤洋 vor 1 Jahr
Ursprung
Commit
2b1f9cd5a9
1 geänderte Dateien mit 55 neuen und 9 gelöschten Zeilen
  1. 55 9
      src/view/performance/chejianbaogong.vue

+ 55 - 9
src/view/performance/chejianbaogong.vue

@@ -1458,10 +1458,10 @@
                				  <el-input v-model="formData3.sczl_bh10" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="getygsubmit($event, '10')"  placeholder="" />
                				</el-col>
                				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_bh11" id="bh11"  @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="getygsubmit($event, '11')"  placeholder="" />
+               				  <el-input v-model="formData3.sczl_bh11" id="bh11"  @keyup.enter.native="getygsubmit($event, '11','1')"  placeholder="" />
                				</el-col>
                	 </el-row>
-
+<!-- 19231 -->
 
 
                	<el-row :gutter="10" style="margin-top: 10px;">
@@ -1597,8 +1597,7 @@
 		  </template>
 		</el-dialog>
 		
-		
-		
+	
 		
 		<!-- JP机台独立页面 -->
 		<el-dialog v-model="JPchanliangVisible" :before-close="JPcloseDialog" style="width: 100%;height: 100%;;margin: 0px auto" :title="'班组产量提报'" destroy-on-close>
@@ -1755,6 +1754,19 @@
 			    </div>
 			  </el-form>
 			</el-dialog>
+			
+			<!-- 日产量上报拉料 -->
+			<el-dialog v-model="llblModellist" :before-close="() => llblModellist = false" style="width: 20%">
+			  <el-form>
+			    <div>
+			      <el-table :data="llemployeeDatalist" border :show-overflow-tooltip="true" :cell-class-name="JPblplanUsageCellClass"  @row-click="lltablebllickHandlerlist($event)">
+			        <el-table-column prop="员工编号" label="员工编号"></el-table-column>
+			        <el-table-column prop="ygxm" label="员工姓名"></el-table-column>
+			      </el-table>
+			    </div>
+			  </el-form>
+			</el-dialog>
+			
 
 
 
@@ -2705,13 +2717,47 @@ const FacilityDetail = async () => {
 	formData.value.production_all=response.data.total.产量
 	}
 };
-
+// 19231
+const llemployeeDatalist = ref('')
+const llblModellist = ref(false)
 //员工编号回车事件
-const getygsubmit = (event, inputName) => {
-  let combinedString = 'sczl_bh' + inputNme;
-  let variableValue = eval('formData3.value.' + combinedString);
-  GetYg(variableValue,inputName)
+const getygsubmit = async  (key,i,val) => {
+	const response = await getYg({sczl_bh:formData3.value.sczl_bh11});
+	// console.log(response)
+	if (response.code === 0) {
+	  if(response.data.length === 1){
+	    formData3.value.sczl_bh11= response.data[0].ygxm
+	    formData3.value.sczl_name11= response.data[0].员工编号
+	  }else{
+	    llblModellist.value = true;
+	    llemployeeDatalist.value = response.data // 假设响应数据是数组
+	  }
+	}
 }
+const llclickedlist = ref(false);
+ const lltablebllickHandlerlist = async (row, column, event) => {
+     if (llclickedlist.value) {
+       // 如果已经点击过一次,则不再执行操作
+       return;
+     }
+     // let nextIndex = 1;
+     // while (formData3.value.sczl_bh11 !== '') {
+     //   nextIndex++;
+     //   if (nextIndex > 10) {
+     //     // 如果所有字段都已经填满,则不做任何事情并退出函数
+     //     return;
+     //   }
+     // }
+	 console.log(row)
+     // 将选定的值分配给下一个空的代码和名称字段
+     formData3.value.sczl_bh11 = row.员工编号;
+     formData3.value.sczl_name11 = row.ygxm;
+     llblModellist.value = false;
+     llclickedlist.value = true;
+     setTimeout(() => {
+       llclickedlist.value = false;
+     }, 300); // 300毫秒内再次点击将不会触发事件,你可以根据需要调整这个延迟时间
+   };
 
 const blModel = ref(false)
 const employeeData = ref('')