新增

src/api/jixiaoguanli/jitairibaobiao.js

@@ -993,4 +993,36 @@ export const ChanliangAdd = (data) => {
     method: 'post',
     data
   })
+}
+//日产量上报添加->工单资料获取
+export const ChanliangWorkorder = (params) => {
+  return service({
+    url: '/mes_server/facility/ChanliangWorkorder',
+    method: 'get',
+    params
+  })
+}
+//日产量上报->印件资料
+export const ChanliangPrintDetail = (params) => {
+  return service({
+    url: '/mes_server/facility/ChanliangPrintDetail',
+    method: 'get',
+    params
+  })
+}
+//日产量上报添加->工艺资料
+export const ChanliangProcessDetail = (params) => {
+  return service({
+    url: '/mes_server/facility/ChanliangProcessDetail',
+    method: 'get',
+    params
+  })
+}
+//班组维护->员工姓名获取
+export const EmployeeData = (params) => {
+  return service({
+    url: '/mes_server/facility/EmployeeData',
+    method: 'get',
+    params
+  })
 }

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1479,7 +1479,7 @@
 			<el-row :gutter="24">
 				<el-col :span="6">
 				  <el-form-item label="印件号:" prop="flatFeed" class="mab">
-				  <el-input v-model="formdata3.value.yjno" id="印件号" @focus="yjnoHandleFocus()" @blur="getYJMCsubmit()" @keydown="ent1($event)" :clearable="true" />
+				  <el-input v-model="formdata3.value.yjno" id="印件号"  @keydown="ent1($event)" :clearable="true" />
 				  </el-form-item>
 				</el-col>
 				<el-col :span="18">
@@ -1506,7 +1506,14 @@
 			<el-row :gutter="24">
 			  <el-col :span="6">
 			    <el-form-item label="日期:" prop="flatFeed" class="mab">
-                 <el-input v-model="formdata3.value.rq"  id="日期"  @keydown="ent1($event)" @blur="getJtbhsubmit()" :clearable="true" style="width: 100px;" />
+                 <!-- <el-input v-model="formdata3.value.rq"  id="日期"  @keydown="ent1($event)" @blur="getJtbhsubmit()" :clearable="true" style="width: 100px;" /> -->
+				 <el-date-picker
+				         v-model="formdata3.value.rq"
+				         type="datetime"				         
+				         format="YYYY/MM/DD"
+				         value-format="YYYY-MM-DD"
+						 @keydown="ent1($event)"
+				       />
 			    </el-form-item>
 			  </el-col>
 			  <el-col :span="6">
@@ -1519,10 +1526,10 @@
 			     <!-- <el-input v-model="formdata3.value.starttime"  id="日期"  @keydown="ent1($event)" @blur="getJtbhsubmit()" style="width: 100px;" /> -->
 				 <el-date-picker
 				         v-model="formdata3.value.starttime"
-				         type="datetime"
-				         
+				         type="datetime"				         
 				         format="YYYY/MM/DD hh:mm:ss"
 				         value-format="YYYY-MM-DD h:m:s"
+						 @keydown="ent1($event)"
 				       />
 			    </el-form-item>
 			  </el-col>
@@ -1532,6 +1539,35 @@
 				</el-form-item>
 				</el-col>
 			</el-row>
+			
+			
+			
+			<el-row :gutter="24">
+			  <el-col :span="9">
+			    <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"
+				         type="datetime"				         
+				         format="YYYY/MM/DD hh:mm:ss"
+				         value-format="YYYY-MM-DD h:m:s"
+						 @keydown="ent1($event)"
+				       />
+			    </el-form-item>
+			  </el-col>
+			  <el-col :span="6">
+			    <el-form-item label="下机时间:" prop="flatFeed" class="mab">
+			    <!-- <el-input v-model="formdata3.value.sj2"  id="机器"  @keydown="ent1($event)" :clearable="true" style="width: 170px;" /> -->
+				<el-date-picker
+				        v-model="formdata3.value.sj2"
+				        type="datetime"				         
+				        format="YYYY/MM/DD hh:mm:ss"
+				        value-format="YYYY-MM-DD h:m:s"
+						@keydown="ent1($event)"
+				      />
+			    </el-form-item>
+			  </el-col>
+			</el-row>
 		
 		
 		
@@ -1678,10 +1714,10 @@
 		  
 		    <el-row :gutter="10" style="margin-top: 1vh;">
 		  		  	 <el-col :span="2">
-		  		  	   <el-input v-model="formdata3.value.bzdh" id="bzdh"  @keydown="ent($event, '辅电表', 'bzdh', 'bh1')"  placeholder="ZI00401" />
+		  		  	   <el-input v-model="formdata3.value.bzdh" id="bzdh"  @keydown="ent1($event)"  placeholder="" />
 		  		  	 </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员1['编号']" id="bh1"  @keydown="ent($event, 'bzdh', 'bh1', 'bh2')" @keyup.enter.native="getygsubmit($event, '1')"  placeholder="" />
+		  		       <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="" />
@@ -1877,6 +1913,10 @@ import {
    ChanliangDel,
    ChanliangAdd,
    MachineChanliangDetailEdit,
+   ChanliangWorkorder,
+   ChanliangPrintDetail,
+   ChanliangProcessDetail,
+   EmployeeData
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -2164,29 +2204,7 @@ const FacilityDetail = async () => {
 	formData.value.production_all=response.data.total.产量
   }
 };
-//员工编号回车事件
-const getygsubmit = (event, inputName) => {
 
-	  console.log(inputName)
-	 
-		  let combinedString = 'sczl_bh' + inputName;
-		   console.log(combinedString)
-		  //  let variableName = 'sczl_gdbh'+inputName;
-		   let variableValue = eval('formdata3.value.' + combinedString);
-		   console.log(variableValue)
-		   GetYg(variableValue,inputName)  
-}
-//获取员工信息
-const GetYg = async (value,inputName) => {
-  const response = await getYg({sczl_bh:value});
-  console.log(response) 
-  if (response.code === 0) {
-	console.log(response.data.ygxm) 
-	let Bname = 'sczl_name' + inputName;
-	formData3.value[Bname]=response.data.ygxm
-	// console.log(formData.value[Bname])
-  }
-}
 
 // 验证规则
 const rule = reactive({
@@ -3046,12 +3064,13 @@ const MachineChanliang = async(value) => {
    if (response.code === 0) {  
 	 chanliangVisible.value=true
 	 formdata3.value=response.data
-	 const pattern = /-(.*?)〖(.*?)$/;
-	 const matches = formdata3.value.gxmc.match(pattern);
-	 formdata3.value.gymc=matches[1]
+	 const result=formdata3.value.gxmc.match(/-(.{2})/)
+	 // const pattern = /-(.*?)〖(.*?)$/;
+	 // const matches = formdata3.value.gxmc.match(pattern);
+	 formdata3.value.gymc=result[1]
 	 formdata3.value.sczl_jtbh=JTMC
 	 formdata3.value.rq=date
-
+	 console.log(formdata3.value)
    }
  }
  const yjnoArr = ref([0])
@@ -3059,16 +3078,14 @@ const MachineChanliang = async(value) => {
  //工单编号回车事件
  const getCPMCsubmit = () => {
  	if(formdata3.value.工单编号!=''){
- 		productionGdmc({gdbh:formdata3.value.工单编号}).then(response=>{
+ 		ChanliangWorkorder({search:formdata3.value.工单编号,machine:JTMC}).then(response=>{
  		  if (response.code === 0) {
- 			  formdata3.value.cpmc = response.data.Gd_cpmc
- 			  yjnoArr.value = response.data.yjno;
- 			  
+ 			  formdata3.value.cpmc = response.data[0].cpmc		  
  			  document.getElementById('产品名称').style.color = 'red';
+			  getYJMCsubmit()
  			}else{
  				formdata3.value.工单编号 = '';
  				formdata3.value.cpmc = '';
- 				gxmc.value = '';
  				document.getElementById('产品名称').style.color = 'black';
  			}
  		});
@@ -3076,8 +3093,7 @@ const MachineChanliang = async(value) => {
  		ElMessage({
  		  type: 'error',
  		  message: '请注意, 工单编号输入空置, 除非有特殊需要！'
- 		})
- 		
+ 		})	
  		gxmc.value = '';
  		document.getElementById('产品名称').style.color = 'black';
  	}
@@ -3094,21 +3110,16 @@ const MachineChanliang = async(value) => {
  const getYJMCsubmit = () => {
   if(formdata3.value.工单编号!='' && formdata3.value.yjno!=''){
   	//获取印件名称
- 	productionYjmc({gdbh:formdata3.value.工单编号,yjno:formdata3.value.yjno}).then(response=>{
+ 	ChanliangPrintDetail({gdbh:formdata3.value.工单编号}).then(response=>{
   	  if (response.code === 0) {
-  		  formdata3.value.yjmc = response.data.yj_yjmc
-  		  gxmc.value = response.data.gxmc
- 		  formdata3.value.gxmc = gxmc.value.sczl_gxmc;
- 		  setColorReadonly('印件名称')
- 		  
+  		  formdata3.value.yjmc = response.data[0].yjmc
+  		  formdata3.value.yjno = response.data[0].yjno
+ 		  setColorReadonly('印件名称')		  
   		}else{
   			ElMessage({
   			  type: 'error',
   			  message: '印件编号不存在, 将恢复默认值, 请仔细确认数据准确性！'
   			})
-  			formdata3.value.yjno = yjnoArr.value[0];
-  			formdata3.value.yjmc = '';
- 			gxmc.value = '';
   		}
   	});
   }else{
@@ -3116,9 +3127,6 @@ const MachineChanliang = async(value) => {
   	  type: 'error',
   	  message: '印件编号不存在, 将恢复默认值, 请仔细确认数据准确性！'
   	})
- 	formdata3.value.yjno = yjnoArr.value[0];
- 	formdata3.value.yjmc = '';
- 	gxmc.value = '';
   }
  }
  //工序名称获得焦点事件
@@ -3135,10 +3143,14 @@ const MachineChanliang = async(value) => {
  	setColorReadonly('工艺名称')
  	
 	//弹出选择
-	productionGx({gdbh:formdata3.value.工单编号,yjno:formdata3.value.yjno}).then(response=>{
+	ChanliangProcessDetail({gdbh:formdata3.value.工单编号,yjno:formdata3.value.yjno,machine:JTMC}).then(response=>{
 		if (response.code === 0) {
-			  selectData.splice(0, selectData.length, ...response.data)
-			  GXVisible.value=true
+			formdata3.value.gxmc=response.data[0].name
+			formdata3.value.gxh=response.data[0].gxh
+			const res=response.data[0].name.match(/>(.{2})/)
+			formdata3.value.gymc=res[1]
+			  // selectData.splice(0, selectData.length, ...response.data)
+			  // GXVisible.value=true
 			 //  nextTick(()=>{
 				//   console.log(tableRef)
 				//   console.log(selectData)
@@ -3149,7 +3161,26 @@ 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
+ 	// if(formdata3.value[propertyName]!=''){
+ 	// 	EmployeeData({code:formdata3.value.组员+inputName+['编号']}).then(response=>{
+ 	// 		if (response.code === 0) {
+ 	// 			//设置比例
+ 	// 			// formdata3.value.组员1['姓名'] = response.data.ygxm;
+		// 		// formdata3.value.组员+inputName+['姓名'] = response.data[0].员工姓名;
+ 	// 		}else{
+ 	// 			// formdata3.value['sczl_bh'+inputName+'_name'] = '';
+ 	// 		}
+ 	// 	})
+ 	// }
+ }
  //追加字体颜色和不可输入
  const setColorReadonly = (id) => {
  	const newInput = document.getElementById(id)
@@ -3241,9 +3272,8 @@ const MachineChanliang = async(value) => {
  	sczl_bh98: formdata3.value.拉料['编号'],
  	
    }
-
-   const response = await ChanliangAdd(restoredData);
    console.log(restoredData)
+   const response = await ChanliangAdd(restoredData);
    if (response.code === 0) {
  	  ElMessage({
  	    type: 'success',