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

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/details/NavIgation.vue

@@ -541,7 +541,8 @@ export default {
 
       this.$refs.assessmentBefore.setLastRecord(
         lastPredialysisEvaluation,
-        lastDryWeightDislysis
+        lastDryWeightDislysis,
+
       );
       this.$refs.prescription.setLastRecord(
         schedual,
@@ -589,7 +590,9 @@ export default {
       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/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 != 'temperature' && key != 'breathing_rate' && 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
@@ -1021,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 {
@@ -1047,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 =  ''
         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 = ''
         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/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/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; } }'