功能优化

src/view/job/rewards/rewards.vue

@@ -1231,13 +1231,13 @@ const GetYg = (event, inputName) => {
   var num = parseInt(inputName) - 1;
   if (num >= 1 && num <= 10) {
     getYg({ sczl_bh: detailData['JL_bh' + num] }).then(response => {
-      detailData['jlname' + num] = response.data.ygxm;
-      detailData['JL_bh' + num] = response.data.员工编号;
+      detailData['jlname' + num] = response.data[0].ygxm;
+      detailData['JL_bh' + num] = response.data[0].员工编号;
     });
   } else if (num >= 10 && num <= 21) {
     getYg({ sczl_bh: detailData['sczl_bh' + (num - 11)] }).then(response => {
-      detailData['zrname' + (num - 11)] = response.data.ygxm;
-      detailData['sczl_bh' + (num - 11)] = response.data.员工编号;
+      detailData['zrname' + (num - 11)] = response.data[0].ygxm;
+      detailData['sczl_bh' + (num - 11)] = response.data[0].员工编号;
     });
   }
 };

src/view/performance/06-packingDocuments/index.vue

@@ -777,7 +777,7 @@ const handleGetYg = async() => {
   try {
     const res = await getYg({ sczl_bh: detailData.sczl_bh })
     if (res.code === 0) {
-      detailData.name = res.data.ygxm
+      detailData.name = res.data[0].ygxm
     } else {
       detailData.name = ''
     }

src/view/performance/07-otherDocuments/index.vue

@@ -509,8 +509,8 @@ const handleShowDetail = () => {
 const handleYgbhEnter = async() => {
   const res = await getYg({ sczl_bh: detailData.Sczl_bh1 })
   if (res.code === 0) {
-    detailData.name = res.data.ygxm
-	detailData.Sczl_bh1 = res.data.员工编号
+    detailData.name = res.data[0].ygxm
+	detailData.Sczl_bh1 = res.data[0].员工编号
   }
 }
 

src/view/performance/08-timesheet/index.vue

@@ -756,10 +756,10 @@ const moveFocus = async(event) => {
         }
         const res = await getYg({ sczl_bh })
         if (res.code === 0) {
-          const { data: { 员工编号,ygxm }} = res
-		  console.log((index - 1) / 5 + 1)
-          detailData[`name${(index - 1) / 5 + 1}`] = ygxm
-		  detailData[`wgjs_bh${(index - 1) / 5 + 1}`] = 员工编号
+    //       const { data: { 员工编号,ygxm }} = res
+		  // console.log((index - 1) / 5 + 1)
+          detailData[`name${(index - 1) / 5 + 1}`] = res.data[0].ygxm
+		  detailData[`wgjs_bh${(index - 1) / 5 + 1}`] = res.data[0].员工编号
         }
       }
       break

src/view/performance/Dayreports.vue

@@ -1473,8 +1473,8 @@ const GetYg = (event,inputName) => {
 		getYg({sczl_bh:event.target.value}).then(response=>{
 			if (response.code === 0) {
 				//设置比例
-				formData.value['sczl_bh'+inputName+'_name'] = response.data.ygxm;
-				formData.value['sczl_bh'+inputName] = response.data.员工编号;
+				formData.value['sczl_bh'+inputName+'_name'] = response.data[0].ygxm;
+				formData.value['sczl_bh'+inputName] = response.data[0].员工编号;
 			}else{
 				formData.value['sczl_bh'+inputName+'_name'] = '';
 			}

src/view/performance/MachineDocuments.vue

@@ -986,8 +986,8 @@ const getYgMcsubmit = (inputName) => {
 	if(value){
 		getYg({sczl_bh:value}).then(response=>{
 			if (response.code === 0) {
-				formData.value['sczl_bh' + inputName+'_name']=response.data.ygxm
-				formData.value['sczl_bh' + inputName]=response.data.员工编号
+				formData.value['sczl_bh' + inputName+'_name']=response.data[0].ygxm
+				formData.value['sczl_bh' + inputName]=response.data[0].员工编号
 				setColorReadonly('name'+inputName)
 			}else{
 				formData.value['sczl_bh' + inputName+'_name']='';

src/view/performance/Manualdocuments.vue

@@ -795,7 +795,7 @@ const getygsubmit = async (event, inputName) => {
 		console.log(response)
 		if (response.code === 0) {
 			let Bname = 'sczl_bh' + inputName+'_name';
-			formData.value[Bname]=response.data.ygxm;
+			formData.value[Bname]=response.data[0].ygxm;
 			//设置姓名样式
 			
 			if(inputName>0){

src/view/performance/chejianbaogong.vue

@@ -124,25 +124,26 @@
             <el-tabs v-model="activName" type="card" @tab-click="duohandleClick"   >
 			<el-tab-pane label="设备作业清单" @click="showTable('印件资料')" name="first" style="font-size: 14px;">
 				<el-table ref="multipleTable"
-						  :show-overflow-tooltip="true"
-						  :row-style="{ height: '20px' }"
-						  :cell-style="{ padding: '0px'}" :header-row-style="{ height: '20px' }"
-						  :header-cell-style="{ padding: '0px' }"
-						  @row-click="yjupdateCompanyFunc"
-						  :cell-class-name="sbzyqdplanUsageCellClass"
-						  style="width: 100%; height: 330px; font-size: 14px;" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
-					<el-table-column align="left" label="选择" prop="yj_yjno" width="80"/>
-					<el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="180" />
-					<el-table-column align="left" label="印件资料" prop="印件资料" width="240" />
-					<el-table-column align="left" label="工序名称" prop="工序名称" width="100" />
-					<el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="180"/>
-					<el-table-column align="left" label="装版时数" prop="装版时数" width="100"/>
-					<el-table-column align="left" label="工序产能" prop="工序产能" width="100"/>
-					<el-table-column align="left" label="计划工时" prop="计划工时" width="100"/>
-					<el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="240" />
-					<el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
-					<el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
-				</el-table>
+						:show-overflow-tooltip="true"
+						highlight-current-row="true"
+						:row-style="{ height: '20px' }"
+						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+						:header-cell-style="{ padding: '0px' }"
+						@row-click="yjupdateCompanyFunc"
+						style="width: 100%;height: 330px" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
+<!--                <el-table-column type="selection" width="55" />-->
+				<!-- <el-table-column align="left" label="选择" prop="bh"  width="80"/> -->
+				<el-table-column align="left" sortable label="工单编号|质量信息" prop="工单编号|质量信息" width="145" />
+				<el-table-column align="left" sortable label="印件资料" prop="印件资料" width="240" />
+				<el-table-column align="left" sortable label="工序名称" prop="工序名称" width="100" />
+				<el-table-column align="left" sortable label="计划产量/已完成" prop="计划产量/已完成" width="130"/>
+				<el-table-column align="left" sortable label="装版时数" prop="装版时数" width="85"/>
+				<el-table-column align="left" sortable label="工序产能" prop="工序产能" width="85"/>
+				<el-table-column align="left" sortable label="计划工时" prop="计划工时" width="85"/>
+				<el-table-column align="left" sortable label="计划生产时段" prop="计划生产时段" width="210" />
+				<el-table-column align="left" sortable label="排产备注" prop="排产备注" width="100" />
+				<el-table-column align="left" sortable label="产品名称" prop="产品名称" width="240" />
+			  </el-table>
 			</el-tab-pane>
 
 
@@ -192,8 +193,8 @@
                           <el-table-column align="left" label="制程废品" prop="制程废品" width="100" />
                           <el-table-column align="left" label="制程次品" prop="制程次品" width="100" />
                           <el-table-column align="left" label="前工序废" prop="前工序废" width="100" />
-						              <el-table-column align="left" label="来料异常" prop="来料异常"  width="100"/>
-				            		  <el-table-column align="left" label="装版工时" prop="装版工时" width="100" />
+						  <el-table-column align="left" label="来料异常" prop="来料异常"  width="100"/>
+						  <el-table-column align="left" label="装版工时" prop="装版工时" width="100" />
                           <el-table-column align="left" label="保养工时" prop="保养工时" width="100" />
                           <el-table-column align="left" label="打样工时" prop="打样工时" width="100"/>
                           <el-table-column align="left" label="异常停机工时" prop="异常停机工时"  width="120"/>
@@ -203,7 +204,7 @@
                           <el-table-column align="left" label="码包" prop="码包" width="100" />
                           <el-table-column align="left" label="主电表" prop="主电表"  width="100"/>
                           <el-table-column align="left" label="辅电表" prop="辅电表" width="100" />
-                          <el-table-column align="left" label="色度数" prop="色度数" width="100" />
+                          <el-table-column align="left" label="色度数" prop="色度" width="100" />
                         </el-table>
                         </el-tab-pane>
 
@@ -354,7 +355,7 @@
 
             <div style="margin-top:100px;">
 			<el-row :gutter="20">
-			 <el-col :span="15">
+			 <el-col :span="10">
 			   <el-form-item label="机台编号" prop="id">
 			 <el-select v-model="selectedOption" placeholder="请选择">
 			   <el-option
@@ -368,7 +369,10 @@
 			 </el-col>
 			 <el-col :span="10">
 			   <el-form-item label="班组编号" prop="id">
-				<el-input v-model="BZMC"  placeholder="" />
+				<el-select v-model="BZMC" placeholder="" >
+				  <el-option label="A 班" value="A 班"></el-option>
+				  <el-option label="B 班" value="B 班"></el-option>						  
+				</el-select>
 			   </el-form-item>
 			 </el-col>
 			</el-row>
@@ -2774,7 +2778,8 @@ const getbzyg = async (value,key) => {
 const getxunchayg = async (value) => {
   const response = await getYg({sczl_bh:xunchaData.value.sczl_bh});
   if (response.code === 0) {
-    xunchaData.value.sczl_name=response.data.ygxm
+    xunchaData.value.sczl_name=response.data[0].ygxm
+	xunchaData.value.sczl_bh=response.data[0].员工编号
   }
 }
 const getlaliaoyg = async (value) => {
@@ -3147,7 +3152,8 @@ const yinbanNodeClick = (node, check, nodeData) => {
   }
 };
 const onyinban = async() => {
-	const res = await facilityPrintGetTab({productCode:formData.value.productCode})
+	console.log(formData)
+	const res = await facilityPrintGetTab({productCode:formData.value.工单编号})
 	// const res = await facilityPrintGetTab({productCode:'104601001'})
 	if(res.code===0){
 		yinbantreeData.value=[{
@@ -3468,6 +3474,7 @@ const zhichengDialog = async () => {
 		    type: 'success',
 		    message: '成功'
 		  })
+		  InspectionRecord()
 		  zhichengVisible.value=false
 		  zhibiaoselectData.value=[]
 		  fujiaselectData.value=[]
@@ -3512,7 +3519,7 @@ const FieldInspectionRecord = async () => {
 const GetMachineMac = async (addr) => {
   console.log(addr);
   const response = await getMachineMac({ addr: addr });
-  // const response = await getMachineMac({ addr: '00-E0-4D-77-31-9E' });
+  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-84' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-90' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-50' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-60-CC' });
@@ -4684,6 +4691,7 @@ const FacilityInspect = async () => {
 }
 // 关闭弹窗
 const closeDialog = () => {
+	chanliangVisible.value=false
     dialogFormVisible.value = false
     formData.value = {
         address: '',
@@ -4770,11 +4778,11 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
      text-align:center;
      background-color:white}
 	 .bt {
-	   margin-top: 20PX;
+	   margin-top: 1vh;
 	   margin-bottom: 10PX;
 	   height: 5vh;
-	   width: 12vh;
-	   font-size:2vh;
+	   width: 11vh;
+	   font-size:1.5vh;
 	 }
 	  .gva-table-box{
 	   font-size: 15px;

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -327,7 +327,10 @@
           			 </el-col>
           			 <el-col :span="10">
           			   <el-form-item label="班组编号" prop="id">
-          				<el-input v-model="BZMC"  placeholder="" />
+						<el-select v-model="BZMC" placeholder="" >
+						  <el-option label="A 班" value="A 班"></el-option>
+						  <el-option label="B 班" value="B 班"></el-option>						  
+						</el-select>
           			   </el-form-item>
           			 </el-col>
           			</el-row>
@@ -2056,9 +2059,14 @@ const handleNodeClick = (nodeData,node) => {
 		DelType.value = false
 		AddType.value = false
 		// MachineVisible.value=true
-      } else if (nodeData.level === 2) {
+      } else if (nodeData.level === 2) {
+		sbzyData.length = 0;
+		FPData.length=0;
+		CLMXData.length=0;
+		JYData.length=0;
         console.log(node.label); // 第二级节点
-		JTMC=node.label.split("-")[0]
+		JTMC=node.label.split("-")[0]
+		console.log(JTMC)
 		JTMCOn.value=true
 		dateOn.value=false
 		showbutton.value=false
@@ -2155,7 +2163,7 @@ const GetdialogSbyxgl = async () => {
     		formData.value.class=classbz.value.join(',')
     		console.log(formData.value.class)
     		formData.value.JTMC=JTMC
-    		const responses = await MachineDetailList({workshop:'胶印车间'});
+    		const responses = await MachineDetailList({workshop:CJMC.value});
     		if(responses.code===0){
     				   responses.data.map(item=>{
     					   if(item.设备编号==JTMC){
@@ -2179,47 +2187,64 @@ const GDBH=ref()
 const FacilityProduction = async () => {
   const response = await facilityProduction({machine:JTMC});
   if (response.code === 0) {
-	console.log(response)
-	// 填充formData对象的基本字段
-	 //    formData.value.工单编号 = response.data.工单编号;
-	 //    formData.value.印件编号 = response.data.印件号;
-	 //    formData.value.工序名称 = response.data.工序名称;
-	 //    formData.value.产品名称 = response.data.产品名称;
-		// formData.value.班组 = response.data.班组编号;
-		formData.value.工单编号 = response.data.工单编号;
-		formData.value.印件号 = response.data.印件号;
-		formData.value.工序号 = response.data.工序名称.substring(0,2);
-		formData.value.工序名称 = response.data.工序名称;
-		formData.value.产品名称 = response.data.产品名称;
-		formData.value.班组Id=response.data.班组Id
-		formData.value.machine=JTMC
-		formData.value.状态=response.data.状态
-		
-		let sczl_bhkey=''
-		let sczl_namekey=''
-		if (response.data.班组成员) {
-		  for (let i = 0; i < Math.min(Object.keys(response.data.班组成员).length, 6); i++) {
-						 sczl_bhkey=`sczl_bh${i+1}`
-						 sczl_namekey=`sczl_name${i+1}`
-		    formData.value[sczl_bhkey] = response.data.班组成员[i]['编号'];
-		    formData.value[sczl_namekey] = response.data.班组成员[i]['姓名'];
-			console.log(response.data.班组成员[i]['编号'])
-			classbz.value[i]=response.data.班组成员[i]['编号']
-		  }
-		}
-		formData.value.class=classbz.value.join(',')
-		console.log(formData.value.class)
-		formData.value.JTMC=JTMC
-		const responses = await MachineDetailList({workshop:'胶印车间'});
-		if(responses.code===0){
-				   responses.data.map(item=>{
-					   if(item.设备编号==JTMC){
-						   formData.value.status=item.状态
-					   }
-				   })
-		}
-		// console.log(formData.value.工单编号)
-		
+	console.log(response)
+	if(response.data===null){
+		formData.value.工单编号 = '';
+		formData.value.印件号 = '';
+		formData.value.工序号 = '';
+		formData.value.工序名称 = '';
+		formData.value.产品名称 = '';
+		formData.value.班组Id=''
+		formData.value.machine=JTMC
+		formData.value.状态=''
+		let sczl_bhkey=''
+		let sczl_namekey=''
+	   for (let i = 0; i < 6; i++) {
+					 sczl_bhkey=`sczl_bh${i+1}`
+					 sczl_namekey=`sczl_name${i+1}`
+		formData.value[sczl_bhkey] = '';
+		formData.value[sczl_namekey] = '';
+	  }
+		console.log(sbzyData)		
+	}else{
+		// 填充formData对象的基本字段
+		 //    formData.value.工单编号 = response.data.工单编号;
+		 //    formData.value.印件编号 = response.data.印件号;
+		 //    formData.value.工序名称 = response.data.工序名称;
+		 //    formData.value.产品名称 = response.data.产品名称;
+			// formData.value.班组 = response.data.班组编号;
+			formData.value.工单编号 = response.data.工单编号;
+			formData.value.印件号 = response.data.印件号;
+			formData.value.工序号 = response.data.工序名称.substring(0,2);
+			formData.value.工序名称 = response.data.工序名称;
+			formData.value.产品名称 = response.data.产品名称;
+			formData.value.班组Id=response.data.班组Id
+			formData.value.machine=JTMC
+			formData.value.状态=response.data.状态
+			
+			let sczl_bhkey=''
+			let sczl_namekey=''
+			if (response.data.班组成员) {
+			  for (let i = 0; i < Math.min(Object.keys(response.data.班组成员).length, 6); i++) {
+							 sczl_bhkey=`sczl_bh${i+1}`
+							 sczl_namekey=`sczl_name${i+1}`
+			    formData.value[sczl_bhkey] = response.data.班组成员[i]['编号'];
+			    formData.value[sczl_namekey] = response.data.班组成员[i]['姓名'];
+				
+				classbz.value[i]=response.data.班组成员[i]['编号']
+			  }
+			}
+			formData.value.class=classbz.value.join(',')			
+			formData.value.JTMC=JTMC
+			const responses = await MachineDetailList({workshop:CJMC.value});
+			if(responses.code===0){
+					   responses.data.map(item=>{
+						   if(item.设备编号==JTMC){
+							   formData.value.status=item.状态
+						   }
+					   })
+			}
+	}
   }
   // getTableData()
 }