被护理人信息，社区信息

src/api/system/communityInfo.js

@@ -16,7 +16,21 @@ export function getCommunityInfo(id) {
         method: 'get'
     })
 }
-
+// 查询省信息
+export function FirstLevels(query) {
+    return request({
+        url: '/system/communityInfo/getFirstLevelInfo',
+        method: 'get',
+        params: query
+    })
+}
+// 查询市信息
+export function SecondaryLevelInfo(id) {
+    return request({
+        url: `/system/communityInfo/getSecondaryLevelInfo?`+`parentId=${id}`,
+        method: 'get',
+    })
+}
 // 新增居住社区信息
 export function addCommunityInfo(data) {
     return request({
@@ -29,7 +43,7 @@ export function addCommunityInfo(data) {
 // 修改居住社区信息
 export function updateCommunityInfo(data) {
     return request({
-        url: '/system/nurseItemTemplate/edit',
+        url: '/system/communityInfo/edit',
         method: 'post',
         data: data
     })

src/api/system/patientArchives.js

@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+// 查询被护理人基本信息列表
+export function listPatientArchives(query) {
+    return request({
+        url: '/system/patientArchives/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询被护理人基本信息详细
+export function getPatientArchives(id) {
+    return request({
+        url: '/system/patientArchives/' + id,
+        method: 'get'
+    })
+}
+// 查询省信息
+export function FirstLevel(query) {
+    return request({
+        url: '/system/communityInfo/getFirstLevelInfo',
+        method: 'get',
+        params: query
+    })
+}
+// 查询市信息
+export function SecondaryLevelInfo(id) {
+    return request({
+        url: `/system/communityInfo/getSecondaryLevelInfo?`+`parentId=${id}`,
+        method: 'get',
+    })
+}
+// 新增被护理人基本信息
+export function addPatientArchives(data) {
+    return request({
+        url: '/system/patientArchives',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改被护理人基本信息
+export function updatePatientArchives(data) {
+    return request({
+        url: '/system/patientArchives/edit',
+        method: 'post',
+        data: data
+    })
+}
+
+// 删除被护理人基本信息
+export function delPatientArchives(id) {
+    return request({
+        url: '/system/patientArchives/' + id,
+        method: 'delete'
+    })
+}

src/views/system/communityInfo/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
-      <el-form-item label="所属区域编码" prop="areaCode">
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <!-- <el-form-item label="所属区域编码" prop="areaCode">
         <el-input
           v-model="queryParams.areaCode"
           placeholder="请输入所属区域编码"
@@ -16,8 +23,70 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item> -->
+      <el-form-item label="所属区域" prop="areaCode">
+        <el-select v-model="queryParams.province" clearable placeholder="请选择省">
+          <el-option
+            v-for="item in arealist"
+            :key="item.id"
+            :label="item.areaName"
+            :value="item.id"
+            @click.native="province(item)"
+          >
+          </el-option>
+        </el-select>
+
+        <el-select
+          v-model="queryParams.city"
+          clearable
+          placeholder="请选择市"
+          style="margin-left: 10px"
+        >
+          <el-option
+            v-for="item in citylist"
+            :key="item.areaCode"
+            :label="item.areaName"
+            :value="item.areaCode"
+            @click.native="clickcity(item)"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-model="queryParams.area"
+          clearable
+          placeholder="请选择区"
+          style="margin-left: 10px"
+        >
+          <el-option
+            v-for="item in arealists"
+            :key="item.areaCode"
+            :label="item.areaName"
+            :value="item.areaCode"
+            @click.native="clickarea(item)"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-model="queryParams.areaCode"
+          clearable
+          placeholder="请选择街道"
+          style="margin-left: 10px"
+        >
+          <el-option
+            v-for="item in streetlist"
+            :key="item.areaCode"
+            :label="item.areaName"
+            :value="item.areaCode"
+            @click.native="clickstreet(item)"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="社区名称" prop="communityName">
+      <el-form-item
+        label="社区名称"
+        prop="communityName"
+        style="margin-left: 20px"
+      >
         <el-input
           v-model="queryParams.communityName"
           placeholder="请输入社区名称"
@@ -25,7 +94,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="社区经度" prop="communityLongitude">
+      <!-- <el-form-item label="社区经度" prop="communityLongitude">
         <el-input
           v-model="queryParams.communityLongitude"
           placeholder="请输入社区经度"
@@ -40,10 +109,18 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -56,7 +133,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:communityInfo:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,7 +145,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:communityInfo:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -78,7 +157,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:communityInfo:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,20 +168,41 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:communityInfo:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="communityInfoList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="communityInfoList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-      <el-table-column label="所属区域编码" align="center" prop="areaCode" />
+      <!-- <el-table-column label="所属区域编码" align="center" prop="areaCode" />
-      <el-table-column label="社区编码" align="center" prop="communityCode" />
+      <el-table-column label="社区编码" align="center" prop="communityCode" /> -->
+      <el-table-column label="所属区域" align="center" prop="areaName" />
       <el-table-column label="社区名称" align="center" prop="communityName" />
-      <el-table-column label="社区经度" align="center" prop="communityLongitude" />
+      <el-table-column
-      <el-table-column label="社区纬度" align="center" prop="communityLatitude" />
+        label="社区经度"
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        align="center"
+        prop="communityLongitude"
+      />
+      <el-table-column
+        label="社区纬度"
+        align="center"
+        prop="communityLatitude"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -109,14 +210,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:communityInfo:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:communityInfo:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -128,24 +231,162 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <!-- 添加居住社区信息对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open2"
+      width="1060px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <div
+          v-for="(item, index) in form.communityInfoList"
+          :key="index"
+          style="margin-top: 20px"
+        >
+          <el-form-item label="所属区域" 
+          :rules="rules.communityInfoList.areaCode"
+          :prop="`communityInfoList.${index}.areaCode`">
+            <el-select v-model="item.province" clearable placeholder="请选择省">
+              <el-option
+                v-for="item in arealist"
+                :key="item.areaCode"
+                :label="item.areaName"
+                :value="item.areaCode"
+                @click.native="province(item)"
+              >
+              </el-option>
+            </el-select>
 
-    <!-- 添加或修改居住社区信息对话框 -->
+            <el-select
+              v-model="item.city"
+              clearable
+              placeholder="请选择市"
+              style="margin-left: 10px"
+            >
+              <el-option
+                v-for="item in citylist"
+                :key="item.areaCode"
+                :label="item.areaName"
+                :value="item.areaCode"
+                @click.native="clickcity(item)"
+              >
+              </el-option>
+            </el-select>
+            <el-select
+              v-model="item.area"
+              clearable
+              placeholder="请选择区"
+              style="margin-left: 10px"
+            >
+              <el-option
+                v-for="item in arealists"
+                :key="item.areaCode"
+                :label="item.areaName"
+                :value="item.areaCode"
+                @click.native="clickarea(item)"
+              >
+              </el-option>
+            </el-select>
+            <el-select
+              v-model="item.areaCode"
+              clearable
+              placeholder="请选择街道"
+              style="margin-left: 10px"
+            >
+              <el-option
+                v-for="item in streetlist"
+                :key="item.areaCode"
+                :label="item.areaName"
+                :value="item.areaCode"
+                @click.native="clickstreet(item)"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="社区名称"
+           :rules="rules.communityInfoList.communityName"
+          :prop="`communityInfoList.${index}.communityName`"
+          >
+            <el-input
+              v-model="item.communityName"
+              placeholder="请输入社区名称"
+            />
+          </el-form-item>
+          <el-form-item label="社区经度"
+            :rules="rules.communityInfoList.communityLongitude"
+          :prop="`communityInfoList.${index}.communityLongitude`"
+          >
+            <el-input
+              v-model="item.communityLongitude"
+              placeholder="请输入社区经度"
+            />
+          </el-form-item>
+          <el-form-item label="社区纬度"
+          :rules="rules.communityInfoList.communityLatitude"
+          :prop="`communityInfoList.${index}.communityLatitude`"
+          >
+            <el-input
+              v-model="item.communityLatitude"
+              placeholder="请输入社区纬度"
+            />
+          </el-form-item>
+          <el-button
+            type="primary"
+            circle
+            plain
+            icon="el-icon-circle-plus-outline"
+            @click="addcommunity"
+            v-if="index == 0"
+            style="margin-left: 10px"
+          ></el-button>
+
+          <el-button
+            type="danger"
+            icon="el-icon-delete"
+            circle
+            plain
+            @click="delcommunity(index)"
+            style="margin-left: 10px"
+            v-if="index != 0"
+          ></el-button>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 修改居住社区信息对话框 -->
     <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="areaCode">
+        <!-- <el-form-item label="所属区域编码" prop="areaCode">
           <el-input v-model="form.areaCode" placeholder="请输入所属区域编码" />
-        </el-form-item>
+        </el-form-item> -->
-        <el-form-item label="社区编码" prop="communityCode">
+        <el-form-item label="所属区域" prop="areaCode">
-          <el-input v-model="form.communityCode" placeholder="请输入社区编码" />
+          <el-input v-model="form.areaName" placeholder="请输入所属区域" />
         </el-form-item>
         <el-form-item label="社区名称" prop="communityName">
           <el-input v-model="form.communityName" placeholder="请输入社区名称" />
         </el-form-item>
         <el-form-item label="社区经度" prop="communityLongitude">
-          <el-input v-model="form.communityLongitude" placeholder="请输入社区经度" />
+          <el-input
+            v-model="form.communityLongitude"
+            placeholder="请输入社区经度"
+          />
         </el-form-item>
         <el-form-item label="社区纬度" prop="communityLatitude">
-          <el-input v-model="form.communityLatitude" placeholder="请输入社区纬度" />
+          <el-input
+            v-model="form.communityLatitude"
+            placeholder="请输入社区纬度"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -157,7 +398,15 @@
 </template>
 
 <script>
-import { listCommunityInfo, getCommunityInfo, delCommunityInfo, addCommunityInfo, updateCommunityInfo } from "@/api/system/communityInfo";
+import {
+  listCommunityInfo,
+  getCommunityInfo,
+  delCommunityInfo,
+  addCommunityInfo,
+  updateCommunityInfo,
+  FirstLevels,
+  SecondaryLevelInfo,
+} from "@/api/system/communityInfo";
 
 export default {
   name: "CommunityInfo",
@@ -175,37 +424,224 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      total2: 0,
+      total: 0,
       // 居住社区信息表格数据
       communityInfoList: [],
+      // 所属区域
+      arealist: [],
+      citylist: [],
+      arealists: [],
+      streetlist: [],
+      city:"",
+      area:"",
+      areaCodes:"",
+      value: "",
+      value3: "",
+      value2: "",
+      value1: "",
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      open2: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        areaCode: null,
+        // areaCode: null,
-        communityCode: null,
+        // communityCode: null,
-        communityName: null,
+        // communityName: null,
-        communityLongitude: null,
+        // communityLongitude: null,
-        communityLatitude: null,
+        // communityLatitude: null,
+      },
+      getProvincequeryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pageNum: 1,
+        // pageSize: 10,
+        // searchValue: null,
+        // createBy: null,
+        // createTime: null,
+        // updateBy: null,
+        // updateTime: null,
+        // remark: null,
+        // areaCode: null,
+        // areaName: null,
+        // areaLevel: null,
+        // sort: null,
+      },
+      getProvincequeryParams2: {
+        pageNum: 1,
+        pageSize: 10,
+        pageNum: 1,
+        // pageSize: 10,
+        // searchValue: null,
+        // createBy: null,
+        // createTime: null,
+        // updateBy: null,
+        // updateTime: null,
+        // remark: null,
+        // areaCode: null,
+        // areaName: null,
+        // areaLevel: null,
+        // sort: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        areaCode: 
+            {
+              required: true,
+              message: "所属区域不能为空",
+              trigger: "blur",
+            },
+             communityName: 
+            {
+              required: true,
+              message: "社区名称不能为空",
+              trigger: "blur",
+            },
+            communityLongitude: {
+              required: true,
+              message: "经度不能为空",
+              trigger: "blur",
+            },
+            communityLatitude:{
+              required: true,
+              message: "纬度不能为空",
+              trigger: "blur",
+            },
+        communityInfoList:{
+           areaCode: 
+            {
+              required: true,
+              message: "所属区域不能为空",
+              trigger: "blur",
+            },
+             communityName: 
+            {
+              required: true,
+              message: "社区名称不能为空",
+              trigger: "blur",
+            },
+            communityLongitude: {
+              required: true,
+              message: "经度不能为空",
+              trigger: "blur",
+            },
+            communityLatitude:{
+              required: true,
+              message: "纬度不能为空",
+              trigger: "blur",
             }
+        }
+         
+          
+          
+        
+      },
     };
   },
   created() {
     this.getList();
+    this.Provincelist();
   },
   methods: {
+    // 查询省事件
+    province(item) {
+      console.log(item);
+      // this.item.city=""
+      // this.value1 = "";
+      // this.value2 = "";
+      // this.value3 = "";
+      SecondaryLevelInfo(item.id).then((res) => {
+        console.log(res);
+        this.SecondaryLevelInfolist = res.data;
+        // console.log(this.SecondaryLevelInfolist);
+        this.citylist = res.data;
+      });
+    },
+    // 点击市
+    clickcity(item) {
+      this.value2 = "";
+      this.value3 = "";
+      console.log(item);
+      SecondaryLevelInfo(item.id).then((res) => {
+        console.log(res);
+        this.arealists = res.data;
+      });
+    },
+    //点击区县城
+    clickarea(item) {
+      this.value3 = "";
+      console.log(item);
+      SecondaryLevelInfo(item.id).then((res) => {
+        console.log(res);
+        this.streetlist = res.data;
+      });
+    },
+    //点击街道
+    clickstreet(item) {
+      this.form.areaCode = item.areaCode;
+      console.log(this.form);
+    },
+    // 所属省下拉框
+    loadMore() {
+      console.log("1");
+      var a = Math.ceil(this.total2 / 10);
+      console.log(this.arealist.length);
+      if (this.arealist.length + 1 >= this.total2) {
+      } else {
+        if (this.getProvincequeryParams.pageNum >= a) {
+        } else {
+          this.getProvincequeryParams.pageNum++;
+          FirstLevels(this.getProvincequeryParams).then((res) => {
+            console.log(res);
+            res.rows.forEach((e) => {
+              this.arealist.push(e);
+              console.log(this.arealist);
+            });
+          });
+        }
+      }
+    },
+    Provincelist() {
+      FirstLevels(this.getProvincequeryParams).then((res) => {
+        console.log(res);
+        this.arealist = res.data;
+        this.total2 = res.total;
+        console.log(this.arealist);
+      });
+    },
+    //删除delcommunity
+    delcommunity(index) {
+      this.form.communityInfoList.splice(index, 1);
+      console.log(this.form.communityInfoList);
+    },
+    //添加addcommunity
+    addcommunity() {
+      var obj = {
+        areaCode: "",
+        communityCode: "",
+        communityName: "",
+        communityLongitude: "",
+        communityLatitude: "",
+        // diseaseName: "",
+        // description: "",
+        // sort: "",
+      };
+      if (this.form.communityInfoList.length == 5) {
+        this.$message.error("最多只能5条");
+      } else {
+        this.form.communityInfoList.push(obj);
+      }
+    },
     /** 查询居住社区信息列表 */
     getList() {
       this.loading = true;
-      listCommunityInfo(this.queryParams).then(response => {
+      listCommunityInfo(this.queryParams).then((response) => {
         this.communityInfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -214,51 +650,104 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open2 = false;
       this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+        // id: null,
-        areaCode: null,
+        // areaCode: null,
-        communityCode: null,
+        // communityCode: null,
-        communityName: null,
+        // communityName: null,
-        communityLongitude: null,
+        // communityLongitude: null,
-        communityLatitude: null,
+        // communityLatitude: null,
-        createBy: null,
+        // createBy: null,
-        createTime: null,
+        // createTime: null,
-        updateBy: null,
+        // updateBy: null,
-        updateTime: null
+        // updateTime: null,
+        communityInfoList: [
+          {
+            province:'',
+            city:'',
+            area:'',
+            areaCodes: '',
+            areaCode: "",
+            communityCode: "",
+            communityName: "",
+            communityLongitude: "",
+            communityLatitude: "",
+          },
+        ],
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+   
       this.getList();
+
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+        this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        searchValue: null,
+        province:null,
+        city:null,
+        area:null,
+        areaCodes:null,
+
+        // createBy: null,
+        // createTime: null,
+        // updateBy: null,
+        // updateTime: null,
+        // remark: null,
+        areaCode: null,
+        areaName: null,
+        areaLevel: null,
+        // sort: null,
+      },
+      
+      //  FirstLevels(this.getProvincequeryParams).then((res) => {
+      //   console.log(res);
+      //   this.arealist = res.data;
+      //   this.total2 = res.total;
+      //   console.log(this.arealist);
+      // });
+      //  SecondaryLevelInfo(this.getProvincequeryParams2).then((res) => {
+      //   console.log(res);
+      //   this.citylist = res.data;
+      //   // this.arealists=res.data;
+      //   // this.streetlist=res.data;
+      //   this.total2 = res.total;
+      //   // console.log(this.arealist);
+      // });
+
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map((item) => item.id);
-      this.single = selection.length!==1
+      this.single = selection.length !== 1;
-      this.multiple = !selection.length
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.open = true;
+      // this.open = true;
+      this.open2 = true;
       this.title = "添加居住社区信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      console.log(row)
-      getCommunityInfo(id).then(response => {
+      const id = row.id || this.ids;
+      getCommunityInfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改居住社区信息";
@@ -266,18 +755,20 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateCommunityInfo(this.form).then(response => {
+            updateCommunityInfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+
               this.getList();
             });
           } else {
-            addCommunityInfo(this.form).then(response => {
+            addCommunityInfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.open2 = false;
               this.getList();
             });
           }
@@ -287,19 +778,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除居住社区信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal
+        .confirm('是否确认删除居住社区信息编号为"' + ids + '"的数据项？')
+        .then(function () {
           return delCommunityInfo(ids);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/communityInfo/export', {
+      this.download(
-        ...this.queryParams
+        "system/communityInfo/export",
-      }, `communityInfo_${new Date().getTime()}.xlsx`)
+        {
-    }
+          ...this.queryParams,
-  }
+        },
+        `communityInfo_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/system/patientArchives/index.vue

@@ -0,0 +1,682 @@
+<template>
+  <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="communityCode">
+        <el-input
+          v-model="queryParams.communityCode"
+          placeholder="请输入居住小区编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属区域编码" prop="areaCode">
+        <el-input
+          v-model="queryParams.areaCode"
+          placeholder="请输入所属区域编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户编号" prop="patientCode">
+        <el-input
+          v-model="queryParams.patientCode"
+          placeholder="请输入用户编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+       <el-form-item label="所属区域" prop="areaCode">
+        <el-select
+          v-model="value"
+          clearable
+          placeholder="请选择省"
+        
+        >
+          <el-option
+            v-for="item in arealist"
+            :key="item.id"
+            :label="item.areaName"
+            :value="item.id"
+            @click.native="province(item)"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+            v-model="value1"
+            clearable
+            placeholder="请选择市"
+            style="margin-left: 10px"
+          
+          >
+            <el-option
+              v-for="item in citylist"
+              :key="item.areaCode"
+              :label="item.areaName"
+              :value="item.areaCode"
+              @click.native="clickcity(item)"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="value2"
+            clearable
+            placeholder="请选择区"
+           style="margin-left: 10px"
+           
+          >
+            <el-option
+              v-for="item in arealists"
+              :key="item.areaCode"
+              :label="item.areaName"
+              :value="item.areaCode"
+              @click.native="clickarea(item)"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="value3"
+            clearable
+            placeholder="请选择街道"
+            style="margin-left: 10px"
+           
+          >
+            <el-option
+              v-for="item in streetlist"
+              :key="item.areaCode"
+              :label="item.areaName"
+              :value="item.areaCode"
+              @click.native="clickstreet(item)"
+            >
+            </el-option>
+          </el-select>
+        
+      </el-form-item>
+      
+      <!-- <el-form-item label="身份证号" prop="cardNo">
+        <el-input
+          v-model="queryParams.cardNo"
+          placeholder="请输入身份证号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="sys_user表id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入sys_user表id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户微信unionid" prop="unionid">
+        <el-input
+          v-model="queryParams.unionid"
+          placeholder="请输入用户微信unionid"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户微信openid" prop="openid">
+        <el-input
+          v-model="queryParams.openid"
+          placeholder="请输入用户微信openid"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="居住小区" prop="communityAliasName">
+        <el-input
+          v-model="queryParams.communityAliasName"
+          placeholder="请输入居住小区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="姓名" prop="patientName">
+        <el-input
+          v-model="queryParams.patientName"
+          placeholder="请输入姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="紧急联系人名称" prop="urgentContactName">
+        <el-input
+          v-model="queryParams.urgentContactName"
+          placeholder="请输入紧急联系人名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="紧急联系人电话" prop="urgentContactPhone">
+        <el-input
+          v-model="queryParams.urgentContactPhone"
+          placeholder="请输入紧急联系人电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="住址经度" prop="homeLongitude">
+        <el-input
+          v-model="queryParams.homeLongitude"
+          placeholder="请输入住址经度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="住址纬度" prop="homeLatitude">
+        <el-input
+          v-model="queryParams.homeLatitude"
+          placeholder="请输入住址纬度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="个人头像地址" prop="headPictureUrl">
+        <el-input
+          v-model="queryParams.headPictureUrl"
+          placeholder="请输入个人头像地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:patientArchives:add']"
+        >新增</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:patientArchives:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:patientArchives:remove']"
+        >删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:patientArchives:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="patientArchivesList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="patientName" />
+      <el-table-column label="所属区域" align="center" prop="areaName" />
+        <el-table-column label="居住小区" align="center" prop="communityAliasName" />
+         <el-table-column label="身份证号" align="center" prop="cardNo" />
+          <el-table-column label="联系电话" align="center" prop="phone" />
+          <el-table-column label="居住地址" align="center" prop="address" />
+            <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+communityAliasName
+      <!-- <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="居住小区编码" align="center" prop="communityCode" />
+      <el-table-column label="所属区域编码" align="center" prop="areaCode" />
+      <el-table-column label="用户编号" align="center" prop="patientCode" />
+      <el-table-column label="用户姓名" align="center" prop="patientName" />
+     
+      <el-table-column label="sys_user表id" align="center" prop="userId" />
+      <el-table-column label="用户微信unionid" align="center" prop="unionid" />
+      <el-table-column label="用户微信openid" align="center" prop="openid" />
+      <el-table-column label="手机号码" align="center" prop="phone" />
+    
+      <el-table-column label="紧急联系人名称" align="center" prop="urgentContactName" />
+      <el-table-column label="紧急联系人电话" align="center" prop="urgentContactPhone" />
+      <el-table-column label="住址经度" align="center" prop="homeLongitude" />
+      <el-table-column label="住址纬度" align="center" prop="homeLatitude" />
+      <el-table-column label="个人头像地址" align="center" prop="headPictureUrl" /> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:patientArchives:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:patientArchives:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改被护理人基本信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1018px" append-to-body >
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
+         <el-form-item label="姓名" prop="patientName">
+          <el-input v-model="form.patientName" placeholder="请输入姓名"  :disabled="true"/>
+        </el-form-item>
+         <el-form-item label="所属区域" prop="areaName">
+          <el-input v-model="form.areaName" placeholder="请输入所属区域" :disabled="true"/>
+        </el-form-item>
+         <el-form-item label="居住小区" prop="communityAliasName">
+          <el-input v-model="form.communityAliasName" placeholder="请输入居住小区" />
+        </el-form-item>
+         <el-form-item label="客户编号" prop="patientCode">
+          <el-input v-model="form.patientCode" placeholder="请输入客户编号" />
+        </el-form-item>
+         <el-form-item label="客户姓名" prop="patientName">
+          <el-input v-model="form.patientName" placeholder="请输入客户姓名" />
+        </el-form-item>
+         <el-form-item label="身份证号" prop="cardNo">
+          <el-input v-model="form.cardNo" placeholder="请输入身份证号" />
+        </el-form-item>
+         <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号码" />
+        </el-form-item>
+         <el-form-item label="居住地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入居住地址" />
+        </el-form-item>
+         <el-form-item label="紧急联系人" prop="urgentContactName">
+          <el-input v-model="form.urgentContactName" placeholder="请输入紧急联系人名称" />
+        </el-form-item>
+        <el-form-item label="紧急联系电话" prop="urgentContactPhone" label-width="80">
+          <el-input v-model="form.urgentContactPhone" placeholder="请输入紧急联系人电话" />
+        </el-form-item>
+        <el-form-item label="居住住址经度" prop="homeLongitude">
+          <el-input v-model="form.homeLongitude" placeholder="请输入住址经度" />
+        </el-form-item>
+        <el-form-item label="居住住址纬度" prop="homeLatitude">
+          <el-input v-model="form.homeLatitude" placeholder="请输入住址纬度" />
+        </el-form-item>
+            
+        <el-form-item label="头像" prop="headPictureUrl">
+          <!-- <img src="/profile/avatar/2022/09/08/1662624067718_20220908160250A001.jpg" alt=""> -->
+          <img :src="baseUrl + form.headPictureUrl" style="width: 500px;height: 400px">
+          <img slot="reference" :src="baseUrl + form.headPictureUrl" style="width: 200px;height: 150px">
+
+          <!-- <el-input v-model="form.headPictureUrl" placeholder="请输入个人头像地址" /> -->
+        </el-form-item> 
+      </el-form>
+        <!-- <el-form-item label="居住小区编码" prop="communityCode">
+          <el-input v-model="form.communityCode" placeholder="请输入居住小区编码" />
+        </el-form-item>
+        <el-form-item label="所属区域编码" prop="areaCode">
+          <el-input v-model="form.areaCode" placeholder="请输入所属区域编码" />
+        </el-form-item>
+        <el-form-item label="用户编号" prop="patientCode">
+          <el-input v-model="form.patientCode" placeholder="请输入用户编号" />
+        </el-form-item>
+       
+       
+        <el-form-item label="sys_user表id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入sys_user表id" />
+        </el-form-item>
+        <el-form-item label="用户微信unionid" prop="unionid">
+          <el-input v-model="form.unionid" placeholder="请输入用户微信unionid" />
+        </el-form-item>
+        <el-form-item label="用户微信openid" prop="openid">
+          <el-input v-model="form.openid" placeholder="请输入用户微信openid" />
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号码" />
+        </el-form-item>
+       
+        <el-form-item label="紧急联系人名称" prop="urgentContactName">
+          <el-input v-model="form.urgentContactName" placeholder="请输入紧急联系人名称" />
+        </el-form-item>
+        <el-form-item label="紧急联系人电话" prop="urgentContactPhone">
+          <el-input v-model="form.urgentContactPhone" placeholder="请输入紧急联系人电话" />
+        </el-form-item>-->
+    
+      <div slot="footer" class="dialog-footer" style="margin-right:40%">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPatientArchives, getPatientArchives, delPatientArchives, addPatientArchives, updatePatientArchives,FirstLevel,SecondaryLevelInfo} from "@/api/system/patientArchives";
+
+export default {
+  name: "PatientArchives",
+  data() {
+    return {
+      baseUrl:"http://192.168.16.85:8080",
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      total2:0,
+      total3:0,
+      value3: "",
+      value2: "",
+      value1: "",
+      value: "",
+      // 被护理人基本信息表格数据
+      patientArchivesList: [],
+      // 所属区域
+      arealist:[],
+      // 查询市
+      SecondaryLevelInfolist:[],
+
+      citylist: [],
+      arealists:[],
+      streetlist:[],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        communityCode: null,
+        areaCode: null,
+        patientCode: null,
+        patientName: null,
+        cardNo: null,
+        userId: null,
+        unionid: null,
+        openid: null,
+        phone: null,
+        address: null,
+        urgentContactName: null,
+        urgentContactPhone: null,
+        homeLongitude: null,
+        homeLatitude: null,
+        headPictureUrl: null,
+      },
+      getProvincequeryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+       SecondaryLevelInfoqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id:null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        patientName: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        areaName: [
+          { required: true, message: "所属区域不能为空", trigger: "blur" }
+        ],
+         communityAliasName: [
+          { required: true, message: "居住不能为空", trigger: "blur" }
+        ],
+         patientCode: [
+          { required: true, message: "客户编号不能为空", trigger: "blur" }
+        ],
+         urgentContactName: [
+          { required: true, message: "客户姓名不能为空", trigger: "blur" }
+        ],
+         cardNo: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" }
+        ],
+          address: [
+          { required: true, message: "居住地址不能为空", trigger: "blur" }
+        ],
+         urgentContactName: [
+          { required: true, message: "紧急联系人不能为空", trigger: "blur" }
+        ],
+         urgentContactPhone: [
+          { required: true, message: "紧急联系电话不能为空", trigger: "blur" }
+        ],
+         homeLongitude: [
+          { required: true, message: "居住地址经度不能为空", trigger: "blur" }
+        ],
+        homeLatitude: [
+          { required: true, message: "居住地址维度不能为空", trigger: "blur" }
+        ],
+        headPictureUrl: [
+          { required: true, message: "头像不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.Provincelist();
+    // this.areas();
+  },
+  methods: {
+    // 查询省事件
+    province(item){
+      console.log(item)
+      this.value1 = "";
+       this.value2 = "";
+      this.value3 = "";
+      SecondaryLevelInfo(item.id).then((res) => {
+        console.log(res);
+        this.SecondaryLevelInfolist = res.data;
+        // console.log(this.SecondaryLevelInfolist);
+        this.citylist = res.data;
+      });
+    },
+    // 点击市
+     clickcity(item) {
+      this.value2 = "";
+      this.value3 = "";
+      console.log(item);
+      SecondaryLevelInfo(item.id).then((res) => {
+        console.log(res);
+        this.arealists = res.data;
+      });
+    },
+ //点击区县城
+    clickarea(item) {
+      this.value3 = "";
+      console.log(item);
+      SecondaryLevelInfo(item.id).then((res) => {
+        console.log(res);
+        this.streetlist = res.data;
+      });
+    },
+     //点击街道
+    clickstreet(item) {
+      this.form.areaCode = item.areaCode;
+      console.log(this.form);
+    },
+    // 所属省下拉框
+        loadMore() {
+      console.log("1");
+      var a = Math.ceil(this.total2 / 10);
+      console.log(this.arealist.length);
+      if (this.arealist.length + 1 >= this.total2) {
+      } else {
+        if (this.getProvincequeryParams.pageNum >= a) {
+        } else {
+          this.getProvincequeryParams.pageNum++;
+          FirstLevel(this.getProvincequeryParams).then((res) => {
+            console.log(res);
+            res.rows.forEach((e) => {
+              this.arealist.push(e);
+              console.log(this.arealist)
+            });
+          });
+        }
+      }
+    },
+      Provincelist() {
+      FirstLevel(this.getProvincequeryParams).then((res) => {
+        console.log(res);
+        this.arealist = res.data;
+        this.total2 = res.total;
+        console.log(this.arealist);
+      });
+    },
+    /** 查询被护理人基本信息列表 */
+    getList() {
+      this.loading = true;
+      listPatientArchives(this.queryParams).then(response => {
+        this.patientArchivesList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        communityCode: null,
+        areaCode: null,
+        patientCode: null,
+        patientName: null,
+        cardNo: null,
+        userId: null,
+        unionid: null,
+        openid: null,
+        phone: null,
+        address: null,
+        urgentContactName: null,
+        urgentContactPhone: null,
+        homeLongitude: null,
+        homeLatitude: null,
+        headPictureUrl: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加被护理人基本信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPatientArchives(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改被护理人基本信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePatientArchives(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPatientArchives(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除被护理人基本信息编号为"' + ids + '"的数据项？').then(function() {
+        return delPatientArchives(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/patientArchives/export', {
+        ...this.queryParams
+      }, `patientArchives_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/person/index.vue

@@ -60,7 +60,7 @@
           </el-option>
         </el-select>
       </el-form-item> -->
-      <el-form-item label="护理站" prop="departmentName">
+      <el-form-item label="护理站" prop="nurseStationId">
         <el-select
           v-model="queryParams.nurseStationId"
           clearable
@@ -172,6 +172,7 @@
         label="所属科室编码"
         align="center"
         prop="departmentCode"
+
       /> -->
       <!-- <el-table-column label="创建人id" align="center" prop="userId" /> -->
       <!-- <el-table-column
@@ -444,6 +445,7 @@
             plain
             @click="deldisease(index)"
 
+
             v-if="index != 0"
           ></el-button>
         </div>