From 82cb5151f29f93893fc3c9058e41a0fe825e0271 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Wed, 17 Apr 2024 09:12:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A3=80=E4=BF=AE=E5=B7=A5=E5=8D=95=20?=
 =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/overhaulOrder/addServiceRecord.vue | 32 +++++++++++++++++---
 src/pages/upkeepOrder/addServiceRecord.vue   | 28 +++++++++++++++--
 src/pages/upkeepOrder/detail.vue             |  4 +--
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/pages/overhaulOrder/addServiceRecord.vue b/src/pages/overhaulOrder/addServiceRecord.vue
index cd45ce7..8375b89 100644
--- a/src/pages/overhaulOrder/addServiceRecord.vue
+++ b/src/pages/overhaulOrder/addServiceRecord.vue
@@ -132,6 +132,7 @@
 				<view class="sure" @click="chooseUser">确认</view>
 			</view>
 		</u-popup>
+		<SelectItemList :isShowSelectItem=isShowSelectItem :singleColumnList=singleColumnList  @searchItem='searchItem' @chooseItem1='chooseItem1'/>
 		<u-select v-model="singleColumnShow" mode="single-column" :default-value='singleColumnDefaultValue'
 			:list="singleColumnList" @confirm="chooseSingleColumn" @cancle='singleColumnShow = false'></u-select>
 		<u-picker mode="time" v-model="datetimeShow" :default-time='datetimeDefaultValue' :params="params"
@@ -151,13 +152,14 @@
 	import * as sparePartsApi from "@/api/spareParts.js"
 	import * as deptApi from "@/api/dept.js"
 	import * as dictApi from "@/api/dict.js"
+	import SelectItemList from "../../components/item/slectItemList.vue"
 	const { proxy} = getCurrentInstance()
 	const loading = ref(false)
 	const type = ref('')
 	// 备件弹窗
 	const isPopupShow = ref(false)
 	const sparePartsList = ref([])
-
+    const isShowSelectItem = ref(false)//选择备件弹出窗
 	const singleColumnShow = ref(false)
 	const singleColumnDefaultValue = ref([])
 	const singleColumnList = ref([])
@@ -390,7 +392,12 @@
 		} else {
 			singleColumnDefaultValue.value = []
 		}
-		singleColumnShow.value = true
+		if(fieldName == 'number'){
+			isShowSelectItem.value = true;
+		}else{
+			singleColumnShow.value = true
+		}
+		
 	}
 	// 单列模式点击确定之后
 	function chooseSingleColumn(e) {
@@ -411,8 +418,8 @@
 		singleColumnShow.value = false
 	}
 	// 获取备件列表
-	async function getSparePartsList() {
-		number =deviceNumber.value
+	async function getSparePartsList(number,name) {
+		number =form.value.deviceNumber
 		let param = {
 			number:number,
 			name:name
@@ -423,6 +430,7 @@
 				item.label = item.name
 			})
 			sparePartsList.value = res.data
+			singleColumnList.value = sparePartsList.value
 		}).catch(() => { })
 	}
 	// 打开弹窗
@@ -510,6 +518,22 @@
 		await getSelecUser()
 		await getSparePartsList()
 	})
+	async function searchItem(name){
+		await getSparePartsList(null,name);
+	}
+	
+	async function chooseItem1(type,forms){
+		if(!forms.value.number&&type==1){
+			proxy.$modal.showToast('请选择备件')
+			return
+		}
+		if(type==1){
+			form1.value.number = forms.value.temporarilyNumber
+			form1.value.name =forms.value.temporarilyName
+		}
+		await getSparePartsList(null,null);
+		isShowSelectItem.value = false;
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/upkeepOrder/addServiceRecord.vue b/src/pages/upkeepOrder/addServiceRecord.vue
index 8dec9be..0fed48c 100644
--- a/src/pages/upkeepOrder/addServiceRecord.vue
+++ b/src/pages/upkeepOrder/addServiceRecord.vue
@@ -134,6 +134,7 @@
 				<view class="sure" @click="chooseUser">确认</view>
 			</view>
 		</u-popup>
+		<SelectItemList :isShowSelectItem=isShowSelectItem :singleColumnList=singleColumnList  @searchItem='searchItem' @chooseItem1='chooseItem1'/>
 		<u-select v-model="singleColumnShow" mode="single-column" :default-value='singleColumnDefaultValue'
 			:list="singleColumnList" @confirm="chooseSingleColumn" @cancle='singleColumnShow = false'></u-select>
 		<u-picker mode="time" v-model="datetimeShow" :default-time='datetimeDefaultValue' :params="params" @confirm='chooseDatetime' @cancle='datetimeShow = false'></u-picker>
@@ -152,13 +153,14 @@
 	import * as sparePartsApi from "@/api/spareParts.js"
 	import * as deptApi from "@/api/dept.js"
 	import * as dictApi from "@/api/dict.js"
+	import SelectItemList from "../../components/item/slectItemList.vue"
 	const { proxy} = getCurrentInstance()
 	const loading = ref(false)
 	const type = ref('')
 	// 备件弹窗
 	const isPopupShow = ref(false)
 	const sparePartsList = ref([])
-	
+	const isShowSelectItem = ref(false)
 	const singleColumnShow = ref(false)
 	const singleColumnDefaultValue = ref([])
 	const singleColumnList = ref([])
@@ -167,6 +169,7 @@
 	const isShowSelecUser = ref(false)
 	const jxDetailsStatus = ref([])//完成情况
 	const formatDate = ref('')//日期展示
+	const deviceNumber = ref(null);
 const form = ref({
 		number: '',
 		name:'',
@@ -368,7 +371,8 @@ const form = ref({
 		} else {
 			singleColumnDefaultValue.value = []
 		}
-		singleColumnShow.value = true
+		//singleColumnShow.value = true
+		isShowSelectItem.value = true;
 	}
 	// 单列模式点击确定之后
 	function chooseSingleColumn(e) {
@@ -388,7 +392,7 @@ const form = ref({
 		singleColumnShow.value = false
 	}
 	// 获取备件列表
-	async function getSparePartsList() {
+	async function getSparePartsList(number,name) {
 		number =deviceNumber.value
 		let param = {
 			number:number,
@@ -400,6 +404,7 @@ const form = ref({
 				item.label = item.name
 			})
 			sparePartsList.value = res.data
+			singleColumnList.value = sparePartsList.value
 		}).catch(() => { })
 	}
 	// 打开弹窗
@@ -444,6 +449,22 @@ const form = ref({
 		datetimeDefaultValue.value = val ? val : proxy.$time.formatDate()
 		datetimeShow.value = true
 	}
+	async function searchItem(name){
+		await getSparePartsList(null,name);
+	}
+	
+	async function chooseItem1(type,forms){
+		if(!forms.value.number&&type==1){
+			proxy.$modal.showToast('请选择备件')
+			return
+		}
+		if(type==1){
+			form1.value.number = forms.value.temporarilyNumber
+			form1.value.name =forms.value.temporarilyName
+		}
+		await getSparePartsList(null,null);
+		isShowSelectItem.value = false;
+	}
 	// 日期模式点击确定之后
 	function chooseDatetime(e) {
 		let array1 = []
@@ -474,6 +495,7 @@ const form = ref({
 		if (option.type) type.value = option.type;
 		if (option.factoryAreaNumber) factoryAreaNumber.value = option.factoryAreaNumber;
 		if (option.number) form.value.number = option.number;
+		if (option.deviceNumber) deviceNumber.value = option.deviceNumber;
 		if (option.data && JSON.parse(decodeURIComponent(option.data)) && JSON.parse(decodeURIComponent(option
 			.data)).id) {
 			form.value = JSON.parse(decodeURIComponent(option.data))
diff --git a/src/pages/upkeepOrder/detail.vue b/src/pages/upkeepOrder/detail.vue
index e654d17..40bc759 100644
--- a/src/pages/upkeepOrder/detail.vue
+++ b/src/pages/upkeepOrder/detail.vue
@@ -206,11 +206,11 @@
 		}
 		if (clickType == 'updata') {
 			proxy.$tab.navigateTo(
-				`/pages/upkeepOrder/addServiceRecord?type=${data.value.type}&factoryAreaNumber=${data.value.factoryAreaNumber}&number=${data.value.number}&data=${encodeURIComponent(JSON.stringify(item))}`
+				`/pages/upkeepOrder/addServiceRecord?type=${data.value.type}&factoryAreaNumber=${data.value.factoryAreaNumber}&number=${data.value.number}&data=${encodeURIComponent(JSON.stringify(item))}&deviceNumber=${data.value.deviceNumber}`
 			)
 		} else {
 			proxy.$tab.navigateTo(
-				`/pages/upkeepOrder/addServiceRecord?type=${data.value.type}&factoryAreaNumber=${data.value.factoryAreaNumber}&number=${data.value.number}`
+				`/pages/upkeepOrder/addServiceRecord?type=${data.value.type}&factoryAreaNumber=${data.value.factoryAreaNumber}&number=${data.value.number}&deviceNumber=${data.value.deviceNumber}`
 			)
 		}
 	}