0228

components/dialog-lot/dialog-lot.vue

@@ -25,7 +25,7 @@
 					<text class="label value">{{item['daywork'].temporaryProcessQualifiedNum}}</text>
 				</view>
 				<view class="list-container-item uni-row" style="border-radius: 0 0 8rpx 8rpx;">
-					<text class="label">上道工序</text>
+					<text class="label">已完成工序</text>
 					<text class="label value">{{item['process'].processAlias}}</text>
 				</view>
 			</view>

components/dialog-lotInfo/dialog-lotInfo.vue

@@ -13,7 +13,8 @@
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">产品描述</text>
-				<text class="label right">{{ store.planDetails['productDescription'] ? store.planDetails['productDescription'] : '-' }}</text>
+				<text
+					class="label right">{{ store.planDetails['productDescription'] ? store.planDetails['productDescription'] : '-' }}</text>
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">箱号</text>
@@ -21,15 +22,17 @@
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">投入数</text>
-				<text class="label right">{{lotData['processQualifiedNum'] == 0 ? lotData['productionQuantity'] : lotData['processQualifiedNum']}}</text>
+				<text
+					class="label right">{{lotData['processQualifiedNum'] == 0 ? lotData['productionQuantity'] : lotData['processQualifiedNum']}}</text>
 			</view>
 			<view class="item-info uni-row">
-				<text class="label">上道工序</text>
+				<text class="label">已完成工序</text>
 				<text class="label right">{{ lotData.prevProcess ? lotData['prevProcess'].processAlias : '-'}}</text>
 			</view>
 			<view class="item-info uni-row">
-				<text class="label">当前工序</text>
-				<text class="label right">{{ lotData.currentProcess ? lotData['currentProcess'].processAlias : '-'}}</text>
+				<text class="label">待加工工序</text>
+				<text
+					class="label right">{{ lotData.currentProcess ? lotData['currentProcess'].processAlias : '-'}}</text>
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">下道工序</text>
@@ -37,7 +40,7 @@
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">所在区域</text>
-				<text class="label right">{{ lotData['place'] ? lotData['place'] : '-' }}</text>
+				<text class="label right">{{ getPlaceText(lotData)}}</text>
 			</view>
 			<view class='middle'>
 				<view class='segment'></view>
@@ -47,11 +50,13 @@
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">炉号</text>
-				<text id="manufacturer" class="label right">{{ furnaceNoInfo.furnaceNumber ? furnaceNoInfo.furnaceNumber : '-'}}</text>
+				<text id="manufacturer"
+					class="label right">{{ furnaceNoInfo.furnaceNumber ? furnaceNoInfo.furnaceNumber : '-'}}</text>
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">计划单号</text>
-				<text id="manufacturer" class="label right">{{ furnaceNoInfo.productionPlanNo ? furnaceNoInfo.productionPlanNo : '-'}}</text>
+				<text id="manufacturer"
+					class="label right">{{ furnaceNoInfo.productionPlanNo ? furnaceNoInfo.productionPlanNo : '-'}}</text>
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">序号</text>
@@ -79,7 +84,8 @@
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">原料编码</text>
-				<text class="label right">{{ furnaceNoInfo.rawMaterialCode ? furnaceNoInfo.rawMaterialCode : '-' }}</text>
+				<text
+					class="label right">{{ furnaceNoInfo.rawMaterialCode ? furnaceNoInfo.rawMaterialCode : '-' }}</text>
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">来料日期</text>
@@ -87,11 +93,13 @@
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">技术要求1</text>
-				<text class="label right">{{ furnaceNoInfo.firstTechnicalRequirement ? furnaceNoInfo.firstTechnicalRequirement : '-' }}</text>
+				<text
+					class="label right">{{ furnaceNoInfo.firstTechnicalRequirement ? furnaceNoInfo.firstTechnicalRequirement : '-' }}</text>
 			</view>
 			<view class="item-info uni-row">
 				<text class="label">技术要求2</text>
-				<text class="label right">{{ furnaceNoInfo.secondTechnicalRequirement ? furnaceNoInfo.secondTechnicalRequirement : '-' }}</text>
+				<text
+					class="label right">{{ furnaceNoInfo.secondTechnicalRequirement ? furnaceNoInfo.secondTechnicalRequirement : '-' }}</text>
 			</view>
 		</view>
 
@@ -131,6 +139,13 @@
 		})
 	}
 
+	function getPlaceText(item) {
+		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
+			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+		let deptName = item.dayworkItemList[0].deptName
+		return place == "-" ? deptName + "-" : deptName + "-" + place
+	}
+
 	function close() {
 		baseDialog.value.close()
 	}
@@ -189,20 +204,20 @@
 
 		}
 	}
-	
+
 	.middle {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: center
 	}
-	
+
 	.segment {
 		width: 80rpx;
 		background-color: rgba(213, 213, 213, 1);
 		border: 1rpx solid rgba(213, 213, 213, 1);
 	}
-	
+
 	.lotTitle {
 		margin: 16rpx 16rpx 16rpx 0;
 	}

components/dialog-outsourceLot/dialog-outsourceLot.vue

@@ -25,7 +25,7 @@
 					<text class="label value">{{item['daywork'].temporaryProcessQualifiedNum}}</text>
 				</view>
 				<view class="list-container-item uni-row" style="border-radius: 0 0 8rpx 8rpx;">
-					<text class="label">上道工序</text>
+					<text class="label">已完成工序</text>
 					<text class="label value">{{item['process'].processAlias}}</text>
 				</view>
 			</view>

pages/assistDaywork/index.vue

@@ -75,11 +75,11 @@
 						class="label right">{{ item.prevProcess == null ? item['productionQuantity']  : item['processQualifiedNum']}}</text>
 				</view>
 				<view class="item-info uni-row">
-					<text class="label">上道工序</text>
+					<text class="label">已完成工序</text>
 					<text class="label right">{{ item.prevProcess ? item['prevProcess'].processAlias : '-'}}</text>
 				</view>
 				<view class="item-info uni-row">
-					<text class="label">当前工序</text>
+					<text class="label">待加工工序</text>
 					<!-- <text
 						class="label right">{{ item.currentProcess ? item.prevProcess && item['currentProcess'].processAlias == item['prevProcess'].processAlias ? '-' : item['currentProcess'].processAlias : '-'}}</text> -->
 					<text
@@ -99,7 +99,7 @@
 				</view>
 				<view v-if="notPreProcess" class="item-info uni-row">
 					<text class="label">所在区域</text>
-					<text class="label right">{{ item['place'] ? item['place'] : '-' }}</text>
+					<text class="label right">{{ getPlaceText(item) }}</text>
 				</view>
 				<view
 					v-if="item['dayworkItemList'] && item['dayworkItemList'].length >0 && item['dayworkItemList'][0].status >3"
@@ -268,6 +268,13 @@
 	function reflush() {
 		init();
 	}
+
+	function getPlaceText(item) {
+		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
+			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+		let deptName = item.dayworkItemList[0].deptName
+		return place == "-" ? deptName + "-" : deptName + "-" + place
+	}
 	//扫码
 	function handleScan() {
 		// 引入原生插件

pages/batchReporting/index.vue

@@ -70,11 +70,11 @@
 						class="label right">{{ item.prevProcess == null ? item['productionQuantity']  : item['processQualifiedNum']}}</text>
 				</view>
 				<view class="item-info uni-row">
-					<text class="label">上道工序</text>
+					<text class="label">已完成工序</text>
 					<text class="label right">{{ item.prevProcess ? item['prevProcess'].processAlias : '-'}}</text>
 				</view>
 				<view class="item-info uni-row">
-					<text class="label">当前工序</text>
+					<text class="label">待加工工序</text>
 					<!-- <text
 						class="label right">{{ item.currentProcess ? item.prevProcess && item['currentProcess'].processAlias == item['prevProcess'].processAlias ? '-' : item['currentProcess'].processAlias : '-'}}</text> -->
 					<text
@@ -94,7 +94,7 @@
 				</view> -->
 				<view v-if="notPreProcess" class="item-info uni-row">
 					<text class="label">所在区域</text>
-					<text class="label right">{{ item['place'] ? item['place'] : '-' }}</text>
+					<text class="label right">{{ getPlaceText(item) }}</text>
 				</view>
 				<view
 					v-if="item['dayworkItemList'] && item['dayworkItemList'].length >0 && item['dayworkItemList'][0].status >3"
@@ -272,6 +272,12 @@
 		reflush();
 	})
 
+	function getPlaceText(item) {
+		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
+			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+		let deptName = item.dayworkItemList[0].deptName
+		return place == "-" ? deptName + "-" : deptName + "-" + place
+	}
 
 	onShow(() => {
 		reflush();

pages/batchReportingOutsource/index.vue

@@ -70,11 +70,11 @@
 						class="label right">{{ item.prevProcess == null ? item['productionQuantity']  : item['processQualifiedNum']}}</text>
 				</view>
 				<view class="item-info uni-row">
-					<text class="label">上道工序</text>
+					<text class="label">已完成工序</text>
 					<text class="label right">{{ item.prevProcess ? item['prevProcess'].processAlias : '-'}}</text>
 				</view>
 				<view class="item-info uni-row">
-					<text class="label">当前工序</text>
+					<text class="label">待加工工序</text>
 					<!-- <text
 						class="label right">{{ item.currentProcess ? item.prevProcess && item['currentProcess'].processAlias == item['prevProcess'].processAlias ? '-' : item['currentProcess'].processAlias : '-'}}</text> -->
 					<text
@@ -94,7 +94,7 @@
 				</view> -->
 				<view v-if="notPreProcess" class="item-info uni-row">
 					<text class="label">所在区域</text>
-					<text class="label right">{{ item['place'] ? item['place'] : '-' }}</text>
+					<text class="label right">{{ getPlaceText(item) }}</text>
 				</view>
 				<view
 					v-if="item['dayworkItemList'] && item['dayworkItemList'].length >0 && item['dayworkItemList'][0].status >3"
@@ -256,6 +256,13 @@
 
 	})
 
+	function getPlaceText(item) {
+		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
+			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+		let deptName = item.dayworkItemList[0].deptName
+		return place == "-" ? deptName + "-" : deptName + "-" + place
+	}
+
 	// 页面下拉刷新操作
 	onPullDownRefresh(() => {
 		uni.stopPullDownRefresh();

pages/index/index.vue

@@ -119,8 +119,9 @@
 		initBaseUrl();
 		getCurrentVersion()
 		//getUser();
-		// !useInnerUrl.value && 
+		// !useInnerUrl.value &&
 		setTimeout(doCheckUpdata, 500)
+
 		initPdfUrl();
 	})
 

pages/queryLotInfo/index.vue

@@ -37,12 +37,12 @@
 					<text class="label right">{{ lotData['totalQuantityNum']}}</text>
 				</view>
 				<view class="item-info uni-row">
-					<text class="label">上道工序:</text>
+					<text class="label">已完成工序:</text>
 					<text
 						class="label right">{{ lotData.prevProcess && lotData['prevProcess'] != "" ? lotData['prevProcess'].processAlias : '-'}}</text>
 				</view>
 				<view class="item-info uni-row">
-					<text class="label">当前工序:</text>
+					<text class="label">待加工工序:</text>
 					<view class="label right uni-row">
 						<text
 							class="label right">{{ lotData.currentProcess && lotData['currentProcess'] != "" ? lotData['currentProcess'].processAlias : '-'}}</text>
@@ -69,6 +69,10 @@
 					<text
 						class="label right">{{ lotData['status'] == 1 ?"进行中":lotData['status'] == 3?"周转中":lotData['status'] == 2?"待领取":lotData['status'] == 4?"已送达":lotData['status'] == 5?"已完成":"未开始"}}</text>
 				</view>
+				<view class="item-info uni-row">
+					<text class="label">所在区域:</text>
+					<text class="label right">{{getPlaceText(lotData)}}</text>
+				</view>
 			</view>
 		</view>
 		<!-- 领料信息 -->
@@ -581,6 +585,15 @@
 			return "仪器室检"
 		}
 	}
+
+	function getPlaceText(item) {
+		let place = item.dayworkItemList[item.dayworkItemList.length - 1].place == "" ? item.dayworkItemList[item
+				.dayworkItemList.length - 1].turnoverArea == "" ?
+			'-' : item.dayworkItemList[item.dayworkItemList.length - 1].turnoverArea : item.dayworkItemList[item
+				.dayworkItemList.length - 1].place
+		let deptName = item.dayworkItemList[item.dayworkItemList.length - 1].deptName
+		return place == "-" ? deptName + "-" : deptName + "-" + place
+	}
 	const showStatusColor = (item) => {
 		// console.log(status)
 		console.log(item, 111)