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

src/view/performance/chejianbaogong.vue

@@ -321,7 +321,7 @@
           </el-tabs>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 50%" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
+          <el-dialog v-model="detailShow" style="width: 105vh" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <el-table ref="multipleTable"
                         :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1524,13 +1524,20 @@
 			  <el-col :span="7">
 			    <el-form-item label="开工时间:" prop="flatFeed" class="mab">
 			     <!-- <el-input v-model="formdata3.value.starttime"  id="日期"  @keydown="ent1($event)" @blur="getJtbhsubmit()" style="width: 100px;" /> -->
-				 <el-date-picker
+				 <!-- <el-date-picker
 				         v-model="formdata3.value.starttime"
 				         type="datetime"				         
 				         format="YYYY/MM/DD hh:mm:ss"
 				         value-format="YYYY-MM-DD h:m:s"
 						 @keydown="ent1($event)"
-				       />
+				       /> -->
+					   <el-date-picker
+					            v-model="formdata3.value.starttime"
+					           type="datetime"
+					           placeholder="Pick a Date"
+					           format="YYYY/MM/DD HH:mm:ss"
+							   @keydown="ent1($event)"
+					         />
 			    </el-form-item>
 			  </el-col>
 				<el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
@@ -1544,7 +1551,7 @@
 			
 			<el-row :gutter="24">
 			  <el-col :span="9">
-			    <el-form-item label="上级时间:" prop="flatFeed" class="mab">
+			    <el-form-item label="上机时间:" prop="flatFeed" class="mab">
 			     <!-- <el-input v-model="formdata3.value.sj1"  id="日期"   @keydown="ent1($event)"  :clearable="true" style="width: 170px;" /> -->
 				 <el-date-picker
 				         v-model="formdata3.value.sj1"
@@ -1720,34 +1727,34 @@
 		  		       <el-input v-model="formdata3.value.组员1['编号']" id="bh1"  @keydown="ent($event, 'bzdh', 'bh1', 'bh2')" @keyup.enter.native="GetYg($event, '1')"  placeholder="" />
 		  		     </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员2['编号']" id="bh2"  @keydown="ent($event, 'bh1', 'bh2', 'bh3')" @keyup.enter.native="getygsubmit($event, '2')"  placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员2['编号']" id="bh2"  @keydown="ent($event, 'bh1', 'bh2', 'bh3')" @keyup.enter.native="GetYg($event, '2')"  placeholder="" />
 		  		     </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员3['编号']" id="bh3"  @keydown="ent($event, 'bh2', 'bh3', 'bh4')" @keyup.enter.native="getygsubmit($event, '3')"  placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员3['编号']" id="bh3"  @keydown="ent($event, 'bh2', 'bh3', 'bh4')" @keyup.enter.native="GetYg($event, '3')"  placeholder="" />
 		  		     </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员4['编号']" id="bh4"  @keydown="ent($event, 'bh3', 'bh4', 'bh5')" @keyup.enter.native="getygsubmit($event, '4')"  placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员4['编号']" id="bh4"  @keydown="ent($event, 'bh3', 'bh4', 'bh5')" @keyup.enter.native="GetYg($event, '4')"  placeholder="" />
 		  		     </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员5['编号']" id="bh5"  @keydown="ent($event, 'bh4', 'bh5', 'bh6')" @keyup.enter.native="getygsubmit($event, '5')"  placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员5['编号']" id="bh5"  @keydown="ent($event, 'bh4', 'bh5', 'bh6')" @keyup.enter.native="GetYg($event, '5')"  placeholder="" />
 		  		     </el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员6['编号']" id="bh6"  @keydown="ent($event, 'bh5', 'bh6', 'bh7')" @keyup.enter.native="getygsubmit($event, '6')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员6['编号']" id="bh6"  @keydown="ent($event, 'bh5', 'bh6', 'bh7')" @keyup.enter.native="GetYg($event, '6')"  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员7['编号']" id="bh7"  @keydown="ent($event, 'bh6', 'bh7', 'bh8')" @keyup.enter.native="getygsubmit($event, '7')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员7['编号']" id="bh7"  @keydown="ent($event, 'bh6', 'bh7', 'bh8')" @keyup.enter.native="GetYg($event, '7')"  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员8['编号']" id="bh8"  @keydown="ent($event, 'bh7', 'bh8', 'bh9')" @keyup.enter.native="getygsubmit($event, '8')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员8['编号']" id="bh8"  @keydown="ent($event, 'bh7', 'bh8', 'bh9')" @keyup.enter.native="GetYg($event, '8')"  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员9['编号']" id="bh9"  @keydown="ent($event, 'bh8', 'bh9', 'bh10')" @keyup.enter.native="getygsubmit($event, '9')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员9['编号']" id="bh9"  @keydown="ent($event, 'bh8', 'bh9', 'bh10')" @keyup.enter.native="GetYg($event, '9')"  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员10['编号']" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="getygsubmit($event, '10')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员10['编号']" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="GetYg($event, '10')"  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.拉料['编号']"  @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="getygsubmit($event, '11')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.拉料['编号']"  @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="GetYg($event, '11')"  placeholder="" />
 		  			</el-col>
 		  		   </el-row>
 		  		
@@ -3070,6 +3077,21 @@ const MachineChanliang = async(value) => {
 	 formdata3.value.gymc=result[1]
 	 formdata3.value.sczl_jtbh=JTMC
 	 formdata3.value.rq=date
+	 console.log(formdata3.value.bzdh)
+	 if (formdata3.value.bzdh === 'A班') {
+	     console.log(date + " 08:00:00");
+	     formdata3.value.starttime = ''; // 清空值
+	     setTimeout(()=>{
+			 formdata3.value.starttime = date + " 08:30:00"; // 设置为 20:30:00
+	     })
+	 } else if (formdata3.value.bzdh === 'B班') {
+	     console.log(date + " 20:30:00");
+	     formdata3.value.starttime = ''; // 清空值
+	     setTimeout(()=>{
+	     			 formdata3.value.starttime = date + " 20:30:00"; // 设置为 20:30:00
+	     })
+	 }
+
 	 console.log(formdata3.value)
    }
  }
@@ -3163,12 +3185,53 @@ const MachineChanliang = async(value) => {
  	
  //获取员工信息
  const GetYg = (event,inputName) => {
-	 const propertyName = `组员${inputName}['编号']`;
-	 console.log(propertyName)
-	 console.log(formdata3.value.组员1['编号'])
-	 console.log(formdata3.value[propertyName])
-	 const value = eval('formdata3.value.' + propertyName);
-	 console.log(value); // 输出：ZM01074
+	 // console.log(eval(`formdata3.value.组员${inputName}['编号']`))
+	 const value=ref()
+	 if(inputName==='11'){
+		 value.value=formdata3.value.拉料['编号']
+	 }else{
+		value.value= eval(`formdata3.value.组员${inputName}['编号']`)
+	 }
+	 
+	 	EmployeeData({code:value.value}).then(response=>{
+	 		if (response.code === 0) {
+	 			if(inputName==='1'){
+	 			  formdata3.value.组员1['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='2'){
+	 			  formdata3.value.组员2['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='3'){
+	 			  formdata3.value.组员3['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='4'){
+	 			  formdata3.value.组员4['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='5'){
+	 			  formdata3.value.组员5['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='6'){
+	 			  formdata3.value.组员6['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='7'){
+	 			  formdata3.value.组员7['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='8'){
+	 			  formdata3.value.组员8['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='9'){
+	 			  formdata3.value.组员9['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='10'){
+	 			  formdata3.value.组员10['姓名']=response.data[0].员工姓名;
+	 			}else if(inputName==='11'){
+		          formdata3.value.拉料['姓名']=response.data[0].员工姓名;
+	            }	 			
+	 		}else{
+	 			// formdata3.value['sczl_bh'+inputName+'_name'] = '';
+	 		}
+	 	})
+	 
+	 
+	 
+	 
+	 // const propertyName = `组员${inputName}['编号']`;
+	 // console.log(propertyName)
+	 // console.log(formdata3.value.组员1['编号'])
+	 // console.log(formdata3.value[propertyName])
+	 // const value = eval('formdata3.value.' + propertyName);
+	 // console.log(value); // 输出：ZM01074
  	// if(formdata3.value[propertyName]!=''){
  	// 	EmployeeData({code:formdata3.value.组员+inputName+['编号']}).then(response=>{
  	// 		if (response.code === 0) {