Merge remote-tracking branch 'origin/master'

pages/drawingMenu/index.vue

@@ -4,7 +4,8 @@
 			<view class="margenTop" style="font-size: 30rpx;font-weight: bold;">批次号：{{product.lotCode}}</view>
 			<view class="margenTop" style="font-size: 30rpx;font-weight: bold;">产品描述：{{product.productDescription}}
 			</view>
-			<view class="margenTop" style="font-size: 30rpx;font-weight: bold;    flex-direction: row;">
+			<view class="margenTop"
+				style="font-size: 30rpx;font-weight: bold;    flex-direction: row; display: inline-block; line-height: 35px; height: 35px;">
 				<view>工艺版本：{{product.technologyVersion}}</view>
 				<view style="margin-left: 200rpx;">工序：</view>
 				<uni-data-select v-model="curSelectedProcessCode" :localdata="selectedProcessList" :clear="false"
@@ -73,6 +74,12 @@
 				text: v.processAlias,
 				value: v.processCode
 			}))
+			if (!selectedProcessList.value.some(v => v.value == processCode.value)) {
+				selectedProcessList.value.push({
+					text: processAlias.value,
+					value: processCode.value
+				})
+			}
 			curSelectedProcessCode.value = processCode.value
 		})
 	}

pages/queryLotInfo/index.vue

@@ -16,7 +16,7 @@
 			<view v-if="lotData==null" class="no-date">
 				<text>暂无数据</text>
 			</view>
-			<view v-else >
+			<view v-else>
 				<view class="item-info uni-row" style="margin-top: 16rpx;"> <text class="label">批次号:</text>
 					<text class="label right" style="font-size: 30rpx;color: black;">{{ lotData['lotCode'] }}</text>
 				</view>
@@ -67,7 +67,7 @@
 				<view class="item-info uni-row">
 					<text class="label">批次状态:</text>
 					<text
-						class="label right">{{ lotData['status'] == 1 ?"进行中":lotData['status'] == 3?"周转中":lotData['status'] == 2?"待周转":lotData['status'] == 4?"已送达":lotData['status'] == 5?"已完成":"未开始"}}</text>
+						class="label right">{{ lotData['status'] == 1 ?"进行中":lotData['status'] == 3?"周转中":lotData['status'] == 2?"待领取":lotData['status'] == 4?"已送达":lotData['status'] == 5?"已完成":"未开始"}}</text>
 				</view>
 			</view>
 		</view>
@@ -196,7 +196,7 @@
 						<text class="label">检测项目:</text>
 						<text class="label right">{{ info['checkStandard']}}</text>
 					</view>
-					<view  class="item-info uni-row">
+					<view class="item-info uni-row">
 						<text class="label">检测结果:</text>
 						<text class="label right">{{ info['checkResult'] !=""?info['checkResult'] :'-'}}</text>
 					</view>
@@ -286,17 +286,17 @@
 			</view>
 		</view>
 		<uni-drawer ref="showRight" mode="right" :mask-click="true">
-				<view style="text-align: center; font-size: 48rpx; padding: 48rpx 0 24rpx 0;">工艺列表</view>
-				<view style="font-size: 24rpx;text-align: center;color: red; margin-bottom: 16rpx;">
-					蓝色工序为当前工序
-				</view>
-				<scroll-view scroll-y="true" style="height: 82%;" @touchmove.stop>
-					<view v-for="(item,index) in curProcessAfte" :key="index"
-						style="padding: 8rpx 5% 8rpx 14%; border-top: 1px solid #cccccc">
-						<text :style="{ color: showStatusColor(item) }">{{ index + 1 }}.{{item.processAlias}}</text>
-					</view>
-				</scroll-view>
-			</uni-drawer>
+			<view style="text-align: center; font-size: 48rpx; padding: 48rpx 0 24rpx 0;">工艺列表</view>
+			<view style="font-size: 24rpx;text-align: center;color: red; margin-bottom: 16rpx;">
+				蓝色工序为当前工序
+			</view>
+			<scroll-view scroll-y="true" style="height: 82%;" @touchmove.stop>
+				<view v-for="(item,index) in curProcessAfte" :key="index"
+					style="padding: 8rpx 5% 8rpx 14%; border-top: 1px solid #cccccc">
+					<text :style="{ color: showStatusColor(item) }">{{ index + 1 }}.{{item.processAlias}}</text>
+				</view>
+			</scroll-view>
+		</uni-drawer>
 	</scroll-view>
 	<view class="bottom-btn-container uni-row">
 		<button class="bottom-btn" @click="init()">扫码查询</button>
@@ -413,14 +413,13 @@
 						carrierCode: vehicleObj.carrierCode,
 					}).then(response => {
 						if (response.code == 200) {
-							if(response.data.length>0) {
-								if(response.data.length > 1){
-								selectLotDialog.value.open(response.data);
-								}else{
+							if (response.data.length > 0) {
+								if (response.data.length > 1) {
+									selectLotDialog.value.open(response.data);
+								} else {
 									handleDoIt(response.data[0])
 								}
-							}
-							else {
+							} else {
 								uni.showToast({
 									icon: 'none',
 									title: "该箱未绑定批次,请重新扫码",
@@ -432,26 +431,26 @@
 				}
 			);
 		} else {
-		// 测试时用
-		getDayworkCarrierByCarrierCode({
-			carrierCode: '000390'
-		}).then(res => {
-			if (res.code == 200) {
-				if (res.data.length > 0) {
-					if(res.data.length > 1){
-					selectLotDialog.value.open(res.data);
-					}else{
-						handleDoIt(res.data[0])
+			// 测试时用
+			getDayworkCarrierByCarrierCode({
+				carrierCode: '000390'
+			}).then(res => {
+				if (res.code == 200) {
+					if (res.data.length > 0) {
+						if (res.data.length > 1) {
+							selectLotDialog.value.open(res.data);
+						} else {
+							handleDoIt(res.data[0])
+						}
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "该箱未绑定批次,请重新扫码",
+							duration: 2000
+						})
 					}
-				} else {
-					uni.showToast({
-						icon: 'none',
-						title: "该箱未绑定批次,请重新扫码",
-						duration: 2000
-					})
 				}
-			}
-		})
+			})
 		}
 	}
 
@@ -539,33 +538,28 @@
 	}
 	//获得检测类型
 	function getType(data) {
-		if(data == "outsourcedInspection") {
+		if (data == "outsourcedInspection") {
 			return "外协检"
-		}
-		else if(data == "patrolInspection") {
+		} else if (data == "patrolInspection") {
 			return "巡检"
-		}
-		else if(data == "deliveryInspection") {
+		} else if (data == "deliveryInspection") {
 			return "交检"
-		}
-		else if(data == "factoryInspection") {
+		} else if (data == "factoryInspection") {
 			return "出厂检"
-		}
-		else if(data == "firstArticleInspection") {
+		} else if (data == "firstArticleInspection") {
 			return "首件检"
-		}
-		else{
+		} else {
 			return "仪器室检"
 		}
 	}
 	const showStatusColor = (item) => {
 		// console.log(status)
-		console.log(item,111)
-		console.log(lotData.value,222)
-		if(item.processStepNumber == lotData.value.currentProcess.processStepNumber){
+		console.log(item, 111)
+		console.log(lotData.value, 222)
+		if (item.processStepNumber == lotData.value.currentProcess.processStepNumber) {
 			return '#3482ff'
 		}
-		
+
 	}
 	const handleClickTab = (val) => {
 		//scrollTop.value = top
@@ -666,7 +660,7 @@
 			width: 80%;
 			background-color: rgba(213, 213, 213, 1);
 			border: 1rpx solid rgba(213, 213, 213, 1);
-			margin:16px 0;
+			margin: 16px 0;
 		}
 
 		.item-info {