对 仪器 校验优化

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