From eb01ce23d3aee3e02a0c2701b64c5cb91e715976 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 4 Aug 2023 17:26:22 +0800
Subject: [PATCH] dj

---
 .../patientRegister/PatientRegisterEdit.vue   | 334 +++++-------------
 .../patientRegister/PatientRegisterList.vue   |  65 ++--
 src/store/index.js                            |   3 +-
 src/views/customerOrg/customerOrg.vue         |   3 +-
 src/views/customerOrg/patientRegister.vue     |   8 +-
 5 files changed, 127 insertions(+), 286 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 47d93e2..551c727 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -3,36 +3,21 @@
     <table>
       <td style="width: 60%">
         <div style="display: flex">
-          <el-form
-            ref="form"
-            :model="form"
-            label-width="80px"
-            :rules="rules"
-            size="medium"
-          >
+          <el-form ref="form" :model="form" label-width="80px" :rules="rules" size="medium">
             <el-row>
               <el-col :span="6">
                 <el-form-item label="单位名称" prop="customerOrgId">
-                  <el-cascader
-                    v-model="form.customerOrgId"
-                    :options="patientRegister.customerOrgTreeAll"
-                    :props="{
-                      checkStrictly: true,
-                      expandTrigger: 'hover',
-                      ...customerOrg.treeprops,
-                    }"
-                    :show-all-levels="false"
-                    disabled
-                  >
+                  <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll" :props="{
+                    checkStrictly: true,
+                    expandTrigger: 'hover',
+                    ...customerOrg.treeprops,
+                  }" :show-all-levels="false" disabled>
                   </el-cascader>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="条码号" prop="patientRegisterNo">
-                  <el-input
-                    v-model="form.patientRegisterNo"
-                    disabled
-                  ></el-input>
+                  <el-input v-model="form.patientRegisterNo" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -45,21 +30,13 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="姓名" prop="patientName">
-                  <el-input
-                    v-model="form.patientName"
-                    @blur="query(form.patientName)"
-                  ></el-input>
+                  <el-input v-model="form.patientName" @blur="query(form.patientName)"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="性别" prop="sexId">
                   <el-select v-model="form.sexId" placeholder="请选择">
-                    <el-option
-                      v-for="item in dict.sex"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    >
+                    <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -79,27 +56,15 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="出生日期" prop="birthDate">
-                  <el-date-picker
-                    v-model="form.birthDate"
-                    type="date" value-format="yyyy-MM-dd"
-                    placeholder="出生日期"
-                    style="width: 135px" 
-                    @change="changeBirthDate"
-                  />
+                  <el-date-picker v-model="form.birthDate" type="date" value-format="yyyy-MM-dd" placeholder="出生日期"
+                    style="width: 135px" @change="changeBirthDate" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="婚姻状况" prop="maritalStatusId">
-                  <el-select
-                    v-model="form.maritalStatusId"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in dict.maritalStatus"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    >
+                  <el-select v-model="form.maritalStatusId" placeholder="请选择">
+                    <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
+                      :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -109,33 +74,17 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="体检类别" prop="medicalTypeId">
-                  <el-select
-                    v-model="form.medicalTypeId"
-                    placeholder="请选择"
-                    filterable
-                  >
-                    <el-option
-                      v-for="item in dict.medicalType"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    />
+                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable>
+                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="人员类别" prop="personnelTypeId">
-                  <el-select
-                    v-model="form.personnelTypeId"
-                    placeholder="请选择"
-                    filterable
-                  >
-                    <el-option
-                      v-for="item in dict.personnelType"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    />
+                  <el-select v-model="form.personnelTypeId" placeholder="请选择" filterable>
+                    <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -166,11 +115,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="身份证号" prop="idNo">
-                  <el-input
-                    v-model="form.idNo"
-                    @change="changeIdNo"
-                    @blur="query(form.idNo)"
-                  ></el-input>
+                  <el-input v-model="form.idNo" @change="changeIdNo" @blur="query(form.idNo)"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -195,17 +140,8 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="民族" prop="nationId">
-                  <el-select
-                    v-model="form.nationId"
-                    placeholder="请选择"
-                    filterable
-                  >
-                    <el-option
-                      v-for="item in dict.nation"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    />
+                  <el-select v-model="form.nationId" placeholder="请选择" filterable>
+                    <el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName" :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -216,18 +152,9 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="性激素期" prop="sexHormoneTermId">
-                  <el-select
-                    v-model="form.sexHormoneTermId"
-                    placeholder="请选择"
-                    filterable
-                    clearable
-                  >
-                    <el-option
-                      v-for="item in dict.sexHormoneTerm"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    >
+                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable>
+                    <el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
+                      :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -261,98 +188,51 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="体检开始" prop="isMedicalStart">
-                  <el-radio v-model="form.isMedicalStart" label="Y" disabled
-                    >是</el-radio
-                  >
-                  <el-radio v-model="form.isMedicalStart" label="N" disabled
-                    >否</el-radio
-                  >
+                  <el-radio v-model="form.isMedicalStart" label="Y" disabled>是</el-radio>
+                  <el-radio v-model="form.isMedicalStart" label="N" disabled>否</el-radio>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="体检中心" prop="organizationUnitId">
-                  <el-select
-                    v-model="form.organizationUnitId"
-                    placeholder="请选择"
-                    filterable
-                  >
-                    <el-option
-                      v-for="item in dict.organization"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    >
+                  <el-select v-model="form.organizationUnitId" placeholder="请选择" filterable>
+                    <el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName"
+                      :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="分组" prop="customerOrgGroupId">
-                  <el-select
-                    v-model="form.customerOrgGroupId"
-                    placeholder="请选择"
-                    filterable
-                    clearable
-                    @change="changeCustomerOrgGroupId"
-                    :disabled="
-                      form.customerOrgId === dict.personOrgId ? true : false
-                    "
-                  >
-                    <el-option
-                      v-for="item in patientRegister.customerOrgGroup"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    />
+                  <el-select v-model="form.customerOrgGroupId" placeholder="请选择" filterable clearable
+                    @change="changeCustomerOrgGroupId" :disabled="form.customerOrgId === dict.personOrgId ? true : false
+                      ">
+                    <el-option v-for="item in patientRegister.customerOrgGroup" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="套餐" prop="medicalPackageId">
-                  <el-select
-                    v-model="form.medicalPackageId"
-                    placeholder="请选择"
-                    filterable
-                    clearable
-                    @change="changeMedicalPackageId"
-                    :disabled="
-                      form.customerOrgId === dict.personOrgId ? false : true
-                    "
-                  >
-                    <el-option
-                      v-for="item in dict.medicalPackage"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    />
+                  <el-select v-model="form.medicalPackageId" placeholder="请选择" filterable clearable
+                    @change="changeMedicalPackageId" :disabled="form.customerOrgId === dict.personOrgId ? false : true
+                      ">
+                    <el-option v-for="item in dict.medicalPackage" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="完成标志" prop="completeFlag">
-                  <el-select
-                    v-model="form.completeFlag"
-                    placeholder="请选择"
-                    disabled
-                  >
-                    <el-option
-                      v-for="item in dict.completeFlag"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    >
+                  <el-select v-model="form.completeFlag" placeholder="请选择" disabled>
+                    <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName"
+                      :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="备注" prop="remark">
-                  <el-input
-                    v-model="form.remark"
-                    type="textarea"
-                    :rows="2"
-                    placeholder="请输入备注"
-                  ></el-input>
+                  <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -364,14 +244,10 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="创建时间">
-                  <el-input
-                    :value="
-                      form.creationTime
-                        ? lmoment(form.creationTime, 'yyyy-MM-DD')
-                        : ''
-                    "
-                    disabled
-                  ></el-input>
+                  <el-input :value="form.creationTime
+                      ? lmoment(form.creationTime, 'yyyy-MM-DD')
+                      : ''
+                    " disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -381,23 +257,16 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="修改时间">
-                  <el-input
-                    :value="
-                      form.lastModificationTime
-                        ? lmoment(form.lastModificationTime, 'yyyy-MM-DD')
-                        : ''
-                    "
-                    disabled
-                  ></el-input>
+                  <el-input :value="form.lastModificationTime
+                      ? lmoment(form.lastModificationTime, 'yyyy-MM-DD')
+                      : ''
+                    " disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
-          <el-image
-            class="photo"
-            :src="apiurl + '/' + patientRegister.patientRegisterRd.photo"
-            style="width: 150; height: 200"
-          >
+          <el-image class="photo" :src="form.photo? (apiurl + '/' + form.photo):''"
+            style="width: 150; height: 200">
             <div slot="placeholder" class="image-slot">
               加载中<span class="dot">...</span>
             </div>
@@ -413,8 +282,7 @@
             <el-button type="success" class="btnClass" @click="Onsubmit('form')">保存</el-button>
           </div>
           <div class="btn">
-            <el-button type="primary" class="btnClass" @click="openCamera" icon="el-icon-camera"
-              >拍照</el-button>
+            <el-button type="primary" class="btnClass" @click="openCamera" icon="el-icon-camera">拍照</el-button>
           </div>
           <div class="btn">
             <el-button type="primary" class="btnClass">申请单</el-button>
@@ -423,7 +291,7 @@
             <el-button type="primary" class="btnClass">打条码</el-button>
           </div>
           <div class="btn">
-            <el-button type="primary" class="btnClass" >打指引单</el-button>
+            <el-button type="primary" class="btnClass">打指引单</el-button>
           </div>
           <div class="btn">
             <el-button type="primary" class="btnClass">复制新增</el-button>
@@ -435,24 +303,9 @@
       </td>
     </table>
     <!-- 人员档案列表 -->
-    <el-dialog
-      title="人员档案列表"
-      :visible.sync="dialogVisible"
-      width="800"
-      :append-to-body="true"
-    >
-      <el-table
-        :data="patientList"
-        border
-        width="800"
-        height="480"
-        row-key="id"
-        size="small"
-        class="el-table__body-wrapper tbody"
-        highlight-current-row
-        @row-click="rowick"
-        ref="patientList"
-      >
+    <el-dialog title="人员档案列表" :visible.sync="dialogVisible" width="800" :append-to-body="true">
+      <el-table :data="patientList" border width="800" height="480" row-key="id" size="small"
+        class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="patientList">
         <el-table-column type="index" width="30" />
         <el-table-column prop="patientNo" label="档案号" />
         <el-table-column prop="lastTime" label="末次体检" width="100">
@@ -474,7 +327,7 @@
         <el-table-column prop="maritalStatusId" label="婚姻">
           <template slot-scope="scope">
             <div>
-              {{ ldddw(dict.maritalStatus,"id",scope.row.maritalStatusId,"displayName") }}
+              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
             </div>
           </template>
         </el-table-column>
@@ -502,14 +355,8 @@
       </span>
     </el-dialog>
     <!-- 拍照 -->
-    <el-dialog
-      title="拍照"
-      :visible.sync="patientRegister.cameraVisble"
-      width="400"
-      height="800"
-      :show-close="false"
-      :append-to-body="true"
-    >
+    <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="800" :show-close="false"
+      :close-on-click-modal="false" :append-to-body="true">
       <Camera :id="form.id" />
     </el-dialog>
   </div>
@@ -520,7 +367,7 @@ import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import mm from "../../utlis/mm";
 
-import { objCopy, setNull, dddw,parseID,birthdayToAge } from "../../utlis/proFunc";
+import { objCopy, setNull, dddw, parseID, birthdayToAge } from "../../utlis/proFunc";
 import Camera from "./Camera.vue";
 import PatientRegisterItem from "./PatientRegisterItem.vue";
 export default {
@@ -528,6 +375,7 @@ export default {
     Camera,
     PatientRegisterItem,
   },
+  props:['formInitData','editTimes'],
   data() {
     return {
       apiurl: mm.apiurl,
@@ -540,7 +388,7 @@ export default {
         medicalPackageId: null, //套餐
         patientName: "", //姓名
         birthDate: "", //字符串 如：2012-01-29
-        sexId: "9", //性别 默认未知U
+        sexId: "U", //性别 默认未知U
         age: null, //年龄
         jobCardNo: "", //工卡号
         medicalCardNo: "", //体检卡号
@@ -549,8 +397,7 @@ export default {
         personnelTypeId: null, //人员类别
         jobPost: "", //职务
         jobTitle: "", //职称
-        photo:
-          "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //照片
+        photo:"", //照片
         salesman: "", //介绍人
         sexHormoneTermId: null, //性激素期限
         isNameHide: "N", //隐藏姓名
@@ -605,14 +452,11 @@ export default {
     };
   },
 
-  created() {},
+  created() { },
 
   //挂载完成
   mounted() {
-    //表单赋值
-    //console.log('mounted this.patientRegister.patientRegisterRd',this.patientRegister.patientRegisterRd)
-    objCopy(this.patientRegister.patientRegisterRd, this.form);
-    console.log("mounted this.form", this.form);
+    objCopy(this.formInitData, this.form);
   },
 
   computed: {
@@ -624,14 +468,14 @@ export default {
     },
 
     //修改出生日期
-    changeBirthDate(){
+    changeBirthDate() {
       this.form.age = birthdayToAge(this.form.birthDate)
     },
 
     //修改身份证，生成年龄、出生、性别
-    changeIdNo(){
+    changeIdNo() {
       let ret = parseID(this.form.idNo)
-      if(ret.age != -1){
+      if (ret.age != -1) {
         this.form.birthDate = ret.birthday
         this.form.age = ret.age
         this.form.sexId = ret.sex
@@ -796,28 +640,15 @@ export default {
   },
 
   //监听事件
-  watch: {
-    //新增触发
-    "patientRegister.addTimes"(newVal, oldVal) {
-      //console.log('patientRegister.addTimes newVal：',newVal,' oldVal：',oldVal)
-      if (newVal != oldVal) {
-        //console.log('this.patientRegister.patientRegisterRdInit',this.patientRegister.patientRegisterRdInit)
-        objCopy(this.patientRegister.patientRegisterRdInit, this.form);
-        //console.log('this.form',this.form)
-      }
-    },
+  watch: {   
 
-    //编辑触发
-    "patientRegister.patientRegisterRd.id"(newVal, oldVal) {
-      console.log(
-        "patientRegister.patientRegisterRd.id newVal：",
-        newVal,
-        " oldVal：",
-        oldVal
-      );
+    //新增或编辑
+    "editTimes"(newVal, oldVal) {     
+      //console.log('editTimes newVal：',newVal,' oldVal：',oldVal)
       if (newVal != oldVal) {
-        console.log("newVal：", this.patientRegister.patientRegisterRd);
-        objCopy(this.patientRegister.patientRegisterRd, this.form);
+        console.log('this.editTimes',this.editTimes)
+        objCopy(this.formInitData, this.form);
+        //console.log('this.form',this.form)
       }
     },
 
@@ -836,11 +667,13 @@ export default {
 ::v-deep .el-form-item {
   margin-bottom: -15px;
 }
+
 .btn {
   margin-left: 10px;
 }
-.btnClass{
-  width:110px;
+
+.btnClass {
+  width: 110px;
 }
 
 .photo {
@@ -852,6 +685,7 @@ export default {
   width: 150px;
   height: 160px;
 }
+
 ::v-deep .el-table--small .el-table__cell {
   padding: 0px 0;
 }
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 7de1c79..0773146 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1,9 +1,8 @@
 <template>
   <div style="display: flex">
     <div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
-      <el-table :data="dataList" border :height="patientRegister.prListHeight" 
-        highlight-current-row @row-click="rowick" ref="dataList" size="small"
-        @selection-change="handleSelectionChange">
+      <el-table :data="patientRegister.prList" border :height="patientRegister.prListHeight" highlight-current-row @row-click="rowick"
+        size="small" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="40">
 
         </el-table-column>
@@ -142,7 +141,7 @@
         <el-tab-pane label="已选组合项目" name="1">
           <PatientRegisterAsbItem />
         </el-tab-pane>
-      </el-tabs>      
+      </el-tabs>
     </div>
     <div style="margin-left: 10px;width:110px;">
       <div class="listBtn">
@@ -158,27 +157,28 @@
         <el-button type="primary" class="btnClass" @click="openCamera" icon="el-icon-camera">拍照</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" >健康档案</el-button>
+        <el-button type="primary" class="btnClass">健康档案</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" >调整分组</el-button>
+        <el-button type="primary" class="btnClass">调整分组</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" >调整项目</el-button>
+        <el-button type="primary" class="btnClass">调整项目</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" >打指引单</el-button>
+        <el-button type="primary" class="btnClass">打指引单</el-button>
       </div>
     </div>
 
     <!-- 体检人员登记 -->
-    <el-dialog :title="patientRegister.patientRegisterId ? '编辑' : '新增'" :visible.sync="dialogVisible" width="100%">
-      <PatientRegisterEdit />
+    <el-dialog :title="patientRegister.patientRegisterId ? '编辑' : '新增'" :visible.sync="dialogVisible"
+      :close-on-click-modal="false" width="100%">
+      <PatientRegisterEdit :formInitData="formInitData" :editTimes="editTimes"/>
     </el-dialog>
 
     <!-- 拍照 -->
     <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="800" :show-close="false"
-      :append-to-body="true">
+      :append-to-body="true" :close-on-click-modal="false">
       <Camera :id="patientRegister.patientRegisterId" />
     </el-dialog>
   </div>
@@ -200,12 +200,13 @@ export default {
     PatientRegisterAsbItem,
   },
   data() {
-    return {
-      dataList: [], //列表数据
+    return {      
       multipleSelection: [], //选中的数据列表
       dialogVisible: false,
       dialogCamera: false,
       tabChoosed: "1",
+      formInitData: {},      //体检登记初始表单数据
+      editTimes:0,
     };
   },
 
@@ -214,7 +215,7 @@ export default {
   //挂载完成
   mounted() { },
   computed: {
-    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
@@ -238,6 +239,7 @@ export default {
     //点击体检次数行
     rowick(row) {
       this.patientRegister.photo = ""; //清除照片缓存
+
       this.patientRegister.patientRegisterId = row.id;
       this.patientRegister.patientRegisterRd = row;
       this.patientRegister.query.customerOrgParentId = row.customerOrgParentId;
@@ -256,23 +258,29 @@ export default {
         return;
       }
       //console.log('customerOrgId',customerOrgId)
-      this.patientRegister.patientRegisterId = "";
-      this.patientRegister.patientRegisterRd.photo = '';
-      this.patientRegister.patientRegisterRdInit.id = "";
+      // this.patientRegister.patientRegisterId = "";
+      // this.patientRegister.patientRegisterRd.photo = '';
+      // this.patientRegister.patientRegisterRdInit.id = "";
+      // this.patientRegister.patientRegisterRdInit.customerOrgId = this.patientRegister.query.customerOrgId;
+      // this.patientRegister.addTimes++;
+      // this.patientRegister.patientRegisterTimes++;
       this.patientRegister.patientRegisterRdInit.customerOrgId = this.patientRegister.query.customerOrgId;
-      this.patientRegister.addTimes++;
-      this.patientRegister.patientRegisterTimes++;
+      this.formInitData = { ...this.patientRegister.patientRegisterRdInit };
       this.patientRegister.patientRegisterAbs = [];
-      this.dialogVisible = true;
+      this.dialogVisible = true;      
+      this.editTimes++; //触发表单窗口，数据更新
     },
 
     edit() {
-      if (!this.patientRegister.patientRegisterId) {
+      if (!this.patientRegister.patientRegisterRd.id) {
         alert("请选择要操作的记录");
         return;
       }
-      this.patientRegister.patientRegisterTimes++;
+      //this.patientRegister.patientRegisterTimes++; 
+      this.getPatientRegisterAbs(this.patientRegister.patientRegisterRd.id);     
+      this.formInitData = { ...this.patientRegister.patientRegisterRd };
       this.dialogVisible = true;
+      this.editTimes++; //触发表单窗口，数据更新
     },
 
     //拍照
@@ -357,14 +365,14 @@ export default {
     //查询
     query() {
       let body = {}
-      
+
       console.log(`this.patientRegister.query`, this.patientRegister.query)
       if (this.patientRegister.query.customerOrgFlag) {
         if (this.patientRegister.query.CustomerOrgParentId) {
           body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
-        } else{
+        } else {
           if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
-        } 
+        }
       }
 
       if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
@@ -390,7 +398,7 @@ export default {
       console.log('/api/app/patientregister/getlistinfilter', body)
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
-          this.dataList = res.data;
+          this.patientRegister.prList = res.data;
         });
     },
   },
@@ -424,7 +432,8 @@ export default {
   margin-top: 5px;
   text-align: center;
 }
-.btnClass{
-  width:110px;
+
+.btnClass {
+  width: 110px;
 }
 </style>
diff --git a/src/store/index.js b/src/store/index.js
index 9eda8b7..b7cf56d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -48,7 +48,7 @@ export default new Vuex.Store({
       patientRegisterTimes: 0, //体检人员登记窗口显示次数(弃用)
       addTimes: 0, //用于触发新增时初始化赋值
       saveTimes:0,  //用于体检登记时，触发分组调整保存
-      photo:"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出，拍照时会更新
+      photo:"", //单独抽出，拍照时会更新
       cameraVisble: false, //拍照控件显示
       patientRegisterRdInit: {
         id: "", //id
@@ -107,6 +107,7 @@ export default new Vuex.Store({
       patientRegisterAbs: [], //人员已选组合项目
       prListHeight:312,     //人员列表高度
       prAsbItemHeight:156,  //组合项目高度
+      prList:[],            //体检登记记录
     },
 
     //体检医生诊台
diff --git a/src/views/customerOrg/customerOrg.vue b/src/views/customerOrg/customerOrg.vue
index 93f5fe0..6511f3c 100644
--- a/src/views/customerOrg/customerOrg.vue
+++ b/src/views/customerOrg/customerOrg.vue
@@ -87,8 +87,7 @@ export default {
         } else {
           this.customerOrg.orgEditStyle += "overflow-y: scroll;height:" + editHeight + "px;";
           this.customerOrg.orgDetailStyle += "overflow-y: scroll;height:" + this.customerOrg.orgDetailHeight + "px;";
-        }
-        
+        }        
       }
 
     }
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index 7067090..c2a2381 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -170,7 +170,7 @@ export default {
     },
 
     resize() {
-      console.log(this.window.pageHeight,this.window.pageWidth)
+      //console.log(this.window.pageHeight,this.window.pageWidth)
       let headerHeight = Number(150);
       let orgDetailHeight = Number(100);
       let editHeight = Number(200);
@@ -182,13 +182,11 @@ export default {
       if (this.window.pageHeight < 600) {
         this.patientRegister.prListHeight = editHeight;
         this.patientRegister.prAsbItemHeight = orgDetailHeight;
-
-        this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (600 - headerHeight) + "px;";
-        
+        this.CustomerOrgTreeStyle = "overflow: scroll;border: 1px solid;width:200px; height:" + (600 - headerHeight) + "px;";        
       } else {
         this.patientRegister.prListHeight = Math.floor((this.window.pageHeight - 300) * 2 / 3);
         this.patientRegister.prAsbItemHeight = Math.floor((this.window.pageHeight - 300) * 1 / 3); 
-        console.log(this.patientRegister.prListHeight,this.patientRegister.prAsbItemHeight)
+        //console.log(this.patientRegister.prListHeight,this.patientRegister.prAsbItemHeight)
       }
     }
   },