Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/Pharmacy/DispensingDetails.vue

@@ -1,4 +1,4 @@
-<template>
+<template><!--发药明细-->
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
@@ -17,7 +17,7 @@
             size="small"
             style="width: 200px; margin-left: 10px"
             class="filter-item"
-            v-model="name"
+            v-model="keyword"
             placeholder="请输入患者姓名"
           ></el-input>
 
@@ -54,7 +54,7 @@
             class="filter-item"
             type="primary"
             icon="el-icon-search"
-            @click="search"
+            @click="query"
             >查询</el-button
           >
         </div>
@@ -73,21 +73,39 @@
         <el-table-column type="index" label="序号" align="center" width="250">
         </el-table-column>
         <el-table-column label="患者名称" align="center" width="300">
-          <template slot-scope="scope"> </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.Name  ? scope.row.Name  : ""}}</span>
+          </template>
         </el-table-column>
 
         <el-table-column label="开立医生" align="center" width="300">
-          <template slot-scope="scope"> </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.DoctorName  ? scope.row.DoctorName  : ""}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="发药时间" align="center" width="400">
-          <template slot-scope="scope"> </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.RecordDate  ? scope.row.RecordDate  : ""}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="400">
           <template slot-scope="scope">
-            <el-button type="primary" @click="views">查看</el-button>
+            <el-button type="primary" @click="views(scope.row)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
     </div>
 
     <details-print
@@ -96,12 +114,18 @@
       :propsTable="propsTable"
     >
     </details-print>
+
   </div>
 </template>
 
 <script>
 import detailsPrint from "./print/details.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  dispensingdetails,
+  prescriptiondetails
+} from "@/api/pharmacy"
+const moment = require('moment')
 export default {
   components: {
     detailsPrint,
@@ -113,21 +137,78 @@ export default {
         { path: false, name: "发药明细" },
         { path: "/Pharmacy/DispensingDetails", name: "发药明细" },
       ],
-      name: "",
+      keyword: "",
       tableList: [{}],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      prescriptionList:[],//处方
+      stat_order:[],//临时医嘱
+      total: 0,
+      page: 1,
+      limit: 10,
     };
   },
-
+  created() {
+    this.init();
+    this.query();
+  },
   methods: {
+    init(){
+      this.page = 1;
+      this.limit = 10;
+      this.keyword = "";
+    },
+    query(){
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        page: 1,
+        limit: this.limit,
+      }
+      dispensingdetails(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableList = res.data.data.list;
+          this.total = res.data.data.total;
+        }
+      })
+    },
+    search(){
+      console.log("this.start_time",this.start_time)
+      console.log("this.end_time",this.end_time)
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        page: this.page,
+        limit: this.limit,
+      }
+      dispensingdetails(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableList = res.data.data.list;
+        }
+      })
+    },
+
     // 查看
-    views() {
+    views(data) {
+      console.log("吱吱吱",data)
       this.$refs.detailsprint.show();
+      this.$refs.detailsprint.drugdetails(data);
+    },
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.search();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.search();
     },
   },
-  created() {},
 };
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-</style>
+</style>

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -1,4 +1,4 @@
-<template>
+<template><!--药品发药页面-->
   <div class="main-contain new-main-contain">
     <div class="position">
       <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
@@ -18,6 +18,7 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               placeholder="选择日期"
+              :change="testsss()"
             >
             </el-date-picker>
           </div>
@@ -261,6 +262,11 @@
 import drugPrint from "./print/drugPrint.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug,SaveSetting,getPharmacyConfig,getUserdDrugList } from "@/api/his/advice";
+import {
+  waitingdrug,
+  issueddrugs,
+  getpharmacycontent
+} from "@/api/pharmacy"
 const moment = require('moment')
 export default {
   components: {
@@ -295,6 +301,13 @@ export default {
   },
 
   methods: {
+    testsss(){
+      console.log("time",this.start_time);
+    },
+    //初始化
+    init(){
+
+    },
      searchAction() {
       this.getlist();
     },
@@ -363,14 +376,11 @@ export default {
         .catch(() => {});
     },
 
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
     getlist(){
       var params = {
         start_time:this.start_time,
         keywords:this.keywords,
-      }  
+      }
       getTodayAdviceList(params).then(response=>{
          if(response.data.state == 1){
            var list =  response.data.data.list
@@ -379,8 +389,8 @@ export default {
            var doctorlist = response.data.data.doctorlist
            this.doctorList = doctorlist
          }
-      }) 
-    }, 
+      })
+    },
    getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
       var max_str = "";
@@ -489,6 +499,7 @@ export default {
     }
   },
   created() {
+    this.init();
     this.getlist()
   },
 };
@@ -530,4 +541,4 @@ export default {
     justify-content: flex-end;
   }
 }
-</style>
+</style>

src/xt_pages/dialysis/batch_print/batch_print_order_four.vue

@@ -435,7 +435,7 @@
                       <td width="60">静脉压<br/>mmHg</td>
                       <td width="60">跨膜压<br/>mmHg</td>
                       <td width="60">KT/V</td>
-                      <td width="200">病情特殊处理<br/>及专科护理措施纪录</td>
+                      <td width="200">病情特殊处理<br/>及专科护理措施记录</td>
                       <td width="80">护士签名</td>
                     </tr>
                     <!-- </thead>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -996,7 +996,7 @@
                             colspan="11"
                             style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;"
                           >
-                            治疗纪录
+                            治疗记录
                           </td>
                         </tr>
                         <tr>
@@ -1801,7 +1801,7 @@
                           style="width: 80px;text-align: left"
                         >
                           <div
-                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;" 
+                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;"
                             v-if="record.dialysis_order != null && record.check.creater ==record.check.creater"
                           >
                             <span

src/xt_pages/dialysis/batch_print/batch_print_order_three.vue

@@ -910,7 +910,7 @@
                           <td width="60">跨膜压<br />mmHg</td>
                           <td width="60">电导度<br />mS/m</td>
                           <td width="200">
-                            病情特殊处理<br />及专科护理措施纪录
+                            病情特殊处理<br />及专科护理措施记录
                           </td>
                           <td width="80">护士签名</td>
                         </tr>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -29,7 +29,7 @@
             @click="batchPrintActionOne"
             type="primary"
             style=""
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -78,7 +78,7 @@
             @click="batchPrintActionOne"
             type="primary"
             style=""
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -197,7 +197,7 @@
             @click="batchPrintActionOne"
             type="primary"
             style=""
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -647,7 +647,7 @@ export default {
       },
       selecting_schs: [],
       partitionArr: [],
-  
+
     };
   },
   created() {
@@ -696,7 +696,7 @@ export default {
       this.getSchedualPatientList();
       this.getTemplateInfo();
     }
-    
+
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
@@ -742,7 +742,7 @@ export default {
       this.getSchedualPatientList()
     },
     changeEndTime(){
-      
+
       this.getSchedualPatientList()
     },
     getAllZone: function() {
@@ -766,7 +766,7 @@ export default {
       console.log("params332322332323232",this.listQuery)
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
-      
+
         if (response.data.state == 0) {
           this.loading = false;
           this.$message.error(response.data.msg);
@@ -783,7 +783,7 @@ export default {
               if(response.data.data.schedule[i].dialysis_order!=null){
                 SchedualPatientsTable["start_time"] = response.data.data.schedule[i].dialysis_order.start_time ? parseTime(response.data.data.schedule[i].dialysis_order.start_time,"{h}:{i}") : '';
               }
-          
+
               SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id;
               SchedualPatientsTable["sch_time_int"] = response.data.data.schedule[i].schedule_date;
               SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");
@@ -795,16 +795,16 @@ export default {
                  SchedualPatientsTable["source"] = response.data.data.schedule[i].patient.source;
                 SchedualPatientsTable["patient_id"] = response.data.data.schedule[i].patient_id;
               }
-             
+
               SchedualPatientsTable["number"] =  response.data.data.schedule[i].device_number.number;
-               
+
               if(response.data.data.schedule[i].treatment_mode!=null){
                 SchedualPatientsTable["mode_name"] = response.data.data.schedule[i].treatment_mode.name;
               }
               if(response.data.data.schedule[i].prescription!=null){
-                SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;  
+                SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;
               }
-             
+
               if (response.data.data.schedule[i].assessment_before_dislysis != null) {
                 SchedualPatientsTable["dialysis_before_weight"] =response.data.data.schedule[i].assessment_before_dislysis.weight_before;
               }
@@ -820,17 +820,17 @@ export default {
                 SchedualPatientsTable.bp.push(bp);
                }
               }
-             
+
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
-             
+
             }
           }
         }
       });
     },
     getValue: function(val) {
-      
+
       if (val != undefined) {
         var str = val.value.split("/")
         return str[0];

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -33,7 +33,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -91,7 +91,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -205,7 +205,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -308,7 +308,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -336,7 +336,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -409,7 +409,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -487,7 +487,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -495,7 +495,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -1331,7 +1331,7 @@ export default {
             }
         })
         }
-        
+
         if(num == 0){
           this.$message.success('核对完成')
         }

src/xt_pages/dialysis/template/DialysisPrintOrderFifty.vue

@@ -1160,7 +1160,7 @@
                             line-height: 30px;
                           "
                         >
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -50,7 +50,7 @@
             病区：
             <div class="under_line" style="width: 50px;text-align: center;">
               <span>{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
-              
+
             </div>
           </div>
           <div class="inline_block">
@@ -532,7 +532,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 14 : 13" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -594,9 +594,9 @@
                         <!-- SPO2 -->
                         <td >{{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "" }}</td>
                         <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
-                        
+
                         <td>{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
-                        
+
                         <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                           {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
                         </td>
@@ -869,14 +869,14 @@
                     <span>{{ advice.advice_name }}</span>
 
                     <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-                    
+
                     <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
-                    
+
                     <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                     <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
-                    
+
                     <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
-                   
+
                     <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                   </td>
                   <!-- <td colspan="2" height="60px" style="text-align: center" v-else >

src/xt_pages/dialysis/template/DialysisPrintOrderFortyNine.vue

@@ -521,7 +521,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1139,7 +1139,7 @@
                             line-height: 30px;
                           "
                         >
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -1289,7 +1289,7 @@
                                 : ""
                             }}
                           </span>
-                          
+
                         </td>
                         <!-- <td
                           v-if="

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -1087,7 +1087,7 @@
                             line-height: 30px;
                           "
                         >
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -616,7 +616,7 @@
               <td width="80">透析液温度<br/>℃</td>
               <td width="60">置换率<br/>ml/min</td> -->
 
-              <td width="">病情特殊处理<br/>及专科护理措施纪录</td>
+              <td width="">病情特殊处理<br/>及专科护理措施记录</td>
               <td width="80">护士签名</td>
             </tr>
 

src/xt_pages/dialysis/template/DialysisPrintOrderNineteen.vue

@@ -490,7 +490,7 @@
                   <tbody>
                     <tr>
                       <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                        治疗纪录
+                        治疗记录
                       </td>
                     </tr>
                     <tr>
@@ -1346,7 +1346,7 @@ export default {
           response.data.data.dialysisOrder === null
             ? null
             : response.data.data.dialysisOrder;
-        
+
         if (this.operators.length > 0) {
           var operatorsLen = this.operators.length;
           for (var index = 0; index < operatorsLen; index++) {
@@ -1487,7 +1487,7 @@ export default {
                     this.monitors[index].end = "【结束透析】";
                   }
               }
-            
+
           }
         }
 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -536,7 +536,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -868,14 +868,14 @@
                     <span>{{ advice.advice_name }}</span>
 
                     <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-                    
+
                     <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
-                    
+
                     <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                     <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
-                    
+
                     <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
-                   
+
                     <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                   </td>
                   <!-- <td colspan="2" height="60px" style="text-align: center" v-else >

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -487,7 +487,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -1015,7 +1015,7 @@
                       治疗医生：
                       <div class="under_line" style="width: 80px">
                         <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
-                       
+
                         <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{ getAdminUser(prescription.prescription_doctor) }}</span>
                         <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else />
                       </div>
@@ -1332,7 +1332,7 @@ export default {
             }
         })
         }
-        
+
         if(num == 0){
           this.$message.success('核对完成')
         }

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -572,7 +572,7 @@
             <!--<td width="80">透析液温度<br/>℃</td>
               <td width="60">置换率<br/>ml/min</td> -->
 
-            <td width="">病情特殊处理<br />及专科护理措施纪录</td>
+            <td width="">病情特殊处理<br />及专科护理措施记录</td>
             <td width="60">护士签名</td>
           </tr>
 

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -146,7 +146,7 @@
                       {{ predialysis.internal_fistula_other }}
                     </div>
                   </div>
-                </div>  
+                </div>
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -508,7 +508,7 @@
                       <td width="80">血流量<br />ml/min</td>
                       <td width="90" v-if="org_id!=10210">超滤量累计L</td>
                       <td width="90" v-else>超滤量累计ml</td>
-                 
+
                       <td width="90">置换液流量ml/h</td>
                       <td width="80">钠浓度<br />mmol/L</td>
                       <td width="240">
@@ -1125,7 +1125,7 @@
             </tr>
           </template>
           <!-- <tr v-if="this.advice_groups_2.length == 0">
-            <td colspan="7" style="text-align:left;">特殊纪录：</td>
+            <td colspan="7" style="text-align:left;">特殊记录：</td>
         </tr> -->
         </tbody>
         <div class="print-yema4">1</div>
@@ -1238,7 +1238,7 @@
                 </tr>
               </template>
               <!-- <tr >
-                <td colspan="7" style="text-align:left;">特殊纪录：</td>
+                <td colspan="7" style="text-align:left;">特殊记录：</td>
             </tr> -->
             </tbody>
           </table>

src/xt_pages/user/patients.vue

@@ -408,7 +408,7 @@
             <span>{{ scope.row.created_time | parseTime('{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        
+
         <el-table-column label="转归" align="center">
           <template slot-scope="scope">
             <span>{{ LapsetoInfo(scope.row) }}</span>
@@ -416,12 +416,16 @@
         </el-table-column>
         <el-table-column label="转出(死亡)时间" min-width="134" align="center">
           <template slot-scope="scope">
-            <span>{{getTime(scope.row.death_time)}}</span>
+<!--            <span>{{getTime(scope.row.death_time)}}</span>-->
+            <span v-if="scope.row.lapseto == 1"> </span>
+            <span v-else >{{getTime(scope.row.death_time)}}</span>
           </template>
         </el-table-column>
          <el-table-column label="转出(死亡)原因" align="center" min-width="150">
           <template slot-scope="scope">
-            <span>{{scope.row.out_reason}}</span>
+<!--            <span>{{scope.row.out_reason}}</span>-->
+            <span v-if="scope.row.lapseto == 1"> </span>
+            <span v-else >{{scope.row.out_reason}}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="140">
@@ -507,7 +511,7 @@
               >
             </el-radio-group>
           </el-form-item>
-         
+
           <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required>
             <el-date-picker
               v-model="lapsetoForm.lapseto_time"
@@ -844,7 +848,7 @@
 
       },
       handleSuccess({ results, header }) {
-       
+
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')
@@ -860,7 +864,7 @@
           var isHasDryWeight = header.includes('干体重(kg)')
           var isHasHeight = header.includes('身高(cm)')
           var isHasHomeAddress = header.includes('家庭住址')
-         
+
           if (!(isHasName && isHasGender && isHasPhone && isHasIdCard && isHasDate && isHasSource && isHasLapseto && isHasInfectious && isHasDiagnose && isHasDialysisNo && isHasDryWeight && isHasHeight && isHasHomeAddress)) {
             this.dialogVisible = true
             return
@@ -1070,12 +1074,12 @@
                     }
                   }
                 }
-               
+
                 this.export_date.push(obj)
               }
 
               let index = 0
-             
+
               for (let i = 0; i < this.export_date.length; i++) {
                 if (this.export_date[i].dialysis_no == '') {
                   let new_dialysis_no = this.max_dialysis_no + index
@@ -1167,7 +1171,7 @@
                 'patients': this.export_date
               }
               console.log("export2222",this.export_date)
-              
+
               postExportPatients(params).then(
                 response => {
                   if (response.data.state === 1) {
@@ -1333,7 +1337,7 @@
         return new Date(time).getTime() / 1000
       },
       search() {
-        
+
         this.listQuery.keywords = this.searchKey
         this.getList()
       },
@@ -1341,17 +1345,17 @@
         this.getList()
       },
       getList() {
-       
+
         fetchList(this.listQuery).then(response => {
           if (response.data.state === 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
             this.tableData = response.data.data.patients
-           
+
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
-           
+
           }
         })
       },
@@ -1515,7 +1519,7 @@
       },
      toExport(){
       import('@/vendor/Export2Excel').then(excel => {
-      
+
         console.log("hhhh323223",this.tableData)
         for(let i=0;i<this.tableData.length;i++){
           if(this.tableData[i].gender == 1){
@@ -1554,11 +1558,11 @@
              this.tableData[i].is_infectiouss = "阳性"
           }
         }
-       
+
         const tHeader = ['姓名', '性别', '身份证号码','年龄','透析号','首次治疗时间','本人电话','患者来源','治疗状态','传染病']
         const filterVal = ['name', 'genders', 'id_card_no','age_year','dialysis_no','first_dialysis_date','phone','sources','lapesetos','is_infectiouss']
         console.log("table",this.tableData)
-      
+
         const data = this.formatJson(filterVal, this.tableData)
         excel.export_json_to_excel({
           header: tHeader,