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

src/router/modules/dialysis.js

@@ -219,6 +219,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/twenty',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_twenty'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twenty',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/otherone',
       component: () =>

src/xt_pages/data/prescription.vue

@@ -226,9 +226,9 @@
 
                 <el-col :span="8">
                   <el-form-item label="透析器/灌流器：">
+
                     <el-input
-                      v-model="addPlan.dialyzer_perfusion_apparatus"
-                    ></el-input>
+                      v-model="addPlan.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -420,6 +420,12 @@
         </el-col>
       </el-row>
     </div>
+    <multi-select-box
+      :propsForm="InnerDialogProps"
+      v-on:dialog-comfirm="innerDialogComfirm"
+      v-on:dialog-cancle="innerDialogCancle"
+    >
+    </multi-select-box>
   </div>
 </template>
 
@@ -431,19 +437,31 @@ import {
   postSystemPrescription,
   updateSystemPrescription
 } from "@/api/config";
+import { getDataConfig } from '@/utils/data'
+import MultiSelectBox from '../dialysis/details/dialog/MultiSelectBox/index'
+
 
 export default {
   name: "prescription",
-  components: {},
+  components: { MultiSelectBox },
 
   data() {
     return {
+      InnerDialogProps: {
+        values: [],
+        visibility: false,
+        isShowTextArea: true,
+        customContent: '',
+        titles: '',
+        type: '' // 不同弹框类型，用来匹配数据
+      },
       dialysisTimeShow: new Date(2018, 1, 1, 3, 0),
       modeOptions: null,
       current_select: 0,
       mode_name: "HD",
       pageLoading: false,
       itemLoading: false,
+      dialyzerPerfusionApparatus:[],
       treatment_mode: [
         // 治疗模式
         {
@@ -807,6 +825,30 @@ export default {
   },
   computed: {},
   methods: {
+    showInnerDialog: function(val) {
+      this.InnerDialogProps.visibility = true
+      switch (val) {
+        case '5': // 透析器/灌流器
+          this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
+          this.InnerDialogProps.titles = '透析器/灌流器'
+          this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
+          this.InnerDialogProps.selected = this.addPlan.dialyzer_perfusion_apparatus
+          this.InnerDialogProps.isShowTextArea = false
+          break
+      }
+    },
+    innerDialogComfirm: function(val) {
+      this.InnerDialogProps.visibility = false
+      switch (val.type) {
+        case 'dialyzer_perfusion_apparatus':
+          this.addPlan.dialyzer_perfusion_apparatus = val.value.join(',')
+          break
+
+      }
+    },
+    innerDialogCancle: function() {
+      this.InnerDialogProps.visibility = false
+    },
     openEdit() {},
     tableRows({ row, rowIndex }) {
       // 把每一行的索引放进row
@@ -882,7 +924,7 @@ export default {
       );
 
       getSystemPrescription(params).then(response => {
-        
+
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
@@ -892,7 +934,7 @@ export default {
               prescription.anticoagulant = "低分子肝素"
            }
           if (prescription.id > 0) {
-            
+
             for (const key in prescription) {
               this.addPlan[key] = prescription[key];
             }
@@ -928,7 +970,7 @@ export default {
         } else {
           this.system_prescription = response.data.data.prescriptions;
           console.log("为什么",this.system_prescription)
-          
+
           for (let i = 0; i < this.system_prescription.length; i++) {
             if (this.system_prescription[i].mode == 1) {
               this.isEdit = true;
@@ -946,7 +988,7 @@ export default {
     },
     changeThisAnticoagulant() {
       var thismode = parseInt(this.addPlan.anticoagulant);
-     
+
       if (isNaN(thismode) || thismode <= 0) {
         return false;
       }
@@ -1019,8 +1061,13 @@ export default {
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
     this.blood_access_option = this.$store.getters.blood_access;
     this.addPlan.mode = 1;
+    this.dialyzerPerfusionApparatus = getDataConfig(
+      'hemodialysis',
+      'dialyzer_perfusion_apparatus'
+    )
     this.getAllSystemPrescription();
     this.getSystemPrescription(this.addPlan.mode);
+
   },
   watch: {
     "addPlan.dialysis_duration": function() {

src/xt_pages/dialysis/batch_print/batch_print_order_nine.vue

@@ -1296,14 +1296,14 @@
                     v-for="(advice, advice_index) in record.advices"
                     :key="advice_index"
                   >
-                    <td height="32px">
+                    <td height="40px">
                       <span v-if="advice[0].start_time">
                         {{ getTime(advice[0].start_time, "{h}:{i}") }}
                       </span>
                       <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                     </td>
                     <td
-                      height="32px"
+                      height="40px"
                       colspan="2"
                       class="advice-name"
                       style="padding-left:7px;"
@@ -1342,7 +1342,7 @@
                   <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
                 </td> -->
                     <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-                    <td height="32px">
+                    <td height="40px">
                       <span
                         v-if="setAdminUserES(advice[0], 'advice_doctor') == ''"
                         >{{ getAdminUser(advice[0], "advice_doctor") }}</span
@@ -1360,7 +1360,7 @@
                   <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
                   <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
                 </td> -->
-                    <td height="32px">
+                    <td height="40px">
                       <span
                         v-if="
                           setAdminUserES(advice[0], 'execution_staff') == ''
@@ -1376,7 +1376,7 @@
                         style="height: 30px;"
                       />
                     </td>
-                    <td height="32px">
+                    <td height="40px">
                       <span v-if="advice[0].execution_time">{{
                         getTime(advice[0].execution_time, "{h}:{i}")
                       }}</span>

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -90,7 +90,7 @@
                 </div>
                 <div class="row">
                     血管通路 
-                    <div class="inline_block under_line" style="width:93%;text-align: left;">
+                    <div class="inline_block under_line" style="width:92%;text-align: left;">
                     <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-左') || isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-右')" showValue="内瘘"></label-box>
                     （<label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-左')" showValue="左"></label-box>
                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-右')" showValue="右"></label-box>）
@@ -111,7 +111,7 @@
                 </div>
                 <div class="row">
                     抗凝药物 
-                    <div class="inline_block under_line" style="width:93%;text-align: left;">
+                    <div class="inline_block under_line" style="width:92%;text-align: left;">
                     <label-box :isChecked="record.prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>&nbsp;
                     <label-box :isChecked="record.prescription.anticoagulant == 3 ?  true : record.prescription.anticoagulant == 6 ? true : record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
                     （<label-box :isChecked="record.prescription.anticoagulant == 6 ? true : false" showValue="钙"></label-box>
@@ -202,7 +202,7 @@
                 </div>
                 <div class="row">
                     透前评估 
-                    <div class="inline_block under_line" style="width:93%;text-align: left;">
+                    <div class="inline_block under_line" style="width:92%;text-align: left;">
                     <div class="inline_block" style="margin-right:30px;">
                         体温
                         <div class="inline_block" style="width:50px;text-align:center">
@@ -353,7 +353,7 @@
                 <table class="print-table" border="1">
                     <tbody>
                     <tr>
-                        <td width="40" style="padding-left:5px;border:none;border-right:1px solid #000;">
+                        <td width="40" rowspan="2" style="padding-left:5px;border:none;border-right:1px solid #000;">
                         透后评估
                         </td>
 
@@ -386,7 +386,10 @@
                             </span>次/分
                         </div>
                         </td>
-                        <td width="50" style="border:none;padding-left:5px">实际置换量:</td>
+                        
+                    </tr>
+                    <tr>
+                      <td width="50" style="border:none;padding-left:5px">实际置换量:</td>
                         <td width="30" style="text-align:left;border:none;">
                         <div>
                             <span class="under_line" style="width:50px;display:inline-block">
@@ -401,6 +404,8 @@
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false) : false" showValue="+ +"></label-box>
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false) : false" showValue="+ + +"></label-box>
                         </td>
+                        <td width="50" style="text-align:left;border:none;"></td>
+                        <td width="110" style="text-align:left;border:none;"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -797,7 +802,7 @@ export default {
       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: 3px 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-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}'
       const style3 =
-        '@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;}.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; width: 50%;}'
+        '@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:16px}.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;}.row {font-size: 16px;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; width: 50%;}'
       printJS({
         printable: 'print_content',
         type: 'html',

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -160,6 +160,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 20">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -667,6 +677,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirteen" });
       } else if (this.template_id == 15) {
         this.$router.push({ path: "/dialysis/print/batch/fifteen" });
+      } else if (this.template_id == 20) {
+        this.$router.push({ path: "/dialysis/print/batch/twenty" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/NavIgation.vue

@@ -541,7 +541,8 @@ export default {
 
       this.$refs.assessmentBefore.setLastRecord(
         lastPredialysisEvaluation,
-        lastDryWeightDislysis
+        lastDryWeightDislysis,
+
       );
       this.$refs.prescription.setLastRecord(
         schedual,
@@ -571,7 +572,7 @@ export default {
       this.$refs.monitor_dialog.show();
     },
     showAssessmentAfterDialog: function() {
-      this.$refs.assessment_after_dislysis.show(this.assessment_after_dislysis);
+      this.$refs.assessment_after_dislysis.show(this.assessment_after_dislysis,this.last_assessment_after_dislysis);
     },
     showDoctorAdviceDialog: function() {
       this.$refs.doctor_advice.show();
@@ -583,13 +584,15 @@ export default {
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
-      this.$refs.prescription.show(this.prescription);
+      this.$refs.prescription.show(this.prescription,this.schedual);
     },
     showAccepts: function() {
       this.$refs.accepts.show(this.receiver_treatment_access);
     },
     showAssessmentBefore: function() {
-      this.$refs.assessmentBefore.show(this.predialysis_evaluation);
+      console.log(this.last_predialysis_evaluation)
+
+      this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation);
     },
     showDoubleCheck: function() {
       this.$refs.doubleCheck.show();

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

@@ -1013,7 +1013,7 @@ export default {
     },
 
     // 数据开始
-    show(predialysis) {
+    show(predialysis,last_after) {
       this.isVisibility = true
       this.predialysis = predialysis
       this.form.observation_content = predialysis.observation_content
@@ -1022,7 +1022,27 @@ export default {
         predialysis.observation_content_other
       // console.log("透后", predialysis);
 
+      if(predialysis != null && predialysis.id == 0){
+        if (last_after != null) {
+          for (var key in last_after){
+            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' ){
+              this.$set(
+                this.form,
+                key,
+                last_after[key]
+              )
+
+            }
+          }
+        }
+      }
+
+
+
+
       this.getPermission()
+
+
     },
 
     hide() {

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

@@ -645,9 +645,11 @@
         }
         return false
       },
-      show(assessment) {
+      show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
+        console.log(last_predialysis_evaluation)
+
+        this.lastPredialysisEvaluation = last_predialysis_evaluation
         this.assessment = assessment
-        console.log('透前', assessment)
         this.getPermission()
         this.isVisibility = true
         for (let i = 0; i < this.admin_users.length; i++) {
@@ -659,43 +661,39 @@
           this.weight_adjust.doctor = this.$store.getters.xt_user.user.id
         }
 
+
+
+
+
         if (this.predialysis_evaluation.id == 0) {
-          if (this.lastDryWeightDislysis != null) {
-            this.weight_adjust.weight = this.lastDryWeightDislysis.dry_weight
-            this.assessmentBeforeDislysis.dry_weight = this.lastDryWeightDislysis.dry_weight
+
+
+          if (lastDryWeightDislysis != null) {
+            this.weight_adjust.weight = lastDryWeightDislysis.dry_weight
+            this.$set(
+              this.assessmentBeforeDislysis,
+              'dry_weight',
+              lastDryWeightDislysis.dry_weight.toString()
+            )
+
           } else {
             if (this.lastPredialysisEvaluation != null) {
               this.weight_adjust.weight = this.lastPredialysisEvaluation.dry_weight
               this.assessmentBeforeDislysis.dry_weight = this.lastPredialysisEvaluation.dry_weight
             }
           }
+
           if (this.lastPredialysisEvaluation != null) {
-            this.$set(
-              this.assessmentBeforeDislysis,
-              'additional_weight',
-              this.lastPredialysisEvaluation['additional_weight'].toString()
-            )
+            for (var key in this.lastPredialysisEvaluation){
+              if (key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' && key != 'dry_weight' && key != 'weight_before'){
+                this.$set(
+                  this.assessmentBeforeDislysis,
+                  key,
+                  this.lastPredialysisEvaluation[key]
+                )
 
-            this.$set(
-              this.assessmentBeforeDislysis,
-              'internal_fistula',
-              this.lastPredialysisEvaluation['internal_fistula']
-            )
-            this.$set(
-              this.assessmentBeforeDislysis,
-              'internal_fistula_skin',
-              this.lastPredialysisEvaluation['internal_fistula_skin']
-            )
-            this.$set(
-              this.assessmentBeforeDislysis,
-              'blood_access_part_id',
-              this.lastPredialysisEvaluation['blood_access_part_id']
-            )
-            this.$set(
-              this.assessmentBeforeDislysis,
-              'blood_access_part_opera_id',
-              this.lastPredialysisEvaluation['blood_access_part_opera_id']
-            )
+              }
+            }
           }
 
         } else {
@@ -703,12 +701,6 @@
           this.weight_adjust.weight = this.predialysis_evaluation['dry_weight']
         }
 
-
-
-
-
-
-
       },
       hide() {
         this.isVisibility = false
@@ -808,7 +800,7 @@
 
             break
           case '11': //
-            this.InnerDialogProps.values = this.$store.getters.puncture_needle
+            this.InnerDialogProps.values =getDataConfig('hemodialysis', 'puncture_needle')
             this.InnerDialogProps.titles = '穿刺针'
             this.InnerDialogProps.type = 'puncture_needle'
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_needle
@@ -816,7 +808,8 @@
 
             break
         }
-      }, innerDialogComfirm: function(val) {
+      },
+      innerDialogComfirm: function(val) {
         this.InnerDialogProps.visibility = false
         switch (val.type) {
           case 'last_dialysis_after':
@@ -857,7 +850,8 @@
             this.assessmentBeforeDislysis.puncture_needle = val.value.join(',')
             break
         }
-      }, innerDialogCancle: function() {
+      },
+      innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       }, handleComfirm: function() {
         var arr = this.assessmentBeforeDislysis
@@ -1019,15 +1013,12 @@
 
       },
       'predialysis_evaluation.id': function() {
-        console.log(this.last_predialysis)
 
         if (this.predialysis_evaluation.id > 0) {
           for (var index in this.assessmentBeforeDislysis) {
             this.assessmentBeforeDislysis[index] = this.predialysis_evaluation[index]
           }
 
-          // this.assessmentBeforeDislysis['catheter_bend'] = this.predialysis_evaluation['catheter_bend'].toString()
-          // this.assessmentBeforeDislysis['is_hemorrhage'] = this.predialysis_evaluation['is_hemorrhage'].toString()
           if (this.predialysis_evaluation['catheter_bend'] == 0) {
             this.assessmentBeforeDislysis['catheter_bend'] = ''
           } else {
@@ -1045,34 +1036,6 @@
             this.assessmentBeforeDislysis['is_infect'] = this.predialysis_evaluation['is_infect'] + ''
           }
 
-          //
-          //
-          // if (this.predialysis_evaluation['puncture_way'] == 0) {
-          //   this.assessmentBeforeDislysis['puncture_way'] = ''
-          // } else {
-          //   this.assessmentBeforeDislysis['puncture_way'] = this.predialysis_evaluation['puncture_way'] + ''
-          // }
-          //
-          //
-          // if (this.predialysis_evaluation['venous_catheterization'] == 0) {
-          //   this.assessmentBeforeDislysis['venous_catheterization'] = ''
-          // } else {
-          //   this.assessmentBeforeDislysis['venous_catheterization'] = this.predialysis_evaluation['venous_catheterization'] + ''
-          // }
-          //
-          //
-          // if (this.predialysis_evaluation['venous_catheterization_part'] == 0) {
-          //   this.assessmentBeforeDislysis['venous_catheterization_part'] = ''
-          // } else {
-          //   this.assessmentBeforeDislysis['venous_catheterization_part'] = this.predialysis_evaluation['venous_catheterization_part'] + ''
-          // }
-          //
-          //
-          // if (this.predialysis_evaluation['emergency_treatment'] == 0) {
-          //   this.assessmentBeforeDislysis['emergency_treatment'] = ''
-          // } else {
-          //   this.assessmentBeforeDislysis['emergency_treatment'] = this.predialysis_evaluation['emergency_treatment'] + ''
-          // }
 
           if (this.predialysis_evaluation['blood_access_part_id'] == 0) {
             this.assessmentBeforeDislysis['blood_access_part_id'] = ''

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

@@ -128,7 +128,7 @@
               {{ scope.row.transmembrane_pressure ? scope.row.transmembrane_pressure : "" }}
             </template>
           </el-table-column>
-          
+
           <el-table-column prop="transmembrane_pressure" align="center"  label="跨膜压(mmHg)" width="120" v-if="isShow('跨膜压') && (monitors[0] && monitors[0]['transmembrane_pressure_type'] != 2)" >
             <template slot-scope="scope">
               {{ scope.row.transmembrane_pressure ? scope.row.transmembrane_pressure : "" }}
@@ -148,7 +148,7 @@
                   template_id == 12 ||
                   template_id == 13 ||
                   template_id == 17 ||
-                  template_id == 18 || 
+                  template_id == 18 ||
                   template_id == 19 ||
                   template_id == 20)
             "
@@ -330,7 +330,7 @@
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
             </template>
           </el-table-column>
-          
+
           <el-table-column
             prop="heparin"
             align="center"
@@ -890,14 +890,16 @@ export default {
       getTodayMonitor(params).then(rs => {
         var resp = rs.data.data
         this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
+        this.form.temperature = '' // this.last_monitor_record.pulse_frequency;
+
         this.form.pulse_frequency = '' // this.last_monitor_record.pulse_frequency;
-        this.form.breathing_rated = resp.monitor.breathing_rate ? resp.monitor.breathing_rate : ''
+        this.form.breathing_rated =  resp.monitor.breathing_rated ? resp.monitor.breathing_rated : ''
         this.form.systolic_bp = '' // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = '' // this.last_monitor_record.diastolic_blood_pressure;
         this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : ''
         this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
         this.form.venous_pressure_type = resp.monitor.venous_pressure_type ? resp.monitor.venous_pressure_type : 1
-        this.form.arterial_pressure = '' // this.last_monitor_record.arterial_pressure;
+        this.form.arterial_pressure = resp.monitor.arterial_pressure ? resp.monitor.arterial_pressure : '' // this.last_monitor_record.arterial_pressure;
         this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type ? resp.monitor.arterial_pressure_type : 1
         this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
         this.form.transmembrane_pressure_type = resp.monitor.transmembrane_pressure_type ? resp.monitor.transmembrane_pressure_type : 1
@@ -905,18 +907,20 @@ export default {
         this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : ''
         this.form.sodium_concentration = resp.monitor.sodium_concentration ? resp.monitor.sodium_concentration : ''
         this.form.dialysate_temperature = resp.monitor.dialysate_temperature ? resp.monitor.dialysate_temperature : ''
-        this.form.temperature = resp.monitor.temperature ? resp.monitor.temperature : ''
+        this.form.temperature =  resp.monitor.temperature ? resp.monitor.temperature : ''
         this.form.replacement_rate = resp.monitor.replacement_rate ? resp.monitor.replacement_rate : ''
         this.form.heparin = resp.monitor.heparin ? resp.monitor.heparin : ''
         this.form.dialysate_flow = resp.monitor.dialysate_flow ? resp.monitor.dialysate_flow : ''
-        this.form.displacement_quantity = '' // this.last_monitor_record.displacement_quantity;
-        this.form.conductivity = ''
-        this.form.displacement_flow_quantity = ''
-        this.form.ktv = '' // this.last_monitor_record.ktv;
-        this.form.symptom = '' // this.last_monitor_record.symptom;
-        this.form.dispose = '' // this.last_monitor_record.dispose;
-        this.form.result = '' // this.last_monitor_record.result;
+        this.form.displacement_quantity =  resp.monitor.displacement_quantity ? resp.monitor.displacement_quantity : '' // this.last_monitor_record.displacement_quantity;
+        this.form.conductivity =   ''
+        this.form.displacement_flow_quantity = resp.monitor.displacement_flow_quantity ? resp.monitor.displacement_flow_quantity : ''
+        this.form.ktv =  resp.monitor.ktv ? resp.monitor.ktv : '' // this.last_monitor_record.ktv;
+        this.form.symptom =  resp.monitor.symptom ? resp.monitor.symptom : '' // this.last_monitor_record.symptom;
+        this.form.dispose =  resp.monitor.dispose ? resp.monitor.dispose : '' // this.last_monitor_record.dispose;
+        this.form.result =  resp.monitor.result ? resp.monitor.result : '' // this.last_monitor_record.result;
         this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation ? resp.monitor.blood_oxygen_saturation : ''
+
+
       })
     },
 

src/xt_pages/dialysis/details/index.vue

@@ -25,7 +25,7 @@
         <el-tab-pane label="候诊区" name="first">
           <div class="cell clearfix" style="margin-bottom:10px;">
             <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
-            <el-input size="small" style="width:24%;" v-model.trim="search_input" class="filter-item"/>
+            <el-input size="small" style="width:24%;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
             <el-button size="small" class="filter-item" type="primary" style="margin-right:20px;" @click="searchAction">搜索</el-button>
           </div>
           <div class="cell clearfix" style="margin-bottom:10px;display:flex;">

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -268,7 +268,7 @@
         <div style="width:270px;margin-right:20px;">
             <div class="cell clearfix" style="margin-bottom:10px;">
             <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 130px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
-            <el-input size="small" style="width:80px;" v-model.trim="search_input" class="filter-item"/>
+            <el-input size="small" style="width:80px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
             <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
           </div>
           <div class="cell clearfix" style="margin-bottom:10px;">
@@ -601,7 +601,7 @@ export default {
       //
       tableData: [],
       selected_date: new Date(),
-      // search_input 和 search_keyword，使输入关键字时不会经常刷新 filtedSchedules
+      // search_input 和 search_keyword，使输入关键字时不会经常刷新  filtedSchedules
       search_keyword: '', // 确定用于搜索的关键字
       search_input: '', // 输入中的关键字
       patient_state:[
@@ -663,13 +663,13 @@ export default {
       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: 3px 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-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;}';
       const style3 =
-        '@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;}.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; width: 50%;}';
+        '@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:16px}.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;}.row {font-size: 16px;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; width: 50%;}';
       // const style3 =
       //   '@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: 16px;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: 16px;padding: 5px 5px;line-height: 18px;}.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:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
       //
 
       const style5 =
-        '@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 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 14px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 40px;  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;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  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 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.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;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
+        '@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 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 14px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 28px;  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;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  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 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.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;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
       const style6 =
         '@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:16px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:16px}.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;}';
 

src/xt_pages/dialysis/schedualPatient.vue

@@ -69,7 +69,7 @@
       </el-select>
       <label class="title"><span class="name">日期查询</span> : </label>
       <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
-      <el-input size="small" style="width: 180px;" v-model.trim="search_input" class="filter-item"/>
+      <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
     </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -22,18 +22,19 @@
             </td>
             <td width="30">岁</td>
 
-            <td width="50">住院号:</td>
+            
+            <td width="50">门诊号:</td>
             <td width="150">
               <div class="under-line">
-                  {{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number : "" }}
+                {{ patientInfo.dialysis_no ? patientInfo.dialysis_no : "" }}
               </div>
             </td>
             <td width="20"></td>
 
-            <td width="50">门诊号:</td>
+            <td width="50">住院号:</td>
             <td width="150">
-              <div class="under-line">
-                {{ patientInfo.dialysis_no ? patientInfo.dialysis_no : "" }}
+              <div class="under-line">&nbsp;
+                  {{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number : "/" }}
               </div>
             </td>
             <td></td>
@@ -45,22 +46,22 @@
           <tr>
             <td width="90">传染病标志:</td>
             <td width="80">
-              <div class="under-line">{{InfectiousDiseases?InfectiousDiseases:'无'}}</div>
+              <div class="under-line">{{InfectiousDiseases?InfectiousDiseases:'阴性'}}</div>
             </td>
             <td width="10"></td>
             <td width="110">上次透析时间:</td>
             <td width="120">
-              <div class="under-line">{{lastpredialysis?getTime(lastpredialysis.assessment_date, "{y}-{m}-{d}"):''}}</div>
+              <div class="under-line">&nbsp;{{lastpredialysis?getTime(lastpredialysis.assessment_date, "{y}-{m}-{d}"):''}}</div>
             </td>
             <td width="10"></td>
             <td width="110">本次透析时间:</td>
             <td width="120">
-              <div class="under-line">{{ queryParams.xtdate }}</div>
+              <div class="under-line">&nbsp;{{ queryParams.xtdate }}</div>
             </td>
             <td width="10"></td>
             <td width="80">透析次数:</td>
             <td width="120">
-              <div class="under-line">{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
+              <div class="under-line">&nbsp;{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
             </td>
             <td></td>
           </tr>
@@ -69,6 +70,10 @@
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
           <tr>
+            <td width='50'>床位号:</td>
+            <td width='100'>
+              <div class="under-line">&nbsp;{{ getNumber() }}</div>
+            </td>
             <td width="40">诊 断:</td>
             <td width="">
               <div class="under-line" style="text-align:left">&nbsp;{{ patientInfo.diagnose }}</div>
@@ -98,7 +103,7 @@
                     <td width="1"></td>
                     <td width="40">意识:</td>
                     <td style="max-width:350px;">
-                      <div>
+                      <div style="display:flex;">
                         <label-box style="margin-left:5px;" v-for="(item, index) in consciousness_arr" :key="index" :isChecked="receiverTreatmentAccess.consciousness == item.id ? true : false" :showValue="item.name"></label-box>&nbsp;
 
                         <!-- <label-box :isChecked='receiverTreatmentAccess.consciousness==1?true:false' showValue='清醒'></label-box>
@@ -118,7 +123,6 @@
                         &nbsp;{{ receiverTreatmentAccess.consciousness == 3 ? '昏迷' : receiverTreatmentAccess.consciousness == 4 ? '模糊' : '' }}
                       </div>
                     </td> -->
-                    <td width="10">;</td>
                     <td width="40">感染:</td>
                     <td width="80">
                         <label-box :isChecked='(predialysis.complication == "" || predialysis.complication == "无") ? true : false' showValue='无'></label-box>
@@ -247,11 +251,11 @@
                     <td width="65">穿刺方法:</td>
                     <td width="180">
                       <div>
-                        <label-box :isChecked="predialysis.puncture_way == 1 ? true : false" showValue="绳梯"></label-box>
+                        <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('绳梯') > -1 ? true : false" showValue="绳梯"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.puncture_way == 4 ? true : false" showValue="定点"></label-box>
+                        <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('定点') > -1 ? true : false" showValue="定点"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.puncture_way == 3 ? true : false" showValue="区域"></label-box>
+                        <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('区域') > -1 ? true : false" showValue="区域"></label-box>
                         &nbsp;
                       </div>
                     </td>
@@ -389,25 +393,25 @@
                       <td width='40'>体重:</td>
                       <td width='50'>干体重:</td>
                       <td width="50">
-                        <div class="under-line">&nbsp;{{ predialysis.dry_weight ? predialysis.dry_weight : "" }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}</div>
                       </td>
                       <td width="10">Kg</td>
                       <td width="30"></td>
                       <td width='70'>上次透后:</td>
                       <td width="50">
-                        <div class="under-line">&nbsp;{{ assessmentafter.weight_after ? assessmentafter.weight_after : "" }}</div>
+                        <div class="under-line">&nbsp;{{ assessmentafter.weight_after ? assessmentafter.weight_after : "/" }}</div>
                       </td>
                       <td width="10">Kg</td>
                       <td width="30"></td>
                       <td width='70'>本次透前:</td>
                       <td width="50">
-                        <div class="under-line">&nbsp;{{ predialysis.weight_before ? predialysis.weight_before : "" }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.weight_before ? predialysis.weight_before : "/" }}</div>
                       </td>
                       <td width="10">Kg</td>
                       <td width="30"></td>
                       <td width='70'>本次透后:</td>
                       <td width="50">
-                        <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}</div>
+                        <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "/" }}</div>
                       </td>
                       <td width="10">Kg</td>
                       <td></td>
@@ -421,13 +425,13 @@
                     <td width="70">计划时间:</td>
                     <td width="40">
                       <div class="under-line">
-                        &nbsp;{{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "" }}
+                        &nbsp;{{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : 0 }}
                       </div>
                     </td>
                     <td width="10">h</td>
                     <td width="40">
                       <div class="under-line">
-                        &nbsp;{{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "" }}
+                        &nbsp;{{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : 0 }}
                       </div>
                     </td>
                     <td width="35">min</td>
@@ -435,13 +439,13 @@
                     <td width="100">实际治疗时间:</td>
                     <td width="40">
                       <div class="under-line">
-                        &nbsp;{{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : "" }}
+                        &nbsp;{{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : 0 }}
                       </div>
                     </td>
                     <td width="10">h</td>
                     <td width="40">
                       <div class="under-line">
-                        &nbsp;{{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : "" }}
+                        &nbsp;{{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
                       </div>
                     </td>
                     <td width="35">min</td>
@@ -452,7 +456,6 @@
               <table class="table-box">
                 <tbody>
                   <tr>
-                    <td width="90">预设超滤量:</td>
                     <td width="80">预设超滤量:</td>
                     <td width="50">
                       <div class="under-line">
@@ -474,10 +477,17 @@
                         <div class="under-line">&nbsp;{{ prescription.mode ? prescription.mode : "" }}</div>
                     </td>
                     <td width="20"></td>
-                    <td width="140">透析器/灌流器型号:</td>
+                    <td width="80">透析器:</td>
                     <td width="80">
                       <div class="under-line">
-                        &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
+                        &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.indexOf('+') > -1 ? prescription.dialyzer_perfusion_apparatus.split('+')[0] : prescription.dialyzer_perfusion_apparatus : '/' }}
+                      </div>
+                    </td>
+                    <td width="20"></td>
+                    <td width="80">灌流器型号:</td>
+                    <td width="80">
+                      <div class="under-line">
+                        &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.indexOf('+') > -1 ? prescription.dialyzer_perfusion_apparatus.split('+')[1] : "/" : '/' }}
                       </div>
                     </td>
                     <td></td>
@@ -661,7 +671,7 @@
                     <td></td>
                     <td width="70">主管医生:</td>
                     <td width="100">
-                      <div>
+                      <div style="text-align:left;">
                         <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">
                             {{ getAdminUser(prescription.prescription_doctor) }}
                         </span>
@@ -672,7 +682,7 @@
                     </td>
                     <td width="120">穿刺/开管护士:</td>
                     <td width="100">
-                      <div>
+                      <div style="text-align:left;">
                         <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
                         {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) }}</span>
                         <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt="" srcset="" v-else />
@@ -680,7 +690,7 @@
                     </td>
                     <td width="70">核对护士:</td>
                     <td width="100">
-                      <div>
+                      <div style="text-align:left;">
                         <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                             {{ getAdminUser(check == null ? 0 : check.modifier) ? getAdminUser(check == null ? 0 : check.modifier) : "" }}
                         </span>
@@ -718,8 +728,10 @@
             <td>&nbsp;{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
             <td>&nbsp;{{ monitor.temperature ? monitor.temperature : '' }}</td>
             <td>
-              &nbsp;{{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
-              {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
+              <span v-if="monitor.systolic_blood_pressure || monitor.diastolic_blood_pressure">
+                &nbsp;{{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
+                {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
+              </span>
             </td>
             <td>&nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : '' }}</td>
             <td>&nbsp;{{ monitor.breathing_rate ? monitor.breathing_rate : '' }}</td>
@@ -823,7 +835,7 @@
               </table>
 
 
-              <table class="table-box" style="margin-bottom:200px;">
+              <table class="table-box" style="margin-bottom:130px;">
                 <tbody>
                   <tr>
                     <!-- <td width="70">其他记录:</td> -->
@@ -844,7 +856,7 @@
                     <td></td>
                     <td width="150">当班责任护士:</td>
                     <td width="100">
-                      <div>
+                      <div style="text-align:left">
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                         <img class="es-img" style="height:30px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
                       </div>
@@ -852,7 +864,7 @@
                     <td width="30"></td>
                     <td width="70">下机护士:</td>
                     <td width="100">
-                      <div>
+                      <div style="text-align:left">
                         <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
                           {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
                         <img class="es-img" style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
@@ -1103,6 +1115,17 @@ export default {
     }
   },
   methods: {
+    getPunctureWay: function(val) {
+      let puncture_method_name = '/'
+      const puncture_method = getDataConfig("hemodialysis", "puncture_method")
+
+      for (let i = 0; i < puncture_method.length; i++) {
+        if (puncture_method[i].id == val) {
+          puncture_method_name = puncture_method[i].name
+        }
+      }
+      return puncture_method_name
+    },
     getHumorExcessiveSymptom(val) {
       const humor_excessive_symptom = getDataConfig('hemodialysis', 'humor_excessive_symptom')
       var humor_excessive_symptom_name = ''
@@ -1184,15 +1207,31 @@ export default {
     },
     getNumber() {
       if (this.dialysisOrder != null) {
-        return (
-          this.patientInfo.DialysisSchedule.device_zone.name +
-          this.dialysisOrder.DeviceNumber.number
-        )
+        if(this.patientInfo.DialysisSchedule.device_zone.name.indexOf("区") > -1){
+          return (
+            this.patientInfo.DialysisSchedule.device_zone.name +
+            this.dialysisOrder.DeviceNumber.number
+          );
+        } else {
+          return (
+            this.patientInfo.DialysisSchedule.device_zone.name + "区" +
+            this.dialysisOrder.DeviceNumber.number
+          );
+        }
+        
       } else {
-        return (
-          this.patientInfo.DialysisSchedule.device_zone.name +
-          this.patientInfo.DialysisSchedule.device_number.number
-        )
+        if(this.patientInfo.DialysisSchedule.device_zone.name.indexOf("区") > -1){
+          return (
+            this.patientInfo.DialysisSchedule.device_zone.name +
+            this.patientInfo.DialysisSchedule.device_number.number
+          );
+        }else{
+          return (
+            this.patientInfo.DialysisSchedule.device_zone.name + "区" +
+            this.patientInfo.DialysisSchedule.device_number.number
+          );
+        }
+        
       }
     },
 

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -788,7 +788,7 @@
         </tr>
 
         <tr v-for="monitor in monitors" :key="monitor.id">
-          <td>
+          <td style="height:40px;">
             &nbsp;
             <!-- <template>
               <span v-if="monitor.monitoring_date">
@@ -857,13 +857,13 @@
         <!-- <template v-for="group in doctor_advices" > -->
 
         <tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index">
-          <td height="32px">
+          <td height="40px">
               <span v-if="advice.start_time">
                 {{ getTime(advice.start_time, "{h}:{i}") }}
               </span>
             <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
           </td>
-          <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
+          <td height="40px" colspan="2" class="advice-name" style="padding-left:7px;">
             <span v-if="advice.parent_id > 0">---></span>
             <span>{{ advice.advice_name }}</span>
             <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
@@ -879,15 +879,15 @@
                   <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
                 </td> -->
           <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-          <td height="32px">
+          <td height="40px">
             <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
             <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
           </td>
-          <td height="32px">
+          <td height="40px">
             <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
             <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
           </td>
-          <td height="32px">
+          <td height="40px">
             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
           </td>
         </tr>
@@ -2071,6 +2071,8 @@ export default {
               this.doctor_advices.push(obj1)
               this.doctor_advices.push(obj2)
               this.doctor_advices.push(obj3)
+              this.doctor_advices.push(obj3)
+              this.doctor_advices.push(obj3)
             }
             if (this.doctor_advices.length === 1) {
               var obj = { advice_name: '', start_time: '' }
@@ -2079,17 +2081,40 @@ export default {
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj1)
               this.doctor_advices.push(obj2)
+              this.doctor_advices.push(obj2)
+              this.doctor_advices.push(obj2)
             }
             if (this.doctor_advices.length === 2) {
               var obj = { advice_name: '', start_time: '' }
               var obj1 = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj1)
+              this.doctor_advices.push(obj1)
+              this.doctor_advices.push(obj1)
             }
             if (this.doctor_advices.length === 3) {
               // eslint-disable-next-line no-redeclare
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+            }
+            if (this.doctor_advices.length === 2) {
+              // eslint-disable-next-line no-redeclare
+              var obj = { advice_name: '', start_time: '' }
+              this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+            }
+            if (this.doctor_advices.length === 1) {
+              // eslint-disable-next-line no-redeclare
+              var obj = { advice_name: '', start_time: '' }
+              this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
             }
 
             if (this.doctor_advices.length > 0) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -77,7 +77,7 @@
       </div>
       <div class="row">
         血管通路 
-        <div class="inline_block under_line" style="width:93%;text-align: left;">
+        <div class="inline_block under_line" style="width:92%;text-align: left;">
           <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="内瘘"></label-box>
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="右"></label-box>）
@@ -98,7 +98,7 @@
       </div>
       <div class="row">
         抗凝药物 
-        <div class="inline_block under_line" style="width:93%;text-align: left;">
+        <div class="inline_block under_line" style="width:92%;text-align: left;">
           <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>&nbsp;
           <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="低分子肝素"></label-box>
           （<label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : false" showValue="钙"></label-box>
@@ -189,7 +189,7 @@
       </div>
       <div class="row">
         透前评估 
-        <div class="inline_block under_line" style="width:93%;text-align: left;">
+        <div class="inline_block under_line" style="width:92%;text-align: left;">
           <div class="inline_block" style="margin-right:30px;">
             体温
             <div class="inline_block" style="width:50px;text-align:center">
@@ -304,7 +304,7 @@
       <table class="print-table" border="1">
         <tbody>
           <tr style="height:40px;line-height:40px">
-            <td width="40" style="padding-left:5px;border:none;border-right:1px solid #000;">
+            <td width="40" rowspan="2" style="padding-left:5px;border:none;border-right:1px solid #000;">
               透后评估
             </td>
 
@@ -337,7 +337,9 @@
                 </span>次/分
               </div>
             </td>
-
+          </tr>
+            
+          <tr style="height:40px;line-height:40px">
             <td width="50" style="border:none;padding-left:5px">实际置换量:</td>
             <td width="30" style="text-align:left;border:none;">
               <div>
@@ -354,6 +356,8 @@
               <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false) :false" showValue="+ +"></label-box>
               <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false) :false" showValue="+ + +"></label-box>
             </td>
+            <td width="50" style="text-align:left;border:none;"></td>
+            <td width="110" style="text-align:left;border:none;"></td>
           </tr>
         </tbody>
       </table>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -980,6 +980,13 @@
                   </div>
                   kg
                 </div>
+                <div class="inline_block" v-if="orgid == 9566">
+                  医生签名：
+                  <div class="under_line" style="width: 70px;text-align: left">
+                      <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
+                      <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                  </div>
+                </div>
               </div>
             </td>
           </tr>
@@ -1304,7 +1311,8 @@ export default {
         zongliang_unit: "mg",
         gaimingcheng_unit: "",
         gaijiliang_unit: ""
-      }
+      },
+      orgid:''
     };
   },
   methods: {
@@ -1918,6 +1926,7 @@ export default {
     }
   },
   created() {
+    this.orgid = this.$store.getters.xt_user.org.id;
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     // this.orgname = "遂溪方济医院";

src/xt_pages/stock/config/goodInfo.vue

@@ -16,7 +16,8 @@
         icon="el-icon-circle-plus-outline"
         type="primary"
         @click="showInfoDialog"
-        >新增</el-button
+      >新增
+      </el-button
       >
     </div>
 
@@ -34,7 +35,8 @@
         type="primary"
         icon="el-icon-search"
         @click="search"
-        >搜索</el-button
+      >搜索
+      </el-button
       >
     </div>
 
@@ -134,428 +136,439 @@
 </template>
 
 <script>
-import GoodInfoDailog from "../Dialog/goodInfoDailog";
-import {
-  createGoodInfo,
-  deleteGoodInfo,
-  GetAllDeals,
-  GetAllGoodType,
-  GetAllManufacturer,
-  GetGoodInfo,
-  GetGoodInfoByGoodId,
-  getGoodInfoList,
-  modifyGoodInfo
-} from "@/api/stock";
+  import GoodInfoDailog from '../Dialog/goodInfoDailog'
+  import {
+    createGoodInfo,
+    deleteGoodInfo,
+    GetAllDeals,
+    GetAllGoodType,
+    GetAllManufacturer,
+    GetGoodInfo,
+    GetGoodInfoByGoodId,
+    getGoodInfoList,
+    modifyGoodInfo
+  } from '@/api/stock'
 
-export default {
-  components: {
-    GoodInfoDailog
-  },
-  name: "goodInfo",
-  data() {
-    return {
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      total: 0,
-      pageTotal: 0,
-      pageSelect: 0,
-      page: 1,
-      limit: 10,
-      keywords: "",
-      goodInfo: {
-        loading: false,
-        goodInfoData: [],
-        good_code: "",
-        editGoodId: "",
-        editGoodIndex: "",
-        goodInfoDialog: {
-          goodInfoTitle: "新增商品信息",
-          isCreated: 1, //1.创建 2.编辑 3.查看详情
-          formValue: {
-            good_id: "",
-            specification_name: "",
-            buy_price: "",
-            sell_price: "",
-            remark: "",
-            manufacturer: "",
-            good_type_id: "",
-            dealer: "",
-            expiry_date_warn_day_count: "",
-            stock_warn_count: "",
-            is_reuse: "2",
-            dealers: [],
-            manufacturers: [],
-            goodType: [],
-            goodUnit: []
-          },
+  export default {
+    components: {
+      GoodInfoDailog
+    },
+    name: 'goodInfo',
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        page: 1,
+        limit: 10,
+        keywords: '',
+        goodInfo: {
+          loading: false,
+          goodInfoData: [],
+          good_code: '',
+          editGoodId: '',
+          editGoodIndex: '',
+          goodInfoDialog: {
+            goodInfoTitle: '新增商品信息',
+            isCreated: 1, //1.创建 2.编辑 3.查看详情
+            formValue: {
+              good_id: '',
+              specification_name: '',
+              buy_price: '',
+              sell_price: '',
+              remark: '',
+              manufacturer: '',
+              good_type_id: '',
+              dealer: '',
+              expiry_date_warn_day_count: '',
+              stock_warn_count: '',
+              is_reuse: '2',
+              dealers: [],
+              manufacturers: [],
+              goodType: [],
+              goodUnit: []
+            },
 
-          isVisibility: false
+            isVisibility: false
+          }
         }
       }
-    };
-  },
-  methods: {
-    search: function() {
-      this.getList();
     },
-    handleGoodInfoEdit: function(index, row) {
-      this.getAllDealer();
-      this.getAllManufacturer();
-      this.getAllGoodType();
-      this.goodInfo.editGoodId = row.id;
-      this.goodInfo.editGoodIndex = index;
-
-      let params = {
-        id: row.id
-      };
-      GetGoodInfo(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          console.log(response.data.data.goodInfo);
-
-          if (response.data.data.goodInfo.good_unit <= 0) {
-            this.goodInfo.goodInfoDialog.formValue.good_unit = "";
-          } else {
-            this.goodInfo.goodInfoDialog.formValue.good_unit =
-              response.data.data.goodInfo.good_unit;
-          }
+    methods: {
+      search: function() {
+        this.getList()
+      },
+      handleGoodInfoEdit: function(index, row) {
+        this.getAllDealer()
+        this.getAllManufacturer()
+        this.getAllGoodType()
+        this.goodInfo.editGoodId = row.id
+        this.goodInfo.editGoodIndex = index
 
-          if (response.data.data.goodInfo.manufacturer <= 0) {
-            this.goodInfo.goodInfoDialog.formValue.manufacturer = "";
+        let params = {
+          id: row.id
+        }
+        GetGoodInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
           } else {
-            this.goodInfo.goodInfoDialog.formValue.manufacturer =
-              response.data.data.goodInfo.manufacturer;
-          }
+            console.log(response.data.data.goodInfo)
 
-          if (response.data.data.goodInfo.dealer <= 0) {
-            this.goodInfo.goodInfoDialog.formValue.dealer = "";
-          } else {
-            this.goodInfo.goodInfoDialog.formValue.dealer =
-              response.data.data.goodInfo.dealer;
-          }
+            if (response.data.data.goodInfo.good_unit <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.good_unit = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.good_unit =
+                response.data.data.goodInfo.good_unit
+            }
 
-          this.goodInfo.goodInfoDialog.formValue.specification_name =
-            response.data.data.goodInfo.specification_name;
-          this.goodInfo.goodInfoDialog.formValue.buy_price =
-            response.data.data.goodInfo.buy_price;
-          this.goodInfo.goodInfoDialog.formValue.sell_price =
-            response.data.data.goodInfo.sell_price;
-          this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count =
-            response.data.data.goodInfo.expiry_date_warn_day_count;
-          this.goodInfo.goodInfoDialog.formValue.stock_warn_count =
-            response.data.data.goodInfo.stock_warn_count;
-          this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString();
-          this.goodInfo.goodInfoDialog.formValue.remark =
-            response.data.data.goodInfo.remark;
-          this.goodInfo.goodInfoDialog.isCreated = 2;
-          this.goodInfo.good_code = response.data.data.goodInfo.good_code;
-          this.goodInfo.goodInfoDialog.formValue.good_id =
-            response.data.data.goodInfo.good_type_id;
-          this.$refs.dialog.show();
-        }
-      });
-    },
-    handleGoodInfoDelete: function(index, row) {
-      this.$confirm("确认删除这条商品信息?", "删除商品信息", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          let params = {
-            id: row.id
-          };
+            if (response.data.data.goodInfo.manufacturer <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.manufacturer =
+                response.data.data.goodInfo.manufacturer
+            }
 
-          deleteGoodInfo(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+            if (response.data.data.goodInfo.dealer <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.dealer = ''
             } else {
-              this.goodInfo.goodInfoData.splice(index, 1);
-              this.$message.success("删除成功");
+              this.goodInfo.goodInfoDialog.formValue.dealer =
+                response.data.data.goodInfo.dealer
             }
-          });
+
+            this.goodInfo.goodInfoDialog.formValue.specification_name =
+              response.data.data.goodInfo.specification_name
+            this.goodInfo.goodInfoDialog.formValue.buy_price =
+              response.data.data.goodInfo.buy_price
+            this.goodInfo.goodInfoDialog.formValue.sell_price =
+              response.data.data.goodInfo.sell_price
+            this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count =
+              response.data.data.goodInfo.expiry_date_warn_day_count
+            this.goodInfo.goodInfoDialog.formValue.stock_warn_count =
+              response.data.data.goodInfo.stock_warn_count
+            this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString()
+            this.goodInfo.goodInfoDialog.formValue.remark =
+              response.data.data.goodInfo.remark
+            this.goodInfo.goodInfoDialog.isCreated = 2
+            this.goodInfo.good_code = response.data.data.goodInfo.good_code
+            this.goodInfo.goodInfoDialog.formValue.good_id =
+              response.data.data.goodInfo.good_type_id
+            this.$refs.dialog.show()
+          }
         })
-        .catch(() => {});
-    },
-    showGoodInfoDetails: function(index, row) {
-      let params = {
-        id: row.id
-      };
-      GetGoodInfo(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          this.goodInfo.goodInfoDialog.formValue.specification_name =
-            response.data.data.goodInfo.specification_name;
-          this.goodInfo.goodInfoDialog.formValue.good_unit =
-            response.data.data.goodInfo.good_unit;
-          this.goodInfo.goodInfoDialog.formValue.buy_price =
-            response.data.data.goodInfo.buy_price;
-          this.goodInfo.goodInfoDialog.formValue.sell_price =
-            response.data.data.goodInfo.sell_price;
-          this.goodInfo.goodInfoDialog.formValue.manufacturer =
-            response.data.data.goodInfo.manufacturer;
-          this.goodInfo.goodInfoDialog.formValue.dealer =
-            response.data.data.goodInfo.dealer;
-          this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count =
-            response.data.data.goodInfo.expiry_date_warn_day_count;
-          this.goodInfo.goodInfoDialog.formValue.stock_warn_count =
-            response.data.data.goodInfo.stock_warn_count;
-          this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString();
+      },
+      handleGoodInfoDelete: function(index, row) {
+        this.$confirm('确认删除这条商品信息?', '删除商品信息', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id
+            }
 
-          this.goodInfo.goodInfoDialog.formValue.remark =
-            response.data.data.goodInfo.remark;
-          this.goodInfo.goodInfoDialog.isCreated = 3;
-          this.goodInfo.goodInfoDialog.isVisibility = true;
+            deleteGoodInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.goodInfo.goodInfoData.splice(index, 1)
+                this.$message.success('删除成功')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
+      showGoodInfoDetails: function(index, row) {
+        let params = {
+          id: row.id
         }
-      });
-    },
-    getList() {
-      this.goodInfo.loading = true;
-      let params = {
-        page: this.page,
-        limit: this.limit,
-        keyword: this.keywords
-      };
-      getGoodInfoList(params).then(response => {
-        if (response.data.state == 0) {
-          this.goodInfo.loading = false;
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          this.goodInfo.loading = false;
-          this.total = response.data.data.total;
-          this.goodInfo.goodInfoData = [];
-          for (let i = 0; i < response.data.data.list.length; i++) {
-            this.goodInfo.goodInfoData.push(response.data.data.list[i]);
+        GetGoodInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.goodInfo.goodInfoDialog.formValue.specification_name =
+              response.data.data.goodInfo.specification_name
+            this.goodInfo.goodInfoDialog.formValue.good_unit =
+              response.data.data.goodInfo.good_unit
+            this.goodInfo.goodInfoDialog.formValue.buy_price =
+              response.data.data.goodInfo.buy_price
+            this.goodInfo.goodInfoDialog.formValue.sell_price =
+              response.data.data.goodInfo.sell_price
+            this.goodInfo.goodInfoDialog.formValue.manufacturer =
+              response.data.data.goodInfo.manufacturer
+            this.goodInfo.goodInfoDialog.formValue.dealer =
+              response.data.data.goodInfo.dealer
+            this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count =
+              response.data.data.goodInfo.expiry_date_warn_day_count
+            this.goodInfo.goodInfoDialog.formValue.stock_warn_count =
+              response.data.data.goodInfo.stock_warn_count
+            this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString()
+
+            this.goodInfo.goodInfoDialog.formValue.remark =
+              response.data.data.goodInfo.remark
+            this.goodInfo.goodInfoDialog.isCreated = 3
+            this.goodInfo.goodInfoDialog.isVisibility = true
           }
+        })
+      },
+      getList() {
+        this.goodInfo.loading = true
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords
         }
-      });
-    },
-    tableRowClassName({ row, rowIndex }) {
-      //把每一行的索引放进row
-      row.index = rowIndex;
-    },
-    onRowClick(row, event, column) {
-      this.goodInfo.goodInfoData = [];
-      this.goodType.tableCurrentIndex = row.index;
-      this.goodInfo.goodInfoDialog.formValue.good_id = row.id;
-      let params = {
-        id: row.id
-      };
-      this.goodInfo.loading = true;
-      GetGoodInfoByGoodId(params).then(response => {
-        if (response.data.state == 0) {
-          this.goodInfo.loading = false;
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          this.goodInfo.loading = false;
-          for (let i = 0; i < response.data.data.list.length; i++) {
-            this.goodInfo.goodInfoData.push(response.data.data.list[i]);
+        getGoodInfoList(params).then(response => {
+          if (response.data.state == 0) {
+            this.goodInfo.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.goodInfo.loading = false
+            this.total = response.data.data.total
+            this.goodInfo.goodInfoData = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.goodInfo.goodInfoData.push(response.data.data.list[i])
+            }
           }
+        })
+      },
+      tableRowClassName({ row, rowIndex }) {
+        //把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClick(row, event, column) {
+        this.goodInfo.goodInfoData = []
+        this.goodType.tableCurrentIndex = row.index
+        this.goodInfo.goodInfoDialog.formValue.good_id = row.id
+        let params = {
+          id: row.id
         }
-      });
-    },
-    goodInfoDialogComfirm: function(val) {
-      if (val.isCreated == 2) {
-        //修改
-        val["id"] = this.goodInfo.editGoodId;
-        val["good_code"] = this.goodInfo.good_code;
-
-        modifyGoodInfo(val).then(response => {
+        this.goodInfo.loading = true
+        GetGoodInfoByGoodId(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.goodInfo.loading = false
+            this.$message.error(response.data.msg)
+            return false
           } else {
-            this.$refs.dialog.hide();
+            this.goodInfo.loading = false
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.goodInfo.goodInfoData.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      goodInfoDialogComfirm: function(val) {
+        if (val.isCreated == 2) {
+          //修改
+          val['id'] = this.goodInfo.editGoodId
+          val['good_code'] = this.goodInfo.good_code
 
-            this.goodInfo.goodInfoData[
-              this.goodInfo.editGoodIndex
-            ].specification_name =
-              response.data.data.goodInfo.specification_name;
-            this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].good_unit =
-              response.data.data.goodInfo.good_unit;
-            this.goodInfo.goodInfoData[
-              this.goodInfo.editGoodIndex
-            ].buy_price = response.data.data.goodInfo.buy_price.toString();
-            this.goodInfo.goodInfoData[
-              this.goodInfo.editGoodIndex
-            ].sell_price = response.data.data.goodInfo.sell_price.toString();
-            this.goodInfo.goodInfoData[
-              this.goodInfo.editGoodIndex
-            ].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString();
-            this.goodInfo.goodInfoData[
-              this.goodInfo.editGoodIndex
-            ].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString();
+          modifyGoodInfo(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$refs.dialog.hide()
 
-            this.$message.success("修改成功");
-          }
-        });
-      } else if (val.isCreated == 1) {
-        //新增
-        createGoodInfo(val).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.$refs.dialog.hide();
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].specification_name =
+                response.data.data.goodInfo.specification_name
+              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].good_unit =
+                response.data.data.goodInfo.good_unit
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].buy_price = response.data.data.goodInfo.buy_price.toString()
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].sell_price = response.data.data.goodInfo.sell_price.toString()
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
 
-            this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo);
+              this.$message.success('修改成功')
+            }
+          })
+        } else if (val.isCreated == 1) {
+          //新增
+          createGoodInfo(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$refs.dialog.hide()
 
-            this.$message.success("新增成功");
-          }
-        });
-      }
-    },
-    goodInfoDialogCancle: function() {
-      this.$refs.dialog.hide();
-    },
-    showInfoDialog: function() {
-      this.$refs.dialog.show();
-      this.getAllDealer();
-      this.getAllManufacturer();
-      this.goodInfo.goodInfoDialog.formValue.goodType = [];
-      GetAllGoodType().then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          for (let i = 0; i < response.data.data.goodType.length; i++) {
-            this.goodInfo.goodInfoDialog.formValue.goodType.push(
-              response.data.data.goodType[i]
-            );
-          }
-          if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
-            this.$message.error("请先新增商品类型");
-            return;
+              this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
+
+              this.$message.success('新增成功')
+            }
+          })
+        }
+      },
+      goodInfoDialogCancle: function() {
+        this.$refs.dialog.hide()
+      },
+      showInfoDialog: function() {
+        this.$refs.dialog.show()
+        this.getAllDealer()
+        this.getAllManufacturer()
+        this.goodInfo.goodInfoDialog.formValue.goodType = []
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
           } else {
-            this.goodInfo.goodInfoDialog.isVisibility = true;
-            this.goodInfo.goodInfoDialog.isCreated = 1;
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              if (response.data.data.goodType[i].type == 1) {
+                response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
+              }
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(
+                response.data.data.goodType[i]
+              )
+            }
+            if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
+              this.$message.error('请先新增商品类型')
+              return
+            } else {
+              this.goodInfo.goodInfoDialog.isVisibility = true
+              this.goodInfo.goodInfoDialog.isCreated = 1
+            }
           }
-        }
-      });
-      this.goodInfo.goodInfoDialog.formValue.good_id = "";
-      this.goodInfo.goodInfoDialog.formValue.specification_name = "";
-      this.goodInfo.goodInfoDialog.formValue.buy_price = "";
-      this.goodInfo.goodInfoDialog.formValue.sell_price = "";
-      this.goodInfo.goodInfoDialog.formValue.remark = "";
-      this.goodInfo.goodInfoDialog.formValue.manufacturer = "";
-      this.goodInfo.goodInfoDialog.formValue.good_type_id = "";
-      this.goodInfo.goodInfoDialog.formValue.dealer = "";
-      this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = "";
-      this.goodInfo.goodInfoDialog.formValue.stock_warn_count = "";
-      this.goodInfo.goodInfoDialog.formValue.is_reuse = "2";
-    },
-    getAllDealer: function() {
-      this.goodInfo.goodInfoDialog.formValue.dealers = [];
-      GetAllDeals().then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          for (let i = 0; i < response.data.data.dealer.length; i++) {
-            this.goodInfo.goodInfoDialog.formValue.dealers.push(
-              response.data.data.dealer[i]
-            );
+        })
+        this.goodInfo.goodInfoDialog.formValue.good_id = ''
+        this.goodInfo.goodInfoDialog.formValue.specification_name = ''
+        this.goodInfo.goodInfoDialog.formValue.buy_price = ''
+        this.goodInfo.goodInfoDialog.formValue.sell_price = ''
+        this.goodInfo.goodInfoDialog.formValue.remark = ''
+        this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
+        this.goodInfo.goodInfoDialog.formValue.good_type_id = ''
+        this.goodInfo.goodInfoDialog.formValue.dealer = ''
+        this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = ''
+        this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
+        this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
+      },
+      getAllDealer: function() {
+        this.goodInfo.goodInfoDialog.formValue.dealers = []
+        GetAllDeals().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.dealer.length; i++) {
+              this.goodInfo.goodInfoDialog.formValue.dealers.push(
+                response.data.data.dealer[i]
+              )
+            }
           }
-        }
-      });
-    },
-    getAllManufacturer: function() {
-      this.goodInfo.goodInfoDialog.formValue.manufacturers = [];
-      GetAllManufacturer().then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          for (let i = 0; i < response.data.data.manufacturer.length; i++) {
-            this.goodInfo.goodInfoDialog.formValue.manufacturers.push(
-              response.data.data.manufacturer[i]
-            );
+        })
+      },
+      getAllManufacturer: function() {
+        this.goodInfo.goodInfoDialog.formValue.manufacturers = []
+        GetAllManufacturer().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.manufacturer.length; i++) {
+              this.goodInfo.goodInfoDialog.formValue.manufacturers.push(
+                response.data.data.manufacturer[i]
+              )
+            }
           }
-        }
-      });
-    },
-    getAllGoodType: function() {
-      this.goodInfo.goodInfoDialog.formValue.goodType = [];
-      GetAllGoodType().then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          for (let i = 0; i < response.data.data.goodType.length; i++) {
-            this.goodInfo.goodInfoDialog.formValue.goodType.push(
-              response.data.data.goodType[i]
-            );
+        })
+      },
+      getAllGoodType: function() {
+        this.goodInfo.goodInfoDialog.formValue.goodType = []
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              if (response.data.data.goodType[i].type == 1) {
+                response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
+              }
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(
+                response.data.data.goodType[i]
+              )
+              console.log(this.goodInfo.goodInfoDialog.formValue.goodType)
+            }
           }
-        }
-      });
-    },
-    handleSizeChange(val) {
-      this.limit = val;
-      this.getList();
+        })
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      }
     },
-    handleCurrentChange(val) {
-      this.page = val;
-      this.getList();
+    created() {
+      this.getList()
+      // this.getAllDealer()
+      // this.getAllManufacturer()
+      // this.getAllGoodType()
+      this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit
     }
-  },
-  created() {
-    this.getList();
-    // this.getAllDealer()
-    // this.getAllManufacturer()
-    // this.getAllGoodType()
-    this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit;
   }
-};
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-.information {
-  border: 1px #dcdfe6 solid;
-  padding: 30px 20px 30px 20px;
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
 
   .border {
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
-}
 
-.title {
-  height: 44px;
-  line-height: 44px;
-  padding: 0 0 0 10px;
-  margin: 0 0 10px 0;
-}
+  }
+
+  .title {
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    margin: 0 0 10px 0;
+  }
 
-.edit_separater {
-  border-top: 1px solid rgb(233, 233, 233);
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
 </style>
 
 <style>
-.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-  font-size: 12px;
-}
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
 
-.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-  background: #6fb5fa;
-}
-.el-table td,
-.el-table th.is-leaf,
-.el-table--border,
-.el-table--group {
-  border-color: #d0d3da;
-}
-.el-table--border::after,
-.el-table--group::after,
-.el-table::before {
-  background-color: #d0d3da;
-}
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
 </style>

src/xt_pages/user/components/PatientDetail.vue

@@ -245,8 +245,8 @@
             <el-col :span="24">
               <el-form-item label="传染病 : " required prop="is_infectious">
                 <el-radio-group v-model="form.is_infectious" disabled>
-                  <el-radio :label="1">无</el-radio>
-                  <el-radio :label="2">有</el-radio>
+                  <el-radio :label="1">阴性</el-radio>
+                  <el-radio :label="2">阳性</el-radio>
                 </el-radio-group>
                 <el-checkbox-group
                   v-model="form.contagions"

src/xt_pages/user/components/PatientForm.vue

@@ -301,8 +301,8 @@
               <el-col :span="24">
                 <el-form-item label="传染病 : " prop="contagions">
                   <el-radio-group v-model="form.is_infectious">
-                    <el-radio :label="1">无</el-radio>
-                    <el-radio :label="2">有</el-radio>
+                    <el-radio :label="1">阴性</el-radio>
+                    <el-radio :label="2">阳性</el-radio>
                   </el-radio-group>
                   <el-checkbox-group
                     v-model="form.contagions"
@@ -932,7 +932,7 @@ const defaultForm = {
   homeTelephone: "",
   relative_phone: "",
   relative_relations: "",
-  lapseto: "",
+  lapseto: 1,
   homeAddress: "",
   work: "",
   unit_address: "",

src/xt_pages/user/dialysisSolution.vue

@@ -381,8 +381,7 @@
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
             <el-form-item label="透析器/灌流器：">
               <el-input
-                v-model="addPlan.dialyzer_perfusion_apparatus"
-              ></el-input>
+              v-model="addPlan.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
             </el-form-item>
           </el-col>
 
@@ -572,6 +571,14 @@
         >
       </span>
     </el-dialog>
+
+    <multi-select-box
+      :propsForm="InnerDialogProps"
+      v-on:dialog-comfirm="innerDialogComfirm"
+      v-on:dialog-cancle="innerDialogCancle">
+    </multi-select-box>
+
+
   </div>
 </template>
 
@@ -595,6 +602,7 @@ import { calculateAnticoagulantZL, uParseTime } from '@/utils/tools'
 import store from '@/store'
 
 import { GetDeviceInfo } from '@/api/dialysis'
+import MultiSelectBox from '../dialysis/details/dialog/MultiSelectBox/index'
 
 const periodWeek = [
   { value: '每周', label: '每周' },
@@ -639,6 +647,14 @@ export default {
       callback()
     }
     return {
+      InnerDialogProps: {
+        values: [],
+        visibility: false,
+        isShowTextArea: true,
+        customContent: '',
+        titles: '',
+        type: '' // 不同弹框类型，用来匹配数据
+      },
       deviceList: [],
       dialysisTimeShow: new Date(2018, 1, 1, 3, 0),
       isEdit: false,
@@ -800,6 +816,7 @@ export default {
       blood_filters: null,
       perfusion_apparatus: null,
       hemodialysis_machines: null,
+      dialyzerPerfusionApparatus: [],
       solution_detail: {
         id: 0,
         affirm_state: 0,
@@ -857,10 +874,35 @@ export default {
     }
   },
   components: {
+    MultiSelectBox,
     tableTitle,
     PatientSidebar
   },
   methods: {
+    showInnerDialog: function(val) {
+      this.InnerDialogProps.visibility = true
+      switch (val) {
+        case '5': // 透析器/灌流器
+          this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
+          this.InnerDialogProps.titles = '透析器/灌流器'
+          this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
+          this.InnerDialogProps.selected = this.addPlan.dialyzer_perfusion_apparatus
+          this.InnerDialogProps.isShowTextArea = false
+          break
+      }
+    },
+    innerDialogComfirm: function(val) {
+      this.InnerDialogProps.visibility = false
+      switch (val.type) {
+        case 'dialyzer_perfusion_apparatus':
+          this.addPlan.dialyzer_perfusion_apparatus = val.value.join(',')
+          break
+
+      }
+    },
+    innerDialogCancle: function() {
+      this.InnerDialogProps.visibility = false
+    },
     changeBodyFluid: function() {},
     GetDeviceData: function() {
       const params = {}
@@ -1656,6 +1698,11 @@ export default {
     this.blood_access_option = this.$store.getters.blood_access
     this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
 
+    this.dialyzerPerfusionApparatus = getDataConfig(
+      'hemodialysis',
+      'dialyzer_perfusion_apparatus'
+    )
+
     this.queryParams.id = this.patientID
     // this.fetchAllDoctorAndNurse();
     this.fetchAllAdminUsers()

src/xt_pages/workforce/schedule_print.vue

@@ -58,14 +58,12 @@
                 <td :width="td_4_width" valign="top">
                   <div class="proj" v-if="Object.keys(main_collection.hdf).length > 0">
                     <div class="proj_title">血滤:</div>
-                    <div class="proj_item">
-                      {{ patient_names(main_collection.hdf) }}
+                    <div class="proj_item" v-html="patient_other_names(main_collection.hdf)">
                     </div>
                   </div>
                   <div class="proj" v-if="Object.keys(main_collection.hd_hp).length > 0">
                     <div class="proj_title">灌流:</div>
-                    <div class="proj_item">
-                      {{ patient_names(main_collection.hd_hp) }}
+                    <div class="proj_item" v-html="patient_other_names(main_collection.hd_hp)">>
                     </div>
                   </div>
                 </td>
@@ -111,7 +109,19 @@
               evening: { /* zone_name: [ schedule, ... ] */ }
             },
             hdf: [ /* schedule, ... */],
-            hd_hp: [ /* schedule, ... */]
+            hd_hp: [ /* schedule, ... */],
+
+            new_hdf:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
+            new_hd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            }
+
           },
           {
             day: 2,
@@ -122,7 +132,17 @@
               evening: { /* zone_name: [ schedule, ... ] */ }
             },
             hdf: [ /* schedule, ... */],
-            hd_hp: [ /* schedule, ... */]
+            hd_hp: [ /* schedule, ... */],
+            new_hdf:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
+            new_hd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            }
           },
           {
             day: 3,
@@ -133,7 +153,17 @@
               evening: { /* zone_name: [ schedule, ... ] */ }
             },
             hdf: [ /* schedule, ... */],
-            hd_hp: [ /* schedule, ... */]
+            hd_hp: [ /* schedule, ... */],
+            new_hdf:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
+            new_hd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            }
           },
           {
             day: 4,
@@ -144,7 +174,17 @@
               evening: { /* zone_name: [ schedule, ... ] */ }
             },
             hdf: [ /* schedule, ... */],
-            hd_hp: [ /* schedule, ... */]
+            hd_hp: [ /* schedule, ... */],
+            new_hdf:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
+            new_hd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            }
           },
           {
             day: 5,
@@ -155,7 +195,17 @@
               evening: { /* zone_name: [ schedule, ... ] */ }
             },
             hdf: [ /* schedule, ... */],
-            hd_hp: [ /* schedule, ... */]
+            hd_hp: [ /* schedule, ... */],
+            new_hdf:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
+            new_hd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            }
           },
           {
             day: 6,
@@ -166,7 +216,17 @@
               evening: { /* zone_name: [ schedule, ... ] */ }
             },
             hdf: [ /* schedule, ... */],
-            hd_hp: [ /* schedule, ... */]
+            hd_hp: [ /* schedule, ... */],
+            new_hdf:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
+            new_hd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            }
           },
           {
             day: 7,
@@ -177,7 +237,17 @@
               evening: { /* zone_name: [ schedule, ... ] */ }
             },
             hdf: [ /* schedule, ... */],
-            hd_hp: [ /* schedule, ... */]
+            hd_hp: [ /* schedule, ... */],
+            new_hdf:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
+            new_hd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            }
           }
         ]
       }
@@ -204,11 +274,9 @@
           }
 
           var schedules = resp.data.schedules
-          console.log(schedules)
 
           for (let index = 0; index < schedules.length; index++) {
             const schedule = schedules[index]
-            console.log(schedule)
             if (schedule.patient == null || schedule.zone == null) {
               continue
             }
@@ -219,6 +287,8 @@
             var main_collection = this.schedules[weekday - 1]
 
             var time_type_schedules
+            var other_time_type_schedules
+
             if (time_type == 1) {
               time_type_schedules = main_collection.all.am
             } else if (time_type == 2) {
@@ -235,12 +305,14 @@
 
             if (schedule.mode.id == 2) { // HDF
               main_collection.hdf.push(schedule)
+
+
             } else if (schedule.mode.id == 3) { // HD+HF
               main_collection.hd_hp.push(schedule)
             }
+
           }
 
-          console.log(this.schedules)
 
         } else {
           this.$message.error(resp.msg)
@@ -266,6 +338,49 @@
 
         return names.join('、')
       },
+      patient_other_names: function(schedules) {
+        let am = []
+        let pm = []
+        let evening = []
+
+        var names = []
+        for (let index = 0; index < schedules.length; index++) {
+          const schedule = schedules[index]
+          console.log(schedule)
+
+          names.push(schedule.patient.name)
+
+          if(schedule.schedule_type == 1){
+            am.push(schedule.patient.name)
+
+          }else if(schedule.schedule_type == 2){
+            pm.push(schedule.patient.name)
+
+
+          }else if(schedule.schedule_type == 3){
+            evening.push(schedule.patient.name)
+          }
+        }
+        const obj = {}
+        names = names.reduce((cur, next) => {
+          obj[next] ? '' : obj[next] = true && cur.push(next)
+          return cur
+        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+        var str= ""
+
+        if(am.length > 0){
+          str = "上午:"+ am.join("、") +"<br/>"
+        }
+
+        if(pm.length > 0){
+          str = str + "下午:"+ pm.join("、")+"<br/>"
+        }
+
+        if(evening.length > 0){
+          str = str + "晚上:"+ evening.join("、")
+        }
+        return str
+      },
       printAction: function() {
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'