From 254fae52317802bab6d924cbba06aafd17960caf Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Thu, 23 May 2024 15:25:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20update=20=E7=A6=BB=E7=BA=BF=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productOffline/createProductOffline.vue   | 88 +++++++++++++------
 .../mes/workScheduling/workScheduling.vue     |  9 +-
 2 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/src/pages/mes/productOffline/createProductOffline.vue b/src/pages/mes/productOffline/createProductOffline.vue
index 2bca023..0343362 100644
--- a/src/pages/mes/productOffline/createProductOffline.vue
+++ b/src/pages/mes/productOffline/createProductOffline.vue
@@ -1,12 +1,12 @@
 <template>
 	<!-- 列表展示标准模版 -->
-	<view>
+	<view class="detail-container">
 		<u-form :model="form">
 			<view>
 				<u-form-item label="产品编码" prop="productCode">
 					<view>
-						<u-input v-model="form.productCode" type="select" @click="showProduct = true"  placeholder="请选择产品编码"/>
-						<!-- <u-input v-model="form.productCode" disabled="true"/> -->
+						<u-input v-model="form.productCode" disabled="true"   placeholder="请选择产品编码"/>
+						<!-- <u-input v-model="form.productCode" type="select" @click="showProduct = true" disabled="true"/> -->
 					</view>
 				</u-form-item>
 			</view>
@@ -45,6 +45,13 @@
 					</view>
 				</u-form-item>
 			</view>
+			<view>
+				<u-form-item label="质检人员" prop="checkPersonCode">
+					<view>
+						<u-input v-model="form.checkPersonCode" />
+					</view>
+				</u-form-item>
+			</view>
 			<view>
 				<u-form-item label="离线原因" prop="offlineReson">
 					<view>
@@ -52,16 +59,18 @@
 					</view>
 				</u-form-item>
 			</view>
+			<view class="btns">
+				<button class="sure" @click="handleSubmit" :loading='loading' :disabled='loading'>提交处理</button>
+			</view>
 		</u-form>
-		<view class="footer">
+<!-- 		<view class="footer" >
 			<view class="btns">
 				<button class="sure" @click="handleSubmit" :loading='loading' :disabled='loading'>提交处理</button>
 			</view>
 			<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
-		</view>
-		<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
+		</view> -->
 	</view>
-		<u-select v-model="showProduct" :list="productList" @confirm="selectProduct"></u-select>
+		<view><u-select v-model="showProduct" :list="productList" @confirm="selectProduct"></u-select></view>
 </template>
 
 <script setup lang="ts">
@@ -95,6 +104,7 @@
 		offlineReson:'',
 		productDestination:'',
 		name:'',
+		checkPersonCode:''
 	})
 	/*分页参数*/
 	const params = ref({
@@ -104,31 +114,47 @@
 	})
 	// 提交处理请求函数
 	function handleSubmit(){
-		if(form.value.productCode!=''){
-			proxy.$modal.confirm('确定提交处理吗').then(() => {
-				proxy.$modal.loading('加载中')
-				loading.value = true
-				productOfflineApi.create(form.value).then((res) => {
-					proxy.$modal.closeLoading()
-					if (res.data) {
-						proxy.$modal.showToast('成功')
-						setTimeout(() => {
-							proxy.$tab.navigateBack()
-							loading.value = false
-						}, 1500)
-					} else {
-						proxy.$modal.showToast('失败')
+		if(form.value.productDestination == ''){
+			proxy.$modal.showToast('产品去向不能为空')
+			setTimeout(() => {
+				proxy.$modal.closeLoading()
+			}, 1000)
+			return ; 
+		}
+		if(form.value.checkPersonCode == ''){
+			proxy.$modal.showToast('质检人员不能为空')
+			setTimeout(() => {
+				proxy.$modal.closeLoading()
+			}, 1000)
+			return ; 
+		}
+		if(form.value.offlineReson == ''){
+			proxy.$modal.showToast('离线原因不能为空')
+			setTimeout(() => {
+				proxy.$modal.closeLoading()
+			}, 1000)
+			return ; 
+		}
+		proxy.$modal.confirm('确定提交处理吗').then(() => {
+			proxy.$modal.loading('加载中')
+			loading.value = true
+			productOfflineApi.create(form.value).then((res) => {
+				proxy.$modal.closeLoading()
+				if (res.data) {
+					proxy.$modal.showToast('成功')
+					setTimeout(() => {
+						proxy.$tab.navigateBack()
 						loading.value = false
-					}
-				}).catch(() => {
-					proxy.$modal.closeLoading()
+					}, 1500)
+				} else {
+					proxy.$modal.showToast('失败')
 					loading.value = false
-				})
+				}
+			}).catch(() => {
+				proxy.$modal.closeLoading()
+				loading.value = false
 			})
-		}
-		else{
-			proxy.$modal.showToast('请先选择产品编码')
-		}
+		})
 	}
 	// 选择产品回调函数
 	function selectProduct(index){
@@ -203,6 +229,10 @@
 </script>
 
 <style lang="scss" scoped>
+	.detail-container {
+		min-height: 100vh;
+		background: white;
+	}
 	
 	.footer {
 		position: fixed;
diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue
index a83ef08..2fcddf5 100644
--- a/src/pages/mes/workScheduling/workScheduling.vue
+++ b/src/pages/mes/workScheduling/workScheduling.vue
@@ -139,13 +139,13 @@
 						@click="kaigong(item)">开工</u-button>
 					<u-button type="success" size="mini" @click="SOP(item)" class="btn"
 						style="background-color:#aa5500">SOP</u-button>
-					<u-button v-if="item.flagDo==0 && item.status==1" type="primary" size="mini"
+					<u-button v-if="item.flagDo==0 && item.status==1 && item.workingNode != 'endNode'" type="primary" size="mini"
 						@click="callBasicItem(item)" class="btn">叫料</u-button>
-					<u-button v-if="item.flagDo==0 && item.status==1" type="error" size="mini"
+					<u-button v-if="item.flagDo==0 && item.status==1 && item.workingNode != 'endNode'" type="error" size="mini"
 						@click="addBasicItem(item)" class="btn">补料</u-button>
 					<u-button v-if="item.status==1 && item.workingNode =='endNode'" type="success" size="mini"
 							@click="finished(item)" class="btn">完工</u-button>
-					<u-button v-if="(current==3||current==0) && item.status==1" type="success" size="mini"
+					<u-button v-if="(current==3||current==0) && item.status==1 && item.workingNode != 'endNode'" type="success" size="mini"
 						style="background-color:#888888"
 						@click="openOffLine(item)" class="btn">离线</u-button>
 				</view>
@@ -497,7 +497,7 @@
 					tabParams.value.pageNo = 1
 					getTabsList()
 				} else {
-					proxy.$modal.showToast('失败')
+					proxy.$modal.showToast(res.msg)
 				}
 			}).catch(() => {
 				proxy.$modal.closeLoading()
@@ -565,6 +565,7 @@
 					status.value = 'loadmore'
 					tabParams.value.status = '0'
 					tabParams.value.flagDo = '1'
+					tabParams.value.pageNo = 1
 					getRequestList()
 				} else {