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

src/api/config.js

   })
 }
 
-export function postXtHisProjectIsOpen(params) {
-  return request({
-    url: '/api/xtconfigproject/isopen',
-    method: 'post',
-    params: params
-  })
-}
 
 export function postMonitorIsOpen(params){
   console.log("params",params)
 
 
 export function getMonitorConfig(params){
-
+  
   return request({
     url:"/api/monitor/getmonitorconfig",
     method:"Get",
 
 
 export function addOrderConfig(params){
-
+  
   return request({
     url:"/api/order/addorderconfig",
     method:"Get",
 }
 
 export function getOrderConfig(params){
-
+  
   return request({
     url:"/api/order/getorderconfig",
     method:"get",
 }
 
 export function changeFuncPrint(params){
-
+  
   return request({
     url:"/api/order/changefuncprint",
     method:"get",
 }
 
 export function getDataPrintList(params){
-
+  
   return request({
     url:"/api/order/getdataprint",
     method:"get",
     params:params
   })
-}
+}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                           {{record.prescription && record.prescription.dialysis_irrigation?record.prescription.dialysis_irrigation:"/"}}
                         </div>
                       </div>
-                      <div class="inline_block" style="flex:1;">
-                        干体重：
+                      <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
+                        血浆分离器：
                         <div
                           class="under_line"
-                          style="width: 150px;text-align: center"
+                          style="width: 70px;text-align: center"
                         >
-                          {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis.dry_weight
-                              ? record.assessment_before_dislysis.dry_weight
-                              : "/"
-                          }}
+                          <span v-if="record.prescription.plasma_separator ? record.prescription.plasma_separator != 0 && record.prescription.plasma_separator != '0' : false">{{ record.prescription.plasma_separator }}</span>
+                          <span v-else>/</span>
+                        </div>
+                      </div>
+                      <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
+                        胆红素吸附柱：
+                        <div
+                          class="under_line"
+                          style="width: 70px;text-align: center"
+                        >
+                          <span v-if="record.prescription.bilirubin_adsorption_column ? record.prescription.bilirubin_adsorption_column != 0 && record.prescription.bilirubin_adsorption_column != '0' : false">{{ record.prescription.bilirubin_adsorption_column }}</span>
+                          <span v-else>/</span>
                         </div>
-                        kg
                       </div>
+                      
                     </div>
 
                     <div
                         计划超滤量：
                         <div
                           class="under_line"
-                          style="width: 150px;text-align: center"
+                          style="width: 100px;text-align: center"
                         >
                           {{
                             record.prescription &&
                         </div>
                         ml
                       </div>
+                      <div class="inline_block" style="flex:1;">
+                        干体重：
+                        <div
+                          class="under_line"
+                          style="width: 100px;text-align: center"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.dry_weight
+                              ? record.assessment_before_dislysis.dry_weight
+                              : "/"
+                          }}
+                        </div>
+                        kg
+                      </div>
                     </div>
 
                     <div class="row" style="padding: 2px 0;line-height:23px;">

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyNine.vue

                     <div class="order-title">血液净化治疗记录单</div>
                     <div class="row">
                         <div class="inline_block" style="margin-right:30px;">
-                            姓名 
+                            姓名
                             <div class="inline_block under_line" style="width:80px;text-align: center;">
                                 {{ record.patient.name ? record.patient.name : '' }}
                             </div>
                     </div>
                     <div class="row">
                         <div class="inline_block" style="margin-right:30px;">
-                            透前体重 
+                            透前体重
                             <div class="inline_block under_line" style="width:100px;text-align: center;">
                                 {{ record.assessment_before_dislysis.weight_before ? record.assessment_before_dislysis.weight_before : "" }}
                             </div>Kg
                                 <td style="text-align:left;padding-left:10px;">
                                     <div>
                                         <div style="height:40px;line-height:40px;">
-                                            治疗方式 
+                                            治疗方式
                                             <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="!record.prescription.mode_id">
                                             /
                                             </div>
                                         <div style="height:40px;line-height:40px;">
                                             单超
                                             <div class="inline_block under_line" style="width:50px;">
-                                            {{ record.prescription.single_time ? record.prescription.single_time : '' }} 
+                                            {{ record.prescription.single_time ? record.prescription.single_time : '' }}
                                             </div>h
                                             <div class="inline_block under_line" style="width:50px;">
                                             {{ record.prescription.single_water ? record.prescription.single_water : '' }}
                                             <span v-if="record.prescription.anticoagulant == 2">iu</span>
                                             <span v-if="record.prescription.anticoagulant == 1">mg</span>
                                             <span v-if="record.prescription.anticoagulant == 6">iu</span>
-                                            <span v-if="record.prescription.anticoagulant == 7">iu</span>&nbsp; 
+                                            <span v-if="record.prescription.anticoagulant == 7">iu</span>&nbsp;
                                             追加量
                                             <div class="inline_block under_line" style="width:50px;text-align:center">
                                             {{ record.prescription.anticoagulant_weichi ? record.prescription.anticoagulant_weichi : "" }}
                                             <span v-if="record.prescription.anticoagulant == 2">iu/h</span>
                                             <span v-if="record.prescription.anticoagulant == 1">mg/h</span>
                                             <span v-if="record.prescription.anticoagulant == 6">iu/h</span>
-                                            <span v-if="record.prescription.anticoagulant == 7">iu/h</span>&nbsp; 
+                                            <span v-if="record.prescription.anticoagulant == 7">iu/h</span>&nbsp;
                                         </div>
                                         <div style="height:40px;line-height:40px;">
                                             无抗凝剂（ <span style="width:50px;display:inline-block;"><span v-if="record.prescription.anticoagulant == 1">√</span></span> ）
                             <td width='80'>护士</td>
                             <td width='80'>时间</td>
                         </tr>
-                        <tr v-for="(advice, advice_index) in record.his_advices.length > 0 ? record.his_advices : record.advices" :key="advice_index">
+                        <tr v-for="(advice, advice_index) in record.his_advices" :key="advice_index">
                         <td style="height:40px;line-height:40px">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
                         <td class="parent">
-                            <span v-if="advice.parent_id > 0"><---></span>
+                            <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>
                             <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
                             <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                         </td>
                         <td>
-                            <span v-if="setAdminUserES(advice[0], 'advice_doctor') == ''">
-                                {{getAdminUser(advice[0], 'advice_doctor')}}
+                            <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">
+                                {{getAdminUser(advice, 'advice_doctor')}}
                             </span>
                             <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                                <img style="height:30px;" :src="setAdminUserES(advice[0], 'advice_doctor')" alt srcset />
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'advice_doctor')" alt srcset />
                             </span>
                         </td>
                         <td>
-                            <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">
-                                {{getAdminUser(advice[0], 'execution_staff')}}
+                            <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
+                                {{getAdminUser(advice, 'execution_staff')}}
                             </span>
                             <span v-else>
-                                <img style="height:30px;" :src="setAdminUserES(advice[0], 'execution_staff')" alt srcset />
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
                             </span>
                         </td>
                         <td>{{ getTime(advice.execution_time, "{h}:{i}") }}</td>
                     </table>
                     <div class="row">
                         <div class="inline_block" style="margin-right:30px;">
-                            透析小结：透后体重 
+                            透析小结：透后体重
                             <div class="inline_block under_line" style="width:100px;text-align: center;">
                                 &nbsp;{{ record.assessment_after_dislysis.weight_after ? record.assessment_after_dislysis.weight_after : "" }}
                             </div>Kg
   },
   created() {
     var xtuser = this.$store.getters.xt_user
-    // console.log('xtuser', xtuser)
+     console.log('xtuser', xtuser)
     this.orgname = xtuser.org.org_name
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode
 .print-template-two tr {
   line-height: 30px;
 }
-</style>
+</style>

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

 import { uParseTime } from '@/utils/tools'
 import store from '@/store'
 import request from '@/utils/request'
+import { parseTime } from '@/utils'
 
 export default {
   name: 'treatmentSummaryDialog',

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                   <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
                     血浆分离器：
                     <div class="under_line" style="width: 70px;text-align: center">
-                     {{prescription.plasma_separator?prescription.plasma_separator:'/'}}
+                      <span v-if="prescription.plasma_separator ? prescription.plasma_separator != 0 && prescription.plasma_separator != '0' : false">{{ prescription.plasma_separator }}</span>
+                      <span v-else>/</span>
                     </div>
                   </div>
-                  <div class="inline_block" style="flex:1;">
-                    干体重：
-                    <div class="under_line" style="width: 150px;text-align: center">
-                      {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}
+                  <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
+                    胆红素吸附柱：
+                    <div class="under_line" style="width: 70px;text-align: center">
+                      <span v-if="prescription.bilirubin_adsorption_column ? prescription.bilirubin_adsorption_column != 0 && prescription.bilirubin_adsorption_column != '0' : false">{{ prescription.bilirubin_adsorption_column }}</span>
+                      <span v-else>/</span>
                     </div>
-                    kg
                   </div>
                 </div>
 
                   </div>
                   <div class="inline_block" style="flex:1;">
                     计划超滤量：
-                    <div class="under_line" style="width: 150px;text-align: center">
+                    <div class="under_line" style="width: 100px;text-align: center">
                       {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
                     </div>
                     L
                   </div>
+                  <div class="inline_block" style="flex:1;">
+                    干体重：
+                    <div class="under_line" style="width: 100px;text-align: center">
+                      {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}
+                    </div>
+                    kg
+                  </div>
                 </div>
 
                 <div class="row" style="padding: 2px 0;line-height:23px;">

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

             <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box>
           </div>
         </div>
-        
+
         <div class="inline_block" v-if="receiverTreatmentAccess.condition == 1">
           住院：
           <div class="under_line" style="width: 30px;text-align: center;">
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        console.log(this.advice_groups);
+         // console.log(this.advice_groups);
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/outpatientCharges/statementPrint.vue

   letter-spacing: 5px;
 }
 
-.dialysis-print-order .order-title {
-  margin: auto;
-  font-weight: 600;
-  text-align: center;
-  font-size: 22px;
-  padding: 10px;
-}
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px;
+  }
 
-.dialysis-print-order .table-box {
-  width: 100%;
-  line-height: 23px;
-  font-size: 14px;
-}
+  .dialysis-print-order .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: 40px;
-  font-size: 14px;
-  border-color: #000;
-}
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
 
-.dialysis-print-order .print-table-no {
-  width: 100%;
-  text-align: center;
-  border-collapse: collapse;
-  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 .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 .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
 
-.dialysis-print-order .radio-lebel-box {
-  font-weight: 400;
-  cursor: pointer;
-}
+  .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-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-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),
+  .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 .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-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
 
-.dialysis-print-order .print-table tr td {
-  padding: 1px 1px;
-  /*line-height: 25px;*/
-}
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
 
-.es-img {
-  height: 30px;
-}
+  .es-img {
+    height: 30px;
+  }
 
-.advice-name {
-  text-align: left;
-}
+  .advice-name {
+    text-align: left;
+  }
 
-.advice-children {
-  display: flex;
-}
+  .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;
-}
+  .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;
+  }
 
-.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;
-}
+  .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;
+  }
 </style>
 
 <style lang="scss">
 
-.newContainer{
+  .newContainer{
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
 
   .el-date-editor{
-    .el-input__inner{
-      padding-right:0px;
-    }
+  .el-input__inner{
+    padding-right:0px;
+  }
   }
   .el-table td, .el-table th{
     text-align: center;
   }
-}
-.newContainer::-webkit-scrollbar{
-  height: 15px !important;
-}
+  }
+  .newContainer::-webkit-scrollbar{
+    height: 15px !important;
+  }
 </style>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
                 <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
                 <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
-                <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>
+                <!--<dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>-->
+                <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid' :dialysisShow="dialysisShow"></dialysis-index>
+
             </div>
 
         </div>
         recordVisible: false,
         recordObj: {},
         additions: [],
+        dialysisShow:true
 
         all_data: [],
         all_data_two: [],
       },
 
       choosePatient(val) {
-        console.log(val);
+        console.log(111111,val);
         if(this.titleType == '电子病历'){
           console.log('this.$refs.child.watchSign',this.$refs.child.watchSign);
           if(this.$refs.child.watchSign > 2){

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

   },
   methods: {
     comfirm: function(val) {
+     
       this.propForm.goodType = []
       this.propForm.goods = []
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

         this.isVisibility = true
       }, 
       comfirm: function(val) {
-        console.log("Val2222222",val)
+        console.log("Val2222222",this.currentIndex)
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

     comfirm: function(val) {
       this.$refs.dialog.hide();
       console.log(val)
+      console.log("下摆哦2222222",this.currentIndex)
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0 ; i--) {
           if (i == 0) {

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
             <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
-            <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
             <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>

src/xt_pages/stock/stockQuery.vue

 
         <el-table-column label="剩余库存" align="center">
           <template slot-scope="scope">
-            <span>{{
-              stockInCount(scope.row)- stockOutCount(scope.row) + cancelStockCount(scope.row)
-            }}</span>
+            <span>{{stockInCount(scope.row)  - stockOutCount(scope.row) }}</span>
           </template>
         </el-table-column>
       </el-table>

src/xt_pages/workforce/scheduleTablePrint.vue

                 <td colspan="3">周五({{ weekTitle[4] }})</td>
                 <td colspan="3">周六({{ weekTitle[5] }})</td>
                 <td colspan="3">周日({{ weekTitle[6] }})</td>
-                <td colspan="3">总数</td>
+                <td>总数</td>
             </tr>
             <tr>
                 <td>上午</td>