Merge remote-tracking branch 'origin/master' into master

ruoyi-ui/src/api/system/gldry.js

@@ -62,3 +62,11 @@ export function importExcel(data) {
     data
   })
 }
+// 查询隔离点名称
+export function getGlPlace(type) {
+  return request({
+    url: '/system/gldry/selectValue',
+    method: 'get',
+    params: type
+  })
+}

ruoyi-ui/src/views/system/fcry/index.vue

@@ -419,6 +419,7 @@
 import { listFcry, getFcry, delFcry, addFcry, updateFcry } from "@/api/system/fcry";
 import { getToken } from '@/utils/auth'
 import { importTemplate, importExcel } from "@/api/system/fcry";
+import {getGlPlace} from "@/api/system/gldry";
 
 export default {
   name: "Fcry",
@@ -669,6 +670,12 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      const params = {
+        type : 'shelters'
+      }
+      getGlPlace(params).then(res => {
+        this.form.fcPlace = res.data
+      })
       this.open = true;
       this.title = "添加方舱人员";
     },

ruoyi-ui/src/views/system/gldry/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="隔离点名称" prop="glPlace">
-        <el-select v-model="queryParams.glPlace" placeholder="请选择隔离点名称" clearable>
+        <el-select v-model="queryParams.glPlace" placeholder="请选择隔离点名称" clearable >
           <el-option
             v-for="dict in dict.type.isolation_point"
             :key="dict.value"
@@ -260,14 +260,15 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="隔离点名称" prop="glPlace">
-          <el-select v-model="form.area" placeholder="请选择隔离点名称">
-            <el-option
-              v-for="dict in dict.type.isolation_point"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+<!--          <el-select v-model="form.area" placeholder="请选择隔离点名称">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.isolation_point"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+          <el-input v-model="form.glPlace" :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="房间号" prop="room">
           <el-input v-model="form.room" placeholder="请输入房间号" />
@@ -393,7 +394,7 @@
 </template>
 
 <script>
-import { listGldry, getGldry, delGldry, addGldry, updateGldry } from "@/api/system/gldry";
+import {listGldry, getGldry, delGldry, addGldry, updateGldry, getGlPlace} from "@/api/system/gldry";
 import { getToken } from '@/utils/auth'
 import { importTemplate, importExcel } from "@/api/system/gldry";
 
@@ -634,6 +635,12 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      const params = {
+        type : 'isolation'
+      }
+      getGlPlace(params).then(res => {
+        this.form.glPlace = res.data
+      })
       this.open = true;
       this.title = "添加隔离点人员";
     },