From d66ab921c996c38da3aa373ffdc7c974c157df33 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 09:37:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

---
 src/views/CNAS/resourceDemand/device/component/management.vue |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 77e4671..d090b6e 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -119,7 +119,7 @@
 				<el-col :span="7">
 					<el-form :label-position="labelPosition" :model="formData" label-width="140px" ref="ruleForm">
 						<!-- 瀹為獙瀹ゅ垪琛� -->
-						<el-form-item label="鎵�灞為儴闂�:">
+						<el-form-item label="鎵�灞為儴闂�:" required>
 							<el-select :disabled="isUp" v-model="formData.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small"
 								style="width:100%">
 								<el-option v-for="item in subordinateDepartmentsList" :key="item.value" :label="item.label"
@@ -277,7 +277,7 @@
 				<el-col :span="7">
 					<el-form :label-position="labelPosition" :model="formData2" label-width="120px" ref="ruleForm">
 						<!-- 瀹為獙瀹ゅ垪琛� -->
-						<el-form-item label="鎵�灞為儴闂�:">
+						<el-form-item label="鎵�灞為儴闂�:" required>
 							<el-select v-model="formData2.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
 								<el-option v-for="item in subordinateDepartmentsList" :key="item.value" :label="item.label"
 									:value="item.value">
@@ -813,6 +813,10 @@
 				this.$message.error('鏈緭鍏ユ牎鍑嗘湁鏁堟湡')
 				return
 			}
+			if (!this.formData.subordinateDepartmentsId) {
+				this.$message.error('鏈�夋嫨鎵�灞為儴闂�')
+				return
+			}
 			if (this.formData.deviceStatus === '' || this.formData.deviceStatus === null) {
 				this.$message.error('鏈�夋嫨褰撳墠鐘舵��')
 				return

--
Gitblit v1.9.3