冰箱管理 - 新增，编辑 添加所属房间字段

snowy-admin-web/src/api/basicset/setupApi.js

@@ -25,5 +25,10 @@ export default {
 	// 详情
 	setupDetail(data) {
 		return request('detail', data, 'get')
+	},
+
+	// 根据房间'添加' 或 '编辑' 监控对象管理
+	submitWithRoomForm(data, edit = false) {
+		return request(edit ? 'editWithRoom' : 'addWithRoom', data)
 	}
 }

snowy-admin-web/src/views/biz/monitor/object/form.vue

@@ -13,6 +13,18 @@
 			layout="inline"
 			:label-col="{ style: { width: '100px', justifyContent: 'end' } }"
 		>
+			<a-form-item label="所属房间" name="roomId">
+				<a-select
+					ref="select"
+					v-model:value="formData.roomId"
+					:options="orgOptions"
+					allowClear
+					style="width: 100%"
+					placeholder="请选择您要绑定的房间"
+					:field-names="{ label: 'name', value: 'id' }"
+				/>
+			</a-form-item>
+
 			<a-form-item label="冰箱名称" name="name">
 				<a-input v-model:value="formData.name" placeholder="请输入冰箱名称" allow-clear />
 			</a-form-item>
@@ -22,6 +34,7 @@
 					<a-select-option value="2">停用</a-select-option>
 				</a-select>
 			</a-form-item>
+
 			<a-form-item label="报警接收人" name="alarmUsers">
 				<a-select
 					v-model:value="formData.alarmUsers"
@@ -48,15 +61,18 @@
 	import { required } from '@/utils/formRules'
 	import setupApi from '@/api/basicset/setupApi'
 	import alarmUserApi from '@/api/coldchain/alarmUserApi'
+	import targetRoomApi from '@/api/coldchain/targetRoomApi'
 	const alarmUsersOptions = ref([]) // 报警接收人数据
 
 	// 默认是关闭状态
 	const visible = ref(false)
 	const emit = defineEmits({ successful: null })
 	const formRef = ref()
+	const orgOptions = ref([])
 
 	// 默认要校验的
 	const formRules = {
+		roomId: [required('请选择您要绑定的房间')],
 		name: [required('请输入冰箱名称')],
 		status: [required('请选择冰箱状态')],
 		alarmUsers: [required('请选择报警接收人')]
@@ -67,6 +83,7 @@
 
 	// 打开抽屉
 	const onOpen = (record) => {
+		setOrgData()
 		setalarmUsersData()
 		visible.value = true
 		if (record) {
@@ -79,6 +96,12 @@
 			formData.value = { status: '1', alarmUsers: [] }
 		}
 	}
+	//获取房间的数据
+	const setOrgData = () => {
+		targetRoomApi.targetRoomList().then((res) => {
+			orgOptions.value = res
+		})
+	}
 	//获取报警接收人的数据
 	const setalarmUsersData = () => {
 		alarmUserApi.alarmUserList().then((res) => {
@@ -100,7 +123,9 @@
 					...formData.value,
 					alarmUsers: alarmUsersOptions.value.filter((user) => formData.value.alarmUsers.includes(user.openId))
 				}
-				setupApi.submitForm(parameter, formData.value.id).then(() => {
+
+				console.log(parameter, 'parameter')
+				setupApi.submitWithRoomForm(parameter, formData.value.id).then(() => {
 					onClose()
 					emit('successful')
 				})

snowy-admin-web/src/views/biz/monitor/object/index.vue

@@ -185,6 +185,13 @@
 			ellipsis: true,
 			resizable: true
 		},
+		{
+			title: '所属房间',
+			dataIndex: 'roomName',
+			align: 'center',
+			ellipsis: true,
+			resizable: true
+		},
 		{
 			title: '冰箱状态',
 			dataIndex: 'status',

snowy-admin-web/src/views/biz/monitor/targetroom/form.vue

@@ -13,17 +13,6 @@
 			layout="inline"
 			:label-col="{ style: { width: '100px', justifyContent: 'end' } }"
 		>
-			<a-form-item label="所属组织" name="createOrg">
-				<a-select
-					ref="select"
-					v-model:value="formData.createOrg"
-					:options="orgOptions"
-					allowClear
-					style="width: 100%"
-					placeholder="请选择您要绑定的组织"
-					:field-names="{ label: 'name', value: 'id' }"
-				/>
-			</a-form-item>
 			<a-form-item label="房间名称" name="name">
 				<a-input v-model:value="formData.name" placeholder="请输入房间配置名称" allow-clear />
 			</a-form-item>
@@ -43,7 +32,6 @@
 	import { required } from '@/utils/formRules'
 	import orgApi from '@/api/sys/orgApi.js'
 	import targetRoomApi from '@/api/coldchain/targetRoomApi'
-	const alarmUsersOptions = ref([]) // 报警接收人数据
 
 	// 默认是关闭状态
 	const visible = ref(false)
@@ -56,13 +44,12 @@
 	// 默认要校验的
 	const formRules = {
 		name: [required('请输入房间配置名称')],
-		createOrg: [required('请选择所属组织')],
 		sortCode: [required('请选择排序')]
 	}
 
 	// 打开抽屉
 	const onOpen = (record) => {
-		setalarmUsersData()
+		setOrgData()
 		visible.value = true
 		if (record) {
 			formData.value = Object.assign({}, record)
@@ -71,7 +58,7 @@
 		}
 	}
 	//获取机构的数据
-	const setalarmUsersData = () => {
+	const setOrgData = () => {
 		orgApi.orgList().then((res) => {
 			orgOptions.value = res
 		})

snowy-admin-web/src/views/biz/monitor/targetroom/index.vue

@@ -80,13 +80,7 @@
 			ellipsis: true,
 			resizable: true
 		},
-		{
-			title: '所属组织',
-			dataIndex: 'createOrgName',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
-		},
+
 		{
 			title: '创建时间',
 			dataIndex: 'createTime',