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

src/view/job/processSheet/processSheet.vue

@@ -98,10 +98,10 @@
 	             <div id="liucheng">
 	                 <fieldset class="newlabel">
 	                 <table width="100%" border="1" class="new_craft" id="new_craft">
-	             	   <caption>工艺</caption>	  
+	             	   <caption>工艺</caption>
 	             		  <tr>
 							  <td width="40%">上次<span style="color: red">{{department}}</span>工艺更新时间：<span style="color: red">{{update}}</span></td>
-							  <td> 
+							  <td>
 							      <input type="button" style="margin-left: 1px;" value="增加工艺" @click="addInput"/>
 							  </td>
 						  </tr>
@@ -150,7 +150,8 @@
 	const shuang = ref(false)
 	const update = ref()
 	const data = ref()
-	const gyData = ref([])
+  const peijian = ref(0)
+  const gyData = ref([])
 	const selectedPaper = ref([])
 	const selectedPeijian = ref([])
 	const datas = ref([])
@@ -182,7 +183,7 @@
 				  console.log(getDocumentDatas.data.paper.length)
 				  selectedPaper.value=getDocumentDatas.data.paper
 				  selectedPeijian.value=getDocumentDatas.data.peijian
-				  
+
 			  }else{
 				  dan.value=true
 				  shuang.value=false
@@ -191,6 +192,7 @@
 			  }
 			  workData.value.num=getDocumentDatas.data.paper[0].bom_计划用量;
 			  if(getDocumentDatas.data.peijian){
+          peijian.value=getDocumentDatas.data.peijian[0]['id']
 				  const getHistory = async() => {
 				    const getDocumentHistorys = await getDocumentHistory({
 						order:workData.value.Gd_gdbh,
@@ -200,36 +202,52 @@
 							update.value=getDocumentHistorys.data.update
 							gyData.value=getDocumentHistorys.data.data.map((item)=>({
 								gy:item
-							}))			  	  
+							}))
 				    }
 				  }
 				  getHistory()
 			  }
-			  
+
 		  }
 		}
 		getDocument()
-		
+
 	}
 	const addInput = () => {
 	 gyData.value.push({gy:''})
 	}
 	const sendClick = () => {
-		const saveDocument = async() => {
-			datas.value = gyData.value.map((item)=>(item.gy))
-			data.value= datas.value.join(",")
-		  const saveDocumentDatas = await saveDocumentData({order:2109722,data:data.value,peijian:0})
-		  if (saveDocumentDatas.code === 0) {
-		  	  console.log(saveDocumentDatas)
-		  }
-		}
 		saveDocument()
 	}
+  const saveDocument = async() => {
+    datas.value = gyData.value.map((item)=>(item.gy))
+    data.value= datas.value.join(",")
+    const saveDocumentDatas = await saveDocumentData({order:workData.value.Gd_gdbh,data:data.value,peijian:peijian.value})
+    if (saveDocumentDatas.code === 0) {
+      getDocument()
+    }
+  }
+  const getDocument = async() => {
+    const getDocumentInfos = await getDocumentInfo({
+      order:workData.value.Gd_gdbh,
+      mabao:workData.value.mabao,
+      version:workData.value.version,
+      start_liucheng:workData.value.start_liucheng,
+      tldx:workData.value.tldx,
+      remark:workData.value.remark,
+      string:data.value,
+      num:workData.value.num
+    })
+    if (getDocumentInfos.code === 0) {
+      console.log(getDocumentInfos.data)
+    }
+  }
 	const selectpPaper = (event) => {
 		 workData.value.num=event.target.value
 	}
-	
+
 	const selectPeijian = async(event) => {
+    peijian.value=event.target.value
 		 const getDocumentHistoryss = await getDocumentHistory({
 		 	order:workData.value.Gd_gdbh,
 		 	peijian:event.target.value})
@@ -239,10 +257,10 @@
 		 		update.value=getDocumentHistoryss.data.update
 		 		gyData.value=getDocumentHistoryss.data.data.map((item)=>({
 		 			gy:item
-		 		}))			  	  
+		 		}))
 		 }
 	}
-	
+
 </script>
 
 <style>
@@ -287,7 +305,7 @@
 	    position: fixed;
 	}
 	#daima table{
-	
+
 	}
 	.firm  ul,.product  ul,.tag ul{
 	    width:100%;
@@ -358,4 +376,4 @@
 	.msg{ font-size: 13px; }
 	.onError{ color: red; }
 	.onSuccess{ color: green; }
-</style>
+</style>

src/view/performance/chejianbaogong.vue

@@ -2,16 +2,16 @@
   <div>
 	<header>
 		<div style="height: 50px;">
-			<el-button type="primary" @click="onBZ" >班组维护</el-button>
-			<el-button type="primary" @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
-			<el-button type="primary" @click="onOver" >完工</el-button>
-			<el-button type="primary" @click="onzhicheng"  >制程检验</el-button>
-			<el-button type="primary" @click="ondianjian"  >设备点检</el-button>
-			<el-button type="primary" @click="onxuncha" >管理巡查</el-button>
-			<el-button type="primary" @click="onstatus" >设置机台状态</el-button>
-			<el-button type="primary" @click="onyinban">印版领退</el-button>
-			<el-button type="primary" @click="onClear" >换型清场</el-button>
-			<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
+			<el-button type="primary" size="large" @click="onBZ" >班组维护</el-button>
+			<el-button type="primary" size="large" @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
+			<el-button type="primary" size="large" @click="onOver" >完工</el-button>
+			<el-button type="primary" size="large" @click="onzhicheng"  >制程检验</el-button>
+			<el-button type="primary" size="large" @click="ondianjian"  >设备点检</el-button>
+			<el-button type="primary" size="large" @click="onxuncha" >管理巡查</el-button>
+			<el-button type="primary" size="large" @click="onstatus" >设置机台状态</el-button>
+			<el-button type="primary" size="large" @click="onyinban">印版领退</el-button>
+			<el-button type="primary" size="large" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" size="large" @click="oncomplaints" >客诉记录</el-button>
 		</div>
 		</header>
 
@@ -2152,6 +2152,7 @@ const FacilityWorklist = async () => {
 }
 //检验记录
 const InspectionRecord = async () => {
+  JYData=[]
   const response = await inspectionRecord({machine:JTMC,Gd_gdbh:formData.value.工单编号,team:BZMC.value});
   if(response.code==0){
 	 // 提取 inspectiontime 作为列名
@@ -2196,9 +2197,9 @@ const FacilityDetail = async () => {
   const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team:BZMC.value });
   if (response.code === 0) {
     if(response.data === null){
-      formData.value.上机时间=currentDate+'08:30:00'
+      formData.value.上机时间=currentDate+' 08:30:00'
     }else{
-      formData.value.上机时间=currentDate.split('')[0]+'-'+response.data[0]['生产时间段'].split('>')[1]+' 00'
+      formData.value.上机时间=currentDate.split('-')[0]+'-'+response.data[0]['生产时间段'].split('>')[1]+':00'
     }
     console.log(formData.value.上机时间)
     CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));