Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java

@@ -50,6 +50,11 @@ public class WxInstrumentController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/listAll")
+    public List<WxInstrument> listAll(WxInstrumentReq wxInstrumentReq) {
+        return wxInstrumentService.selectWxInstrumentPage(wxInstrumentReq);
+    }
+
     /**
      * 获取全部的仪器
      */

flossom-ui/src/api/system/instrument.js

@@ -9,6 +9,14 @@ export function listInstrument(query) {
   })
 }
 
+export function listAllInstrument(query) {
+  return request({
+    url: '/system/instrument/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询仪器列详细
 export function getInstrument(id) {
   return request({

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

flossom-ui/src/views/system/userInstrument/index.vue

@@ -367,7 +367,7 @@
 
 <script>
 import { listUserInstrument, getInstrument, delInstrument, addInstrument, updateInstrument,changeSerial,changeGuarantee } from "@/api/system/userInstrument";
-import {listInstrument} from "@/api/system/instrument";
+import {listAllInstrument, listInstrument} from "@/api/system/instrument";
 import {listLog,addLog} from "@/api/system/userInstrumentLog"
 export default {
   name: "Instrument",
@@ -500,8 +500,8 @@ export default {
       this.guaranteeForm.guarantee = "";
     },
     queryInstrument(){
-      listInstrument({}).then(response => {
-        this.instrumentList = response.rows;
+      listAllInstrument({}).then(response => {
+        this.instrumentList = response;
       });
     },
     /** 查询用户仪器绑定列表 */