From 678fabd10f631792c74a1099195f781f2516ceae Mon Sep 17 00:00:00 2001
From: ChiyokoYY <525231835@qq.com>
Date: Sun, 8 Mar 2020 13:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E7=82=B9=E5=8C=BB=E9=99=A2=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/feature/diseaseInfoServer.ts          |   5 +
 .../DiseaseInfoHospitalDD/DiseaseList.vue     | 136 +++--------
 .../DiseaseInfoHospitalDD/PeopleInfoEdit.vue  | 214 ++++++++----------
 3 files changed, 130 insertions(+), 225 deletions(-)

diff --git a/src/api/feature/diseaseInfoServer.ts b/src/api/feature/diseaseInfoServer.ts
index ab437bd..cd24089 100644
--- a/src/api/feature/diseaseInfoServer.ts
+++ b/src/api/feature/diseaseInfoServer.ts
@@ -152,6 +152,11 @@ export class DiseaseInfoServer {
     const url = '/infection/point/hospital/list';
     return this.rSerivce.serverObj.post(url, opts);
   }
+  // 定点医院病患信息详情
+  public searchPointInfo(id: any) {
+    const url = `/infection/point/hospital/detail?id=${id}`;
+    return this.rSerivce.serverObj.get(url);
+  }
   // 病情下拉框
   public findPointIllnessState() {
     const url = '/infection/point/hospital/findPointIllnessState';
diff --git a/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue b/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue
index bafc98c..fb196e4 100644
--- a/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue
+++ b/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue
@@ -7,12 +7,7 @@
       </div>
     </div>
     <div class="diseaseList-query-form">
-      <el-form
-        :inline="true"
-        :model="queryInfo"
-        label-width="100px"
-        demo-form-inline
-      >
+      <el-form :inline="true" :model="queryInfo" label-width="100px" demo-form-inline>
         <el-form-item label="姓名:">
           <el-input
             v-model="queryInfo.suffererName"
@@ -22,25 +17,13 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="身份证:">
-          <el-input
-            v-model="queryInfo.idNo"
-            placeholder="请输入"
-            @input="query('input')"
-          ></el-input>
+          <el-input v-model="queryInfo.idNo" placeholder="请输入" @input="query('input')"></el-input>
         </el-form-item>
         <el-form-item label="手机号:">
-          <el-input
-            v-model="queryInfo.telphone"
-            placeholder="请输入"
-            @input="query('input')"
-          ></el-input>
+          <el-input v-model="queryInfo.telphone" placeholder="请输入" @input="query('input')"></el-input>
         </el-form-item>
         <el-form-item label="患者类型:">
-          <el-select
-            v-model="queryInfo.suffererType"
-            placeholder="请选择"
-            @change="query"
-          >
+          <el-select v-model="queryInfo.suffererType" placeholder="请选择" @change="query">
             <el-option
               v-for="(item, index) in typeList"
               :key="index"
@@ -50,11 +33,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="患者状态:">
-          <el-select
-            v-model="queryInfo.suffererStatus"
-            placeholder="请选择"
-            @change="query"
-          >
+          <el-select v-model="queryInfo.suffererStatus" placeholder="请选择" @change="query">
             <el-option
               v-for="(item, index) in statusList"
               :key="index"
@@ -64,11 +43,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="患者病情:">
-          <el-select
-            v-model="queryInfo.illnessState"
-            placeholder="请选择"
-            @change="query"
-          >
+          <el-select v-model="queryInfo.illnessState" placeholder="请选择" @change="query">
             <el-option
               v-for="(item, index) in illnessList"
               :key="index"
@@ -82,62 +57,25 @@
     <div class="diseaseList-data">
       <el-scrollbar>
         <el-table :data="tableData">
-          <el-table-column
-            prop="suffererName"
-            width="90px"
-            label="人员姓名"
-          ></el-table-column>
-          <el-table-column
-            prop="gender"
-            width="90px"
-            label="性别"
-          ></el-table-column>
-          <el-table-column
-            prop="age"
-            width="90px"
-            label="年龄"
-          ></el-table-column>
+          <el-table-column prop="suffererName" width="90px" label="人员姓名"></el-table-column>
+          <el-table-column prop="gender" width="90px" label="性别"></el-table-column>
+          <el-table-column prop="age" width="90px" label="年龄"></el-table-column>
           <el-table-column prop="telphone" label="手机号"></el-table-column>
-          <el-table-column
-            prop="suffererType"
-            label="患者类型"
-            :show-overflow-tooltip="true"
-          ></el-table-column>
-          <el-table-column
-            prop="illnessState"
-            label="患者状态"
-            :show-overflow-tooltip="true"
-          ></el-table-column>
-          <el-table-column
-            prop="suffererStatus"
-            label="当前所在医院"
-            :show-overflow-tooltip="true"
-          ></el-table-column>
-          <el-table-column
-            prop="illnessState"
-            label="病情"
-            :show-overflow-tooltip="true"
-          ></el-table-column>
-          <el-table-column
-            prop="idNo"
-            label="身份证"
-            :show-overflow-tooltip="true"
-          ></el-table-column>
+          <el-table-column prop="suffererType" label="患者类型" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="illnessState" label="患者状态" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="suffererStatus" label="当前所在医院" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="illnessState" label="病情" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="idNo" label="身份证" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column
             prop="detailed_address"
             label="家庭住址"
             :show-overflow-tooltip="true"
             min-width="140px"
           ></el-table-column>
-          <!-- <el-table-column label="操作" width="80">
+          <el-table-column label="操作" width="80">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="primary"
-                @click="edit(scope.$index, scope.row)"
-                >编辑</el-button
-              >
-              <el-button
+              <el-button size="mini" type="primary" @click="edit(scope.$index, scope.row)">详情</el-button>
+              <!-- <el-button
                 size="mini"
                 type="success"
                 @click="getDetail(scope.$index, scope.row)"
@@ -145,9 +83,9 @@
               >
               <el-button size="mini" type="danger" @click="remove(scope.row.id)"
                 >删除</el-button
-              >
+              >-->
             </template>
-          </el-table-column>-->
+          </el-table-column>
         </el-table>
       </el-scrollbar>
     </div>
@@ -179,16 +117,8 @@
         :on-success="uploadSuccess"
         :on-error="uploadError"
       >
-        <el-button slot="trigger" size="small" type="primary"
-          >选取文件</el-button
-        >
-        <el-button
-          style="margin-left: 10px;"
-          size="small"
-          type="success"
-          @click="submitUpload"
-          >上传</el-button
-        >
+        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+        <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
         <!-- <div slot="tip" class="el-upload__tip">
           只能上传excel文件
         </div>-->
@@ -208,7 +138,7 @@ const serverPath = require('../../../config/index.js').servePath;
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import { diseaseInfoServer } from '@/api/installServer';
 @Component({
-  name: 'DiseaseList',
+  name: 'DiseaseList'
 })
 export default class DiseasDeList extends Vue {
   // 角色权限
@@ -231,14 +161,14 @@ export default class DiseasDeList extends Vue {
 
   // 查询条件
   private queryInfo: any = {
-    idNo: '',
-    illnessState: '0',
+    // idNo: '',
+    // illnessState: '0',
     page: 0,
-    size: 10,
-    suffererName: '',
-    suffererStatus: '0',
-    suffererType: '0',
-    telphone: '',
+    size: 10
+    // suffererName: '',
+    // suffererStatus: '0',
+    // suffererType: '0',
+    // telphone: '',
   };
   private statusList: any[] = [];
   private typeList: any[] = [];
@@ -356,8 +286,8 @@ export default class DiseasDeList extends Vue {
       {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
-      },
+        type: 'warning'
+      }
     );
     if (result !== 'confirm') {
       return this.$message.info('已取消删除');
@@ -432,7 +362,7 @@ export default class DiseasDeList extends Vue {
       suffererName: '',
       suffererStatus: '',
       suffererTel: '',
-      suffererType: '',
+      suffererType: ''
     };
     diseaseInfoServer.downloadList(params).then((res: any) => {
       this.downloadFun(res);
@@ -455,7 +385,7 @@ export default class DiseasDeList extends Vue {
       suffererName: '',
       suffererStatus: '',
       suffererTel: '',
-      suffererType: '',
+      suffererType: ''
     };
     diseaseInfoServer.downloadList(params).then((res: any) => {
       this.downloadFun(res);
diff --git a/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue b/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
index 891eec2..3e9a832 100644
--- a/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
+++ b/src/components/feature/DiseaseInfoHospitalDD/PeopleInfoEdit.vue
@@ -1,22 +1,10 @@
 <template>
   <div class="DiseaseAdd">
     <div class="DiseaseAdd-tool-bar">
-      <span class="tool-bar-title">编辑</span>
+      <span class="tool-bar-title">详情</span>
       <div>
-        <el-button
-          type="primary"
-          icon="el-icon-check"
-          size="small"
-          @click="save"
-          >保存</el-button
-        >
-        <el-button
-          type="primary"
-          icon="el-icon-back"
-          size="small"
-          @click="$router.go(-1)"
-          >返回</el-button
-        >
+        <!-- <el-button type="primary" icon="el-icon-check" size="small" @click="save">保存</el-button> -->
+        <el-button type="primary" icon="el-icon-back" size="small" @click="$router.go(-1)">返回</el-button>
       </div>
     </div>
     <div class="DiseaseAdd-content">
@@ -30,42 +18,39 @@
             class="demo-ruleForm"
             label-position="right"
             :model="editInfo"
+            disabled
           >
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="姓名:" prop="suffererName">
-                  <el-input
-                    v-model="editInfo.suffererName"
-                    placeholder="请输入"
-                  ></el-input>
+                  <el-input v-model="editInfo.suffererName" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="身份证:" prop="suffererCard">
-                  <el-input
-                    v-model="editInfo.suffererCard"
-                    placeholder="请输入"
-                    disabled
-                  ></el-input>
+                <el-form-item label="性别:" prop="gender">
+                  <el-input v-model="editInfo.gender" placeholder></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="年龄:" prop="age">
+                  <el-input v-model="editInfo.age" placeholder></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="身份证:" prop="idNo">
+                  <el-input v-model="editInfo.idNo" placeholder="请输入" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
-                <el-form-item label="联系电话:" prop="suffererTel">
-                  <el-input
-                    v-model="editInfo.suffererTel"
-                    placeholder="请输入"
-                  ></el-input>
+                <el-form-item label="联系电话:" prop="telphone">
+                  <el-input v-model="editInfo.telphone" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="病情:" prop="illnessState">
-                  <el-select
-                    v-model="editInfo.illnessState"
-                    placeholder="请选择"
-                    style="width: 100%"
-                  >
+                  <el-select v-model="editInfo.illnessState" placeholder="请选择" style="width: 100%">
                     <el-option
                       v-for="(item, index) in illnessStateList"
                       :key="index"
@@ -90,16 +75,12 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-              </el-col> -->
+              </el-col>-->
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="患者类型:" prop="suffererType">
-                  <el-select
-                    v-model="editInfo.suffererType"
-                    placeholder="请选择"
-                    style="width: 100%"
-                  >
+                  <el-select v-model="editInfo.suffererType" placeholder="请选择" style="width: 100%">
                     <el-option
                       v-for="(item, index) in suffererTypeList"
                       :key="index"
@@ -109,19 +90,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="类型更改时间:">
-                  <el-date-picker
-                    v-model="editInfo.suffererTypeTime"
-                    type="datetime"
-                    placeholder="选择日期"
-                    :picker-options="pickerOptions"
-                    style="width: 100%"
-                  ></el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="状态:" prop="suffererStatus">
                   <el-select
@@ -140,6 +108,19 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
+                <!-- <el-form-item label="类型更改时间:">
+                  <el-date-picker
+                    v-model="editInfo.suffererTypeTime"
+                    type="datetime"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions"
+                    style="width: 100%"
+                  ></el-date-picker>
+                </el-form-item>-->
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <!-- <el-col :span="12">
                 <el-form-item label="状态更改时间:">
                   <el-date-picker
                     v-model="editInfo.suffererStatusTime"
@@ -149,7 +130,7 @@
                     style="width: 100%"
                   ></el-date-picker>
                 </el-form-item>
-              </el-col>
+              </el-col>-->
             </el-row>
             <!-- <el-row :gutter="20">
               <el-col :span="12">
@@ -167,33 +148,26 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>-->
             <el-row :gutter="20">
               <el-col :span="24">
-                <el-form-item label="住址:" prop="suffererAddress">
-                  <el-input
-                    v-model="editInfo.suffererAddress"
-                    type="textarea"
-                  ></el-input>
+                <el-form-item label="住址:" prop="detailed_address">
+                  <el-input v-model="editInfo.detailed_address" type="textarea"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <!-- <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="备注:">
-                  <el-input
-                    v-model="editInfo.remark"
-                    type="textarea"
-                    placeholder="请输入"
-                  ></el-input>
+                  <el-input v-model="editInfo.remark" type="textarea" placeholder></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row>-->
           </el-form>
         </div>
       </div>
       <div class="DiseaseAdd-form">
-        <div class="form-title">隔离医院信息</div>
+        <!-- <div class="form-title">定点医院信息</div> -->
         <div class="form-wrap">
           <el-form
             :rules="rules"
@@ -202,13 +176,14 @@
             class="demo-ruleForm"
             label-position="right"
             :model="editInfo"
+            disabled
           >
             <el-row :gutter="20">
               <el-col :span="12">
-                <el-form-item label="隔离点/医院:" prop="curSiteId">
+                <el-form-item label="定点医院:" prop="curSiteId">
                   <el-select
-                    v-model="editInfo.curSiteId"
-                    placeholder="请选择"
+                    v-model="editInfo.hospitalName"
+                    placeholder
                     disabled
                     style="width: 100%"
                     @change="selectSite"
@@ -222,12 +197,14 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="病区/房号:">
-                  <el-input
-                    v-model="editInfo.roomNumber"
-                    placeholder="请输入"
-                  ></el-input>
+                  <el-input v-model="editInfo.roomNumber" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>-->
+              <el-col :span="12">
+                <el-form-item label="死亡时间:">
+                  <el-input v-model="editInfo.deathDate" placeholder></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -246,7 +223,7 @@
               <el-col :span="12">
                 <el-form-item label="预计解除时间:">
                   <el-date-picker
-                    v-model="editInfo.turnOutPlanTime"
+                    v-model="editInfo.dischargeTime"
                     type="datetime"
                     placeholder="选择日期"
                     style="width: 100%"
@@ -254,14 +231,10 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <!-- <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="转入区:" prop="fromAreaCode">
-                  <el-select
-                    v-model="editInfo.fromAreaCode"
-                    placeholder="请选择"
-                    style="width: 100%"
-                  >
+                  <el-select v-model="editInfo.fromAreaCode" placeholder="" style="width: 100%">
                     <el-option
                       v-for="(item, index) in districtList"
                       :key="index"
@@ -274,13 +247,10 @@
 
               <el-col :span="12">
                 <el-form-item label="转入区医院:">
-                  <el-input
-                    v-model="editInfo.fromAddress"
-                    placeholder="请输入"
-                  ></el-input>
+                  <el-input v-model="editInfo.fromAddress" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row>-->
           </el-form>
         </div>
       </div>
@@ -293,7 +263,7 @@ import { Component, Prop, Vue } from 'vue-property-decorator';
 import { diseaseInfoServer } from '@/api/installServer';
 
 @Component({
-  name: 'PeopleInfoEdit',
+  name: 'PeopleInfoEdit'
 })
 export default class PeopleInfoEdit extends Vue {
   private id: any;
@@ -320,7 +290,7 @@ export default class PeopleInfoEdit extends Vue {
     turnOutPlanTime: '',
     turnOutTime: '',
     turnOutToPlace: '',
-    turnOutToPlaceType: '',
+    turnOutToPlaceType: ''
   };
 
   // 病患类型下拉框数据
@@ -344,7 +314,7 @@ export default class PeopleInfoEdit extends Vue {
   // 性别下拉框
   private genderList: any[] = [
     { value: 1, label: '男' },
-    { value: 2, label: '女' },
+    { value: 2, label: '女' }
   ];
 
   // 验证表单对象
@@ -355,31 +325,31 @@ export default class PeopleInfoEdit extends Vue {
 
   // 添加校验规则
   private rules = {
-    curSiteId: [
-      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
-    ],
-    suffererName: [
-      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
-    ],
-    suffererCard: [
-      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
-      { validator: this.validIDCardBlur, trigger: 'blur' },
-      { validator: this.validIDCardChange, trigger: 'change' },
-    ],
-    suffererTel: [
-      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
-      { validator: this.validTelBlur, trigger: 'blur' },
-      { validator: this.validTelChange, trigger: 'change' },
-    ],
-    suffererStatus: [
-      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
-    ],
-    suffererType: [
-      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
-    ],
-    illnessState: [
-      { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
-    ],
+    // curSiteId: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] }
+    // ],
+    // suffererName: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] }
+    // ],
+    // suffererCard: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    //   { validator: this.validIDCardBlur, trigger: 'blur' },
+    //   { validator: this.validIDCardChange, trigger: 'change' }
+    // ],
+    // suffererTel: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
+    //   { validator: this.validTelBlur, trigger: 'blur' },
+    //   { validator: this.validTelChange, trigger: 'change' }
+    // ],
+    // suffererStatus: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] }
+    // ],
+    // suffererType: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] }
+    // ],
+    // illnessState: [
+    //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] }
+    // ]
     // suffererAddress: [
     //   { required: true, message: '该项不能为空', trigger: ['blur', 'change'] },
     // ],
@@ -390,7 +360,7 @@ export default class PeopleInfoEdit extends Vue {
     return {
       disabledDate: (time: any) => {
         return this.$moment(time).isAfter(this.$moment(), 'day');
-      },
+      }
     };
   })();
 
@@ -399,7 +369,7 @@ export default class PeopleInfoEdit extends Vue {
     if (
       value.length >= 18 &&
       !/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
-        value,
+        value
       )
     ) {
       return callback(new Error('请输入有效的身份证号码'));
@@ -409,7 +379,7 @@ export default class PeopleInfoEdit extends Vue {
   private validIDCardBlur(rule: any, value: string, callback: any) {
     if (
       !/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
-        value,
+        value
       )
     ) {
       return callback(new Error('请输入有效的身份证号码'));
@@ -448,7 +418,7 @@ export default class PeopleInfoEdit extends Vue {
   }
 
   private getPatientInfo() {
-    diseaseInfoServer.searchSuffererInfo(this.id).then((res: any) => {
+    diseaseInfoServer.searchPointInfo(this.id).then((res: any) => {
       if (res.status === 200) {
         this.editInfo = res.data.data;
         this.editInfo.suffererType = `${this.editInfo.suffererType}`;
@@ -467,7 +437,7 @@ export default class PeopleInfoEdit extends Vue {
           curSiteId: this.editInfo.curSiteId,
           suffererStatusTime: this.editInfo.suffererStatusTime,
           suffererTypeTime: this.editInfo.suffererTypeTime,
-          moveIntoTime: this.editInfo.moveIntoTime,
+          moveIntoTime: this.editInfo.moveIntoTime
         };
       }
     });
-- 
Gitee