Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/patient.js

@@ -161,6 +161,22 @@ export function createCourseOfDiseaseRecord(patient_id, content, record_time) {
   })
 }
 
+export function modifyCourseOfDiseaseRecord(patient_id, content, record_time,id) {
+  var params = {
+    patient_id: patient_id,
+    content: content,
+    record_time: record_time,
+    id: id,
+
+  }
+  return request({
+    url: '/api/patient/course/modify',
+    method: 'post',
+    params: params
+  })
+}
+
+
 export function getRescueRecords(patient_id, start_time_ymd, end_time_ymd) {
   var params = {
     patient_id: patient_id,

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -1242,7 +1242,7 @@
     },
     methods: {
       printAction: function() {
-        const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 40px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .under_line_two { display: inline-block; border-bottom: 1px solid #999; text-align: left; white-space: nowrap; } .under_line_two::before { content: "\\00A0"; } .under_line_two::after { content: "\\00A0"; }  .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 6px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 16px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.advice-children{display:flex;}.print-table-no {\n' +
+        const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 40px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .under_line_two { display: inline-block; border-bottom: 1px solid #999; text-align: left; white-space: nowrap; } .under_line_two::before { content: "\\00A0"; } .under_line_two::after { content: "\\00A0"; }  .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 6px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 16px; } }.es-img{height: 30px; }.advice-name{text-align: left !important;line-height: 16px !important;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.advice-children{display:flex;}.print-table-no {\n' +
           '    width: 100%;\n' +
           '    text-align: center;\n' +
           '    border-collapse: collapse;\n' +
@@ -1526,7 +1526,7 @@
   }
 
   .es-img {
-    height: 25px;
+    height: 30px;
   }
 
   .advice-name {

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -33,8 +33,8 @@
         </li>
       </ul>
       <ul>
-        <li style="height: 0.6rem;" v-if="isShow('跌倒分险评估评分')">
-          <label>跌倒分险评估评分:</label>
+        <li style="height: 0.6rem;" v-if="isShow('跌倒风险评估评分')">
+          <label>跌倒风险评估评分:</label>
           <span class="content">{{this.record.score}}分</span>
         </li>
 

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

@@ -45,8 +45,8 @@
       </el-form-item>
 
 
-      <el-form-item label-width="100dp" label="跌倒分险评估评分 : "
-                    v-if="isShow('跌倒分险评估评分')">
+      <el-form-item label-width="100dp" label="跌倒风险评估评分 : "
+                    v-if="isShow('跌倒风险评估评分')">
         <el-input v-model="receiveTreatmentAsses.score" style="width: 100px"></el-input>
       </el-form-item>
 

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -16,7 +16,7 @@
       <!--<dialysis-print-order-two :patientInfo="patientInfo" :receiverTreatmentAccess="receiverTreatmentAccess" :predialysis="predialysis"></dialysis-print-order-two>-->
 
       <DialysisPrintOrderOne v-bind:childResponse="childResponse" v-if="org_template_info.template_id != 2"> </DialysisPrintOrderOne>
-      
+
       <DialysisPrintOrderTwo v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 2"></DialysisPrintOrderTwo>
 
 
@@ -155,7 +155,7 @@
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
 
         const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
-        const style2 = '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 25px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}'
+        const style2 = '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}'
 
         if (this.org_template_info.template_id != 2) {
           printJS({
@@ -675,7 +675,7 @@
   }
 
   .es-img {
-    height: 25px;
+    height: 30px;
   }
 
   .advice-name {

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1071,7 +1071,7 @@
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
 
-        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:left;border-collapse:collapse;font-size:14px} .dialysis-print-order .under_line {display: inline-block;border-bottom: 1px solid #999;text-align:left;white-space: nowrap;width: 50%;} .dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:left;border-collapse:collapse;font-size:14px} .dialysis-print-order .under_line {display: inline-block;border-bottom: 1px solid #999;text-align:left;white-space: nowrap;width: 50%;} .dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 30px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
 
         if (this.org_template_info.template_id != 2) {
           printJS({
@@ -1684,7 +1684,7 @@
   }
 
   .es-img {
-    height: 25px;
+    height: 30px;
   }
 
   .advice-name {

src/xt_pages/user/courseOfDisease.vue

@@ -1,326 +1,428 @@
 <template>
-<!-- <div class="main-contain">
-    <div class="position">
-       <bread-crumb></bread-crumb>
-    </div> -->
-    <div class="patient-container">
-        <patient-sidebar :id="patient_id" defaultActive="1-2"></patient-sidebar>
-        <!-- <div class="app-container"> -->
-            <div  v-loading="loading">
-              <div class="patient-app-container advice-container app-container">
-
-              <div>
+  <!-- <div class="main-contain">
+      <div class="position">
+         <bread-crumb></bread-crumb>
+      </div> -->
+  <div class="patient-container">
+    <patient-sidebar :id="patient_id" defaultActive="1-2"></patient-sidebar>
+    <!-- <div class="app-container"> -->
+    <div v-loading="loading">
+      <div class="patient-app-container advice-container app-container">
+
+        <div>
                     <span style="margin-left: 10px;float:right;">
-                        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="show_dialog = true">新增</el-button>
-                        <el-button  size="small" v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
+                        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small"
+                                   @click="show_dialog = true">新增</el-button>
+                        <el-button type="primary" icon="el-icon-edit-outline" size="small"
+                                   @click="showEdit">修改</el-button>
+                        <el-button size="small" v-show="selectingRows.length > 0" type="danger"
+                                   @click="deleteAction">删除</el-button>
                     </span>
-                    <!--<span class="filter_title">日期查询</span>-->
-                    <!--<el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>-->
+          <!--<span class="filter_title">日期查询</span>-->
+          <!--<el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>-->
+        </div>
+        <!--<div></div>-->
+        <div class="cell clearfix">
+          <label class="title"><span class="name">日期查询</span> : </label>
+          <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+          <span class="">-</span>
+          <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+        </div>
+        <div class="record">
+          <el-row :gutter="15">
+            <el-col :span="10">
+              <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="record_table" :data="records"
+                        border highlight-current-row @current-change="didChangeCurrentRecord"
+                        @selection-change="didSelectionChange"
+                        :row-class-name="tableRow"
+                        @row-click="onRowClick"
+              >
+                <el-table-column type="selection" width="40" align="center"></el-table-column>
+                <el-table-column label="记录时间" align="center">
+                  <template slot-scope="scope">
+                    {{ recordTime(scope.row.record_time) }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="记录医生" align="center">
+                  <template slot-scope="scope">
+                    {{ doctorName(scope.row.recorder) }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+            <el-col :span="14">
+              <div class="record_content_panel">
+                <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
+                <div class="content">
+                  {{ current_select_record == null ? '' : current_select_record.content }}
                 </div>
-              <!--<div></div>-->
-              <div class="cell clearfix">
-                <label class="title"><span class="name">日期查询</span> : </label>
-                <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                                type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-                <span class="">-</span>
-                <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                                type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
               </div>
-                <div class="record">
-                    <el-row :gutter="15">
-                        <el-col :span="10">
-                            <el-table  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="record_table" :data="records" border highlight-current-row @current-change="didChangeCurrentRecord" @selection-change="didSelectionChange">
-                                <el-table-column type="selection" width="40" align="center"></el-table-column>
-                                <el-table-column label="记录时间" align="center">
-                                    <template slot-scope="scope">
-                                        {{ recordTime(scope.row.record_time) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="记录医生" align="center">
-                                    <template slot-scope="scope">
-                                        {{ doctorName(scope.row.recorder) }}
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </el-col>
-                        <el-col :span="14">
-                            <div class="record_content_panel">
-                                <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
-                                <div class="content">
-                                    {{ current_select_record == null ? "" : current_select_record.content }}
-                                </div>
-                            </div>
-                        </el-col>
-                    </el-row>
-                </div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+      <!-- </div> -->
+      <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog">
+        <div>
+          <div class="new_record_form">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">病程日期</span> : </label>
+              <el-date-picker v-model="course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
+                              style="width: 150px;"
+                              type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd"></el-date-picker>
+
+              <label class="title"><span class="name">日常病程</span> : </label>
+              <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                           :value="option.content"></el-option>
+              </el-select>
             </div>
-        <!-- </div> -->
-        <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog">
-            <div>
-                <div class="new_record_form">
-                  <div class="cell clearfix">
-                    <label class="title"><span class="name">病程日期</span> : </label>
-                    <el-date-picker v-model="course_of_disease_time" prefix-icon="el-icon-date" :editable="false" style="width: 150px;"
-                                    type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                                    value-format="yyyy-MM-dd"></el-date-picker>
-
-                    <label class="title"><span class="name">日常病程</span> : </label>
-                    <el-select v-model="select_template" placeholder="可选择病程模板"  @change="didSelectTemplate" >
-                      <el-option v-for="(option, index) in templates" :key="index" :label="option.title" :value="option.content"></el-option>
-                    </el-select>
-                  </div>
-
-
-                    <div class="textarea_panel">
-                        <el-input v-model="new_content" type="textarea" rows="6" resize="none"></el-input>
-                    </div>
-
-                    <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
-                        <el-button @click="show_dialog = false">取消</el-button>
-                        <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="createAction" :loading="uploading_new_record">保存</el-button>
-                    </div>
-                </div>
+
+
+            <div class="textarea_panel">
+              <el-input v-model="new_content" type="textarea" rows="6" resize="none"></el-input>
             </div>
-        </el-dialog>
-    </div>
+
+            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+              <el-button @click="show_dialog = false">取消</el-button>
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
+                         @click="createAction" :loading="uploading_new_record">保存
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </el-dialog>
+
+
+      <el-dialog title="修改病程记录" width="40%" top="5vh" :visible.sync="show_edit_dialog">
+        <div>
+          <div class="new_record_form">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">病程日期</span> : </label>
+              <el-date-picker v-model="edit_course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
+                              style="width: 150px;"
+                              type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd"></el-date-picker>
+
+              <label class="title"><span class="name">日常病程</span> : </label>
+              <el-select v-model="select_template" placeholder="可选择病程模板" @change="didEditSelectTemplate">
+                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                           :value="option.content"></el-option>
+              </el-select>
+            </div>
+
+
+            <div class="textarea_panel">
+              <el-input v-model="edit_new_content" type="textarea" rows="6" resize="none"></el-input>
+            </div>
+
+            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+              <el-button @click="show_edit_dialog = false">取消</el-button>
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
+                         @click="modifyAction" :loading="uploading_new_record">保存
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </el-dialog>
     </div>
+  </div>
 
   <!-- </div> -->
 </template>
 
 <script>
-import PatientSidebar from "./components/PatientSidebar"
-import { getCourseOfDiseaseRecords, createCourseOfDiseaseRecord, deleteCourseOfDiseaseRecords } from "@/api/patient"
-import { parseTime } from "@/utils"
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-export default {
-    name: "CourseOfDisease",
+  import PatientSidebar from './components/PatientSidebar'
+  import {
+    createCourseOfDiseaseRecord,
+    deleteCourseOfDiseaseRecords,
+    getCourseOfDiseaseRecords,
+    modifyCourseOfDiseaseRecord
+  } from '@/api/patient'
+  import { parseTime } from '@/utils'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
+  export default {
+    name: 'CourseOfDisease',
     components: {
-        PatientSidebar,
-        BreadCrumb
+      PatientSidebar,
+      BreadCrumb
     },
     data() {
-        return {
-            loading: false,
-
-            patient_id: 0,
-            date: [],
-            start_time: '',
-            end_time: '',
-            course_of_disease_time:'',
-            records: [],
-            doctors: [],
-            current_select_record: null,
-            show_dialog: false,
-            uploading_new_record: false,
-            templates: this.$store.getters.configlist.course_disease,
-            select_template: '',
-            new_content: "",
-
-            selectingRows: [],
-        }
+      return {
+        loading: false,
+
+        patient_id: 0,
+        date: [],
+        start_time: '',
+        end_time: '',
+        course_of_disease_time: '',
+        records: [],
+        doctors: [],
+        current_select_record: null,
+        show_dialog: false,
+        show_edit_dialog: false,
+        uploading_new_record: false,
+        templates: this.$store.getters.configlist.course_disease,
+        select_template: '',
+        new_content: '',
+        edit_new_content: '',
+        edit_course_of_disease_time: '',
+        selectingRows: [],
+        table_current_index: -1,
+        edit_current_id:0
+      }
     },
     created() {
-        this.patient_id = parseInt(this.$route.query.id)
-        if (isNaN(this.patient_id) || this.patient_id <= 0) {
-            this.$notify.error({
-                title: "错误",
-                message: "无效的id"
-            })
-            this.$router.push("/patients/patients")
-            return
-        }
-        var now = new Date()
-        this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
-
-
+      this.patient_id = parseInt(this.$route.query.id)
+      if (isNaN(this.patient_id) || this.patient_id <= 0) {
+        this.$notify.error({
+          title: '错误',
+          message: '无效的id'
+        })
+        this.$router.push('/patients/patients')
+        return
+      }
+      var now = new Date()
+      this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
       this.end_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-      nowDate.setMonth(nowDate.getMonth() - 1);
-      nowYear = nowDate.getFullYear();
-      nowMonth = nowDate.getMonth() + 1;
-      nowDay = nowDate.getDate();
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
       this.start_time =
         nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
-
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
 
       this.requestCourseRecords()
 
-
-
     },
     methods: {
-        requestCourseRecords: function() {
-            this.loading = true
-            getCourseOfDiseaseRecords(this.patient_id, this.start_time,this.end_time).then(rs => {
-                this.loading = false
-                var resp = rs.data
-                if (resp.state == 1) {
-                    this.current_select_record = null
-                    this.records = resp.data.records
-                    this.doctors = resp.data.doctors
-
-                } else {
-                    this.$message.error(resp.msg)
-                }
-            }).catch(error => {
-                this.loading = false
-                this.$message.error(error)
-            })
-        },
-
-        didChangeCurrentRecord: function(record) {
-            this.current_select_record = record
-        },
-        recordTime: function(timestamp) {
-            var time = new Date(timestamp * 1000)
-            return parseTime(time, "{y}-{m}-{d}")
-        },
-        doctorName: function(doctor_id) {
-            for (let index = 0; index < this.doctors.length; index++) {
-                const doctor = this.doctors[index];
-                if (doctor.id == doctor_id) {
-                    return doctor.name
-                }
-            }
-            return ""
-        },
-
-
-        createAction: function() {
-            if (this.new_content.length == 0) {
-                this.$message.error("请填写病程内容")
-                return
-            }
-            this.uploading_new_record = true
-            createCourseOfDiseaseRecord(this.patient_id, this.new_content,this.course_of_disease_time).then(rs => {
-                this.uploading_new_record = false
-                var resp = rs.data
-                if (resp.state == 1) {
-                    this.records.unshift(resp.data.record)
-                    // this.$refs.record_table.setCurrentRow()
-                    this.$refs.record_table.setCurrentRow(this.records[0])
-                    // this.current_select_record = this.records[0]
-                    this.show_dialog = false
-                    this.new_content = ""
-
-                } else {
-                    this.$message.error(resp.msg)
+      requestCourseRecords: function() {
+        this.loading = true
+        getCourseOfDiseaseRecords(this.patient_id, this.start_time, this.end_time).then(rs => {
+          this.loading = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.current_select_record = null
+            this.records = resp.data.records
+            this.doctors = resp.data.doctors
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        }).catch(error => {
+          this.loading = false
+          this.$message.error(error)
+        })
+      },
+
+      didChangeCurrentRecord: function(record) {
+        this.current_select_record = record
+      },
+      recordTime: function(timestamp) {
+        var time = new Date(timestamp * 1000)
+        return parseTime(time, '{y}-{m}-{d}')
+      },
+      doctorName: function(doctor_id) {
+        for (let index = 0; index < this.doctors.length; index++) {
+          const doctor = this.doctors[index]
+          if (doctor.id == doctor_id) {
+            return doctor.name
+          }
+        }
+        return ''
+      },
+      modifyAction: function() {
+        if (this.edit_new_content.length == 0) {
+          this.$message.error('请填写病程内容')
+          return
+        }
+        this.uploading_new_record = true
+        modifyCourseOfDiseaseRecord(this.patient_id, this.edit_new_content, this.edit_course_of_disease_time,this.edit_current_id).then(rs => {
+          this.uploading_new_record = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.records[this.table_current_index].content = resp.data.record.content
+            this.records[this.table_current_index].record_time = resp.data.record.record_time
+            this.records[this.table_current_index].recorder = resp.data.record.recorder
+
+            this.show_edit_dialog = false
+            this.edit_new_content = ''
+            this.table_current_index = -1
+
+          } else {
+            this.table_current_index = -1
+            this.$message.error(resp.msg)
+          }
+
+        }).catch(error => {
+          this.table_current_index = -1
+          this.uploading_new_record = false
+          this.$message.error(error)
+        })
+
+      },
+
+      createAction: function() {
+        if (this.new_content.length == 0) {
+          this.$message.error('请填写病程内容')
+          return
+        }
+        this.uploading_new_record = true
+        createCourseOfDiseaseRecord(this.patient_id, this.new_content, this.course_of_disease_time).then(rs => {
+          this.uploading_new_record = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.records.unshift(resp.data.record)
+            // this.$refs.record_table.setCurrentRow()
+            this.$refs.record_table.setCurrentRow(this.records[0])
+            // this.current_select_record = this.records[0]
+            this.show_dialog = false
+            this.new_content = ''
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+
+        }).catch(error => {
+          this.uploading_new_record = false
+          this.$message.error(error)
+        })
+      },
+      didSelectTemplate: function(templateContent) {
+        this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
+
+
+      },didEditSelectTemplate:function(templateContent){
+        this.edit_new_content = this.edit_new_content.length > 0 ? (this.edit_new_content + templateContent) : templateContent
+      },
+
+      didSelectionChange: function(selectRows) {
+        this.selectingRows = selectRows
+      },
+      deleteAction: function() {
+        if (this.selectingRows.length == 0) {
+          return
+        }
+        var ids = []
+        for (let index = 0; index < this.selectingRows.length; index++) {
+          const row = this.selectingRows[index]
+          ids.push(row.id)
+        }
+        var ids_str = ids.join(',')
+        this.loading = true
+        deleteCourseOfDiseaseRecords(this.patient_id, ids_str).then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            for (let id_index = 0; id_index < ids.length; id_index++) {
+              for (let record_index = 0; record_index < this.records.length; record_index++) {
+                if (ids[id_index] == this.records[record_index].id) {
+                  this.records.splice(record_index, 1)
+                  break
                 }
-
-            }).catch(error => {
-                this.uploading_new_record = false
-                this.$message.error(error)
-            })
-        },
-        didSelectTemplate: function(templateContent) {
-            this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
-
-        },
-
-        didSelectionChange: function(selectRows) {
-            this.selectingRows = selectRows
-        },
-        deleteAction: function() {
-            if (this.selectingRows.length == 0) {
-                return
-            }
-            var ids = []
-            for (let index = 0; index < this.selectingRows.length; index++) {
-                const row = this.selectingRows[index];
-                ids.push(row.id)
+              }
             }
-            var ids_str = ids.join(",")
-            this.loading = true
-            deleteCourseOfDiseaseRecords(this.patient_id, ids_str).then(rs => {
-                var resp = rs.data
-                if (resp.state == 1) {
-                    for (let id_index = 0; id_index < ids.length; id_index++) {
-                        for (let record_index = 0; record_index < this.records.length; record_index++) {
-                            if (ids[id_index] == this.records[record_index].id) {
-                                this.records.splice(record_index, 1)
-                                break
-                            }
-                        }
-                    }
-                    this.selectingRows = []
-                    this.$message.success("已删除")
-
-                } else {
-                    this.$message.error(resp.msg)
-                }
-                this.loading = false
-            }).catch(err => {
-                this.loading = false
-                this.$message.error(err)
-            })
-        },startTimeChange(val) {
+            this.selectingRows = []
+            this.$message.success('已删除')
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+          this.loading = false
+        }).catch(err => {
+          this.loading = false
+          this.$message.error(err)
+        })
+      }, startTimeChange(val) {
         this.requestCourseRecords()
       }, endTimeChange(val) {
         this.requestCourseRecords()
+      }, showEdit() {
+        if (this.table_current_index == -1) {
+          this.$message.error('请选择要修改的病情内容')
+          return
+        }
+        this.show_edit_dialog = true
+        this.edit_course_of_disease_time = this.recordTime(this.records[this.table_current_index].record_time)
+        this.edit_new_content = this.records[this.table_current_index].content
+        this.edit_current_id = this.records[this.table_current_index].id
+        this.$refs.record_table.setCurrentRow(null)
+
+      }, tableRow({ row, rowIndex }) {
+        // 把每一行的索引放进row
+        row.index = rowIndex
+      }, onRowClick(row, event, column) {
+        this.table_current_index = row.index
       }
-    },
-}
+    }
+  }
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-.container {
+  .container {
     margin-left: 180px;
     padding: 20px;
     background: #fff;
     min-height: calc(100vh - 173px);
     margin-bottom: 15px;
 
-    .record {
-        padding-top: 20px;
-    }
-}
-.record_content_panel {
+  .record {
+    padding-top: 20px;
+  }
+
+  }
+  .record_content_panel {
     border-width: 1px;
     border-style: solid;
     border-color: #ebeef5;
     min-height: 200px;
 
-    .title {
-        font-size: 14px;
-        font-weight: 500;
-        color: #909399;
-        line-height: 44px;
-        height: 44px;
-        text-align: center;
-        border-bottom-width: 1px;
-        border-bottom-style: solid;
-        border-bottom-color: #ebeef5;
-    }
-    .content {
-        padding: 12px 15px;
-        font-size: 15px;
-        color: gray;
-        line-height: 22px;
-    }
-}
-
-.new_record_form {
-    // padding: 10px, 25px;
-
-    .textarea_panel {
-        margin-top: 10px;
-    }
-}
+  .title {
+    font-size: 14px;
+    font-weight: 500;
+    color: #909399;
+    line-height: 44px;
+    height: 44px;
+    text-align: center;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-bottom-color: #ebeef5;
+  }
+
+  .content {
+    padding: 12px 15px;
+    font-size: 15px;
+    color: gray;
+    line-height: 22px;
+  }
+
+  }
+
+  .new_record_form {
+  /*/ / padding: 10 px, 25 px;*/
+
+  .textarea_panel {
+    margin-top: 10px;
+  }
+
+  }
 </style>