555

pages/pda/jobBooking/components/oneJobQualityBomPL.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-	
+
 		<view class="title_box rx-bc">
 			<view class="name">产品信息</view>
 		</view>
@@ -364,44 +364,59 @@
 
 
 
-			<div v-if="it.extInfo.batchReportInfo.length == 0">
+			<view 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="content_table2">
 
-					<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 class="head row rx-sc">
+						<view class="item ww20"> 质检名称</view>
+						<view class="item ww20"> 工艺参数</view>
+						<view class="item ww30" style="font-size: 20rpx;">质检结果参数</view>
+						<view class="item ww30">质检结果</view>
 
 					</view>
 
 
-					<view class="table" v-if="qua.parameterStandards.length > 0">
-						<view class="tr row rx-sc" v-for="(quaItem, quaItemIdx) in qua.parameterStandards"
+					<view class="table">
+						<view class="tr row rx-sc" v-for="(quaItem, quaItemIdx) in it.extInfo.qualityParam"
 							:key="quaItemIdx">
-							<view class="item ww25 ">
-								<view>{{quaItem.defaultValue }}</view>
+
+							<view class="item ww20 ">
+								<view>{{quaItem.inspectionName }}</view>
 							</view>
-							<view class="item ww45 ">
-								<view>{{ quaItem.symbol }}{{quaItem.toleranceValue }}</view>
+
+							<view class="item ww20 ">
+								<view style="display: flex">
+									<view v-if="quaItem.textType == 3" style="display: flex; align-items: center">
+										{{ quaItem.minValue }} {{ quaItem.unit }}
+										&nbsp;&nbsp;-&nbsp;&nbsp;
+										{{ quaItem.maxValue }} {{ quaItem.unit }}
+									</view>
+
+									<view v-else>
+										{{ quaItem.defaultValue }} {{ quaItem.unit }}
+									</view>
+								</view>
 							</view>
 
 							<view class="item ww30 content_num">
-								<view v-if="isDetails">{{ quaItem.remark }}</view>
-								<input v-else class="uni-input" v-model="quaItem.remark"></input>
+								<view v-if="isDetails">{{ quaItem.qualityResultValue }}</view>
+								<input v-else class="uni-input" v-model="quaItem.qualityResultValue"></input>
 
 							</view>
 
+							<view class="item ww30 content_num">
+								<view v-if='isDetails'>
+									{{ quaItem.qualityResult ?  qualityList[quaItem.qualityResult - 1].name : ''  }}
+								</view>
+
+								<zxz-uni-data-select v-else :localdata="qualityList" v-model="quaItem.qualityResult"
+									dataValue='value' format='{name}' dataKey="value" filterable
+									:clear='false'></zxz-uni-data-select>
+							</view>
+
+
 
 
 						</view>
@@ -410,7 +425,7 @@
 
 				</view>
 
-			</div>
+			</view>
 
 
 
@@ -482,7 +497,12 @@
 					{
 						name: '不合格',
 						value: 2
-					}
+					},
+					{
+						name: '让步接受',
+						value: 3
+					},
+
 				]
 
 
@@ -716,6 +736,7 @@
 				color: #404446;
 				font-size: 28rpx;
 				padding-left: 12rpx;
+				word-break: break-all;
 
 			}