From 608f00f6c691bc6f311011d0dd10adc3b038e79b Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Wed, 29 May 2024 15:48:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20update=20=E8=BF=94=E5=B7=A5=E8=BF=94?=
 =?UTF-8?q?=E4=BF=AE=E5=8D=95=E4=BB=B6=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=A8=A1=E5=BC=8F=EF=BC=8C=E4=BA=BA=E5=91=98=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=80=89=E6=8B=A9=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mes/reworkBatch/index.vue  | 50 ++++++++++++++++++---
 src/pages/mes/reworkSingle/index.vue | 67 +++++++++++++++++++++++-----
 2 files changed, 99 insertions(+), 18 deletions(-)

diff --git a/src/pages/mes/reworkBatch/index.vue b/src/pages/mes/reworkBatch/index.vue
index dfa0b1b..9f1947a 100644
--- a/src/pages/mes/reworkBatch/index.vue
+++ b/src/pages/mes/reworkBatch/index.vue
@@ -64,15 +64,22 @@
 		<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
 		<requestButton @goScan='openScanDetailPopup'></requestButton>
 	</view>
-	<u-popup v-model="showType" mode="bottom" border-radius="14" length="30%">
+<!-- 	<u-popup v-model="showType" mode="bottom" border-radius="14" length="30%">
 		
 			<view style="margin-top: 30px; margin-left: 30px;">
 				<u-input v-model="reworkPersoncode" placeholder="请输入返工返修人员" />
 			</view>
 			<view class="btns">
-				<u-button class="sure" @click="handleReceive">确定</u-button>
+				<u-button class="sure" @click="handleReceive()">确定</u-button>
 			</view>
-	</u-popup>
+	</u-popup> -->
+	<view>
+		<u-popup v-model="showWorker" mode="bottom" border-radius="14" length="30%">
+			<view>
+				<u-select v-model="showWorker" mode="mutil-column-auto"  :list="workerList" @confirm="confirmSelectWorker"></u-select>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script setup lang="ts">
@@ -89,6 +96,7 @@
 	} from 'vue'
 	/*引入API*/
 	import * as reworkBatchApi from "@/api/mes/reworkBatch/reworkBatchApi.ts"
+	import * as productOfflineApi from "@/api/mes/productOffline/productOfflineApi.ts"
 	const { proxy } = getCurrentInstance()
 	const paramData = ref()
 	const tabsList = ref([{name:'待返修'},{name:'返修中'},{name:'已完成'},{name:'已终止'}])
@@ -102,6 +110,14 @@
 		pageSize: 10,
 		status: 1
 	})
+	const teamParams = ref({
+		teamGroup:'1',
+		pageNo: 1,
+		pageSize: 50,
+		status: 1
+	})
+	const showWorker = ref(false)
+	const workerList = ref([])
 	/*是否显示"没有更多了"*/
 	const status = ref('loadmore')
 	/*列表数据集*/
@@ -126,12 +142,12 @@
 	}
 	// 打开处理人员和处理时间弹窗
 	function handleItem(index){
-		reworkPersoncode.value = null
 		paramData.value = index	
-		showType.value = true
+		showWorker.value = true
 	}
 	// “去处理”按钮提交事件
 	function handleReceive(){
+		console.log(reworkPersoncode.value)
 		if(reworkPersoncode.value != '' && reworkPersoncode.value.trim() != ''){
 			paramData.value.reworkPersoncode=reworkPersoncode.value
 			changeStatus(2)
@@ -139,7 +155,7 @@
 		}
 		else{
 			proxy.$modal.showToast('请输入返修人员')
-			reworkPersoncode.value = null
+			reworkPersoncode.value = ''
 		}
 	}
 	// 终止按钮提交事件
@@ -220,12 +236,34 @@
 		    proxy.$modal.closeLoading();
 		}, 500);
 	}
+	// 获取班组人员信息
+	function getPageChildren(){
+		productOfflineApi.getPageChildren(teamParams.value).then((res) => {
+			console.log(res)
+			if (res.data) {
+				console.log(res.data)
+				workerList.value = res.data
+			} else {
+			}
+		}).catch(() => {
+		})
+	}
+	// 选择班组人员回调
+	function confirmSelectWorker(val){
+		console.log(val)
+		paramData.value.reworkPersoncode = val[1].value
+		proxy.$modal.confirm('确定提交吗').then(() => {
+			changeStatus(2)
+		})
+	}
+	
 	/*通用方法*/
 	onShow(() => {
 		params.value.pageNo = 1
 		list.value = []
 		status.value = 'loadmore'
 		getList()
+		getPageChildren()
 	})
 	onReachBottom(() => {
 		getList()
diff --git a/src/pages/mes/reworkSingle/index.vue b/src/pages/mes/reworkSingle/index.vue
index 17834f7..cb16242 100644
--- a/src/pages/mes/reworkSingle/index.vue
+++ b/src/pages/mes/reworkSingle/index.vue
@@ -29,10 +29,10 @@
 					<view>产品编码：</view><view>{{item.productionCode}}</view>
 				</view>
 				<view class="dec">
-					<view>工作类型：</view><view>{{item.status == '1'?'返工' :'返修'}}</view>
+					<view>工作类型：</view><view>{{item.reworkType == '1'?'返工' :'返修'}}</view>
 				</view>
 				<view class="dec">
-					<view>是否有替换件：</view><view>{{item.replaceFlag == 'TRUE'?'是' :'否'}}</view>
+					<view>是否有替换件：</view><view>{{item.replaceFlag == '1'?'是' :'否'}}</view>
 				</view>
 				<view class="dec">
 					<view>返修人员：</view><view>{{item.reworkPersoncode}}</view>
@@ -58,15 +58,26 @@
 		<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
 		<requestButton @goScan='openScanDetailPopup'></requestButton>
 	</view>
-	<u-popup v-model="showType" mode="bottom" border-radius="14" length="30%">
-		
-			<view style="margin-top: 30px; margin-left: 30px;">
-				<u-input v-model="reworkPersoncode" placeholder="请输入返工返修人员" />
-			</view>
-			<view class="btns">
-				<u-button class="sure" @click="handleReceive">确定</u-button>
+<!-- 	<view>
+		<u-popup v-model="showType" mode="bottom" border-radius="14" length="30%">
+			
+				<view style="margin-top: 30px; margin-left: 30px;">
+					<u-input v-model="reworkPersoncode" placeholder="请输入返工返修人员" />
+				</view>
+				<view class="btns">
+					<u-button class="sure" @click="handleReceive">确定</u-button>
+				</view>
+		</u-popup>
+	</view> -->
+
+	<view>
+		<u-popup v-model="showWorker" mode="bottom" border-radius="14" length="30%">
+			<view>
+				<u-select v-model="showWorker" mode="mutil-column-auto"  :list="workerList" @confirm="confirmSelectWorker"></u-select>
 			</view>
-	</u-popup>
+		</u-popup>
+	</view>
+
 </template>
 
 <script setup lang="ts">
@@ -83,6 +94,7 @@
 	} from 'vue'
 	/*引入API*/
 	import * as reworkSingleApi from "@/api/mes/reworkSingle/reworkSingleApi.ts"
+	import * as productOfflineApi from "@/api/mes/productOffline/productOfflineApi.ts"
 	const { proxy } = getCurrentInstance()
 	const paramData = ref()
 	const tabsList = ref([{name:'待返修'},{name:'返修中'},{name:'已完成'},{name:'已终止'}])
@@ -96,6 +108,14 @@
 		pageSize: 10,
 		status: 1
 	})
+	const teamParams = ref({
+		teamGroup:'1',
+		pageNo: 1,
+		pageSize: 50,
+		status: 1
+	})
+	const showWorker = ref(false)
+	const workerList = ref([])
 	/*是否显示"没有更多了"*/
 	const status = ref('loadmore')
 	/*列表数据集*/
@@ -120,9 +140,8 @@
 	}
 	// 打开处理人员和处理时间弹窗
 	function handleItem(index){
-		reworkPersoncode.value = null
 		paramData.value = index	
-		showType.value = true
+		showWorker.value = true
 	}
 	// “去处理”按钮提交事件
 	function handleReceive(){
@@ -215,12 +234,36 @@
 		    proxy.$modal.closeLoading();
 		}, 500);
 	}
+	
+	// 获取班组人员信息
+	function getPageChildren(){
+		productOfflineApi.getPageChildren(teamParams.value).then((res) => {
+			console.log(res)
+			if (res.data) {
+				console.log(res.data)
+				workerList.value = res.data
+			} else {
+			}
+		}).catch(() => {
+		})
+	}
+	
+	// 选择班组人员回调
+	function confirmSelectWorker(val){
+		console.log(val)
+		paramData.value.reworkPersoncode = val[1].value
+		proxy.$modal.confirm('确定提交吗').then(() => {
+			changeStatus(2)
+		})
+	}
+	
 	/*通用方法*/
 	onShow(() => {
 		params.value.pageNo = 1
 		list.value = []
 		status.value = 'loadmore'
 		getList()
+		getPageChildren()
 	})
 	onReachBottom(() => {
 		getList()