Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_app

api/business/processInspection.js

@@ -178,6 +178,13 @@ export function getCarrierInfo(data) {
 		data: data
 	})
 }
+export function getFirstCarrierInfo(data) {
+	return req.request({
+		url: '/business/inspecion/getFirstCarrierInfo',
+		method: 'post',
+		data: data
+	})
+}
 export function getProcessInspectionByDayworkId(data) {
 	return req.request({
 		url: '/business/inspecion/getProcessInspectionByDayworkId',
@@ -228,6 +235,13 @@ export function getLotInfo(data) {
 		data: data
 	})
 }
+export function getDeliveryLotInfo(data) {
+	return req.request({
+		url: '/business/inspecion/getDeliveryLotInfo',
+		method: 'post',
+		data: data
+	})
+}
 export function getLotInfoByFirstInspection(data) {
 	return req.request({
 		url: '/business/inspecion/getLotInfoByFirstInspection',

components/dialog-selectEquipment/dialog-selectEquipment.vue

@@ -1,15 +1,5 @@
 <template>
-	<dialog-base ref="baseDialog" title="请选择">
-		<!-- 		<view class="equipment-container uni-row ">
-			<view v-for="(item, index) in equipments" :class="{'item':true,'selected': isSelected(item)}" :key="index"
-				@click="handleSelection(item)"><text class="label">{{item['equipmentDetailCode']}}</text></view>
-		</view> -->
-		<!-- 		<view v-if="showProcessList">
-			<uni-section title="工序" type="line">
-				<uni-data-select v-model="selectedProcess" :localdata="processList" :clear="false"
-					@change="handleProcessChange"></uni-data-select>
-			</uni-section>
-		</view> -->
+	<dialog-base ref="baseDialog" title="请选择" style="margin: -250rpx auto 0 auto;">
 		<view>
 			<uni-section title="设备" type="line">
 				<!-- <uni-data-select v-model="selectedEquipment" :localdata="equipmentList" :clear="false"
@@ -18,32 +8,6 @@
 					placeholder="请选择/输入设备"></zxz-uni-data-select>
 			</uni-section>
 		</view>
-		<!-- 		<view class="switch uni-row">
-			<text class="label">是否邀请协作者</text>
-			<view class="uni-row" style="align-items: center;">
-				<text>否</text>
-				<switch class="switch" @change="switchChange" />
-				<text>是</text>
-			</view>
-		</view>
-		<view class="userList" v-if="flag">
-			<uni-easyinput class="uni-mt-5" v-model="userName" placeholder="请输入协作者编号"
-				@input="debounce(handleSearchUserName,500)" @blur="handleBlur"></uni-easyinput>
-
-			<view class="uni-row showUser">
-				<view v-for="(item,index) in userList">
-					<view class="user" @click="handleClickUserName(item)">{{item.nickName}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="uni-row selectedUserList">
-			<view class="selectedUser uni-row" v-for="(item,index) in selectedUserList">
-				<view>{{item.nickName}}</view>
-				<view v-if="selectedUserList.length > 0" @click="handleRemoveUserName(item)">×</view>
-			</view>
-		</view> -->
-
-
 		<view class="add-btn-container uni-row">
 			<button type="primary" class="btn" @click="handleStart">开始</button>
 		</view>

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -22,7 +22,7 @@
 						style="margin: 0 0 0 16rpx;outline: 2rpx solid #999999;border-radius: 10rpx;"></uni-data-select>
 				</uni-section>
 			</view>
-	<view class="list-title uni-row">
+	<view v-if="curDayworkItem.turnoverType != '3'" class="list-title uni-row">
 		<text class="label" style="margin: 0 0 0 -24rpx;" >下序是否包装</text><text style="margin-left: 56rpx;" class="label">否</text>
 		<switch class="switch" @change="switchChange" :checked="normalStatus" style="transform: scale(0.8);align-items: center;font-size:32rpx ;" color="rgba(255,85,85,1)" />
 		<text class="label">是</text>

pages/deliveryInspection/form.vue

@@ -47,7 +47,7 @@
 		<!-- 废品信息 -->
 		<view class="title unfit-title uni-row">
 			<text>检查信息</text>
-			<view class="add-btn" @click="handleAddWaste">添加</view>
+			<view v-if="editable()" class="add-btn" @click="handleAddWaste">添加</view>
 		</view>
 		<view class="unfit-container">
 			<view class="unfit-item-container uni-column" v-for="(item, index) in unfitInfos" :key="index">
@@ -68,23 +68,23 @@
 			</view> -->
 			<view class="resu uni-row">
 				<view class="label">检查结果</view>
-				<input :disabled="!editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.checkResult }}</view> -->
+				<input v-if="editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view class="label">超差范围</view>
-				<input :disabled="!editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.exceedLimits }}</view> -->
+				<input v-if="editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view :class="!editable() ? 'label' : ''">检查量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.examiningNum" placeholder="" />
-				<!-- <view v-else class="number value">{{ item.examiningNum }}</view> -->
-				<view :class="!editable() ? 'label' : ''">不良品量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+				<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
+				<view :class="!editable() ? 'label' : ''" style="margin-left: 16rpx;">不良品量</view>
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.disqualificationNum" placeholder="" />
-				<!-- <view v-else class="value">{{ item.disqualificationNum }}</view> -->
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 			</view>
 			</view>
 		</view>
@@ -130,7 +130,8 @@
 			</view>
 			<view class="remark uni-row">
 				<view class="label">备注</view>
-				<textarea :disabled="!editable()" v-model="processInspecion.remark" />
+				<textarea v-if="editable()" v-model="processInspecion.remark" />
+				<view v-else class="value">{{ processInspecion.remark }}</view>
 			</view>
 
 			<view v-if="editable()" class="btns-container uni-row">
@@ -831,4 +832,9 @@
 			}
 		}
 	}
+input:disabled {
+    background-color: #aaaaff !important;
+    color: #ccc !important; /* 假设您想要设置文本颜色 */
+}
+
 </style>

pages/deliveryInspection/scan.vue

@@ -72,7 +72,7 @@
 		onShow
 	} from '@dcloudio/uni-app'
 	import {
-		getLotInfo,
+		getDeliveryLotInfo,
 		getCarrierInfoProcess,
 		getCarrierInfo,
 	} from '@/api/business/processInspection.js'
@@ -140,7 +140,7 @@
 									});
 									// 此处根据拿到的箱子id， 获取到相对应的【 lot_id】，【 lot_code】， 以及该批次关联的其它箱号
 									// 需要定义一个请求方法， 从后端获取
-									getLotInfo(result).then(res => {
+									getDeliveryLotInfo(result).then(res => {
 										if (res.code == 200) {
 											console.log(res)
 											
@@ -205,7 +205,7 @@
 			)
 		} else {
 			const result = {
-				carrierCode: '000060'
+				carrierCode: '000948'
 			}
 			getCarrierInfo(result).then(response => {
 				if (response.code == 200) {
@@ -222,7 +222,7 @@
 							});
 							// 此处根据拿到的箱子id， 获取到相对应的【 lot_id】，【 lot_code】， 以及该批次关联的其它箱号
 							// 需要定义一个请求方法， 从后端获取
-							getLotInfo(result).then(res => {
+							getDeliveryLotInfo(result).then(res => {
 								if (res.code == 200) {
 									console.log(res)
 									

pages/factoryInspection/form.vue

@@ -60,23 +60,23 @@
 			</view> -->
 			<view class="resu uni-row">
 				<view class="label">检查结果</view>
-				<input :disabled="!editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.checkResult }}</view> -->
+				<input v-if="editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view class="label">超差范围</view>
-				<input :disabled="!editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.exceedLimits }}</view> -->
+				<input v-if="editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view :class="!editable() ? 'label' : ''">检查量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.examiningNum" placeholder="" />
-				<!-- <view v-else class="number value">{{ item.examiningNum }}</view> -->
-				<view :class="!editable() ? 'label' : ''">不良品量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+				<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
+				<view :class="!editable() ? 'label' : ''" style="margin-left: 16rpx;">不良品量</view>
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.disqualificationNum" placeholder="" />
-				<!-- <view v-else class="value">{{ item.disqualificationNum }}</view> -->
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 			</view>
 			</view>
 		</view>
@@ -106,7 +106,8 @@
 			</view>
 			<view class="remark uni-row">
 				<view class="label">备注</view>
-				<textarea :disabled="!editable()" v-model="processInspecion.remark" />
+				<textarea v-if="editable()" v-model="processInspecion.remark" />
+				<view v-else class="value">{{ processInspecion.remark }}</view>
 			</view>
 
 			<view v-if="editable()" class="btns-container uni-row">

pages/factoryInspection/index.vue

@@ -121,7 +121,9 @@
 		uni.showLoading({
 			title: '加载中'
 		});
-		//quer.value.creatorId = store.userInfo.userId;
+		if(store.userInfo.roles.some(item =>item.roleKey != 'factoryInspection')) {
+			quer.value.creatorId = store.userInfo.userId;
+		}
 		quer.value.startTime = startTime.value;
 		quer.value.type = "factoryInspection"
 		getProcessInspecionList(quer.value).then(res => {

pages/firstInspection/form.vue

@@ -66,26 +66,26 @@
 				<input class="number" type="number" @blur="rejectNumberChange" v-model="item.rejectNum"
 					placeholder="" />
 			</view> -->
-			<view class="resu uni-row">
-				<view class="label">检查结果</view>
-				<input :disabled="!editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.checkResult }}</view> -->
-			</view>
-			<view class="resu uni-row">
-				<view class="label">超差范围</view>
-				<input :disabled="!editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.exceedLimits }}</view> -->
-			</view>
-			<view class="resu uni-row">
-				<view :class="!editable() ? 'label' : ''">检查量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
-					v-model="item.examiningNum" placeholder="" />
-			<!-- 	<view v-else class="number value">{{ item.examiningNum }}</view> -->
-				<view :class="!editable() ? 'label' : ''">不良品量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
-					v-model="item.disqualificationNum" placeholder="" />
-				<!-- <view v-else class="value">{{ item.disqualificationNum }}</view> -->
-			</view>
+	<view class="resu uni-row">
+		<view class="label">检查结果</view>
+		<input v-if="editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
+		<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
+	</view>
+	<view class="resu uni-row">
+		<view class="label">超差范围</view>
+		<input v-if="editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
+		<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
+	</view>
+	<view class="resu uni-row">
+		<view :class="!editable() ? 'label' : ''">检查量</view>
+		<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
+			v-model="item.examiningNum" placeholder="" />
+		<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
+		<view :class="!editable() ? 'label' : ''" style="margin-left: 16rpx;">不良品量</view>
+		<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
+			v-model="item.disqualificationNum" placeholder="" />
+		<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
+	</view>
 			</view>
 		</view>
 
@@ -124,11 +124,12 @@
 			</view>
 			<view v-if="editable()"  class="remark uni-row">
 				<view class="label">备注</view>
-				<textarea :disabled="!editable()" v-model="processInspecion.remark" />
+				<textarea v-if="editable()" v-model="processInspecion.remark" />
+				<view v-else class="value">{{ processInspecion.remark }}</view>
 			</view>
 
 			<view  class="btns-container uni-row">
-				<view  class="finished-btn" @click="endWork">提交</view>
+				<view class="finished-btn" @click="endWork">提交</view>
 				<view v-if="editable()" class="question-btn uni-column" @click.stop="handleAddConsultation">
 					<uni-icons type="headphones" size="24" />
 					<text>咨询</text>
@@ -182,7 +183,10 @@
 	})
 	const initStatus = ref(0)
 	const editable = () => {
-      if (store.userInfo.roles.some(item => item.roleKey == 'firstArticleInspection')) {
+		if (initStatus.value == 0 && store.userInfo.roles.some(item => item.roleKey == 'firstArticleInspection')) {
+			return true
+		}
+      if (store.userInfo.roles.some(item => item.roleKey == 'firstArticleInspection') && processInspecion.value.firstUpdaterId == store.userInfo.userId) {
 			return true
 		} else {
 			return false
@@ -679,6 +683,9 @@
 					font-size: 28rpx;
 				}
 			}
+		.uni-input-input:disabled {
+		    background-color: #f5f7fa;
+		}
 
 			.result {
 				align-items: center;
@@ -821,4 +828,5 @@
 			transform: scale(0.7);
 		}
 	}
+	input:disabled {background-color: #00ff00;}
 </style>

pages/firstInspection/instrumentRoomForm.vue

@@ -59,23 +59,23 @@
 			</view>
 			<view class="resu uni-row">
 				<view class="label">检查结果</view>
-				<input :disabled="true" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.checkResult }}</view> -->
+				<input v-if="editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view class="label">超差范围</view>
-				<input :disabled="true" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.exceedLimits }}</view> -->
+				<input v-if="editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view :class="!editable() ? 'label' : ''">检查量</view>
-				<input :disabled="true" class="number" type="number" @blur="rejectNumberChange"
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.examiningNum" placeholder="" />
-			<!-- 	<view v-else class="number value">{{ item.examiningNum }}</view> -->
-				<view :class="!editable() ? 'label' : ''">不良品量</view>
-				<input :disabled="true" class="number" type="number" @blur="rejectNumberChange"
+				<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
+				<view :class="!editable() ? 'label' : ''" style="margin-left: 16rpx;">不良品量</view>
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.disqualificationNum" placeholder="" />
-				<!-- <view v-else class="value">{{ item.disqualificationNum }}</view> -->
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 			</view>
 			</view>
 		</view>
@@ -789,4 +789,7 @@
 			transform: scale(0.7);
 		}
 	}
+	.uni-input-input:disabled {
+	    background-color: #f5f7fa;
+	}
 </style>

pages/firstInspection/scan.vue

@@ -81,7 +81,7 @@
 	import {
 		getLotInfoByFirstInspection,
 		getCarrierInfoProcess,
-		getCarrierInfo,
+		getFirstCarrierInfo,
 	} from '@/api/business/processInspection.js'
 	import {
 		debounce
@@ -194,7 +194,7 @@
 					result.processCode = store.outsourcedCode;
 					// console.log(result.processCode)
 					/************************ 根据扫码查询到的数据和需要检查的工序查询信息 ************************/
-					getCarrierInfo(result).then(response => {
+					getFirstCarrierInfo(result).then(response => {
 						if (response.code == 200) {
 							// 判断是哪种返回值 假设是想信息则给lot附检查箱信息
 							// 假设是dayworkCarriers 则 判断是几个批次，假设为多批，则弹出选择框。
@@ -229,9 +229,9 @@
 			const result = {
 				dayworkId: store.dayworkInfo.id,
 				deptId: store.curDeptDetails.deptId,
-				carrierCode: '300045'
+				carrierCode: '100023'
 			}
-			getCarrierInfo(result).then(response => {
+			getFirstCarrierInfo(result).then(response => {
 				if (response.code == 200) {
 					// 判断是哪种返回值 假设是想信息则给lot附检查箱信息
 					// 假设是dayworkCarriers 则 判断是几个批次，假设为多批，则弹出选择框。

pages/instrumentRoomInspection/form.vue

@@ -59,23 +59,23 @@
 			</view>
 			<view class="resu uni-row">
 				<view class="label">检查结果</view>
-				<input :disabled="!editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.checkResult }}</view> -->
+				<input v-if="editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view class="label">超差范围</view>
-				<input :disabled="!editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.exceedLimits }}</view> -->
+				<input v-if="editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view :class="!editable() ? 'label' : ''">检查量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.examiningNum" placeholder="" />
-				<!-- <view v-else class="number value">{{ item.examiningNum }}</view> -->
-				<view :class="!editable() ? 'label' : ''">不良品量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+				<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
+				<view :class="!editable() ? 'label' : ''" style="margin-left: 16rpx;">不良品量</view>
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.disqualificationNum" placeholder="" />
-				<!-- <view v-else class="value">{{ item.disqualificationNum }}</view> -->
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 			</view>
 			</view>
 		</view>
@@ -105,7 +105,8 @@
 			</view>
 			<view class="remark uni-row">
 				<view class="label">备注</view>
-				<textarea :disabled="!editable()" v-model="processInspecion.remark" />
+				<textarea v-if="editable()" v-model="processInspecion.remark" />
+				<view v-else class="value">{{ processInspecion.remark }}</view>
 			</view>
 
 			<view v-if="editable()" class="btns-container uni-row">

pages/onSiteInspection/form.vue

@@ -59,23 +59,23 @@
 			</view>
 			<view class="resu uni-row">
 				<view class="label">检查结果</view>
-				<input :disabled="!editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.checkResult }}</view> -->
+				<input v-if="editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view class="label">超差范围</view>
-				<input :disabled="!editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
-				<!-- <view v-else class="value">{{ item.exceedLimits }}</view> -->
+				<input v-if="editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 			</view>
 			<view class="resu uni-row">
 				<view :class="!editable() ? 'label' : ''">检查量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.examiningNum" placeholder="" />
-			<!-- 	<view v-else class="number value">{{ item.examiningNum }}</view> -->
-				<view :class="!editable() ? 'label' : ''">不良品量</view>
-				<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+				<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
+				<view :class="!editable() ? 'label' : ''" style="margin-left: 16rpx;">不良品量</view>
+				<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 					v-model="item.disqualificationNum" placeholder="" />
-				<!-- <view v-else class="value">{{ item.disqualificationNum }}</view> -->
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 			</view>
 			</view>
 		</view>
@@ -121,7 +121,8 @@
 			</view>
 			<view class="remark uni-row">
 				<view class="label">备注</view>
-				<textarea :disabled="!editable()" v-model="processInspecion.remark" />
+				<textarea v-if="editable()" v-model="processInspecion.remark" />
+				<view v-else class="value">{{ processInspecion.remark }}</view>
 			</view>
 
 			<view v-if="editable()" class="btns-container uni-row">
@@ -826,4 +827,7 @@
 			transform: scale(0.7);
 		}
 	}
+	.uni-input-input:disabled {
+	    background-color: #f5f7fa;
+	}
 </style>

pages/outsourcedInspection/form.vue

@@ -90,27 +90,31 @@
 					<input class="number" type="number" @blur="rejectNumberChange" v-model="item.rejectNum"
 						placeholder="" />
 				</view> -->
-				<view class="resu uni-row">
-					<view class="label">检查结果</view>
-					<input :disabled="!editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
-					<!-- <view v-else class="value">{{ item.checkResult }}</view> -->
-				</view>
-				<view class="resu uni-row">
-					<view class="label">超差范围</view>
-					<input :disabled="!editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
-					<!-- <view v-else class="value">{{ item.exceedLimits }}</view> -->
-				</view>
+		<view class="resu uni-row">
+				<view class="label">检查结果</view>
+				<input v-if="editable()" v-model="item.checkResult" placeholder="请输入检查结果" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
+			</view>
+			<view class="resu uni-row">
+				<view class="label">超差范围</view>
+				<input v-if="editable()" v-model="item.exceedLimits" placeholder="请输入超差范围" maxlength="50" />
+				<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
+			</view>
 				<view class="resu uni-row">
 					<view :class="!editable() ? 'label' : ''">检查量</view>
-					<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+					<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 						v-model="item.examiningNum" placeholder="" />
-					<!-- 	<view v-else class="number value">{{ item.examiningNum }}</view> -->
+						<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
+						
 					<view :class="!editable() ? 'label' : ''">不良品量</view>
-					<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+					<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 						v-model="item.disqualificationNum" placeholder="" />
+					<view v-else class="number value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
+					
 					<view :class="!editable() ? 'label' : ''">废品量</view>
-					<input :disabled="!editable()" class="number" type="number" @blur="rejectNumberChange"
+					<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 						v-model="item.rejectNum" placeholder="" />
+					<view v-else class="number value" style="margin-left:16rpx;">{{ item.rejectNum }}</view>
 				</view>
 			</view>
 		</view>
@@ -941,4 +945,7 @@
 			}
 		}
 	}
+	.uni-input-input:disabled {
+	    background-color: #f5f7fa;
+	}
 </style>