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

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -942,6 +942,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="bzdh"  width="115"/>
 							<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"/>
@@ -2445,6 +2446,7 @@ const handleNodeClick = (nodeData,node) => {
 const JPgytableData = ref([])
 const JPmachineDetails = async (jt, riqi) => {
   const JPmachineDetail_data = await JPmachineDetail({machine: jt, date: riqi});
+  console.log(JPmachineDetail_data)
   _rclsb_gdbh.value = JPmachineDetail_data.data[0]['工单编号']
   if (JPmachineDetail_data.code === 0) {
 	let totalA = JPmachineDetail_data.data.totalA
@@ -2453,22 +2455,41 @@ const JPmachineDetails = async (jt, riqi) => {
 	delete JPmachineDetail_data.data.totalA
 	delete JPmachineDetail_data.data.totalB
 	JPgytableData.value = Object.values(JPmachineDetail_data.data)
-	if(totalA){
-		let rowA = {
-			工单编号: 'A班产量:',
-			yjno: '箱数：'+totalA[0].箱数,
-			产品名称: '检验类型：'+totalA[0].检验类型,
+	console.log(totalA)
+	if(totalA.length === 1){
+		if(totalA){
+			let rowA = {
+				工单编号: 'A班产量:',
+				yjno: totalA[0].检验类型+ ':' +totalA[0].箱数,
+			}
+			JPgytableData.value.push(rowA)
 		}
-		JPgytableData.value.push(rowA)
-	}
-	if(totalB){
-		let rowB = {
-			工单编号: 'B班产量:',
-			yjno: '箱数：'+totalA[0].箱数,
-			产品名称: '检验类型：'+totalA[0].检验类型,
+		if(totalB){
+			let rowB = {
+				工单编号: 'B班产量:',
+				yjno: totalB[0].检验类型+ ':' +totalB[0].箱数,
+			}
+			JPgytableData.value.push(rowB)
+		}
+	}else{
+		if(totalA){
+			let rowA = {
+				工单编号: 'A班产量:',
+				yjno: totalA[0].检验类型+ ':' +totalA[0].箱数,
+				产品名称: totalA[1].检验类型+ ':' +totalA[1].箱数,
+			}
+			JPgytableData.value.push(rowA)
+		}
+		if(totalB){
+			let rowB = {
+				工单编号: 'B班产量:',
+				yjno: totalB[0].检验类型+ ':' +totalB[0].箱数,
+				产品名称: totalB[1].检验类型+ ':' +totalB[1].箱数,
+			}
+			JPgytableData.value.push(rowB)
 		}
-		JPgytableData.value.push(rowB)
 	}
+	
 	// return require(`@/assets/${machineData.状态}.png`);
 	// MachineVisible.value=true
   }