质检

pages/qms/inspectionWork/inspectionProjectReport.vue

@@ -33,16 +33,20 @@
 				</view>
 			</view>
 			<view class="marginTop20 defValue">
-				<text>{{ form.symbol }}</text>
+				<text v-if="form.textType != 8">{{ form.symbol }}</text>
 				<text v-if="form.textType == 3">
 					{{ form.minValue }}-{{ form.maxValue }}
 				</text>
-
-				<text v-else>
+				<text v-else-if="form.textType == 8">
+					标准值：{{form.defaultValue}}{{ form.unitName||'' }} 下限：{{ form.minValue||0 }}{{ form.unitName||'' }}
+					上限：{{ form.minValue||0 }}{{ form.unitName||'' }}
+				</text>
+				<text v-else> 
 					<text>{{ form.defaultValue }}</text>
 				</text>
-
-				{{ form.unitName }}
+				<text v-if="form.textType != 8">
+					<text>{{ form.unitName }}</text>
+				</text>
 			</view>
 			<view class="herder_item marginTop20" v-if="form.executionMethod==2">
 				<view class="herder_text"></view>
@@ -155,14 +159,14 @@
 					检验图片
 				</view>
 			</view>
-			<fileMain class="marginTop20" v-model="form.inspectImage" :type="type=='view'?'view':'add'" ></fileMain>
+			<fileMain class="marginTop20" v-model="form.inspectImage" :type="type=='view'?'view':'add'"></fileMain>
 			<view class="herder_item marginTop20">
 				<view class="herder_text"></view>
 				<view class="herder_view">
 					附件
 				</view>
 			</view>
-			<fileMain class="marginTop20" v-model="form.imgUrl" type="view" ></fileMain>
+			<fileMain class="marginTop20" v-model="form.imgUrl" type="view"></fileMain>
 			<view class="herder_item marginTop20">
 				<view class="herder_text"></view>
 				<view class="herder_view">
@@ -208,7 +212,8 @@
 
 	export default {
 		components: {
-			experimentReport,fileMain
+			experimentReport,
+			fileMain
 		},
 		mixins: [dictMixns],
 		data() {
@@ -225,7 +230,7 @@
 					noQualifiedQuantity: '',
 					sampleQuantity: '',
 					experimentId: '',
-					inspectImage:[]
+					inspectImage: []
 				},
 				acceptUnpackList: [{
 						text: "合格",

pages/qms/inspectionWork/sampleList.vue

@@ -99,15 +99,23 @@
 													:class="{ warn: quality.qualityResults === 2 }">{{ quality.categoryLevelClassName }}</text>
 											</view>
 											<view class="table-cell parameter-cell">
+
+
 												<text class="cell-text" :class="{ warn: quality.qualityResults === 2 }">
 													<text v-if="quality.textType == 3">
 														{{ quality.symbol }}
 														{{ quality.minValue }}-{{ quality.maxValue }}
 													</text>
+													<text v-else-if="quality.textType == 8">
+														标准值：{{quality.defaultValue}}{{ quality.unitName||'' }}
+														下限：{{ quality.minValue||0 }}{{ quality.unitName||'' }}
+														上限：{{ quality.minValue||0 }}{{ quality.unitName||'' }}
+													</text>
 													<text v-else>
 														{{ quality.symbol }} {{ quality.defaultValue }}
 													</text>
-													{{ quality.unitName }}
+													<text v-if="quality.textType != 8">
+														{{ quality.unitName }}</text>
 												</text>
 											</view>
 										</view>
@@ -142,7 +150,8 @@
 			<view style="height: 84rpx"></view>
 			<view class="footerButton">
 				<u-button @click="handleClose" type="default" text="返回"></u-button>
-				<u-button v-if="type != 'view'&&!isCorrelationId&&workData.status!=1" type="primary" @click="save" text="保存"></u-button>
+				<u-button v-if="type != 'view'&&!isCorrelationId&&workData.status!=1" type="primary" @click="save"
+					text="保存"></u-button>
 			</view>
 		</view>
 		<u-toast ref="uToast"></u-toast>
@@ -203,12 +212,12 @@
 						const qualitySampleList = res.qualitySampleList.filter(
 							(item) => item.id == data.projectId,
 						);
-						
+
 						if (qualitySampleList[0].correlationId && !['myInspectionProjectEntrusted',
 								'myInspectionProjectTask'
 							].includes(this.pageName)) {
 							this.isCorrelationId = true
-						}else{
+						} else {
 							qualitySampleList[0].status = 1
 						}
 					} else {