From bec67345e3c799cf5909f43ff404041919c6c0ad Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Wed, 6 May 2026 10:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 28 ++++++++++++-------
 pages/apply/subPages/SK/checkContentEdit.vue  |  2 +-
 pages/apply/subPages/SK/riskHandelEditNew.vue |  4 +--
 pages/apply/subPages/SK/riskVerifyEditNew.vue |  2 +-
 pages/index/index2.nvue                       | 28 ++++++++++++-------
 5 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/App.vue b/App.vue
index 4e79c95..9dc31a5 100644
--- a/App.vue
+++ b/App.vue
@@ -15,6 +15,9 @@
 	import {
 		GetNewRiskAreaInfo,
 	} from './services/apply/subPages/SK/SKServices.js'
+	import {
+		getRequest,
+	} from './services/apply/FOServices/FOServices';
 	import {
 		getAreaLists
 	} from './services/apply/HMServices/HMServices'
@@ -369,19 +372,24 @@
 								uni.setStorageSync('listAreas', listAreas);
 							}
 						})
-						var dataParm = {
-							'name': "SKProductionUnit"
-						}
-						await getEnum(dataParm).then(res => {
-							if (res != undefined && res.length > 0) {
-								for (let i = 0; i < res.length; i++) {
-									res[i].name = res[i].NAME
-									res[i].code = res[i].ID
-								}
-							}
+						const jsons = initFilter(orgId)
+						getRequest(jsons, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
 							var mineTypeStorage = res
 							uni.setStorageSync('mineTypeStorage', mineTypeStorage);
 						})
+						// var dataParm = {
+						// 	'name': "SKProductionUnit"
+						// }
+						// await getEnum(dataParm).then(res => {
+						// 	if (res != undefined && res.length > 0) {
+						// 		for (let i = 0; i < res.length; i++) {
+						// 			res[i].name = res[i].NAME
+						// 			res[i].code = res[i].ID
+						// 		}
+						// 	}
+						// 	var mineTypeStorage = res
+						// 	uni.setStorageSync('mineTypeStorage', mineTypeStorage);
+						// })
 					}
 				}
 			},
diff --git a/pages/apply/subPages/SK/checkContentEdit.vue b/pages/apply/subPages/SK/checkContentEdit.vue
index 9780779..5c91f52 100644
--- a/pages/apply/subPages/SK/checkContentEdit.vue
+++ b/pages/apply/subPages/SK/checkContentEdit.vue
@@ -279,7 +279,7 @@
 			},
 
 			stepAdd() {
-				if (!this.model.Product_Unit) {
+				if (!this.model.Nav_ProductionUnit||!this.model.Nav_ProductionUnit.NAME) {
 					uni.showToast({
 						title: '请选择生产单元',
 						icon: 'none'
diff --git a/pages/apply/subPages/SK/riskHandelEditNew.vue b/pages/apply/subPages/SK/riskHandelEditNew.vue
index 000cdb4..15604bf 100644
--- a/pages/apply/subPages/SK/riskHandelEditNew.vue
+++ b/pages/apply/subPages/SK/riskHandelEditNew.vue
@@ -255,8 +255,8 @@
 			onConfirmPicker(e) {
 				if (!this.isOnline) {
 					var mineTypeStorage = uni.getStorageSync('mineTypeStorage')
-					this.model.Product_Unit = e.value[0].name
-					this.model.MineType = mineTypeStorage[e.indexs[0]].code
+					this.model.Nav_ProductionUnit = e.value[0]
+					this.model.MineType = e.value[0].ID
 				} else {
 					this.model.Nav_ProductionUnit = e.value[0]
 					this.model.PRODUCTION_UNIT_ID = e.value[0].ID
diff --git a/pages/apply/subPages/SK/riskVerifyEditNew.vue b/pages/apply/subPages/SK/riskVerifyEditNew.vue
index b4aff64..fddb3a6 100644
--- a/pages/apply/subPages/SK/riskVerifyEditNew.vue
+++ b/pages/apply/subPages/SK/riskVerifyEditNew.vue
@@ -516,7 +516,7 @@
 			},
 
 			submit() {
-				if (!this.model.Product_Unit) {
+				if (!this.model.Nav_ProductionUnit||!this.model.Nav_ProductionUnit.NAME) {
 					uni.showToast({
 						title: '请选择生产单元',
 						icon: 'none'
diff --git a/pages/index/index2.nvue b/pages/index/index2.nvue
index 57bb774..f7425fa 100644
--- a/pages/index/index2.nvue
+++ b/pages/index/index2.nvue
@@ -112,6 +112,9 @@
 	import {
 		getEnum
 	} from '../../services/common'
+	import {
+		getRequest,
+	} from '../../services/apply/FOServices/FOServices';
 	import {
 		GetNewRiskAreaInfo,
 	} from '../../services/apply/subPages/SK/SKServices.js'
@@ -249,19 +252,24 @@
 							uni.setStorageSync('listAreas', listAreas);
 						}
 					})
-					var dataParm = {
-						'name': "SKProductionUnit"
-					}
-					await getEnum(dataParm).then(res => {
-						if (res != undefined && res.length > 0) {
-							for (let i = 0; i < res.length; i++) {
-								res[i].name = res[i].NAME
-								res[i].code = res[i].ID
-							}
-						}
+					const jsons = initFilter(orgId)
+					getRequest(jsons, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
 						var mineTypeStorage = res
 						uni.setStorageSync('mineTypeStorage', mineTypeStorage);
 					})
+					// var dataParm = {
+					// 	'name': "SKProductionUnit"
+					// }
+					// await getEnum(dataParm).then(res => {
+					// 	if (res != undefined && res.length > 0) {
+					// 		for (let i = 0; i < res.length; i++) {
+					// 			res[i].name = res[i].NAME
+					// 			res[i].code = res[i].ID
+					// 		}
+					// 	}
+					// 	var mineTypeStorage = res
+					// 	uni.setStorageSync('mineTypeStorage', mineTypeStorage);
+					// })
 				}
 			},
 			changeSwiper(e) {