From 40a63515fa60b21c13627d857bdbc49f16e805b8 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 27 Feb 2024 18:06:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=20=E4=BB=AA=E5=99=A8=20=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/instrument/index.vue     | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index f2fe16c..e75e6b2 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -518,7 +518,7 @@
 						<el-option label="IOT仪器" :value="2"></el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item v-show="form.type == 2" label="仪器型号" prop="model">
+				<el-form-item v-if="form.type == 2" label="仪器型号" prop="model">
 					<el-select v-model="form.model" @change="modelChange" style="width: 50%">
 						<el-option label="FR200" value="FR200"></el-option>
 						<el-option label="WL200" value="WL200"></el-option>
@@ -1879,24 +1879,28 @@ export default {
 		submitForm() {
       // 初次护理弹窗检验
       for (let i = 0; i < this.nurseList.length; i++) {
-        if(this.nurseList[i].file == '') {
-          this.$modal.msgError('请上传初次护理弹窗提示视频或图片');
-          return;
-        }
-        if(this.nurseList[i].message == '') {
-          this.$modal.msgError('请上传初次护理规则提示内容');
-          return;
+        if(this.nurseList[i].file != '' || this.nurseList[i].message != '') {
+          if(this.nurseList[i].file == '') {
+            this.$modal.msgError('请上传初次护理弹窗提示视频或图片');
+            return;
+          }
+          if(this.nurseList[i].message == '') {
+            this.$modal.msgError('请上传初次护理规则提示内容');
+            return;
+          }
         }
       }
       // 仪器介绍校验
       for (let i = 0; i < this.introduceList.length; i++) {
-        if(this.introduceList[i].file == '') {
-          this.$modal.msgError('请上传仪器介绍弹窗提示视频或图片');
-          return;
-        }
-        if(this.introduceList[i].message == '') {
-          this.$modal.msgError('请上传仪器介绍规则提示内容');
-          return;
+        if(this.introduceList[i].file != '' || this.introduceList[i].message != '') {
+          if (this.introduceList[i].file == '') {
+            this.$modal.msgError('请上传仪器介绍弹窗提示视频或图片');
+            return;
+          }
+          if (this.introduceList[i].message == '') {
+            this.$modal.msgError('请上传仪器介绍规则提示内容');
+            return;
+          }
         }
       }
 			this.form.nurseList = this.nurseList