11.18

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -24,7 +24,7 @@
 			</view>
 	<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)" />
+		<switch class="switch" @change="switchChange" :checked="normalStatus" style="transform: scale(0.8);align-items: center;font-size:32rpx ;" color="rgba(103, 195, 55, 1.0)" />
 		<text class="label">是</text>
 	</view>
 	<view class="list-title">

pages/queryLotInfo/index.vue

@@ -189,7 +189,7 @@
 					<text class="label right">{{ item['processAlias'] }}</text>
 				</view>
 				<view class="item-info uni-row"> <text class="label">检查员:</text>
-					<text class="label right ">{{ item['nickName'] }}</text>
+					<text class="label right ">{{ item['reviewerName'] }}</text>
 				</view>
 				<view v-if="item.processInspectionDetails && item.processInspectionDetails.length>0" v-for="(info, index) in item.processInspectionDetails" :key="index">
 					<view class="item-info uni-row">

pages/sortProductionPlan/details.vue

@@ -1,16 +1,16 @@
 <template>
 	<view class="page-container uni-column" style="padding: 24rpx;box-sizing: border-box;">
-		<view class="box-bg uni-row">
+		<view class="box-bg uni-row" style="height: 10%;">
 			<view class="input-view uni-row">
 				<uni-icons class="input-uni-icon" type="search" size="18" color="#999" />
 				<input class="nav-bar-input" type="text" v-model="keywords" placeholder="输入搜索关键词" />
 			</view>
 			<view class="search" @click="handleSearch">搜索</view>
 		</view>
-		<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
+		<view v-if="listData.length == 0" style="color: #999;margin:90% auto;height: 90%;">
 			<text>暂无周转到该工段批次</text>
 		</view>
-		<view class="uni-column" v-else >
+		<view class="uni-column" v-else style="overflow: scroll;" >
 			<view v-for="(item, index) in listData" :key="index"
 				class="list-item">
 				<view class="title-container uni-row">

pages/sorting/form.vue

@@ -371,13 +371,14 @@ uni.navigateTo({
 
 	/***************************** 定义了一些事件 *****************************/
 	// 添加不合格信息
-	const handleAddUnfit = () => {
+	async function handleAddUnfit() {
 		// 监听事件
 		uni.$once('addUnfitInfoEvent', (data) => {
 			addUnfitInfo(data)
 		})
-		console.log(getHasInstruction())
-		if(!getHasInstruction()){
+  const hasInstruction = await getHasInstruction();
+    console.log(hasInstruction); // 这将打印 true 或 false
+    if (!hasInstruction) {
 			uni.navigateTo({
 				url: "/pages/sorting/specialOptions",
 				success: (res) => {
@@ -414,7 +415,7 @@ uni.navigateTo({
 		})
 		}
 	}
-	function getHasInstruction(){
+	async function getHasInstruction(){
 				const res = selectInstructionList({
 					technologicalProcessId: dayworkItem.value.technologicalProcessId,
 					processCode: dayworkItem.value.processCode,
@@ -422,7 +423,6 @@ uni.navigateTo({
 				}).then(res=> {
 				return res.data
 			})
-			return res
 	}
 	// 删除不合格信息
 	const handleDelUnfit = (index) => {