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

src/router/modules/dialysis.js

@@ -1118,7 +1118,18 @@ export default {
         noCache: true
       }
     },
-    
+    {//80
+      path: '/dialysis/print/batch/eightyone',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_eightyone'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_eightyone',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/store/modules/globalConfig.js

@@ -1136,6 +1136,21 @@ const global_config = {
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },
+      19: {
+        id: 19,
+        name: '低分子量肝素钠',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
     },
     anticoagulants_set: {
       type: 2

src/xt_pages/Dialysisanalysis/new_otherIndicators/index.vue

@@ -49,7 +49,7 @@ export default {
       this.indicators = []
       getStatisticsList(params).then(response => {
         if (response.data.state == 1) {
-          this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
+          // this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
           console.log('444444444',this.indicators);
           for(let i = 0; i < this.indicators.length; i++){
             this.indicators[i]["check_type"] = 1

src/xt_pages/Dialysisanalysis/weightblood/components/after_Blood.vue

@@ -49,19 +49,19 @@
           <div class="echart" id="mychart"  style="width:100%;height:60vh"></div>
         </div>
 
-          <div style="position: fixed;right: 5%;top: 50vh;">
-            <el-popover
-              placement="left"
-              title="提示"
-              width="500"
-              trigger="click"
-              content="1. 统计时间段内所有患者每次透析时的年龄和透前血压，根据不同年龄的标准值计算达标率。
-                        2. 患者＜60 岁的透前血压以收缩压＜140 或舒张压＜90 为达标值；患者≥60岁的透前血压以收缩压＜160 或舒张压＜90 为达标值。
-                        3. 控制率=（≥60 岁患者的达标例次+＜60 岁患者的达标例次）/时间段内总例次 x100%。">
-              <img src="@/assets/img/xiang.png" alt="" style="height: 20px;width: 20px;" slot="reference">
-              <!-- <el-button slot="reference">click 激活</el-button> -->
-            </el-popover>
-          </div>
+        <div style="position: fixed;right: 5%;top: 50vh;">
+          <el-popover
+            placement="left"
+            title="提示"
+            width="500"
+            trigger="click"
+            content="1. 统计时间段内所有患者每次透析时的年龄和透前血压，根据不同年龄的标准值计算达标率。
+                      2. 患者＜60 岁的透前血压以收缩压＜140 或舒张压＜90 为达标值；患者≥60岁的透前血压以收缩压＜160 或舒张压＜90 为达标值。
+                      3. 控制率=（≥60 岁患者的达标例次+＜60 岁患者的达标例次）/时间段内总例次 x100%。">
+            <img src="@/assets/img/xiang.png" alt="" style="height: 20px;width: 20px;" slot="reference">
+            <!-- <el-button slot="reference">click 激活</el-button> -->
+          </el-popover>
+        </div>
       </div>
     </div>
 
@@ -130,6 +130,7 @@
               style="width: 100%;"
               :header-cell-style = "{'text-align':'center'}"
               :cell-style="{'text-align':'center'}"
+              v-loading="loading"
               height="380">
               <el-table-column
                 prop="index"
@@ -217,6 +218,7 @@ import html2canvas from "html2canvas"
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
         status_id:"",
+        loading:false,
       }
     },
     methods:{
@@ -398,6 +400,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading =true
         Getbpdetail(params).then(response =>{
           if(response.data.state ==1){
             const list = response.data.data.list
@@ -419,6 +422,7 @@ import html2canvas from "html2canvas"
               this.total = response.data.data.total
             }
           }
+          this.loading =false
           console.log('55555透后',response);
         })
       },

src/xt_pages/Dialysisanalysis/weightblood/components/before_Blood.vue

@@ -130,6 +130,7 @@
               style="width: 100%;"
               :header-cell-style = "{'text-align':'center'}"
               :cell-style="{'text-align':'center'}"
+              v-loading="loading"
               height="380">
               <el-table-column
                 prop="index"
@@ -224,7 +225,7 @@ import html2canvas from "html2canvas"
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
         status_id:"",
-
+        loading:false,
       }
     },
     methods:{
@@ -404,6 +405,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading =true
         Getbpdetail(params).then(response =>{
           console.log('Getbpdetail血压',response.data);
           if(response.data.state){
@@ -428,6 +430,7 @@ import html2canvas from "html2canvas"
             }
           }
           console.log('55555',response);
+          this.loading =false
         })
       },
       // 选择日期

src/xt_pages/Dialysisanalysis/weightblood/components/blood_table.vue

@@ -54,8 +54,8 @@
             </div>
             <div>
               统计类型:
-              <el-select v-model="blood_value" placeholder="请选择" style="width: 100px;">
-                <el-option :key="0" label="不限" :value="0"></el-option>
+              <el-select v-model="blood_value" placeholder="请选择" style="width: 150px;">
+                <!-- <el-option :key="0" label="不限" :value="0"></el-option> -->
                 <el-option
                   v-for="item in blood_options"
                   :key="item.value"
@@ -77,6 +77,7 @@
         <el-table :data="tableData" border style="width: 100%"
         :header-cell-style="{textAlign: 'center'}"
         :cell-style="{ textAlign: 'center' }"
+        v-loading="loading"
         height="380">
           <el-table-column
             prop="index"
@@ -186,7 +187,7 @@ import html2canvas from "html2canvas"
         total:0,
         tableData:[],
         status_value:1,
-        blood_value:0,
+        blood_value:1,
         status_options:[{value:1,label:'达标'},{value:2,label:'不达标'}],
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
@@ -197,6 +198,7 @@ import html2canvas from "html2canvas"
 
 
         input:'',
+        loading:true
       }
     },
     methods:{
@@ -309,6 +311,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading =true
         Getbpdetail(params).then(response =>{
           if(response.data.state == 1){
             const list = response.data.data.list
@@ -336,6 +339,7 @@ import html2canvas from "html2canvas"
               this.total = response.data.data.total
             }
           }
+          this.loading =false
           console.log('77777血压表格',response);
         })
       },

src/xt_pages/Dialysisanalysis/weightblood/components/dialyze_after.vue

@@ -152,6 +152,7 @@
           <el-table :data="tableData" border style="width: 100%"
           :header-cell-style="{textAlign: 'center'}"
           :cell-style="{ textAlign: 'center' }"
+          v-loading="loading"
           height="380">
             <el-table-column
               prop="index"
@@ -255,7 +256,6 @@ import html2canvas from "html2canvas"
         dry_value:0,
         after_value:0,
         after_options:[],
-        Patient_name:'',
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
@@ -266,6 +266,7 @@ import html2canvas from "html2canvas"
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
         Patient_name:'',
+        loading:false,
       }
     },
     methods:{
@@ -505,6 +506,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
             const list = response.data.data.list
@@ -521,7 +523,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:item.weight_add,
+                  weight_add:(item.weight_add*1).toFixed(2),
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -530,6 +532,7 @@ import html2canvas from "html2canvas"
               this.total = response.data.data.total
             }
           }
+          this.loading = false
           console.log('77777',response);
         })
       },

src/xt_pages/Dialysisanalysis/weightblood/components/dry_denominator.vue

@@ -153,6 +153,7 @@
           <el-table :data="tableData" border style="width: 100%"
           :header-cell-style="{textAlign: 'center'}"
           :cell-style="{ textAlign: 'center' }"
+          v-loading="loading"
           height="380">
             <el-table-column
               prop="index"
@@ -268,6 +269,7 @@ import html2canvas from "html2canvas"
 
 
         input:'',
+        loading:false
       }
     },
     methods:{
@@ -508,6 +510,7 @@ import html2canvas from "html2canvas"
           limit:this.limit,
           item_type:type,
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
             const list = response.data.data.list
@@ -532,6 +535,7 @@ import html2canvas from "html2canvas"
               this.tableData = table
               this.total = response.data.data.total
             }
+            this.loading = false
           }
           console.log('77777',response);
         })

src/xt_pages/Dialysisanalysis/weightblood/components/dry_weight.vue

@@ -129,6 +129,7 @@
               style="width: 100%;"
               :header-cell-style = "{'text-align':'center'}"
               :cell-style="{'text-align':'center'}"
+              v-loading="loading"
               height="380">
               <el-table-column
                 prop="index"
@@ -221,6 +222,7 @@ import html2canvas from "html2canvas"
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
         status_id:"",
+        loading:false,
       }
     },
     methods:{
@@ -338,12 +340,15 @@ import html2canvas from "html2canvas"
       },
       // 查询
       sete_click(){
+
         this.getecharts()
       },
       // 详情查询
       detil_click(){
+
         this.currentPage =1
         this.getdetail(this.status_value)
+
       },
        // 下载
       Download_click(){
@@ -405,6 +410,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading = true
         Getdryweightdetail(params).then(response =>{
           if(response.data.state ==1){
             const list = response.data.data.list
@@ -424,6 +430,7 @@ import html2canvas from "html2canvas"
               this.tableData = table
               this.total = response.data.data.total
             }
+            this.loading = false
           }
           console.log('555553333干体重',response);
         })

src/xt_pages/Dialysisanalysis/weightblood/components/list_denominator.vue

@@ -152,6 +152,7 @@
           <el-table :data="tableData" border style="width: 100%"
           :header-cell-style="{textAlign: 'center'}"
           :cell-style="{ textAlign: 'center' }"
+          v-loading="loading"
           height="380">
             <el-table-column
               prop="index"
@@ -265,8 +266,8 @@ import html2canvas from "html2canvas"
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
-
         input:'',
+        loading:false,
       }
     },
     methods:{
@@ -511,6 +512,7 @@ import html2canvas from "html2canvas"
           limit:this.limit,
           item_type:type
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           console.log('77777',response);
           if(response.data.state == 1){
@@ -528,7 +530,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:item.weight_add,
+                  weight_add:(item.weight_add*1).toFixed(2),
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -536,6 +538,7 @@ import html2canvas from "html2canvas"
               this.tableData = table
               this.total = response.data.data.total
             }
+            this.loading = false
           }
 
         })

src/xt_pages/Dialysisanalysis/weightblood/components/weight_table.vue

@@ -92,6 +92,7 @@
         <el-table :data="tableData" border style="width: 100%"
           :header-cell-style="{textAlign: 'center'}"
           :cell-style="{ textAlign: 'center' }"
+          v-loading="loading"
           height="380">
             <el-table-column
               prop="index"
@@ -208,8 +209,9 @@ import html2canvas from "html2canvas"
         weight_value:0,
         dry_value:0,
         after_value:0,
+        loading:false
         // after_options:[],
-        Patient_name:'',
+
       }
     },
     methods:{
@@ -359,6 +361,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
             console.log('体重详情分析',response.data.data);
@@ -376,7 +379,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:item.weight_add,
+                  weight_add:(item.weight_add*1).toFixed(2),
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -385,6 +388,7 @@ import html2canvas from "html2canvas"
               this.total = response.data.data.total
             }
           }
+          this.loading = false
           console.log('77777',response);
         })
       },

src/xt_pages/Dialysisanalysis/weightblood/index.vue

@@ -49,7 +49,7 @@ export default {
       this.indicators = []
       getStatisticsList(params).then(response => {
         if (response.data.state == 1) {
-          this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
+          // this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
           console.log('444444444',this.indicators);
           for(let i = 0; i < this.indicators.length; i++){
             this.indicators[i]["check_type"] = 1

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -435,7 +435,7 @@
          width="40%">
        <span>
         <el-input
-          @input="changeText"
+          @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -575,10 +575,13 @@ export default {
          }
       })
     },
-    changeText(){
-      var textarea = ""
-      textarea += this.textarea + ","
-      this.textarea = textarea
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+      }
     },
     tt() {},
     async fun3() {

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -288,7 +288,7 @@
          width="40%">
        <span>
         <el-input
-          @input="changeText"
+          @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -865,10 +865,16 @@ export default {
          }
       })
     },
-    changeText(){
-      var textarea = ""
-      textarea += this.textarea + ","
-      this.textarea = textarea
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        console.log("textarea-=----------------------",textarea)
+        this.textarea = textarea
+      }
+   
+
     }
   },
 };

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -19,71 +19,70 @@
           class="print_page_main_content"
         >
           <div style="display: inline-block; width: 100%; text-align: center">
-            <div
-              class="order-yy-name"
-              style="
-                letter-spacing: 0;
+            <div class="order-yy-name"
+              style="letter-spacing: 0;
                 font-weight: 600;
-                font-size: 22px;
+                font-size: 25px;
                 display: inline-block;
               "
             >
-              {{ orgname }} 血液净化治疗记录单
+              {{ orgname }}<br/>血液净化治疗记录单
             </div>
           </div>
-          <div class="row">
-            <div class="inline_block">
-              姓名：
+          
+          <div class="row" style="display: flex">
+            <div class="inline_block" style="flex: 1;">
+              姓名:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.patient.name }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
-              性别：
+            <div class="inline_block" style="flex: 1;">
+              性别:
               <div class="under_line" style="width: 30px; text-align: center">
                 {{ record.patient.gender == 1 ? "男" : "女" }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
-              年龄：
+            <div class="inline_block" style="flex: 1;">
+              年龄:
               <div class="under_line" style="width: 30px; text-align: center">
                 <!-- {{ record.patient.age }} -->
                 {{ getAge(record.patient) }}
               </div>
               岁
             </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition!=1">
-                门诊：
+            <div class="inline_block" v-if="record.receive_assessment.condition!=1" style="flex: 1;">
+                门诊:
                 <div class="under_line" style="width: 30px; text-align: center">
                   <check-box :checked="record.patient.source == 1"></check-box>
                 </div>
               </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition==1">
-              住院：
+            <div class="inline_block" v-if="record.receive_assessment.condition==1" style="flex: 1;">
+              住院:
               <div class="under_line" style="width: 30px; text-align: center">
                 <check-box :checked="record.patient.source == 1"></check-box>
               </div>
             </div>
-            <div class="inline_block">
-              病区：
+            <div class="inline_block" style="flex: 1;">
+              病区:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_zone.name}}
               </div>
             </div>
-            <div class="inline_block">
-              床号：
+            <div class="inline_block" style="flex: 1;">
+              床号:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_number.number }}
               </div>
             </div>
-            <div class="inline_block">
-              透析号：
+            <div class="inline_block" style="flex: 1;">
+              透析号:
               <div class="under_line" style="width: 70px; text-align: center">
                 {{ record.patient.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px">
-              住院号：
+            <div class="inline_block" style="flex: 1;">
+              住院号:
               <div
                 class="under_line"
                 style="width: 70px; text-align: left"
@@ -102,7 +101,7 @@
           </div>
           <div class="row">
             <div style="">
-              诊断：
+              诊断:
               <div style="border-bottom: 1px solid black;width: 95%;text-align: left;word-break: break-all;
                   word-wrap: break-word;display: inline-block;white-space: unset;"
               >
@@ -133,13 +132,13 @@
                   <td colspan="2">
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
-                        本次透析日期：
+                        本次透析日期:
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        透析次数：
+                        透析次数:
                         <div class="under_line" style="width: 70px; text-align: center">
                           {{
                               record.Count +
@@ -148,10 +147,10 @@
                                   record.patient.user_sys_before_count
                                 : "/"
                             }}
-                        </div>
+                        </div>次
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        透析机型号：
+                        透析机型号:
                         <div class="under_line" style="width: 60%; text-align: center">
                           <span v-if="record.bed_id !=0 && record.bed_id !=''">
                             {{ getnumberlist(record.bed_id) }} 
@@ -159,7 +158,7 @@
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        透析机号：
+                        透析机号:
                         <div class="under_line" style="width: 70px; text-align: center">
                           {{
                             record.dialysis_order &&
@@ -168,12 +167,12 @@
                               ? record.dialysis_order.device_number.number
                               : record.device_number.number
                           }}
-                        </div>
+                        </div>号
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex">
                       <div class="inline_block" style="flex: 1;">
-                        T：
+                        温度:
                         <div class="under_line" style="width: 50px; text-align: center">
                           {{
                             record.assessment_before_dislysis.temperature
@@ -184,7 +183,7 @@
                         °C
                       </div>
                       <div class="inline_block" style="flex: 1;">
-                        P：
+                        脉搏:
                         <div class="under_line" style="width: 50px; text-align: center">
                           {{
                             record.assessment_before_dislysis.pulse_frequency
@@ -195,18 +194,7 @@
                         次/分
                       </div>
                       <div class="inline_block" style="flex: 1;">
-                        R：
-                        <div class="under_line" style="width: 50px; text-align: center">
-                          {{
-                            record.assessment_before_dislysis.breathing_rate
-                              ? record.assessment_before_dislysis.breathing_rate
-                              : "/"
-                          }}
-                        </div>
-                        次/分
-                      </div>
-                      <div class="inline_block" style="flex: 1;">
-                        BP：
+                        血压:
                         <div class="under_line" style="width: 50px; text-align: center">
                           {{
                             record.assessment_before_dislysis.systolic_blood_pressure
@@ -224,10 +212,21 @@
                         </div>
                         mmHg
                       </div>
+                      <div class="inline_block" style="flex: 1;">
+                        呼吸:
+                        <div class="under_line" style="width: 50px; text-align: center">
+                          {{
+                            record.assessment_before_dislysis.breathing_rate
+                              ? record.assessment_before_dislysis.breathing_rate
+                              : "/"
+                          }}
+                        </div>
+                        次/分
+                      </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1;">
-                        透析时间：
+                        透析时间:
                         <div class="under_line"
                           style=" width: 50%; text-align: center; white-space: normal; "
                         >
@@ -237,7 +236,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1">
-                        透析方式：
+                        透析方式:
                         <div class="under_line"
                           style="width: 50%;text-align: center;white-space: normal;"
                         >
@@ -246,7 +245,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1;">
-                        血管通路：
+                        血管通路:
                         <div class="under_line" style="width: 68%;white-space: normal;">
                           <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
                           {{
@@ -264,7 +263,7 @@
                       </div>
                       
                       <div class="inline_block" style="flex: 1">
-                        导管：
+                        导管:
                         <div class="under_line"
                           style="width: 80%; text-align: center;white-space: normal;"
                         >
@@ -274,7 +273,7 @@
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
-                        透析(滤)器：
+                        透析(滤)器:
                         <div class="under_line"
                           style="width: 40%; text-align: center"
                         >
@@ -293,7 +292,7 @@
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        灌流器：
+                        灌流器:
                         <div class="under_line" style="width: 80px; text-align: center">
                           {{
                            record.prescription.dialysis_irrigation
@@ -304,20 +303,17 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1">
-                        置换方式：
+                        置换方式:
                         <div class="under_line"
-                          style="width: 100px; text-align: center"
+                          style="width: 50px; text-align: center"
                         >
                           {{
                             getDisplaceLiquiPart(record.prescription.displace_liqui_part)
                           }}
                         </div>
-                      </div>
-
-                      <div class="inline_block" style="flex: 1">
-                        置换量：
+                        置换量:
                         <div class="under_line"
-                          style="width: 70px; text-align: center"
+                          style="width: 30px; text-align: center"
                         >
                           <span>{{
                             record.prescription.replacement_total
@@ -330,7 +326,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1">
-                        血流量：
+                        血流量:
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
@@ -345,7 +341,7 @@
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
-                        干体重：
+                        干体重:
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{
                             record.assessment_before_dislysis.dry_weight 
@@ -355,14 +351,14 @@
                         kg
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        上次透后体重：
+                        上次透后体重:
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{record.lastafterweight.weight_after ? record.lastafterweight.weight_after:"未称重"}}
                         </div>
                         kg
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        透前体重：
+                        透前体重:
                         <div class="under_line" style="width: 70px; text-align: center">
                           <span>{{
                                record.assessment_before_dislysis.weight_before
@@ -379,7 +375,7 @@
                         kg
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        计划超滤量：
+                        计划超滤量:
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{
                             record.prescription.target_ultrafiltration
@@ -387,12 +383,25 @@
                               : "/"
                           }}
                         </div>
-                        L
+                        kg
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
-                      <div class="inline_block" style="flex: 1.3;">
-                        透析液成分:钾：
+                      <div class="inline_block" style="flex: 1;">
+                        透析液流量:
+                        <div class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.prescription.dialysate_flow
+                              ? record.prescription.dialysate_flow
+                              : "/"
+                          }}
+                        </div>
+                        ml/min
+                      </div>
+                      <div class="inline_block" style="flex: 1;">
+                        透析液成分:钾:
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
@@ -402,27 +411,24 @@
                         mmol/L
                       </div>
                       <div class="inline_block" style="flex: 1;">
-                        钠：
-                        <div
-                          class="under_line"
-                          style="width: 50px; text-align: center"
+                        钠:
+                        <div class="under_line"
+                          style="width: 35px; text-align: center"
                         >
                         <span>{{ record.prescription.sodium ? record.prescription.sodium : "/" }}</span>
                         </div>
                         mmol/L
-                      </div>
-                      <div class="inline_block" style="flex: 1;">
-                        钙：
-                        <div
-                          class="under_line"
-                          style="width: 50px; text-align: center"
+                        钙:
+                        <div class="under_line"
+                          style="width: 35px; text-align: center"
                         >
                         <span> {{ record.prescription.calcium ? record.prescription.calcium : "/" }}</span>                     
                         </div>
                         mmol/L
                       </div>
-                      <div class="inline_block" style="flex: 1.2;">
-                        碳酸氢根：
+                      
+                      <div class="inline_block" style="flex: 1;">
+                        碳酸氢根:
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
@@ -434,23 +440,11 @@
                         </div>
                         mmol/L
                       </div>
-                      <div class="inline_block" style="flex: 1;">
-                        流量：
-                        <div class="under_line"
-                          style="width: 50px; text-align: center"
-                        >
-                          {{
-                            record.prescription.dialysate_flow
-                              ? record.prescription.dialysate_flow
-                              : "/"
-                          }}
-                        </div>
-                        ml/min
-                      </div>
+                      
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
                       <div class="inline_block" style="flex: 1;">
-                        抗凝剂：
+                        抗凝剂:
                         <div class="under_line"
                           style="width: 150px; text-align: center"
                         >
@@ -463,7 +457,7 @@
                       <div class="inline_block" style="flex: 1;"
                         v-if="record.prescription.anticoagulant != 5"
                       >
-                        首剂：
+                        首剂:
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
@@ -479,7 +473,7 @@
                         
                       </div>
                       <div class="inline_block" style="flex: 1;">
-                        追加：
+                        追加:
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
@@ -497,7 +491,7 @@
                       <div class="inline_block" style="flex: 1;"
                         v-if="record.prescription.anticoagulant == 5"
                       >
-                        钙名称：
+                        钙名称:
                         <div
                           class="under_line"
                           style="width: 150px; text-align: center"
@@ -512,7 +506,7 @@
                       <div class="inline_block" style="flex: 1;"
                         v-if="record.prescription.anticoagulant == 5"
                       >
-                        钙剂量：
+                        钙剂量:
                         <div
                           class="under_line"
                           style="width: 50px; text-align: center"
@@ -528,7 +522,7 @@
                       <div class="inline_block" style="flex: 1;"
                         v-if="record.prescription.anticoagulant != 5"
                       >
-                        总量：
+                        总量:
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
@@ -545,14 +539,24 @@
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
-                      <div style="flex:2">流行性病史:</div>
+                      <div style="flex:2">
+                        流行性病史:
+                        <div class="under_line"
+                          style="width: 40%; text-align: center"
+                        >
+                          <span style="display: inline-block;height: 30px;"></span>
+                        </div>
+                      </div>
                       <div style="flex:1">医生签名:
-                        <span v-if=" setAdminUserES( record.prescription, 'creater') == ''">
-                          {{ getAdminUser( record.prescription, "creater")}}
-                        </span>
-                        <img class="es-img" :src=" setAdminUserES( record.prescription, 'creater')"
-                           alt="" srcset="" v-else style="height: 30px"
-                        />
+                        <div class="under_line" style="width: 40%; text-align: center">
+                          <span v-if=" setAdminUserES( record.prescription, 'creater') == ''">
+                            {{ getAdminUser( record.prescription, "creater")}}
+                          </span>
+                          <img class="es-img" :src=" setAdminUserES( record.prescription, 'creater')"
+                            alt="" srcset="" v-else style="height: 30px"
+                          />
+                        </div>
+                        
                       </div>
                     </div>
                   </td>
@@ -838,40 +842,6 @@
                               }}</span>
                             </td>
                           </tr>
-
-                          <tr v-for="(advice, advice_index) in record.his_project" :key="advice_index">
-                            <td height="32px;padding:1px 1px">
-                                <span v-if="advice.start_time">
-                                    {{ getTime(advice.start_time, "{h}:{i}") }}
-                                </span>
-                            </td>
-                            <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
-                                <span style="padding-left:5px;display:inline-block;">
-                                  <span v-if="advice.type ==2">{{ advice && advice.project ? advice.project.project_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
-                                  <span v-if="advice.type ==3">{{ advice && advice.good_info ? advice.good_info.good_name : '' }}  {{ advice && advice.good_info ? advice.good_info.specification_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
-                                </span>
-                            </td>
-
-                            <td height="32px">
-                                <span v-if="setAdminUserES(advice, 'doctor') == ''">
-                                    {{getAdminUser(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, 'doctor')" alt srcset />
-                                </span>
-                            </td>
-                            <td height="32px">
-                                <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
-                                    {{getAdminUser(advice, 'execution_staff')}}
-                                </span>
-                                <span v-else>
-                                    <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
-                                </span>
-                            </td>
-                            <td height="32px">
-                                <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
-                            </td>
-                          </tr>
                         </template>
                       </tbody>
                     </table>
@@ -896,7 +866,7 @@
             </div>
             <div class="row">
               <div class="inline_block">
-                姓名：
+                姓名:
                 <div class="under_line" style="width: 50px; text-align: center">
                   {{ record.patient.name }}
                 </div>
@@ -1004,7 +974,7 @@
                   <td>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
-                        T：
+                        温度：
                         <div
                           class="under_line"
                           style="width: 50px; text-align: center"
@@ -1018,7 +988,7 @@
                         °C
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        P：
+                        脉搏:
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
@@ -1031,23 +1001,9 @@
                         次/分
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        R：
+                        血压:
                         <div class="under_line"
                           style="width: 50px; text-align: center"
-                        >
-                          {{
-                            record.assessment_after_dislysis.breathing_rate
-                              ? record.assessment_after_dislysis.breathing_rate
-                              : "/"
-                          }}
-                        </div>
-                        次/分
-                      </div>
-                      <div class="inline_block" style="flex: 1.5">
-                        BP：
-                        <div
-                          class="under_line"
-                          style="width: 50px; text-align: center"
                         >
                           {{
                             record.assessment_after_dislysis.systolic_blood_pressure
@@ -1056,8 +1012,7 @@
                           }}
                         </div>
                         /
-                        <div
-                          class="under_line"
+                        <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
                           {{
@@ -1068,11 +1023,23 @@
                         </div>
                         mmHg
                       </div>
-                      
+                      <div class="inline_block" style="flex: 1">
+                        呼吸:
+                        <div class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.assessment_after_dislysis.breathing_rate
+                              ? record.assessment_after_dislysis.breathing_rate
+                              : "/"
+                          }}
+                        </div>
+                        次/分
+                      </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 2">
-                        透析器凝血：
+                        透析器凝血:
                         <div class="under_line"
                           style=" width: 60%; text-align: center; white-space: normal;"
                         >
@@ -1080,7 +1047,7 @@
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 2">
-                        内瘘：
+                        内瘘:
                         <div class="under_line"
                           style=" width: 75%; text-align: center; white-space: normal;"
                         >
@@ -1092,7 +1059,7 @@
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 2">
-                        导管：
+                        导管:
                         <div class="under_line"
                           style="min-width: 75%; text-align: center"
                         >
@@ -1102,7 +1069,7 @@
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 2">
-                        实际治疗时间：
+                        实际治疗时间:
                         <div class="under_line"
                           style="width: 30px; text-align: center"
                         >
@@ -1127,7 +1094,7 @@
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
-                        透后体重：
+                        透后体重:
                         <div class="under_line" style="width: 70px; text-align: center">
                           <span>
                             {{
@@ -1146,7 +1113,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1">
-                        体重减少：
+                        体重减少:
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
@@ -1162,9 +1129,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1">
-                        <span>
-                            透析中入量(L)：
-                        </span>
+                        <span>透析中入量(L):</span>
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
@@ -1175,12 +1140,11 @@
                               : "/"
                           }}
                         </div>
-
                         {{ getUnit(record) }}
                       </div>
 
                       <div class="inline_block" style="flex: 1">
-                        实际超滤量：
+                        实际超滤量:
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
@@ -1190,13 +1154,13 @@
                               : "/"
                           }}
                         </div>
-                        ml
+                        kg
                       </div>
                     </div>
 
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1; display: inline-block">
-                        治疗小结：
+                        治疗小结:
                         <div class="under_line"
                           style=" width: 840px;
                             line-height: 25px;
@@ -1217,7 +1181,7 @@
 
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1; display: inline-block">
-                        宣教知识：
+                        宣教知识:
                         <div class="under_line"
                           style=" width: 840px;
                             line-height: 25px;
@@ -1240,11 +1204,10 @@
                 </tr>
                 <tr>
                   <td>
-                    <div class="row"
-                      style="padding: 2px 0; line-height: 23px; display: flex"
-                    >
+                    <div class="row" style="padding: 2px 0; line-height: 23px; display: flex"
+>
                       <div class="inline_block" style="flex: 1">
-                        上机护士：
+                        上机护士:
                         <div class="under_line"
                           style="width: 80px; text-align: center"
                         >
@@ -1273,7 +1236,7 @@
                       </div>
                      
                       <div class="inline_block" style="flex: 1">
-                        核对护士：
+                        核对护士:
                         <div
                           class="under_line"
                           style="width: 80px; text-align: left"
@@ -1401,7 +1364,7 @@
                       </div>
  
                       <div class="inline_block" style="flex: 1">
-                        下机护士：
+                        下机护士:
                         <div
                           class="under_line"
                           style="width: 80px; text-align: center"
@@ -1443,7 +1406,7 @@
 
                       <div class="inline_block" style="flex: 1">
                         上机时间
-                        <div class="under_line" style="width: 80px; text-align: center">
+                        <div class="under_line" style="width: 65%; text-align: center">
                           <span style="height: 30px;display: inline-block;"></span>
                           
                           <span v-if="record.dialysis_order !=null">
@@ -1453,8 +1416,8 @@
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
-                        下机时间：
-                        <div class="under_line" style="width: 80px; text-align: center">
+                        下机时间:
+                        <div class="under_line" style="width: 65%; text-align: center">
                           <span style="height: 30px; display: inline-block">
                           </span>
                           <span v-if="record.dialysis_order!=null">
@@ -2038,7 +2001,7 @@ export default {
     },
     printAction: function () {
       const style =
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom: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;}';
+        '@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: 20px; height: 20px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 16px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom: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;}';
 
       printJS({
         printable: "print_content",
@@ -2187,7 +2150,7 @@ export default {
       }
       return "";
     },
-    // 函数说明：因为一次透析记录有些记录不一定是必须填的，比如 record.receive_assessment 可能为 null，所以要取 record.receive_assessment.way 前需要判断 record.receive_assessment 是否为 null，所以这个方法用来简化模板渲染的代码
+    // 函数说明:因为一次透析记录有些记录不一定是必须填的，比如 record.receive_assessment 可能为 null，所以要取 record.receive_assessment.way 前需要判断 record.receive_assessment 是否为 null，所以这个方法用来简化模板渲染的代码
     // 参数说明：比如判断 record.receive_assessment.way 是不是为1，参数为 (record.receive_assessment, way, 1)
     isCheckBoxChecked: function (record, key, target_value) {
       if (record == null || record == undefined) {

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -934,7 +934,7 @@
                               : "/"
                            }}
                           </span>
-                        
+
 
                           <span v-if="org_id!=10206&&org_id!=10510">
                             {{
@@ -1415,6 +1415,8 @@
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 19"
+                        >iu</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         维持：
@@ -1488,6 +1490,8 @@
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U/h</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 19"
+                        >iu/h</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         总量：
@@ -1540,6 +1544,9 @@
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U</span>
+
+                        <span v-if="record.prescription.anticoagulant == 19"
+                          >iu</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：
@@ -1558,7 +1565,7 @@
                         </div>
                       </div>
 
-                    
+
                       <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                        <div class="inline_block">
                         上机时间：
@@ -1705,7 +1712,9 @@
                               org_id != 9675 &&
                               org_id!=10490  &&
                               org_id!=10600 &&
-                              org_id!=10644
+                              org_id!=10644 &&
+                              org_id!=0&&
+                              org_id!=10567
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1721,7 +1730,7 @@
                           <td
                             width="50"
                             v-if="
-                              org_id ==  10469
+                              org_id ==  10469 || org_id == 0 || org_id ==10567
                             "
                           >
                             钠浓度<br />(mmol/L)
@@ -1740,7 +1749,7 @@
                             <span v-if="org_id!=10471"> (ml)</span>
                             <span v-if="org_id==10471">L</span>
                           </td>
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1750,8 +1759,8 @@
                             "
                             width="50"
                           >
-                          <span v-if="org_id!=0&&org_id!=10683">置换量</span> 
-                          <span v-if="org_id ==0||org_id==10683">置换液速度</span> 
+                          <span v-if="org_id!=0&&org_id!=10683">置换量</span>
+                          <span v-if="org_id ==0||org_id==10683">置换液速度</span>
                             <br />
                             <span v-if="org_id!=10598 && org_id!=10567">
                               <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
@@ -1771,7 +1780,8 @@
                               org_id ==10629 ||
                               org_id == 10510 ||
                               org_id == 0 ||
-                              org_id == 10598
+                              org_id == 10598 ||
+                              org_id == 10567
 
                             "
                           >
@@ -1826,7 +1836,7 @@
                                 : ""
                             }}
                           </td>
-                          
+
                           <td>
                             {{
                               monitor_record.pulse_frequency
@@ -1849,7 +1859,7 @@
                                 : ""
                             }}
                           </td>
-                         
+
                           <td v-if="org_id == 10478 || org_id ==10510">
                             {{
                               monitor_record.arterial_pressure
@@ -1875,7 +1885,7 @@
                             </span>
 
                           </td>
-                        
+
                           <td>
                             {{
                               monitor_record.transmembrane_pressure
@@ -1906,8 +1916,11 @@
                               org_id != 9675 &&
                               org_id!=10490 &&
                               org_id!=10600 &&
-                              org_id!=10644 
-                             
+                              org_id!=10644 &&
+                              org_id!=0 &&
+                              org_id!=10567
+
+
                             "
                           >
                             {{
@@ -1931,7 +1944,7 @@
 
                           <td
                             v-if="
-                              org_id == 10469
+                              org_id == 10469 || org_id ==0 || org_id == 10567
                             "
                           >
                             {{
@@ -1964,7 +1977,7 @@
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                           </td>
                           <td width="50" v-if="org_id == 10489 || org_id ==0"><br />
-                                   
+
                                    {{
                                      monitor_record.ultrafiltration_rate
                                        ? monitor_record.ultrafiltration_rate
@@ -1986,11 +1999,11 @@
                                 : ""
                             }}
                             </span>
-                            
+
                           </td>
 
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0"><br />
-                                   
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567"><br />
+
                                     {{
                                       monitor_record.ultrafiltration_rate
                                         ? monitor_record.ultrafiltration_rate
@@ -2012,13 +2025,13 @@
                                 ? monitor_record.replacement_total
                                 : ""
                             }}
-                            </span> 
+                            </span>
                             <span v-if="org_id==0||org_id==10683">{{
                               monitor_record.replacement_speed
                                 ? monitor_record.replacement_speed
                                 : ""
                             }}
-                            </span> 
+                            </span>
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449">
                             {{
@@ -2038,7 +2051,8 @@
                               org_id ==10629 ||
                               org_id ==10510 ||
                               org_id== 0 ||
-                              org_id ==10598
+                              org_id ==10598 ||
+                              org_id == 10567
                             "
                           >
                             {{ monitor_record.ktv }}
@@ -2130,6 +2144,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 0"></td>
                         <td  v-if="org_id == 0 || org_id == 10375"> </td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
@@ -3089,7 +3104,7 @@
                           //    : "/"
                           //     }}
                             </span> -->
-                        
+
 
                         </div>
                         kg
@@ -3412,7 +3427,7 @@
 
 
                     </div>
-                    
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -3438,7 +3453,7 @@
                     </div>
                   </div>
 
-                   
+
                   </td>
                 </tr>
                 <tr>
@@ -3782,7 +3797,7 @@
                           class="under_line"
                           style="width: 80px; text-align: center"
                         >
-                          
+
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -3910,7 +3925,7 @@ export default {
     };
   },
   created() {
-   
+
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -3945,7 +3960,7 @@ export default {
     // }
     console.log(this.bloodAccessParOpera, "this.bloodAccessParOpera");
 
-   
+
 
     this.blood_access_part = getDataConfig("hemodialysis", "vascular_access");
 
@@ -4210,7 +4225,7 @@ export default {
 
 
           if(this.records!=null && this.records.length>0){
-           
+
             for(let i=0;i<this.records.length;i++){
               this.records[i].new_his_advices = []
                 for(let j=0;j<this.records[i].his_advices.length;j++){
@@ -4551,7 +4566,7 @@ export default {
            name = this.bloodAccessParOpera[i].name
         }
       }
-      
+
       return name
       // if (id in this.bloodAccessParOpera) {
 

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -520,25 +520,24 @@
           >批量打印</el-button>
       </template>
       <!-- this.org_id == 10206 || this.org_id ==0 || this.org_id==9671 -->
-      <!-- <template v-if="this.template_id == 80">
+      <template v-if="template_id == 80">
         <el-button
           size="small"
           icon="el-icon-printer"
           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >批量打印80</el-button>
-      </template> -->
-      <template v-if="(this.org_id == 10206 || this.org_id ==0)&& this.template_id == 80">
+          >批量打印</el-button>
+      </template>
+      <template v-if="this.template_id == 81">
         <el-button
           size="small"
           icon="el-icon-printer"
           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >批量打印</el-button>
+          >批量打印81</el-button>
       </template>
-
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -1922,15 +1921,15 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id == 10206 || this.org_id ==0){
+          if(this.org_id ==10206){
             this.template_id = 80
+            // this.template_id = 81
             console.log("templage-i233232323232322323233232323223",this.template_id)
           }else{
             var template = response.data.data.template;
             this.template_id = template.template_id;
-            
           }
-          
+
         }
       });
     },
@@ -2768,9 +2767,10 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/seventyeight" });
       }else if (this.template_id == 79) {
         this.$router.push({ path: "/dialysis/print/batch/seventynine" });
-      }else if ((this.org_id == 10206 || this.org_id ==0)&& this.template_id == 80) {
-        //  this.template_id == 80
+      }else if (this.template_id == 80) {
         this.$router.push({ path: "/dialysis/print/batch/eighty" });
+      }else if (this.template_id == 81) {
+        this.$router.push({ path: "/dialysis/print/batch/eightyone" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

@@ -266,14 +266,14 @@
           <el-table-column align="center" label="葡萄糖酸钙" v-if="gatherSetting.putaosuangai == 1">
              <template slot-scope="scope">
               <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_three }}</span>
-              <span v-if="scope.row.schedule_date <= timenow">{{ getLongAdviceThree(scope.row.long_doctor_advice,scope.row.schedule_date) }}</span>
+              <span v-if="scope.row.schedule_date > timenow">{{ getLongAdviceThree(scope.row.long_doctor_advice,scope.row.schedule_date) }}</span>
              </template>
           </el-table-column>
 
           <el-table-column align="center" label="肝素钠" v-if="org_id == 0 || org_id == 10683">
              <template slot-scope="scope">
               <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_four }}</span>
-              <span v-if="scope.row.schedule_date <= timenow">{{ getLongAdviceFour(scope.row.long_doctor_advice,scope.row.schedule_date)  }}</span>
+              <span v-if="scope.row.schedule_date > timenow">{{ getLongAdviceFour(scope.row.long_doctor_advice,scope.row.schedule_date)  }}</span>
              </template>
           </el-table-column>
           
@@ -736,6 +736,7 @@
                   list[i].advice_spc_two =""
                   list[i].advice_spc_three = ""
                   list[i].advice_spc_four = ""
+                  list[i].advice_spc_five = 0
                   for(let j=0;j<list[i].advice.length;j++){
                        if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                           list[i].advice_spc+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
@@ -754,9 +755,19 @@
                        }
 
                        if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
-                          list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          // list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                         
+                          if(parseInt(list[i].advice[j].prescribing_number) >0){
+                            list[i].advice_spc_five += parseInt(list[i].advice[j].prescribing_number) 
+                            
+                            list[i].advice_spc_four =  list[i].advice_spc_five + "支"
+                          }else{
+                            list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          }
                        }
 
+
+
                    }
                 }
                 console.log("listwowowowowowo日本",this.list)
@@ -2266,6 +2277,7 @@
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count = 0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("左卡")!=-1){
@@ -2286,6 +2298,7 @@
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+             
            }
          }
          return advice_name
@@ -2351,6 +2364,7 @@
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count =0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("肝素钠")!=-1){
@@ -2370,10 +2384,17 @@
        
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
-             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+            //  
+             count += newArr[i].prescribing_number
            }
          }
-         return advice_name
+         if(count >0){
+          return count +"支"
+         }else{
+          advice_name  += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+          return  advice_name
+         }
+        
        },
        getweekday(date){
           var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

@@ -308,6 +308,7 @@
                   list[i].advice_spc_two =""
                   list[i].advice_spc_three = ""
                    list[i].advice_spc_four = ""
+                   list[i].advice_spc_five = 0
                    for(let j=0;j<list[i].advice.length;j++){
                        if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                           list[i].advice_spc+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
@@ -326,7 +327,14 @@
                        }
 
                        if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
-                          list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          // list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          if(parseInt(list[i].advice[j].prescribing_number) >0){
+                            list[i].advice_spc_five += parseInt(list[i].advice[j].prescribing_number) 
+                            
+                            list[i].advice_spc_four =  list[i].advice_spc_five + "支"
+                          }else{
+                            list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          }
                        }
 
                    }
@@ -566,6 +574,7 @@
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count = 0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("肝素钠")!=-1){
@@ -585,10 +594,16 @@
        
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
-              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+            count += newArr[i].prescribing_number
+              // advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
            }
          }
-         return advice_name
+         if(count >0){
+          return count +"支"
+         }else{
+          return ""
+         }
+        
        },
        getweekday(date){
           var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -314,12 +314,7 @@
               {{ scope.row.advice_spc_five }}
            </template>
         </el-table-column>
-       <el-table-column align="center" label="封管液" v-if="dialysisSett.sealing_fluid_dispose == 1">
-           <template slot-scope="scope">
-             <span>{{scope.row.xt_assesment_after_dislysis.sealing_fluid_dispose}} </span> 
-           </template>
-        </el-table-column>
-
+      
         <el-table-column align="center" label="葡萄糖"  v-if="dialysisSett.glucose==1">
            <template slot-scope="scope">
              <span>{{scope.row.dialysis_solution.amylaceum?scope.row.dialysis_solution.amylaceum:""}} </span> 

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -52,11 +52,10 @@
                 <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1">封管液</td>
                 <td width="100"  v-if="dialysisSett.glucose==1">葡萄糖</td>
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">血流量</td>
-                <td  v-if="dialysisSett.sealing_fluid_dispose==1">封管液</td>
                 <td v-if="dialysisSett.cuhong_set==1">促红</td>
                 <td v-if="dialysisSett.zuoka_set == 1">左卡</td>
                 <td v-if="dialysisSett.difenzi_set == 1">低分子</td>
-                <td v-if="dialysisSett.advice_spc_three == 1">肝素钠</td>
+                <td v-if="dialysisSett.gansuna_set == 1">肝素钠</td>
                 <td v-if="dialysisSett.zhetangtie == 1">蔗糖铁</td>
                 <td v-if="dialysisSett.niaojimei_set == 1">尿激酶</td>
               </tr>
@@ -185,28 +184,23 @@
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
                 
-                <td v-if="dialysisSett.sealing_fluid_dispose ==1">
-                  <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
-                  <span v-else></span>
-                </td>
-                
-                
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+             
+                <td v-if="dialysisSett.cuhong_set==1">
                   {{ item.advice_spc }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td  v-if="dialysisSett.zuoka_set == 1">
                   {{ item.advice_spc_one }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.difenzi_set == 1">
                   {{ item.advice_spc_two }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.gansuna_set == 1">
                   {{ item.advice_spc_three }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.zhetangtie == 1">
                   {{ item.advice_spc_four }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.niaojimei_set == 1">
                   {{ item.advice_spc_five }}
                 </td>
                </tr>

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

@@ -10,7 +10,7 @@
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
-           
+
             <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
               透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
             </span>
@@ -19,8 +19,8 @@
               透前体重：{{predialysis&&(predialysis.weight_before-predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
             </span>
 
-          
-           
+
+
             <span style="position: absolute;left: 30%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
             </span>
@@ -29,8 +29,8 @@
             </span> -->
             <span style="position: absolute;left:38%;top: 3%">
               上次透后体重：
-               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span> 
-               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span> 
+               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span>
+               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span>
             </span>
 
             <span style="position: absolute;left:51%;top: 3%">
@@ -51,8 +51,8 @@
               <span v-if="predialysis!=null && last_record!=null">
                 {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
               </span>
-            
-            
+
+
             </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
@@ -560,7 +560,7 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
-                            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" 
+                            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                             v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 11 && dialysisPrescription.anticoagulant != 13"
                             prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -966,10 +966,10 @@
                     <el-col :span="8"
                             v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
                             v-show="totalShow">
-                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26">
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26 && this.$store.getters.xt_user.template_info.org_id !=10206">
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
-                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26">
+                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26 || this.$store.getters.xt_user.template_info.org_id == 10206">
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                     </el-col>
@@ -1389,7 +1389,7 @@
                 <span>上次透后称重(kg)</span>
                 <span>{{ getLastAfterWeight(last_record) }}</span>
             </div>
-          
+
           <div  class="newLine"><span>近五次数据展示:</span></div>
            <div>
             <el-table
@@ -2282,7 +2282,7 @@ mu
            }else{
                this.dialysisPrescription.dialysis_remark=""
            }
-          
+
           } else {
             this.zhiShow = false
             this.huShow = false
@@ -2634,18 +2634,18 @@ mu
         }
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
-      
+
         if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
             }
-          
+
             if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
               if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)>0){
                 this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
               }
-            
+
             }
          }
         }
@@ -3200,13 +3200,10 @@ mu
         if(moment().weekday() == 0){
            total_day ="周日"
         }
-         
-        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhh",this.targetAdvices)
+
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
-              console.log("WOOWOWOWOWOWOW",this.targetAdvices[i].week_day.indexOf(total_day))
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
-                console.log("尽力啊=--------------------")
                 this.targetAdvices[i].isCheck = 1
               }
               if(this.targetAdvices[i].frequency_type == 1){
@@ -3284,7 +3281,7 @@ mu
              return false
          }
         }
-         
+
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){
@@ -4601,8 +4598,8 @@ mu
       }else{
         this.dialysisPrescription.dialysis_remark = ""
       }
-       
-      
+
+
 
       const ParamsQuery = {}
       ParamsQuery['patient_id'] = this.$route.query.patient_id
@@ -4759,25 +4756,25 @@ mu
 
     },
     handlePatientInfo(id) {
-      
+
       getPatientRecordList(id).then(response=>{
         if(response.data.state ==1){
           this.isVisibility = false
           this.msgtip_visibility = true
 
-          
+
           var beforList = response.data.data.beforList
-       
+
           this.tableData = beforList
 
           var afterList =  response.data.data.afterList
-       
+
           this.afterList = afterList
 
           this.monitorList = response.data.data.monitorList
         }
       })
-     
+
     },
     GetLast(date){
       var weight_after = ""
@@ -4798,23 +4795,23 @@ mu
       return cruor
     },
     GetMonitorList(monitor_date){
-     
+
         var str = ""
         var newArr = []
         for(let i=0;i<this.monitorList.length;i++){
           for(let j=0;j<this.monitorList[i].child.length;j++){
             if(monitor_date == this.monitorList[i].monitoring_date){
-              newArr.push(this.monitorList[i].child[j]) 
+              newArr.push(this.monitorList[i].child[j])
             }
           }
         }
-       
+
         if(newArr!=null && newArr.length>0){
         for(let i=0;i<newArr.length;i++){
             str += newArr[i].systolic_blood_pressure +"/"+newArr[i].diastolic_blood_pressure+","
         }
         }
-      
+
         return str
     },
     handlePatientInfoOne(){
@@ -5480,18 +5477,18 @@ mu
       },
       'dialysisPrescription.prescription_water':function(){
         if(this.$store.getters.xt_user.template_info.org_id==10598){
-           
+
           if(this.dialysisPrescription.mode_id == 2 || this.dialysisPrescription.mode_id == 3){
              this.dialysisPrescription.target_ultrafiltration = parseFloat(this.dialysisPrescription.prescription_water)  + 0.3
           }else{
             if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
-              this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water 
+              this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water
             }
           }
-          
-           
+
+
         }
-        
+
       },
       stockType: function() {
         console.log('stockType', this.stockType)
@@ -5544,7 +5541,7 @@ mu
         }
         console.log(" 人员",this.adminRoles)
       },
-     
+
     },
     created() {
 

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -988,7 +988,7 @@
         >
         </div>
       </template>
-      <template v-if="org_template_info.template_id == 80 && (org_id == 10206 || org_id == 0)">
+      <template v-if="org_template_info.template_id == 80">
         <div>
           <el-button
           :loading="loading"
@@ -1000,8 +1000,7 @@
         >
         </div>
       </template>
-
-      <!-- <template v-if="org_id == 10206 || org_id ==0 || org_id==9671 ">
+      <template v-if="org_template_info.template_id == 81">
         <div>
           <el-button
           :loading="loading"
@@ -1012,8 +1011,8 @@
           >打印</el-button
         >
         </div>
-      </template> -->
-      
+      </template>
+
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1137,8 +1136,7 @@
             </el-table>
           </div>
         </div>
-        <div
-          class="dialysisPage"
+        <div class="dialysisPage"
           style="height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px"
         >
           <DialysisPrintOrderOne
@@ -1536,11 +1534,11 @@
           </DialysisPrintOrderSeventynine>
 
           <DialysisPrintOrdereighty v-bind:childResponse="childResponse"
-            v-if="org_template_info.template_id == 80 && (org_id == 10206 || org_id == 0)">
+            v-if="org_template_info.template_id == 80">
           </DialysisPrintOrdereighty>
-          <!-- <DialysisPrintOrdereighty v-bind:childResponse="childResponse"
-            v-if="org_id == 10206 || org_id == 0 || org_id==9671">
-          </DialysisPrintOrdereighty> -->
+          <DialysisPrintOrdereightyone v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 81">
+          </DialysisPrintOrdereightyone>
         </div>
       </el-container>
     </div>
@@ -1639,6 +1637,7 @@ import DialysisPrintOrderSeventyseven from './template/DialysisPrintOrderSeventy
 import DialysisPrintOrderSeventyeight from './template/DialysisPrintOrderSeventyeight'
 import DialysisPrintOrderSeventynine from './template/DialysisPrintOrderSeventynine'
 import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
+import DialysisPrintOrdereightyone from './template/DialysisPrintOrdereightyone'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1723,6 +1722,7 @@ export default {
     DialysisPrintOrderSeventyeight,
     DialysisPrintOrderSeventynine,
     DialysisPrintOrdereighty,
+    DialysisPrintOrdereightyone,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2436,8 +2436,15 @@ export default {
           scanStyles: false,
         });
       }
-      else if (this.org_template_info.template_id == 80 && (this.org_id == 10206 || this.org_id ==0)) {
-        console.log('this.org_template_info.template_id == 80',this.org_template_info.template_id);
+      else if (this.org_template_info.template_id == 80) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+      }
+      else if (this.org_template_info.template_id == 81 ) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -2661,10 +2668,8 @@ export default {
           this.date = response.data.data.patientInfo.DialysisSchedule.schedule_date
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
-          
-          // this.org_template_info.template_id= response.data.data.org_template_info.template_id
-          // console.log('this.org_template_info是数据',response.data.data.org_template_info.template_id);
-          if(this.org_id !=10206 &&this.org_id !=0){
+
+          if(this.org_id !=10206){
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
             this.org_template_info = response.data.data.org_template_info;
           }else{

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -517,7 +517,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 1"
                       >
@@ -528,7 +528,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                        
+
                         "
                         v-if="prescription.mode_id == 2"
                       >
@@ -539,7 +539,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 3"
                       >
@@ -550,7 +550,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 4"
                       >
@@ -561,7 +561,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 5"
                       >
@@ -572,7 +572,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 6"
                       >
@@ -583,7 +583,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 7"
                       >
@@ -594,7 +594,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 8"
                       >
@@ -605,7 +605,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 9"
                       >
@@ -616,7 +616,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 10"
                       >
@@ -627,7 +627,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 11"
                       >
@@ -638,7 +638,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 12"
                       >
@@ -649,7 +649,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 13"
                       >
@@ -660,7 +660,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 14"
                       >
@@ -671,7 +671,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 15"
                       >
@@ -682,7 +682,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 16"
                       >
@@ -693,7 +693,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 17"
                       >
@@ -704,7 +704,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 18"
                       >
@@ -715,7 +715,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 19"
                       >
@@ -726,7 +726,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 22"
                       >
@@ -737,7 +737,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 23"
                       >
@@ -748,7 +748,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 24"
                       >
@@ -758,7 +758,7 @@
                         class="under_line"
                         style="width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 25"
                       >
@@ -769,7 +769,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 29"
                       >
@@ -780,7 +780,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 30"
                       >
@@ -791,7 +791,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 31"
                       >
@@ -802,7 +802,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 32"
                       >
@@ -813,7 +813,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 33"
                       >
@@ -824,7 +824,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 34"
                       >
@@ -835,7 +835,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 35"
                       >
@@ -846,7 +846,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 36"
                       >
@@ -857,7 +857,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 37"
                       >
@@ -868,7 +868,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 38"
                       >
@@ -879,7 +879,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 39"
                       >
@@ -891,7 +891,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 40"
                       >
@@ -903,7 +903,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 41"
                       >
@@ -915,7 +915,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 42"
                       >
@@ -927,7 +927,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 43"
                       >
@@ -1444,9 +1444,9 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">
-                       <span v-if="org_id!=10644">mg</span> 
-                       <span v-if="org_id==10644">iu</span> 
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                       <span v-if="org_id!=10644">mg</span>
+                       <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
@@ -1463,9 +1463,9 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-                     <span v-if="prescription.anticoagulant == 14">
-                      <span v-if="org_id!=10644">mg</span> 
-                      <span v-if="org_id==10644">iu</span> 
+                     <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                      <span v-if="org_id!=10644">mg</span>
+                      <span v-if="org_id==10644">iu</span>
                      </span>
                      <span v-if="prescription.anticoagulant == 17">U</span>
 
@@ -1509,9 +1509,9 @@
                         <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
-                          <span v-if="prescription.anticoagulant == 14">
-                            <span v-if="org_id!=10644">mg/h</span> 
-                            <span v-if="org_id==10644">iu/h</span> 
+                          <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                            <span v-if="org_id!=10644">mg/h</span>
+                            <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
                       </span>
@@ -1527,9 +1527,9 @@
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 14">
-                            <span v-if="org_id!=10644">mg/h</span> 
-                            <span v-if="org_id==10644">iu/h</span> 
+                          <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                            <span v-if="org_id!=10644">mg/h</span>
+                            <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
                       </span>
@@ -1600,9 +1600,9 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">
-                        <span v-if="org_id!=10644">mg</span> 
-                        <span v-if="org_id==10644">iu</span> 
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                        <span v-if="org_id!=10644">mg</span>
+                        <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                      </span>
@@ -1618,9 +1618,9 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                      <span v-if="prescription.anticoagulant == 14">
-                        <span v-if="org_id!=10644">mg</span> 
-                        <span v-if="org_id==10644">iu</span> 
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                        <span v-if="org_id!=10644">mg</span>
+                        <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
@@ -1839,8 +1839,8 @@
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
-                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
+                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 "> 电导度<br />(ms/cm)</span>
+                          <span v-if="org_id ==10469 || org_id == 0"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
@@ -1851,7 +1851,7 @@
                          <span v-if="org_id == 10471">L</span>
                          <span v-if="org_id != 10471"> (ml)</span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683">超滤率<br/>(ml/h)</td>
+                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683 || org_id ==10567 || org_id == 0">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 ">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
                           <span v-if="org_id == 10683">置换液速度</span>
@@ -1864,7 +1864,7 @@
                           <span v-if="org_id==10598 || org_id == 10567">(L)</span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
@@ -1962,8 +1962,8 @@
 
 
                         <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
-                          <span v-if="org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
+                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490 && org_id!=10567"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
+                          <span v-if="org_id==10469 || org_id == 10567 || org_id == 0"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                           <span v-if="org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
                         </td>
 
@@ -1983,7 +1983,7 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 "><br/>
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id ==10567 || org_id == 0"><br/>
                            <span v-if="org_id!=10644 && org_id!=0">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
                            <span v-if="org_id==10644 ">
                               <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
@@ -2018,7 +2018,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598 || org_id == 10567 || org_id == 0">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -2059,7 +2059,7 @@
                         <td v-if="org_id == 0||org_id == 9829">
                           {{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}
                         </td>
-                       
+
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -2255,7 +2255,7 @@
                           </span>
 
                         </td>
-                     
+
                         <td height="32px">
                           <span v-if="advice!=null && advice.execution_staff>0">
                             <span
@@ -2290,7 +2290,7 @@
                               getTime(advice.execution_time, "{h}:{i}")
                              }}</span>
                           </span>
-                         
+
                         </td>
                         <td height="32px">
                           <span v-if="org_id!=10489">
@@ -2310,7 +2310,7 @@
                               />
                             </span>
                           </span>
-                         
+
                         </td>
                         <td height="32px" v-if="org_id == 10223 || org_id == 9538  ||
                             org_id ==10375 || org_id ==10571 || org_id ==10600">
@@ -2387,7 +2387,7 @@
                         />
                       </td>
                         <td height="32px">
-                          
+
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
@@ -5409,11 +5409,11 @@ export default {
         }
 
         this.jilurow = this.monitors.length + 1;
-        
+
         if(this.advices!=null && this.advices.length>0){
           this.advice_jilurow = this.advices.length + 1;
         }
-       
+
 
         var childMap = {};
         for (const index in this.advices) {
@@ -5525,7 +5525,7 @@ export default {
             }
          }
 
-      
+
 
          let projects = [];
         response.data.data.projects.map((item) => {
@@ -5551,7 +5551,7 @@ export default {
                 this.projects[i].project_team_id = 0
 
                 if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
-                 
+
                   this.projects[i].project_team = this.projects[i].team.project_team
                   this.projects[i].project_team_id = this.projects[i].team.id
                   this.projects[i].start_time = this.projects[i].start_time
@@ -5562,7 +5562,7 @@ export default {
                   this.projects[i].advice_name =  this.projects[i].team.project_team
                   this.projects[i].advice_doctor = this.projects[i].doctor
 
-             
+
                   newHisArr.push(this.projects[i])
                   // this.doctor_advices_2.push(this.project[i])
                 }else{
@@ -5580,14 +5580,14 @@ export default {
                   // this.doctor_advices_2.push(this.projects[i])
                 }
 
-                
+
 
               }
 
             }
             }
 
-          
+
 
             for(let i=0;i<newHisArr.length;i++){
               newHisArr[i].advice_name_str = ""
@@ -5603,7 +5603,7 @@ export default {
 
         }
 
-       
+
 
         //针对内蒙古阿拉善
         if(this.org_id ==10206){
@@ -5706,7 +5706,7 @@ export default {
         this.totollength = this.doctor_advices.length + this.monitors.length;
         console.log("this.totollength",this.totollength)
 
-        
+
         if (this.totollength > 18) {
           var temp_advice_length = this.doctor_advices.length
           var doctor_advices_1 = [];

src/xt_pages/outpatientCharges/summary.vue

@@ -715,6 +715,7 @@ export default {
       settlementVisible: false,
       settlementObj: {},
       accounts_click_vi:false,
+      org_id:'',
     }
   },
 
@@ -757,6 +758,7 @@ export default {
     this.getDoctorList()
     this.getHisOrderList()
     this.getAllstaff()
+    this.org_id == this.$store.getters.xt_user.org.id
   },
 
   methods: {
@@ -3317,6 +3319,7 @@ export default {
           return false
         } else {
           let list = []
+          let list2 = []
           for (let i = 0; i < response.data.data.order.length; i++) {
             let order = response.data.data.order[i]
             let number = ''
@@ -3504,11 +3507,41 @@ export default {
               收费状态: order_status,
               退费日期: ''
             }
-
+            let obj2 = {
+              就诊号: order.mdtrt_id,
+              患者姓名: name,
+              患者性别: gender,
+              患者年龄: age,
+              开处时间: time,
+              参保号: order.his_patient.id_card_no,
+              应收金额: order.medfee_sumamt,
+              实收金额: order.medfee_sumamt,
+              医保统筹金额: order.hifp_pay,
+              大额基金金额: order.hifob_pay,
+              大病基金金额: order.hifmi_pay,
+              补充保险基金金额: order.hifes_pay,
+              医疗救助基金金额: order.maf_pay,
+              公务员基金: order.cvlserv_pay,
+              个人支付基金: order.psn_cash_pay,
+              个人账户支付金额: order.acct_pay,
+              医生姓名: doctor_name,
+              收费类别: balance_accounts,
+              总金额: order.medfee_sumamt,
+              现金支付: '',
+              账户支付: '',
+              支付宝支付: '',
+              微信支付: '',
+              其他支付: '',
+              收费时间: order.setl_time,
+              收费状态: order_status
+            }
             list.push(obj)
+            list2.push(obj2)
           }
-          import('@/vendor/Export2Excel').then((excel) => {
-            const tHeader = [
+          if(this.org_id != 10697 && this.org_id != 0){
+            import('@/vendor/Export2Excel').then((excel) => {
+              console.log('1111111南昌');
+              const tHeader = [
               '就诊号',
               '患者姓名',
               "患者性别",
@@ -3541,17 +3574,58 @@ export default {
               '收费时间',
               '收费状态',
               '退费日期'
-            ]
-            const filterVal = [
+              ]
+              const filterVal = [
+                '就诊号',
+                '患者姓名',
+                "患者性别",
+                "患者年龄",
+                '开处时间',
+                '险种类型',
+                '参保所属医保区划',
+                '参保号',
+                '属地名称',
+                '应收金额',
+                '实收金额',
+                '医保统筹金额',
+                '大额基金金额',
+                '大病基金金额',
+                '补充保险基金金额',
+                '医疗救助基金金额',
+                '公务员基金',
+                '个人支付基金',
+                '个人账户支付金额',
+                '科室',
+                '医生姓名',
+                '收费类别',
+                '收费者姓名',
+                '总金额',
+                '现金支付',
+                '账户支付',
+                '支付宝支付',
+                '微信支付',
+                '其他支付',
+                '收费时间',
+                '收费状态',
+                '退费日期'
+              ]
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: '消费明细'
+              })
+            })
+          }else{
+            import('@/vendor/Export2Excel').then((excel) => {
+              console.log('222222南昌');
+              const tHeader2 = [
               '就诊号',
               '患者姓名',
               "患者性别",
               "患者年龄",
               '开处时间',
-              '险种类型',
-              '参保所属医保区划',
               '参保号',
-              '属地名称',
               '应收金额',
               '实收金额',
               '医保统筹金额',
@@ -3562,10 +3636,8 @@ export default {
               '公务员基金',
               '个人支付基金',
               '个人账户支付金额',
-              '科室',
               '医生姓名',
               '收费类别',
-              '收费者姓名',
               '总金额',
               '现金支付',
               '账户支付',
@@ -3573,16 +3645,44 @@ export default {
               '微信支付',
               '其他支付',
               '收费时间',
-              '收费状态',
-              '退费日期'
-            ]
-            const data = this.formatJson(filterVal, list)
-            excel.export_json_to_excel({
-              header: tHeader,
-              data,
-              filename: '消费明细'
+              '收费状态'
+              ]
+              const filterVal2 = [
+                '就诊号',
+                '患者姓名',
+                "患者性别",
+                "患者年龄",
+                '开处时间',
+                '参保号',
+                '应收金额',
+                '实收金额',
+                '医保统筹金额',
+                '大额基金金额',
+                '大病基金金额',
+                '补充保险基金金额',
+                '医疗救助基金金额',
+                '公务员基金',
+                '个人支付基金',
+                '个人账户支付金额',
+                '医生姓名',
+                '收费类别',
+                '总金额',
+                '现金支付',
+                '账户支付',
+                '支付宝支付',
+                '微信支付',
+                '其他支付',
+                '收费时间',
+                '收费状态'
+              ]
+              const data = this.formatJson(filterVal2, list2)
+              excel.export_json_to_excel({
+                header: tHeader2,
+                data,
+                filename: '消费明细'
+              })
             })
-          })
+          }
         }
       })
     },

src/xt_pages/stock/detail/stockInDetail.vue

@@ -181,7 +181,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,500,1000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -342,6 +342,7 @@ export default {
       return name;
     },
     search: function() {
+      this.getGoodDetailPrintList()
       const Params = {
         page: this.page,
         limit: this.limit,
@@ -490,14 +491,18 @@ export default {
     },
     handleSelectionChange: function(val) {
       this.multipleSelection = val;
+      this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     startTimeChange(val) {
 
@@ -508,6 +513,7 @@ export default {
       } else {
 
         this.GetCancelStock();
+        this.getGoodDetailPrintList()
 
       }
     },
@@ -519,10 +525,12 @@ export default {
       } else {
 
         this.GetCancelStock();
+        this.getGoodDetailPrintList()
       }
     },
     getAllQuery(){
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     getTimestamp(time) {
       // 把时间日期转成时间戳
@@ -907,6 +915,7 @@ export default {
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+          this.tableInfo = []
           this.tableInfo = list
         }
       })

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -174,7 +174,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,500,1000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -473,7 +473,7 @@ export default {
      getDrugWarehouseInfoPrint(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-          
+            this.tabelePrintList = []
             this.tabelePrintList = list
             this.manufacturerList = response.data.data.manufacturerList
             this.dealerList = response.data.data.dealerList

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -318,10 +318,12 @@ export default {
     changeType: function(val) {
       this.order_type = val;
       this.getlist()
+      this.getDrugOutOrderPrint()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.getlist()
+      this.getDrugOutOrderPrint()
     },
     getTypeName: function(row) {
       let name = "";
@@ -443,7 +445,7 @@ export default {
     PrintAction: function() {
       //  window.sessionStorage.setItem('start_out_time',this.start_time)
       //  window.sessionStorage.setItem('end_out_time',this.end_time)
-       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
+       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page+"&storehouse_id="+this.storehouse_id)
     },
     getlist(){
       var params = {
@@ -970,6 +972,7 @@ export default {
          start_time:this.start_time,
          end_time:this.end_time,
          order_type:2,
+         storehouse_id:this.storehouse_id,
       }
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
@@ -1166,6 +1169,7 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.getlist()
+       this.getDrugOutOrderPrint()
      }
   }
 };

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -139,6 +139,7 @@
         keyword:this.$route.query.keyword,
         limit:this.$route.query.limit,
         page:this.$route.query.page,
+        storehouse_id:this.$route.query.storehouse_id,
         cancelStockDate:[],
         drugList:[],
         org_id:0,
@@ -230,6 +231,7 @@
           start_time:this.start_time,
           end_time:this.end_time,
           order_type:parseInt(this.order_type),
+          storehouse_id:parseInt(this.storehouse_id),
         }
       
         getDrugOutOrderPrint(params).then(response=>{

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -419,6 +419,7 @@
       width="40%">
       <span>
         <el-input
+         @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -1183,8 +1184,18 @@ export default {
          return ""
         }
       }
-    }
+    },
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+   },
   },
+ 
   created() {
     if (this.$route.path == "/Pharmacy/in/add") {
       this.crumbs = [

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -405,6 +405,7 @@
       width="40%">
       <span>
         <el-input
+         @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -532,6 +533,15 @@ export default {
     };
   },
   methods: {
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+   },
     changeDrugCode(row,index){
       this.textarea=""
       this.textarea = row.drug_code

src/xt_pages/stock/stockInOrder.vue

@@ -362,6 +362,13 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column label="耗材追溯码" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.good_code}}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">

src/xt_pages/stock/stockInOrderAdd.vue

@@ -239,6 +239,16 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="耗材追溯码" align="center" width="150">
+           
+              <template slot-scope="scope">
+               <div  @click="changeGoodCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.good_code"  placeholder="请输入耗材追溯码"></el-input>
+              </div>
+            </template>
+          
+          </el-table-column>
+
           <el-table-column label="备注" align="center" width="150">
             <template slot-scope="scope">
               <el-input placeholder="请输入备注" v-model="scope.row.remark"></el-input>
@@ -274,8 +284,28 @@
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
 
-
+ 
     </div>
+
+    <el-dialog
+      title="耗材追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+         @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 
 </template>
@@ -380,8 +410,8 @@
             price: '',
             remark: '',
             dealer: '',
-            manufacturer: ''
-
+            manufacturer: '',
+            good_code:""
           },
           isCreated: 1
 
@@ -422,7 +452,12 @@
         showCheck:false,
         showReturnCheck:false,
         warehousing_info_id:0,
-        org_id:0
+        org_id:0,
+        dialogVisible:false,
+        currentRow:{},
+        currentIndex:0,
+        textarea:""
+
       }
     },
     methods: {
@@ -579,6 +614,7 @@
         tempObj["packing_price"] = ""
         tempObj["id"] = 0
         tempObj['register_number'] = ''
+        tempObj['good_code'] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -795,6 +831,7 @@
                   list[i].product_date = this.getTimeOne(list[i].product_date)
                   list[i].good_name = list[i].GoodInfo.good_name
                   list[i].name = list[i].GoodInfo.specification_name +"/"+ list[i].GoodInfo.packing_unit
+                  list[i].good_code = list[i].good_code
                 }
                 this.recordInfo.recordData = []
                 this.recordInfo.recordData = list
@@ -969,7 +1006,31 @@
           return ""
          }
        }
-     }
+     },
+     changeGoodCode(row,index){
+        this.textarea=""
+        this.textarea = row.drug_code
+        this.currentRow = row
+        this.currentIndex =index
+        this.dialogVisible = true
+     },
+     changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+     },
+     saveTextArea(){
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_code = this.textarea 
+          }
+        }
+        this.dialogVisible = false
+      },
     }
     ,
     created() {
@@ -1003,6 +1064,7 @@
       tempObj['packing_price']= ''
       tempObj['id']= 0
       tempObj['register_number'] = ''
+      tempObj['good_code'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockInOrderEdit.vue

@@ -301,6 +301,18 @@
                </el-select>
             </template>
           </el-table-column>
+
+          <el-table-column label="耗材追溯码" align="center" width="150">
+           
+           <template slot-scope="scope">
+              <div  @click="changeGoodCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.good_code"  placeholder="请输入耗材追溯码"></el-input>
+              </div>
+           </template>
+       
+         </el-table-column>
+
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"  :disabled ="disabled"></el-input>
@@ -349,6 +361,26 @@
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
     </div>
+
+    <el-dialog
+      title="耗材追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+         @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -451,6 +483,11 @@ export default {
       list:[],
       is_check:0,
       order_id:0,
+      org_id:0,
+      dialogVisible:false,
+      currentRow:{},
+      currentIndex:0,
+      textarea:""
     };
   },
   methods: {
@@ -482,6 +519,7 @@ export default {
             tempForm["remark"] = "";
             tempForm["dealer"] = "";
             tempForm["manufacturer"] = "";
+            tempForm["good_code"] = ""
             this.recordInfo.recordData.splice(
               this.currentIndex + 1,
               0,
@@ -570,6 +608,7 @@ export default {
       tempObj["manufacturer"] = "";
       tempObj["license_number"] = ""
       tempObj["packing_price"] = ""
+      tempObj["good_code"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -775,6 +814,7 @@ export default {
                 list[i].product_date = this.getTimeOne(list[i].product_date)
                 list[i].good_name = list[i].GoodInfo.good_name
                 list[i].name = list[i].GoodInfo.specification_name
+                list[i].good_code = list[i].good_code
                }
               this.recordInfo.recordData = []
               this.recordInfo.recordData = list
@@ -848,6 +888,7 @@ export default {
             tempObj["manufacturer"] = "";
             tempObj["license_number"] = ""
             tempObj["register_number"] = ""
+            tempObj["good_code"] = ""
             this.recordInfo.recordData.push(tempObj);
           }
         }
@@ -906,6 +947,11 @@ export default {
             }else{
                this.recordInfo.recordData[i].price = val.buy_price
             }
+
+            if(this.org_id == 0 || this.org_id == 10633){
+               this.recordInfo.recordData[i].price = val.first_xt_warehouse_info.packing_price
+            }
+
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].packing_price = "0"
             }else{
@@ -920,6 +966,15 @@ export default {
             }else{
               this.recordInfo.recordData[i].dealer = val.dealer
             }
+
+
+
+            // for(let i=0;i<this.recordInfo.recordData.length;i++){
+            //   this.recordInfo.recordData[i].warehouse_info_str = ""
+            //   for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+            //     this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
+            //   }
+            // }
           
           }
         }
@@ -995,10 +1050,35 @@ export default {
          return ""
         }
       }
-    }
+    },
+    changeGoodCode(row,index){
+        this.textarea=""
+        this.textarea = row.drug_code
+        this.currentRow = row
+        this.currentIndex =index
+        this.dialogVisible = true
+     },
+     changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+     },
+     saveTextArea(){
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_code = this.textarea 
+          }
+        }
+        this.dialogVisible = false
+      },
      
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -148,10 +148,20 @@
                   type="number"
                   v-model="scope.row.stock_count"
                 ></el-input>
+                
               </el-form-item>
             </template>
           </el-table-column>
 
+          <!-- <el-table-column width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>剩余批次详情</span>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.warehouse_info_str }} 
+            </template>
+          </el-table-column> -->
+
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -450,7 +460,8 @@ export default {
       loading:false,
       patients:[],
       classType:[{id:1,name:"上午"},{id:2,name:"下午"},{id:3,name:"晚上"}],
-
+      tableWarehouseInfoList:[],
+      org_id:0,
     };
   },
   methods: {
@@ -830,6 +841,7 @@ export default {
                     warehouseOutInfoList[i].expiry_date = this.getTimeOne(warehouseOutInfoList[i].expiry_date)
                     warehouseOutInfoList[i].product_date = this.getTimeOne(warehouseOutInfoList[i].product_date)
                     warehouseOutInfoList[i].patient_id = warehouseOutInfoList[i].patient_id
+                    
 
                  }
                  this.recordInfo.recordData = warehouseOutInfoList
@@ -921,7 +933,8 @@ export default {
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
             this.recordInfo.recordData[i].patient_id = 0
-             
+            this.recordInfo.recordData[i].xt_warehouse_info = val.xt_warehouse_info
+            this.recordInfo.recordData[i].packing_unit = val.packing_unit
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
               this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_xt_warehouse_info.expiry_date)
             }else{
@@ -941,6 +954,10 @@ export default {
               this.recordInfo.recordData[i].price = val.packing_price
             }
 
+            if(this.org_id == 0 || this.org_id == 10633){
+               this.recordInfo.recordData[i].price = val.first_xt_warehouse_info.packing_price
+            }
+
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
             if(val.dealer == 0){
@@ -949,6 +966,13 @@ export default {
              this.recordInfo.recordData[i].dealer = val.dealer
             }
 
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+              this.recordInfo.recordData[i].warehouse_info_str = ""
+              for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+                this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
+              }
+            }
+
             console.log("日期我我我哦我",  this.recordInfo.recordData)
          }
 
@@ -967,6 +991,7 @@ export default {
           var list = response.data.data.list
           this.numberList = list
           // var lastWarehouseInfoTwo = response.data.data.lastWarehouseInfoTwo
+          // this.tableWarehouseInfoList = lastWarehouseInfoTwo
         }
      })
     },
@@ -1062,7 +1087,7 @@ export default {
 
   },
   created() {
-
+    this.org_id = this.$store.getters.xt_user.org.id
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;

src/xt_pages/user/components/PatientDetail.vue

@@ -286,7 +286,7 @@
                 <el-input v-model="form.homeAddress" disabled style="width: 350px;"></el-input>
               </el-form-item>
             </el-col>
-            
+
              <el-col :span="8" :style="isEdit ? 'width:280px' : ''">
                 <el-form-item
                   label="打印日期:"
@@ -639,7 +639,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-           
+
 
             <div v-show="!generic_info_fold">
               <el-col :span="8">
@@ -1209,12 +1209,12 @@
                   <td colspan="8">
                     <div
                       class="td_proj_content td_align_left"
-                     
+
                     >  {{ patientPrint.remark }}</div>
                   </td>
                 </tr>
 
-              
+
 
                 <tr>
                   <td>
@@ -1235,7 +1235,7 @@
                   <td colspan="7">
                     <div
                       class="td_proj_content td_align_left"
-                     
+
                     >
                      {{ patientPrint.treatment_plan }}
                    </div>
@@ -1251,8 +1251,8 @@
                 {{getTime(patientPrint.created_time)}}</span>
                 <span v-else>{{ printDate }}</span> -->
 
-                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span> 
-                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span> 
+                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
+                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
 
               </div>
               <div class="proj">
@@ -1269,7 +1269,7 @@
       </div>
       <div id="print-info-box" v-else>
         <div class="print_main_content" style="margin-top: 70px;">
-          <div class="order_title">{{ orgname }} 血液净化患者首次门诊病历</div>
+          <div class="order_title" style="font-size: 25px;font-weight: 600;">{{ orgname }}<br/>血液净化治疗患者首次门诊病历</div>
           <div >
             <table >
               <tbody>
@@ -1277,51 +1277,45 @@
                   <td style="width:8%;padding: 3px 0px;font-size: 17px;font-weight: 500;">
                     姓名
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;">
+                  <td style="padding: 3px 0px;font-size: 17px;width:15%;">
                     {{ patientPrint.name }}
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;width:5%;">
                     性别
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;">
+                  <td style="padding: 3px 0px;font-size: 17px;width:5%;">
                     {{ patientPrint.gender }}
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;width:8%;">
                     年龄
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;">
+                  <td style="padding: 3px 0px;font-size: 17px;width:10%;">
                     {{ patientPrint.age }}岁
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;width:10%;">
                     报销方式
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;">
-                    {{patientPrint.reimbursement_way_id}}
+                  <td style="padding: 3px 0px;font-size: 17px;width: 15%;">
+                    {{patientPrint.reimbursement_way_id }}
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;width:10%;">
                     透析号
                   </td>
-                  <td style="padding: 3px 0px;font-size: 17px;">
+                  <td style="padding: 3px 0px;font-size: 17px;width:15%;">
                     {{patientPrint.dialysis_no}}
                   </td>
-                  <!-- <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
-                    籍贯
-                  </td>
-                  <td style="padding: 3px 0px;font-size: 17px;">
-                    {{ patientPrint.native_place }}
-                  </td> -->
                 </tr>
                 <tr>
                   <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
                     电话
                   </td>
-                  <td colspan="2" style="padding: 3px 0px;font-size: 17px;">
+                  <td style="padding: 3px 0px;font-size: 17px;">
                     {{ patientPrint.phone }}
                   </td>
                   <td  style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
                     民族
                   </td>
-                  <td colspan="2" style="padding: 3px 0px;font-size: 17px;">
+                  <td colspan="3" style="padding: 3px 0px;font-size: 17px;">
                     {{ patientPrint.nation }}
                   </td>
                   <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
@@ -1331,17 +1325,17 @@
                     {{ patientPrint.id_card_no }}
                   </td>
                 </tr>
-                <tr>
+                 <tr>
                   <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
                     联系人
                   </td>
-                  <td colspan="2" style="padding: 3px 0px;font-size: 17px;">
+                  <td style="padding: 3px 0px;font-size: 17px;">
                     {{ patientPrint.contact_name }}
                   </td>
                   <td  style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
                     电话
                   </td>
-                  <td colspan="2" style="padding: 3px 0px;font-size: 17px;">
+                  <td colspan="3" style="padding: 3px 0px;font-size: 17px;">
                     {{ patientPrint.home_telephone }}
                   </td>
                   <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
@@ -1355,17 +1349,17 @@
                   <td colspan="2" style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
                     首次透析时间
                   </td>
-                  <td colspan="3" style="padding: 3px 0px;font-size: 17px;">
+                  <td colspan="4" style="padding: 3px 0px;font-size: 17px;">
                     {{ patientPrint.first_dialysis_date }}
                   </td>
-                  <td colspan="2" style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
                     血管通路
                   </td>
                   <td colspan="3" style="padding: 3px 0px;font-size: 17px;">
-                    
+                     {{ patientVascularAccessOne.blood_access_part_id }} {{ patientVascularAccessOne.blood_access_part_opera_id }}
                   </td>
                 </tr>
-                
+
                 <tr>
                   <td style="padding: 3px 0px;font-size: 17px; font-weight: 500;">
                     主诉
@@ -1410,7 +1404,7 @@
                   </td>
                   <td colspan="3">
                     <div class="td_proj_content td_align_left">
-                     
+
                     </div>
                   </td>
                 </tr>
@@ -1421,16 +1415,16 @@
                 <tr>
                   <td colspan="10">
                     <div class="td_proj_title">
-                      T
+                      T:
                       {{
                         patientPrint.temperature
-                      }}℃&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; P
+                      }}℃&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; P:
                       {{
                         patientPrint.pulse
-                      }}次/分&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; R
+                      }}次/分&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; R:
                       {{
                         patientPrint.respiratory
-                      }}次/分&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BP
+                      }}次/分&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; BP:
                       {{ patientPrint.sbp }}/{{ patientPrint.dbp }} mmHg
                     </div>
                   </td>
@@ -1444,13 +1438,13 @@
                   </td>
                 </tr>
                 <tr>
-                  <td>
+                  <td style="width: 10%;">
                     <div class="td_proj_title">辅助检查</div>
                   </td>
                   <td colspan="9">
                     <div
                       class="td_proj_content td_align_left"
-                      
+
                     ></div>
                   </td>
                 </tr>
@@ -1475,22 +1469,11 @@
                       v-html="patientPrint.treatment_plan"
                     ></div>
                   </td>
-                </tr> 
+                </tr>
               </tbody>
             </table>
             <div class="print_footnote_panel">
-              <div class="proj">
-                <span class="proj_title">日期：</span>
-
-                <!-- <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394 || org_id ==10612 || org_id == 0 || org_id ==10617">
-                {{getTime(patientPrint.created_time)}}</span>
-                <span v-else>{{ printDate }}</span> -->
-
-                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span> 
-                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span> 
-
-              </div>
-              <div class="proj">
+              <div class="proj" style="text-align: center;">
                  <span class="proj_title">医生签名：
                     <span v-if="patientPrint!=undefined&&getDcotorName(patientPrint.doctor) == ''">{{getDcotorNameOne(patientPrint.doctor)}}</span>
                     <span v-else>
@@ -1498,6 +1481,11 @@
                     </span>
                  </span>
               </div>
+              <div class="proj" style="text-align: right;">
+                <span class="proj_title">日期：</span>
+                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
+                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
+              </div>
             </div>
           </div>
         </div>
@@ -1741,6 +1729,7 @@ export default {
       ],
       operators:[],
       liuAddresslist:[],
+      patientVascularAccessOne:{},
     };
   },
   computed: {
@@ -1835,6 +1824,7 @@ export default {
           if (response.data.state === 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
+            this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
             console.log("触发了吗无222222", patietInfo);
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;
@@ -2121,8 +2111,8 @@ export default {
               /\n/g,
               "<br/>"
             );
-            
-            
+
+
 
             this.patientPrint.sch_remark = patietInfo.sch_remark.replace(
               /\n/g,
@@ -2682,6 +2672,7 @@ export default {
 .print_footnote_panel .proj {
   display: inline-block;
   width: 49%;
+  text-align: center;
 }
 .print_footnote_panel .proj .proj_title {
   font-weight: 500;

src/xt_pages/user/coursePrint.vue

@@ -8,9 +8,11 @@
     </div>
     <div class="app-container">
       <div id="print_content">
-        <div class="print_page_main_content">
-          <div class="order-yy-name" style="text-align: center;">{{orgname}}</div>
-          <div class="order_title" style="padding-top:12px;text-align: center;"> 病程记录</div>
+        <div class="print_page_main_content" v-for="(item,index) in this.record" :key="index" style="page-break-after: always;">
+          <div class="order-yy-name" style="text-align: center;font-size: 25px;font-weight: 600;">{{orgname}}</div>
+          <div class="order_title" style="padding-top:12px;text-align: center;font-size: 25px;font-weight: 600;"> 
+            血液净化治疗患者病程记录
+          </div>
           <div class="row" style="border-bottom:1px solid #000; display: flex;padding-bottom: 10px;padding-top: 12px;" 
             v-if="org_id !=10206 && org_id !=0">
             <div  style="flex:1;text-align: center;">
@@ -46,14 +48,43 @@
 
             </div>
           </div>
-          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;" v-for="(item,index) in this.record" :key="index">
+          <div class="row" style="border-bottom:1px solid #000; display: flex;padding-bottom: 10px;padding-top: 12px;" 
+           v-else>
+            <div  style="flex:1;text-align: center;">
+              姓名：
+              <div  style="text-align: left;display:inline-block;">{{patient.name }}</div>
+            </div>
+
+            <div style="flex:1;text-align: center;">
+              性别：
+              <div  style="text-align: left;display:inline-block;">
+                {{ patient.gender ==1 ? '男': '女' }}
+              </div>
+            </div>
+
+            <div style="flex:1;text-align: center;" >
+              年龄：
+              <div  style="text-align: left;display:inline-block;">
+                {{patient.age}}
+              </div>
+            </div>
+
+
+            <div style="flex:1;text-align: left;" >
+              日期：
+              <div style="text-align: left;display:inline-block;" >
+                <!-- {{getTime(record[0].record_time,'{y}-{m}-{d} {h}:{i}')}} -->
+                {{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}
+              </div>
+            </div>
+          </div>
+          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;">
             <div class="inline_block" style="display: inline-block;" v-if="org_id !=10206 && org_id !=0">
               <div>{{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
             </div>
             <div class="inline_block" style="margin-left: 30px;display: inline-block;">
               <div>{{item.title}}</div>
             </div>
-
             <div class="inline_block" style="width:100%; word-wrap: break-word; word-break: break-all;">
               <div v-html="item.content" class="printP" >
 
@@ -70,7 +101,6 @@
               </span>
             </div>
           </div>
-
         
         </div>
       </div>
@@ -79,7 +109,6 @@
 
 </template>
 
-
 <script>
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -132,7 +161,7 @@
          
           this.adminUserList = resp.data.adminUser
           this.operators = resp.data.operators
-           console.log("GetCoursePrintData",this.operators)
+           console.log("GetCoursePrintData",resp)
            if (this.operators.length > 0) {
             var operatorsLen = this.operators.length
             for (var index = 0; index < operatorsLen; index++) {

src/xt_pages/user/lapsoSummary.vue

@@ -20,6 +20,7 @@
              <span v-if="scope.row.lapse_type == 2">转出</span>
              <span v-if="scope.row.lapse_type == 3">死亡</span>
              <span v-if="scope.row.lapse_type == 4">院内转诊</span>
+             <span v-if="scope.row.lapse_type == 11">请假</span>
           </template>
         </el-table-column>
        <el-table-column prop="blood_access_part_id" label="转归分类" align="center">
@@ -121,10 +122,11 @@
                             <el-radio  label="2">转出</el-radio>
                             <el-radio  label="3">死亡</el-radio>
                             <el-radio  label="4">院内转诊</el-radio>
+                            <el-radio  label="11">请假</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
-                <el-col :span="24" v-if="lapseto == 2 || lapseto == 3 || lapseto == 4">
+                <el-col :span="24" v-if="lapseto == 2 || lapseto == 3 || lapseto == 4 || lapseto ==11">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
                             <el-radio  label="1">转入</el-radio>
@@ -313,10 +315,11 @@
                           <el-radio  label="2">转出</el-radio>
                           <el-radio  label="3">死亡</el-radio>
                           <el-radio  label="4">院内转诊</el-radio>
+                          <el-radio  label="11">请假</el-radio>
                     </el-radio-group>
                   </el-form-item>
               </el-col>
-              <el-col :span="24" v-if="lapseto == 2">
+              <el-col :span="24" v-if="lapseto == 2  || lapseto == 3 || lapseto == 4 || lapseto ==11">
                   <el-form-item label="转归类型:"> 
                       <el-radio-group style="padding: 10px;" v-model="lapse_type">
                           <el-radio  label="1">转入</el-radio>
@@ -716,7 +719,7 @@
 
       },
       savePatientLapse(){
-          if(this.lapse_type!=1 && this.lapse_reason == ""){
+          if(this.lapse_type!=1 && this.lapse_type!=11 && this.lapse_reason == ""){
              this.$message.error("转出或者死亡原因不能为空!")
              return false
           }
@@ -793,7 +796,7 @@
 
       },
       updatePatientLapse(){
-        if (this.lapse_type !=1 &&this.lapse_reason == ""){
+        if (this.lapse_type !=1 && this.lapse_type !=11 &&this.lapse_reason == ""){
              this.$message.error("转出或者死亡原因不能为空!")
              return false
         }

src/xt_pages/user/patients.vue

@@ -842,13 +842,13 @@
           { value: 1, label: '转出', source: 0, lapseto: 2 },
           { value: 2, label: '留治', source: 0, lapseto: 1 },
           { value: 3, label: '死亡', source:0,  lapseto: 3 },
-          { value: 4, label: "转院", source: 0, lapseto: 4 },
-          { value: 5, label: "肾移植", source: 0, lapseto: 5 },
-          { value: 6, label: "转腹透", source: 0, lapseto: 6 },
-          { value: 7, label: "出院", source: 0, lapseto: 7 },
-          { value: 8, label: "好转", source: 0, lapseto: 8 },
-          { value: 9, label: "放弃治疗", source: 0, lapseto: 9 },
-          { value: 10, label: "其他状态", source: 0, lapseto: 10 },
+          // { value: 4, label: "转院", source: 0, lapseto: 4 },
+          // { value: 5, label: "肾移植", source: 0, lapseto: 5 },
+          // { value: 6, label: "转腹透", source: 0, lapseto: 6 },
+          // { value: 7, label: "出院", source: 0, lapseto: 7 },
+          // { value: 8, label: "好转", source: 0, lapseto: 8 },
+          // { value: 9, label: "放弃治疗", source: 0, lapseto: 9 },
+          // { value: 10, label: "其他状态", source: 0, lapseto: 10 },
           { value: 11, label: "请假", source: 0, lapseto: 11 },
         ],
         scheduling: [

src/xt_pages/workforce/appointment.vue

@@ -91,7 +91,7 @@
       </div>
     </div>
     <div>
-      
+
       <div class="app-container" style="padding: 0 20px 20px 20px;">
         <div>
           <div style="position: relative;height: 57px">
@@ -1216,7 +1216,7 @@ export default {
 
           })
           console.log("tablesit",this.tableList)
-      
+
           const filename = '排班模版'
 
           if (this.$store.getters.xt_user.org.id == 10234) {
@@ -5075,7 +5075,6 @@ export default {
           mode_name = this.mode[i].name
         }
       }
-      console.log("mode_name--",mode_name)
       return mode_name
     }
   },