55

api/pda/tangu.js

@@ -38,4 +38,16 @@ export async function sample(params) {
 		return data.data;
 	}
 	return Promise.reject(data.message);
+}
+
+// 根据工单工序请求bom质检参数
+
+export async function bomQuality(params) {
+	const data = await postJ(
+		Vue.prototype.apiUrl + `/pda/mes/workreport/bomQuality`, params, true,
+	);
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
 }

pages/pda/jobBooking/components/oneJobQualityBom.vue

@@ -558,8 +558,6 @@
 
 
 
-
-
 				}
 
 

pages/pda/jobBooking/components/oneJobQualityBomPL.vue

@@ -310,6 +310,43 @@
 
 
 
+				<view class="item rx-sc" v-if="it.extInfo.batchReportInfo.length == 0">
+					<view class="rx ">
+						<view class="lable lable150 rx-cc ">质检结果</view>
+						<view class="content content_num ">
+							<view v-if='isDetails'>
+								{{ it.extInfo.appearance == 1 ? '合格' : it.extInfo.appearance == 2 ?  '不合格' : '' }}
+							</view>
+							<zxz-uni-data-select v-else :localdata="qualityList" v-model="it.extInfo.appearance"
+								dataValue='value' format='{name}' dataKey="value" filterable
+								:clear='false'></zxz-uni-data-select>
+
+						</view>
+					</view>
+				</view>
+
+
+				<view class="item rx-sc" v-if="it.extInfo.batchReportInfo.length == 0 && it.extInfo.appearance == 1 ">
+					<view class="rx ">
+						<view class="lable lable150 rx-cc ">处置</view>
+						<view class="content content_num ">
+							<view v-if='isDetails'>
+								{{ it.extInfo.taskName }}
+							</view>
+							<zxz-uni-data-select v-else :localdata="stepsList" v-model="it.extInfo.taskId"
+								dataValue='taskId' format='{taskTypeName}' dataKey="taskId" filterable
+								@change=" e => it.extInfo.taskName = e.taskTypeName"
+								:clear='false'></zxz-uni-data-select>
+
+						</view>
+					</view>
+				</view>
+				
+				
+
+
+
+
 			</view>
 
 
@@ -325,7 +362,7 @@
 
 					</view>
 					<view class="item ww20 ">
-						 </view>
+					</view>
 				</view>
 
 
@@ -335,8 +372,8 @@
 							<view>{{yy.allFeedQuantity }}</view>
 						</view>
 						<view class="item ww25 content_num">
-					<view v-if='isDetails'>{{yy.allReportWeight }}</view>
-					<input class="uni-input" v-else v-model="yy.allReportWeight" type='digit'></input>
+							<view v-if='isDetails'>{{yy.allReportWeight }}</view>
+							<input class="uni-input" v-else v-model="yy.allReportWeight" type='digit'></input>
 						</view>
 
 
@@ -348,12 +385,11 @@
 						<view class="item ww30" v-else>
 							<zxz-uni-data-select :localdata="stepsList" v-model="yy.taskId" dataValue='taskId'
 								format='{taskTypeName}' dataKey="taskId" filterable
-								@change=" e => yy.taskName = e.taskTypeName" :clear='false'
-								></zxz-uni-data-select>
+								@change=" e => yy.taskName = e.taskTypeName" :clear='false'></zxz-uni-data-select>
 						</view>
 
 						<view class="item ww20 content_num">
-							
+
 						</view>
 
 
@@ -365,6 +401,54 @@
 
 
 
+			<div v-if="it.extInfo.batchReportInfo.length == 0">
+
+				<view class="content_table2" v-for="(qua,qudIdx) in it.extInfo.qualityParam" :key="qudIdx">
+					<view style="font-size: 28rpx;color: #157A2C; line-height: 40rpx;">质检类型：{{ qua.categoryLevelName}}
+					</view>
+
+					<view class="head row rx-sc" v-if="qua.parameterStandards.length > 0">
+						<view class="item ww25" style="font-size: 20rpx;">
+							{{ qua.parameterStandards[0].singleWeightDivision  != 'undefined undefined' ?  qua.parameterStandards[0].singleWeightDivision : '默认值'}}
+						</view>
+						<view class="item ww45"
+							:style="qua.parameterStandards[0].tolerance.length > 11 ? 'line-height: 26rpx' : ''">
+							{{ qua.parameterStandards[0].tolerance   != 'undefined undefined' ?  qua.parameterStandards[0].tolerance : '质检标准'}}
+						</view>
+
+						<view class="item ww30 rx-bc">
+							质检结果参数
+						</view>
+
+					</view>
+
+
+					<view class="table" v-if="qua.parameterStandards.length > 0">
+						<view class="tr row rx-sc" v-for="(quaItem, quaItemIdx) in qua.parameterStandards"
+							:key="quaItemIdx">
+							<view class="item ww25 ">
+								<view>{{quaItem.defaultValue }}</view>
+							</view>
+							<view class="item ww45 ">
+								<view>{{ quaItem.symbol }}{{quaItem.toleranceValue }}</view>
+							</view>
+
+							<view class="item ww30 content_num">
+								<input class="uni-input" v-model="quaItem.remark"></input>
+							</view>
+
+
+
+						</view>
+
+					</view>
+
+				</view>
+
+			</div>
+
+
+
 
 
 		</view>
@@ -383,7 +467,8 @@
 	} from '@/api/pda/workOrder.js'
 
 	import {
-		sample
+		sample,
+
 	} from '@/api/pda/tangu.js'
 
 	export default {
@@ -424,10 +509,15 @@
 				stepsList: [],
 
 
-
-
-
-
+				qualityList: [{
+						name: '合格',
+						value: 1
+					},
+					{
+						name: '不合格',
+						value: 2
+					}
+				]
 
 
 
@@ -440,6 +530,8 @@
 			this.getSteps()
 
 
+
+
 		},
 		methods: {
 
@@ -473,7 +565,8 @@
 					return {
 						quantity: m.sample,
 						disposeTaskId: m.taskId,
-						source: this.list[idx]
+						source: this.list[idx],
+
 					}
 				})
 
@@ -482,6 +575,7 @@
 					workOrderId: this.list[idx].workOrderId,
 					dispose: _arr,
 
+
 				}
 
 				sample(param).then(res => {
@@ -490,7 +584,8 @@
 				})
 
 
-			}
+			},
+
 
 
 
@@ -699,6 +794,10 @@
 			.ww40 {
 				width: 40%;
 			}
+
+			.ww45 {
+				width: 45%;
+			}
 		}
 
 		.head {

pages/pda/jobBooking/index/index.vue

@@ -54,7 +54,7 @@
 						
 					<oneJobQualityBomPL
 						v-if='objData.semiProductList && objData.semiProductList.length != 0 && taskType == 6 && clientEnvironmentId == 3 && objData.singleReport == 0'
-						:item='objData' :list='objData.semiProductList' :sampleQuality="objData.sampleQuality"></oneJobQualityBomPL>
+						:item='objData' :list='objData.semiProductList'></oneJobQualityBomPL>
 						
 
 					<byProductBom v-if='objData.productRecycleList.length != 0' :list='objData.productRecycleList'