Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain

snowy-admin-web/src/views/basicset/devicetype/form.vue

@@ -16,7 +16,7 @@
 			<a-row :gutter="10">
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 					<a-form-item label="型号名称" name="name">
-						<a-input v-model:value="formData.name" placeholder="请输入型号名称" allow-clear />
+						<a-input v-model:value="formData.name" placeholder="请输入型号名称" allow-clear @blur="handleNameBlur" />
 					</a-form-item>
 				</a-col>
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
@@ -195,6 +195,18 @@
 		}
 	}
 
+	// 检查设备名称是否已注册  编辑的时候不调用接口
+	const handleNameBlur = () => {
+		if (formData.value.name) {
+			devicetypeApi
+				.submitDeviceTypeName({ name: formData.value.name })
+				.then((res) => {})
+				.catch(() => {
+					formData.value.name = ''
+				})
+		}
+	}
+
 	// 检查型号编号是否已注册
 	const handleCodeBlur = () => {
 		if (formData.value.code) {
@@ -206,21 +218,6 @@
 				})
 		}
 	}
-	// 检查型号名称是否已注册
-	watch(
-		() => formData.value.name,
-		(newVal) => {
-			if (newVal) {
-				devicetypeApi
-					.submitDeviceTypeName({ name: newVal })
-					.then((res) => {})
-					.catch(() => {
-						return (formData.value.name = '')
-					})
-			}
-		},
-		{ immediate: true, deep: true }
-	)
 
 	// 打开抽屉
 	const onOpen = (record) => {

snowy-admin-web/src/views/basicset/mem/form.vue

@@ -16,7 +16,12 @@
 			<a-row :gutter="10">
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 					<a-form-item label="设备名称" name="deviceName">
-						<a-input v-model:value="formData.deviceName" placeholder="请输入设备名称" allow-clear />
+						<a-input
+							v-model:value="formData.deviceName"
+							placeholder="请输入设备名称"
+							allow-clear
+							@blur="handleNameBlur"
+						/>
 					</a-form-item>
 				</a-col>
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
@@ -169,22 +174,6 @@
 		sensorCount: [required('请输入传感器路数')]
 	}
 
-	// 检查设备名称是否已注册
-	watch(
-		() => formData.value.deviceName,
-		(newVal) => {
-			if (newVal) {
-				memApi
-					.submitDeviceName({ deviceName: newVal })
-					.then((res) => {})
-					.catch(() => {
-						return (formData.value.deviceName = '')
-					})
-			}
-		},
-		{ immediate: true, deep: true }
-	)
-
 	// 获取设备型号
 	const loadData = () => {
 		devicetypeApi.devicetypeList().then((res) => {
@@ -197,7 +186,20 @@
 			})
 		})
 	}
-	// 检查设备编号是否已注册
+
+	// 检查设备名称是否已注册  编辑的时候不调用接口
+	const handleNameBlur = () => {
+		if (formData.value.deviceName) {
+			memApi
+				.submitDeviceName({ deviceName: formData.value.deviceName })
+				.then((res) => {})
+				.catch(() => {
+					formData.value.deviceName = ''
+				})
+		}
+	}
+
+	// 检查设备编号是否已注册  编辑的时候不调用接口
 	const handleCodeBlur = () => {
 		if (formData.value.deviceCode) {
 			memApi