From 8dbac7145cb22b31630b04d7f17ab3fe9f7a5211 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 21 Sep 2022 10:53:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A2=AB=E6=8A=A4=E7=90=86=E4=BA=BA=20?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E9=87=8D=E7=BD=AE=20=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/communityInfo/index.vue   |  52 +---
 src/views/system/patientArchives/index.vue | 317 +++++++--------------
 2 files changed, 100 insertions(+), 269 deletions(-)

diff --git a/src/views/system/communityInfo/index.vue b/src/views/system/communityInfo/index.vue
index e914fa2..c36b3dc 100644
--- a/src/views/system/communityInfo/index.vue
+++ b/src/views/system/communityInfo/index.vue
@@ -98,22 +98,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="社区经度" prop="communityLongitude">
-        <el-input
-          v-model="queryParams.communityLongitude"
-          placeholder="请输入社区经度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="社区纬度" prop="communityLatitude">
-        <el-input
-          v-model="queryParams.communityLatitude"
-          placeholder="请输入社区纬度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
+
       <el-form-item>
         <el-button
           type="primary"
@@ -675,16 +660,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        // id: null,
-        // areaCode: null,
-        // communityCode: null,
-        // communityName: null,
-        // communityLongitude: null,
-        // communityLatitude: null,
-        // createBy: null,
-        // createTime: null,
-        // updateBy: null,
-        // updateTime: null,
+
         communityInfoList: [
           {
             province: "",
@@ -704,7 +680,6 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-
       this.getList();
     },
     /** 重置按钮操作 */
@@ -717,33 +692,10 @@ export default {
         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();
     },
     // 多选框选中数据
diff --git a/src/views/system/patientArchives/index.vue b/src/views/system/patientArchives/index.vue
index a9c6a15..8444efa 100644
--- a/src/views/system/patientArchives/index.vue
+++ b/src/views/system/patientArchives/index.vue
@@ -1,37 +1,11 @@
 <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-form-item label="所属区域" prop="areaCode">
         <el-select
-          v-model="value"
+          v-model="queryParams.province"
           clearable
           placeholder="请选择省"
-        
         >
           <el-option
             v-for="item in arealist"
@@ -42,97 +16,55 @@
           >
           </el-option>
         </el-select>
+
         <el-select
-            v-model="value1"
-            clearable
-            placeholder="请选择市"
-            style="margin-left: 10px"
-          
+          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
-              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>
+        </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
-              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>
+        </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
-              v-for="item in streetlist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="clickstreet(item)"
-            >
-            </el-option>
-          </el-select>
-        
+          </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"
@@ -149,46 +81,6 @@
           @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>
@@ -251,23 +143,6 @@
           <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
@@ -323,10 +198,10 @@ communityAliasName
          <el-form-item label="居住地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入居住地址" maxlength="100"/>
         </el-form-item>
-         <el-form-item label="紧急联系人" prop="urgentContactName">
+         <el-form-item label="紧急联系人" prop="urgentContactName" >
           <el-input v-model="form.urgentContactName" placeholder="请输入紧急联系人名称" maxlength="20"/>
         </el-form-item>
-        <el-form-item label="紧急联系电话" prop="urgentContactPhone" label-width="80">
+        <el-form-item label="紧急联系电话" prop="urgentContactPhone" label-width="80" style="margin-left:15px">
           <el-input v-model="form.urgentContactPhone" placeholder="请输入紧急联系人电话" maxlength="11"/>
         </el-form-item>
         <el-form-item label="居住住址经度" prop="homeLongitude">
@@ -343,36 +218,6 @@ communityAliasName
           <!-- <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>
@@ -418,6 +263,10 @@ export default {
       citylist: [],
       arealists:[],
       streetlist:[],
+
+      city: "",
+      area: "",
+      areaCode: "",
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -467,7 +316,7 @@ export default {
          patientCode: [
           { required: true, message: "客户编号不能为空", trigger: "blur" }
         ],
-         urgentContactName: [
+         patientName: [
           { required: true, message: "客户姓名不能为空", trigger: "blur" }
         ],
          cardNo: [
@@ -479,21 +328,21 @@ export default {
           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" }
-        ],
+        //  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" }
+        // ],
       }
     };
   },
@@ -506,6 +355,9 @@ export default {
     // 查询省事件
     province(item){
       console.log(item)
+        this.queryParams.city = "";
+      this.queryParams.area = "";
+      this.queryParams.areaCode = "";
       this.value1 = "";
        this.value2 = "";
       this.value3 = "";
@@ -518,6 +370,8 @@ export default {
     },
     // 点击市
      clickcity(item) {
+       this.queryParams.area = "";
+      this.queryParams.areaCode = "";
       this.value2 = "";
       this.value3 = "";
       console.log(item);
@@ -604,8 +458,21 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        patientArchivesList: [
+          {
+            province: "",
+            city: "",
+            area: "",
+            areaCode: "",
+            communityCode: "",
+            communityName: "",
+            communityLongitude: "",
+            communityLatitude: "",
+          },
+        ],
       };
+        
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -616,6 +483,18 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+       (this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        searchValue: null,
+        province: null,
+        city: null,
+        area: null,
+        areaCode: null,
+        areaName: null,
+        areaLevel: null,
+        // sort: null,
+      }),
       this.handleQuery();
     },
     // 多选框选中数据