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

src/api/drug/drug.js

@@ -731,7 +731,7 @@ export function getSelfDrugWarehouseInfoById(id,params){
 export function ModifySelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
  
   return request({
-    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
+    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"&warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
     method:"post",
     data:data,
   })
@@ -818,4 +818,57 @@ export function modifySelfDrugWarehouseOut(params, warehousing_time, dealer_id,
     method:"post",
     data:params,
    })
+}
+
+export function getSelfDrugQuery(params){
+  
+  return request({
+    url:"/api/drug/getselfdrugquery",
+    method:"get",
+    params:params
+  })
+}
+
+export function checkSelfOutDrugQuery(params){
+  
+  return request({
+    url:"/api/drug/checkselfdrugoutquery",
+    method:"Get",
+    params:params
+  })
+}
+
+export function returnCheckSelfOutDrugQuery(params){
+  
+   return request({
+    url:"/api/drug/returncheckselfoutdrugquery",
+    method:"get",
+    params:params,
+   })
+}
+
+export function returnSelfCheckWarehouse(params){
+ 
+  return request({
+    url:"/api/drug/returnselfcheckwarehouse",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getSelfDrugFlow(params){
+  return request({
+    url:"/api/drug/getselfdrugflow",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getSelfDrugBatchNumberList(params){
+ 
+  return request({
+    url:"/api/drug/getselfdrugbatchnumberlist",
+    method:"Get",
+    params:params
+  })
 }

src/router/modules/selfPreparedMedicine.js

@@ -12,6 +12,22 @@ export default {
     isChild: true
   },
   children: [
+    // {
+    //   path: '/stock/selfstockquery',
+    //   component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),
+    //   name: 'stockquery',
+    //   meta: { title: '库存查询', noCache: true }
+
+    // },
+
+    {
+      path:'/stock/selfdrugquery',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/selfDrugQuery'),
+      name: 'stockquery',
+      meta: { title: '自备药库存查询', noCache: true }
+
+    },
+
     {
       path: '/stock/selfwarehouse/info',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseInfo'),
@@ -58,14 +74,25 @@ export default {
       hidden: true,
       is_menu: false,
     },
-    {
-      path: '/stock/selfstockquery',
-      component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),
-      name: 'stockquery',
-      meta: { title: '库存查询', noCache: true }
 
+    {
+      path: '/stock/selfwarehouse/selfdrugflow',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/selfDrugFlow'),
+      name: 'selfdrugflow',
+      meta: { title: '自备药流水', noCache: true },
+      hidden: true,
+      is_menu: false,
     },
 
+    {
+      path: '/stock/selfwarehouse/selfdrugbatchnumber',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/selfDrugBatchNumber'),
+      name: 'selfdrugflow',
+      meta: { title: '自备药批次', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
+    
     {
       path: '/stock/selfPreparedMedicineIndex',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),

src/xt_pages/dialysis/batch_print/batch_print_order_seventeen.vue

@@ -184,13 +184,17 @@
                     
                     <span style="display:inline-block;">
                     <label-box :isChecked="record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>:
-                    <label-box :isChecked="record.prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box>:
+                    <!-- <label-box :isChecked="record.prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box>: -->
                     <label-box :isChecked="record.prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box>:
                     <label-box :isChecked="record.prescription.anticoagulant == 16 ? true : false" showValue="低分子量肝素钙"></label-box>:
                     </span>
-                    <span style="display:inline-block;">
+                    <!-- <span style="display:inline-block;">
                         <div style="display:inline-block;width:30px;text-align:center">
-                            {{ record.prescription.anticoagulant == 7 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "/" }}
+                            {{ record.prescription.anticoagulant == 7 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
+                            {{ record.prescription.anticoagulant == 2 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
+                            {{ record.prescription.anticoagulant == 6 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
+                            {{ record.prescription.anticoagulant == 8 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
+                            {{ record.prescription.anticoagulant == 16 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
                         </div>
                         <span v-if="record.prescription.anticoagulant == 5">mg</span>
                         <span v-if="record.prescription.anticoagulant == 4">mg</span>
@@ -199,14 +203,20 @@
                         <span v-if="record.prescription.anticoagulant == 1">mg</span>
                         <span v-if="record.prescription.anticoagulant == 6">iu</span>
                         <span v-if="record.prescription.anticoagulant == 7">iu</span>
-                    </span>
+                        <span v-if="record.prescription.anticoagulant == 8">iu</span>
+                        <span v-if="record.prescription.anticoagulant == 1">iu</span>
+                    </span> -->
                     <span style="display:inline-block;">
                         <label-box :isChecked="record.prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>
                     </span>
                     <span style="display:inline-block;">
                         首剂：
                         <div style="display:inline-block;width:30px;text-align:center">
-                            {{ record.prescription.anticoagulant == 2 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "/" }}
+                            {{ record.prescription.anticoagulant == 2 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
+                            {{ record.prescription.anticoagulant == 6 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
+                            {{ record.prescription.anticoagulant == 7 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
+                            {{ record.prescription.anticoagulant == 8 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
+                            {{ record.prescription.anticoagulant == 16 && record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : "" }}
                         </div>
                         <span v-if="record.prescription.anticoagulant == 5">mg</span>
                         <span v-if="record.prescription.anticoagulant == 4">mg</span>
@@ -215,11 +225,17 @@
                         <span v-if="record.prescription.anticoagulant == 1">mg</span>
                         <span v-if="record.prescription.anticoagulant == 6">iu</span>
                         <span v-if="record.prescription.anticoagulant == 7">iu</span>
+                        <span v-if="record.prescription.anticoagulant == 8">iu</span>
+                        <span v-if="record.prescription.anticoagulant == 16">iu</span>
                     </span>
                     <span style="display:inline-block;">
                         维持：
                         <div style="display:inline-block;width:30px;text-align:center">
-                            {{ record.prescription.anticoagulant == 2 && record.prescription.anticoagulant_weichi ? record.prescription.anticoagulant_weichi : "/" }}
+                            {{ record.prescription.anticoagulant == 2 && record.prescription.anticoagulant_weichi ? record.prescription.anticoagulant_weichi : "" }}
+                            {{ record.prescription.anticoagulant == 6 && record.prescription.anticoagulant_weichi ? record.prescription.anticoagulant_weichi : "" }}
+                            {{ record.prescription.anticoagulant == 7 && record.prescription.anticoagulant_weichi ? record.prescription.anticoagulant_weichi : "" }}
+                            {{ record.prescription.anticoagulant == 8 && record.prescription.anticoagulant_weichi ? record.prescription.anticoagulant_weichi : "" }}
+                            {{ record.prescription.anticoagulant == 16 && record.prescription.anticoagulant_weichi ? record.prescription.anticoagulant_weichi : "" }}
                         </div>
                         <span v-if="record.prescription.anticoagulant == 5">ml/h</span>
                         <span v-if="record.prescription.anticoagulant == 4">mg/h</span>
@@ -228,11 +244,17 @@
                         <span v-if="record.prescription.anticoagulant == 1">mg/h</span>
                         <span v-if="record.prescription.anticoagulant == 6">iu/h</span>
                         <span v-if="record.prescription.anticoagulant == 7">iu/h</span>
+                        <span v-if="record.prescription.anticoagulant == 8">iu/h</span>
+                        <span v-if="record.prescription.anticoagulant == 16">iu/h</span>
                     </span>
                     <span style="display:inline-block;">
                         总量:
                         <div style="display:inline-block;width:30px;text-align:center">
-                            {{ record.prescription.anticoagulant == 2 && record.prescription.anticoagulant_zongliang ? record.prescription.anticoagulant_zongliang : "/" }}
+                            {{ record.prescription.anticoagulant == 2 && record.prescription.anticoagulant_zongliang ? record.prescription.anticoagulant_zongliang : "" }}
+                            {{ record.prescription.anticoagulant == 6 && record.prescription.anticoagulant_zongliang ? record.prescription.anticoagulant_zongliang : "" }}
+                            {{ record.prescription.anticoagulant == 7 && record.prescription.anticoagulant_zongliang ? record.prescription.anticoagulant_zongliang : "" }}
+                            {{ record.prescription.anticoagulant == 8 && record.prescription.anticoagulant_zongliang ? record.prescription.anticoagulant_zongliang : "" }}
+                            {{ record.prescription.anticoagulant == 16 && record.prescription.anticoagulant_zongliang ? record.prescription.anticoagulant_zongliang : "" }}
                         </div>
                         <span v-if="record.prescription.anticoagulant == 5">mg</span>
                         <span v-if="record.prescription.anticoagulant == 4">mg</span>
@@ -241,6 +263,8 @@
                         <span v-if="record.prescription.anticoagulant == 1">mg</span>
                         <span v-if="record.prescription.anticoagulant == 6">iu</span>
                         <span v-if="record.prescription.anticoagulant == 7">iu</span>
+                        <span v-if="record.prescription.anticoagulant == 8">iu</span>
+                        <span v-if="record.prescription.anticoagulant == 16">iu</span>
                     </span>
                     <span style="display:inline-block;">
                     <label-box :isChecked="record.prescription.anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -119,7 +119,7 @@
                       .blood_access_part_id
                       ? record.assessment_before_dislysis
                           .blood_access_part_id
-                      : 0
+                      : ''
                   }}
                   {{ bloodAccessParOperaName(record.assessment_before_dislysis.blood_access_part_opera_id) }}
                   <!-- {{ blood_access_part_opera_name }} bloodAccessParOperaName-->
@@ -909,7 +909,7 @@
             </table>
           </div>
 
-          <div  style="border: 1px solid black;border-bottom:none;width: 99%;">
+          <div  style="border: 1px solid black;border-bottom:none;width: 99%;box-sizing: border-box;">
             <div class="row" style="display: flex;">
               <div class="inline_block" style="flex: 1">
                 上机护士：
@@ -1101,7 +1101,7 @@
               <div class="inline_block" style="flex: 1">
                 穿刺：
                 <div class="under_line"
-                  style="width: 90px; text-align: center"
+                  style="width: 70%; text-align: center;white-space: normal;"
                 >
                   {{ record.assessment_after_dislysis.internal_fistula ? record.assessment_after_dislysis.internal_fistula : "/" }}
                 </div>
@@ -1110,7 +1110,7 @@
               <div class="inline_block" style="flex: 1">
                 透析器：
                 <div class="under_line"
-                  style="width: 90px; text-align: center"
+                  style="width: 74%; text-align: center;white-space: normal;"
                 >
                   {{ record.assessment_after_dislysis.cruor ? record.assessment_after_dislysis.cruor : "/" }}
                 </div>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -400,7 +400,7 @@
                         血管通路：
                         <div
                           class="under_line"
-                          style="width: 200px; text-align: center"
+                          style="width: 280px; text-align: center"
                         >
                           {{
                             record.assessment_before_dislysis &&
@@ -408,15 +408,10 @@
                               .blood_access_part_id
                               ? record.assessment_before_dislysis
                                   .blood_access_part_id
-                              : 0
+                              :  ""
                           }}
                           {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis
-                              .blood_access_part_opera_name
-                              ? record.assessment_before_dislysis
-                                  .blood_access_part_opera_name
-                              : ""
+                            bloodAccessParOperaName(record.assessment_before_dislysis.blood_access_part_opera_id)
                           }}
                         </div>
                       </div>
@@ -3014,7 +3009,7 @@
                         实际超滤量：
                         <div
                           class="under_line"
-                          style="width: 100px; text-align: center"
+                          style="width: 80px; text-align: center"
                         >
                           {{
                             record.assessment_after_dislysis &&
@@ -3798,10 +3793,12 @@ export default {
     };
   },
   created() {
+   
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
     );
+    this.bloodAccessParOpera = bloodAccessParOpera
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");
@@ -3869,7 +3866,7 @@ export default {
           this.records = this.records.concat(resp.data.schedules);
 
           //华池
-          if(this.org_id == 0 || this.org_id ==10440){
+          if(this.org_id ==10440){
 
           var parint_id =0
 
@@ -3931,27 +3928,24 @@ export default {
             }
           }
           for (const recordIndex in this.records) {
-            var dlegh = 0;
-            if (
-              this.records[recordIndex].monitor_records &&
-              this.records[recordIndex].monitor_records.length < 8
-            ) {
-              dlegh = 8 - this.records[recordIndex].monitor_records.length;
-            } else {
-              dlegh = 0;
-            }
-            if (dlegh > 0) {
-              if (
-                typeof this.records[recordIndex].monitor_records ===
-                  "undefined" ||
-                this.records[recordIndex].monitor_records == null
-              ) {
-                this.records[recordIndex].monitor_records = [];
-              }
-              for (let index = 0; index < dlegh; index++) {
-                this.records[recordIndex].monitor_records.push([]);
-              }
-            }
+            var dlegh = this.records[recordIndex].monitor_records.length;
+            // if (this.records[recordIndex].monitor_records &&this.records[recordIndex].monitor_records.length < 8) {
+            //   dlegh = this.records[recordIndex].monitor_records.length;
+            // } else {
+            //   dlegh = 0;
+            // }
+            // if (dlegh > 0) {
+            //   if (
+            //     typeof this.records[recordIndex].monitor_records ===
+            //       "undefined" ||
+            //     this.records[recordIndex].monitor_records == null
+            //   ) {
+            //     this.records[recordIndex].monitor_records = [];
+            //   }
+            //   for (let index = 0; index < dlegh; index++) {
+            //     this.records[recordIndex].monitor_records.push([]);
+            //   }
+            // }
 
             this.records[recordIndex].isShowZero = false;
             if (this.records[recordIndex].patient.user_org_id == 9535) {
@@ -4099,7 +4093,7 @@ export default {
 
 
           if(this.records!=null && this.records.length>0){
-            console.log("进啦地方大丰")
+           
             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++){
@@ -4430,6 +4424,12 @@ export default {
       }
       return displace_liqui_part_name;
     },
+    bloodAccessParOperaName(id) {
+      if (id in this.bloodAccessParOpera) {
+        return this.bloodAccessParOpera[id].name;
+      }
+      return "";
+    },
   },
 };
 </script>

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

@@ -13,8 +13,9 @@
            
             <span style="position: absolute;left: 20%;top: 3%">
               透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
-            
             </span>
+
+          
            
             <span style="position: absolute;left: 30%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
@@ -23,22 +24,28 @@
               衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
             </span> -->
             <span style="position: absolute;left:38%;top: 3%">
-              上次透后体重：{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg
+              上次透后体重：
+               <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:50%;top: 3%">
+            <span style="position: absolute;left:51%;top: 3%">
               4小时超滤量上限（5%）：
               <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
               kg
             </span>
-            <span style="position: absolute;left: 70%;top: 3%">
+            <span style="position: absolute;left: 70%;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.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
             </span>
 
-            <!-- <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.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
+            <span style="position: absolute;left: 70%;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.additional_weight?predialysis.additional_weight:"" }} kg
+            </span>
+
+            <span style="position: absolute;left: 80%;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.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
                     ref="dialysisPrescription"
@@ -347,41 +354,14 @@
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant!=undefined && anticoagulant.shouji != -1 && isShows('首剂')  && dialysisPrescription.anticoagulant!=1 && dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 &&
-                        this.$store.getters.xt_user.template_info.template_id != 54 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10340 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10432 &&
-                        this.$store.getters.xt_user.template_info.org_id != 9829 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10440 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10469 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10471 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10495 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10375 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10600">
-                       <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
-                          this.$store.getters.xt_user.template_info.template_id != 45 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10346 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10387 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10495 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10375 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10551 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10600
-                           ">
-                            <el-form-item
-                                    v-if='dialysisPrescription.anticoagulant != 1 &&
-                                    this.$store.getters.xt_user.template_info.template_id != 21 &&
-                                     this.$store.getters.xt_user.template_info.template_id != 23 &&
-                                      this.$store.getters.xt_user.template_info.template_id != 38 &&
-                                       this.$store.getters.xt_user.template_info.org_id != 9987 &&
-                                        this.$store.getters.xt_user.template_info.org_id!=9990'
-                                    :label="'首剂(' + anticoagulant.shouji_unit + ') : '" prop="anticoagulant_shouji"
-                                    :rules="isCheckmust('首剂')">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 &&  this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 &&this.$store.getters.xt_user.template_info.org_id != 10495 &&this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702">
+                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&this.$store.getters.xt_user.template_info.template_id != 45 &&this.$store.getters.xt_user.template_info.org_id != 10346 &&this.$store.getters.xt_user.template_info.org_id != 10387 &&this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600">
+                            <el-form-item v-if='dialysisPrescription.anticoagulant != 1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.org_id != 9987 &&  this.$store.getters.xt_user.template_info.org_id!=9990' :label="'首剂(' + anticoagulant.shouji_unit + ') : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
 
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
 
-                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1" v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
 
                             <el-form-item v-if="this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant==7 &&
@@ -452,7 +432,20 @@
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
 
-                            <el-form-item v-else :label="'首剂(' + anticoagulant.shouji_unit + ') : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
+                            <el-form-item v-if="dialysisPrescription.anticoagulant == 13" :label="'首剂(AXaIU) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+                            </el-form-item>
+                            <el-form-item v-if="dialysisPrescription.anticoagulant == 11" :label="'首剂(AXaIU) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+                            </el-form-item>
+
+                            <el-form-item  v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 11 && dialysisPrescription.anticoagulant != 13" :label="'首剂(' + anticoagulant.shouji_unit + ') : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -466,7 +459,7 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 &&
@@ -539,7 +532,22 @@
                                 <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 + ') : '" v-else
+                            <el-form-item v-if="dialysisPrescription.anticoagulant == 13" :label="'维持(AXaIU) : '"
+                            prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
+                            </el-form-item>
+                            <el-form-item v-if="dialysisPrescription.anticoagulant == 11" :label="'维持(AXaIU) : '"
+                            prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+                                <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 + ') : '" 
+                            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"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
@@ -562,7 +570,7 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495">
                             <el-form-item
                                     v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375  && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600'
@@ -624,7 +632,19 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
-                            <el-form-item v-else :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
+                            <el-form-item v-if="dialysisPrescription.anticoagulant == 13" :label="'总量(AXaIU) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+                            </el-form-item>
+                            <el-form-item v-if="dialysisPrescription.anticoagulant == 11" :label="'总量(AXaIU) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+                            </el-form-item>
+                            <el-form-item v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 11 && dialysisPrescription.anticoagulant != 13" :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702) ||
               org_id == 10387
             "
           >
@@ -1681,7 +1681,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702) &&
                 org_id!=10387
             "
           >
@@ -1729,7 +1729,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702)
               || org_id == 10387
             "
           >
@@ -1802,7 +1802,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1874,7 +1874,8 @@
               org_id!=10667 &&
               org_id!=10693 &&
               org_id!=10697 &&
-              org_id!=10635
+              org_id!=10635 &&
+              org_id!=10702
               )
               || org_id == 10387 || org_id == 10694
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,11 +20,11 @@
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -165,13 +165,13 @@
             <td style="text-align:left;padding-left:15px;" colspan="6">
               
               <span style="display:inline-block;">
-                <label-box :isChecked="anticoagulant == 6? true : false" showValue="低分子肝素钙"></label-box>:
+                <!-- <label-box :isChecked="anticoagulant == 6? true : false" showValue="低分子肝素钙"></label-box>: -->
                 <label-box :isChecked="anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>:
                 <label-box :isChecked="anticoagulant == 8? true : false" showValue="依诺肝素"></label-box>:
                 <label-box :isChecked="anticoagulant == 16? true : false" showValue="低分子量肝素钙"></label-box>:
                
               </span>
-              <span style="display:inline-block;">
+              <!-- <span style="display:inline-block;">
                   <div style="display:inline-block;width:30px;text-align:center">
                       {{ (anticoagulant == 6 || anticoagulant == 7) && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "/" }}
                   </div>
@@ -182,14 +182,18 @@
                   <span v-if="prescription.anticoagulant == 1">mg</span>
                   <span v-if="prescription.anticoagulant == 6">iu</span>
                   <span v-if="prescription.anticoagulant == 7">iu</span>
-              </span>
+              </span> -->
               <span style="display:inline-block;">
                   <label-box :isChecked="anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>
               </span>
               <span style="display:inline-block;">
                   首剂：
                   <div style="display:inline-block;width:30px;text-align:center">
-                      {{ anticoagulant == 2 && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "/" }}
+                      {{ anticoagulant == 2 && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}
+                      {{ anticoagulant == 6 && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}
+                      {{ anticoagulant == 7 && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}
+                      {{ anticoagulant == 8 && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}
+                      {{ anticoagulant == 16 && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}
                   </div>
                   <span v-if="prescription.anticoagulant == 5">mg</span>
                   <span v-if="prescription.anticoagulant == 4">mg</span>
@@ -198,11 +202,17 @@
                   <span v-if="prescription.anticoagulant == 1">mg</span>
                   <span v-if="prescription.anticoagulant == 6">iu</span>
                   <span v-if="prescription.anticoagulant == 7">iu</span>
+                  <span v-if="prescription.anticoagulant == 8">iu</span>
+                  <span v-if="prescription.anticoagulant == 16">iu</span>
               </span>
               <span style="display:inline-block;">
                   维持：
                   <div style="display:inline-block;width:30px;text-align:center">
-                      {{ anticoagulant == 2 && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "/" }}
+                      {{ anticoagulant == 2 && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}
+                      {{ anticoagulant == 6 && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}
+                      {{ anticoagulant == 7 && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}
+                      {{ anticoagulant == 8 && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}
+                      {{ anticoagulant == 16 && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}
                   </div>
                   <span v-if="prescription.anticoagulant == 5">ml/h</span>
                   <span v-if="prescription.anticoagulant == 4">mg/h</span>
@@ -211,11 +221,17 @@
                   <span v-if="prescription.anticoagulant == 1">mg/h</span>
                   <span v-if="prescription.anticoagulant == 6">iu/h</span>
                   <span v-if="prescription.anticoagulant == 7">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 8">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 16">iu/h</span>
               </span>
               <span style="display:inline-block;">
                   总量:
                   <div style="display:inline-block;width:30px;text-align:center">
-                      {{ anticoagulant == 2 && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }}
+                      {{ anticoagulant == 2 && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "" }}
+                      {{ anticoagulant == 6 && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "" }}
+                      {{ anticoagulant == 7 && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "" }}
+                      {{ anticoagulant == 8 && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "" }}
+                      {{ anticoagulant == 16 && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "" }}
                   </div>
                   <span v-if="prescription.anticoagulant == 5">mg</span>
                   <span v-if="prescription.anticoagulant == 4">mg</span>
@@ -224,6 +240,8 @@
                   <span v-if="prescription.anticoagulant == 1">mg</span>
                   <span v-if="prescription.anticoagulant == 6">iu</span>
                   <span v-if="prescription.anticoagulant == 7">iu</span>
+                  <span v-if="prescription.anticoagulant == 8">iu</span>
+                  <span v-if="prescription.anticoagulant == 16">iu</span>
               </span>
               <span style="display:inline-block;">
                 <label-box :isChecked="anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -103,8 +103,8 @@
                 style=" width: 52%;
                   text-align: center; white-space: normal;
                 ">
-                {{ predialysis.blood_access_part_id }}
-                {{ predialysis.blood_access_part_opera_name }}
+                {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id : '' }}
+                {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name : '' }}
               </div>
             </div>
             <div class="inline_block" style="flex: 1;" >
@@ -432,7 +432,7 @@
                 v-for="(advice, advice_index) in doctor_advices"
                 :key="advice_index"
               >
-                <td style="line-height:35px">
+                <td height="32px" style="line-height:35px">
                   <span v-if="advice.start_time">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </span>
@@ -515,6 +515,7 @@
                   />
                 </td>
               </tr>
+
             </tbody>
           </table>
         </div>
@@ -626,7 +627,7 @@
           </table>
         </div>
 
-        <div  style="border: 1px solid black;border-bottom:none;border-top:none;width: 99%;">
+        <div  style="border: 1px solid black;border-bottom:none;border-top:none;width: 99%;box-sizing: content-box;">
           <div class="row" style="display: flex;">
             <div class="inline_block" style="flex: 1">
               上机护士：
@@ -722,7 +723,7 @@
             <div class="inline_block" style="flex: 1">
               穿刺：
               <div class="under_line"
-                style="width: 90px; text-align: center"
+                style="width: 70%; text-align: center;white-space: normal;"
               >
                 {{ afterdialysis.internal_fistula ? afterdialysis.internal_fistula : "/" }}
               </div>
@@ -731,7 +732,7 @@
             <div class="inline_block" style="flex: 1">
               透析器：
               <div class="under_line"
-                style="width: 90px; text-align: center"
+                style="width: 74%; text-align: center;white-space:normal;"
               >
                 {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
               </div>
@@ -809,7 +810,7 @@
           </div>
         </div>
         <!-- 透析小结 -->
-        <div style="width: 99%;border: 1px solid black;white-space: normal;">
+        <div style="width: 99%;border: 1px solid black;white-space: normal;box-sizing: content-box;">
           <div style="padding: 5px;">
             <div style="margin-bottom: 10px;">
               宣教知识：
@@ -1664,6 +1665,7 @@ export default {
           this.patientInfo.first_dialysis_date = "";
         }
         this.check = response.data.data.check;
+        console.log('this.check12121',this.check);
         this.xtdate = response.data.data.xtdate;
         this.predialysis = response.data.data.PredialysisEvaluation;
         console.log('透前评估', this.predialysis)
@@ -1891,8 +1893,8 @@ export default {
           this.doctor_advices[index]["isShow"] = 2;
         }
 
-        console.log("时间我我我哦我我",response.data.data.advices)
-        console.log("新时间我哦我哦",this.doctor_advices)
+        console.log("时间我我我哦我我",response.data.data)
+        console.log("新时间我哦我哦医嘱121",this.doctor_advices)
 
 
         if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
@@ -2080,25 +2082,40 @@ export default {
         }
 
 
-        if (this.doctor_advices.length + this.projectsOne.length <= 6) {
-            var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
-            this.print_length = 6;
+        // if (this.doctor_advices.length + this.projectsOne.length <= 6) {
+        //   var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
+        //   this.print_length = 6;
+
+        //   for (let index = 0; index < nl; index++) {
+        //     if (
+        //       this.projectsOne[index] == undefined ||
+        //       this.projectsOne[index].length <= 0
+        //     ) {
+        //       this.projectsOne.push([]);
+        //     } else {
+        //       continue;
+        //     }
+        //   }
+        // }
+        if (this.doctor_advices.length <= 5) {
+          console.log('111111',this.doctor_advices.length);
+          var nl = 5
+          this.print_length = 5
 
-            for (let index = 0; index < nl; index++) {
-              if (
-                this.projectsOne[index] == undefined ||
-                this.projectsOne[index].length <= 0
-              ) {
-                this.projectsOne.push([]);
-              } else {
-                continue;
-              }
+          for (let index = 0; index < nl; index++) {
+            if (
+              this.doctor_advices[index] == undefined ||
+              this.doctor_advices[index].length <= 0
+            ) {
+              this.doctor_advices.push([])
+            } else {
+              continue
             }
           }
-
+        }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
-        console.log("this.totollength",this.totollength)
+        console.log("this.totollength2222222",this.totollength)
         if (this.totollength > 18) {
           var temp_advice_length = 17 - this.monitors.length;
           var doctor_advices_1 = [];

src/xt_pages/management/components/UserForm.vue

@@ -1101,7 +1101,8 @@ export default {
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
         { id: 4, name: "1500mg/l含氯消毒剂" },
-        { id: 5, name: "消毒湿巾" }
+        { id: 5, name: "消毒湿巾" },
+        { id: 6, name: "1.85g/L季铵盐" }
       ],
       // 夜路消毒方式
       sterilizeType: [
@@ -1406,6 +1407,9 @@ export default {
             if (information[index].disinfectant_type === 5) {
                information[index].disinfectant_type = "消毒湿巾";
             }
+            if (information[index].disinfectant_type === 6) {
+               information[index].disinfectant_type = "1.85g/L季铵盐";
+            }
 
             if (information[index].disinfection === 1) {
               information[index].disinfection = "已消毒";
@@ -1989,6 +1993,9 @@ export default {
             if (information[index].disinfectant_type === 5) {
               information[index].disinfectant_type = "消毒湿巾";
             }
+            if (information[index].disinfectant_type === 6) {
+              information[index].disinfectant_type = "1.85g/L季铵盐";
+            }
 
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";
@@ -2327,6 +2334,9 @@ export default {
            if (information[index].disinfectant_type === 5) {
               information[index].disinfectant_type = "消毒湿巾";
             }
+            if (information[index].disinfectant_type === 6) {
+              information[index].disinfectant_type = "1.85g/L季铵盐";
+            }
 
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";

src/xt_pages/management/home.vue

@@ -2999,7 +2999,8 @@ export default {
           { id: 2, name: '500mg/l含氯消毒剂' },
           { id: 3, name: '1000mg/l含氯消毒剂' },
           { id: 4, name: '1500mg/l含氯消毒剂' },
-          { id: 5,  name:  "消毒湿巾"}
+          { id: 5,  name:  "消毒湿巾"},
+          { id:6,name:"1.85g/L季铵盐"}
         ],
         // 夜路消毒方式
         sterilizeType: [
@@ -3988,6 +3989,9 @@ export default {
               if(plan[index].machine_disinfectant === 5){
                  plan[index].machine_disinfectant = "消毒湿巾"
               }
+              if(plan[index].machine_disinfectant === 6){
+                 plan[index].machine_disinfectant = "1.85g/L季铵盐"
+              }
 
               if (plan[index].disinfectan_way === 0) {
                 plan[index].disinfectan_way = '/'
@@ -4128,6 +4132,9 @@ export default {
               if(plandetail[index].machine_disinfectant === 5){
                   plandetail[index].machine_disinfectant = "消毒湿巾"
               }
+              if(plandetail[index].machine_disinfectant === 6){
+                  plandetail[index].machine_disinfectant = "1.85g/L季铵盐"
+              }
 
               if (plandetail[index].disinfectan_way === 0) {
                 plandetail[index].disinfectan_way = '/'

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -73,11 +73,10 @@
           {{ scope.row.index }}
         </template>
       </el-table-column>
-<!--      <el-table-column align="center" label="处方日期">-->
-<!--        <template slot-scope="scope">{{-->
-<!--          getTime(scope.row.record_date)-->
-<!--        }}</template>-->
-<!--      </el-table-column>-->
+     <el-table-column align="center" label="处方日期">
+        <template slot-scope="scope">
+          {{getTime(scope.row.record_date)}}</template>
+      </el-table-column>
       <el-table-column align="center" label="费用编码">
         <template slot-scope="scope">
           {{ scope.row.number }}

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -73,13 +73,13 @@
           {{ scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column align="center" label="处方日期">
+      <!-- <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">
           <span v-if="scope.row.record_date > 0"
             >{{ getTimes(scope.row.record_date) }}
           </span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column align="center" label="费用分类">
         <template slot-scope="scope">
           <span v-if="scope.row.type == 1">

src/xt_pages/stock/selfPreparedMedicine/addWarehouseInfo.vue

@@ -969,29 +969,7 @@
            }
         })
       },
-      toReturnCheck(){
-         const loading = this.$loading({
-          lock: true,
-          text: "Loading",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
-          var params = {
-            warehousing_id:this.warehousing_id,
-          }
-        toReturnCheckWarehousing(params).then(response=>{
-           if(response.data.state == 1){
-            var list = response.data.data.list
-             this.$message.success("反审核成功!")
-             this.showCheck = true
-             this.showReturnCheck = false
-             loading.close()
-           }else{
-            this.$message.error("反审核失败!")
-            loading.close()
-           }
-        })
-      },
+    
       changeUnit(val,index){
     
       },

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -351,7 +351,7 @@
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber,checkSelfOutDrugQuery} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -1162,7 +1162,35 @@
         }
         return total;
       },
-    
+      toCheck(){
+         var params = {
+            warehouse_out_id:this.warehouse_out_id,
+            patient_id:this.patient_id,
+         }
+        checkSelfOutDrugQuery(params).then(response=>{
+          if(response.data.state ==1){
+            var warehousingOutInfoList = response.data.data.warehousingOutInfoList
+              var msg =response.data.data.msg
+              if(msg == 1){
+                this.$message.success("审核成功!")
+                this.showCheck = false
+                this.showReturnCheck = true
+                this.$router.back(-1)
+              }
+              if(msg == 2){
+                var drug_name = response.data.data.drug_name
+                var dose = response.data.data.dose
+                var dose_unit = response.data.data.dose_unit
+                var min_number = response.data.data.min_number
+                var min_unit = response.data.data.min_unit
+                var max_unit = response.data.data.max_unit
+                var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+                this.$message.error(str+"库存不足，审核失败!")
+              }
+              loading.close()
+          }
+        })
+      }
     
     },
     created() {

src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue

@@ -23,6 +23,14 @@
             class="filter-item"
             >审核</el-button
           >
+
+          <el-button
+            size="small"
+            type="primary"
+           v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
+            @click="toReturnCheck()"
+            class="filter-item"
+            >反审核</el-button>
         </div>
       </div>
       <div class="app-container" v-loading="loading">
@@ -340,13 +348,11 @@
   import { uParseTime } from "@/utils/tools";
   import {
     GetAllDrugInfoByID,
-    toCheckWarehousingInfo,
-    toReturnCheckWarehousing,
   } from "@/api/drug/drug_stock";
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList } from "@/api/data";
-  import { getallPatientList,postSearchSelfDrugList,ModifySelfDrugWarehouse,getSelfDrugWarehouseInfoById,deleteSelfWarehouseInfo} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,ModifySelfDrugWarehouse,getSelfDrugWarehouseInfoById,deleteSelfWarehouseInfo,toCheckSelfWarehousingInfo,returnSelfCheckWarehouse} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -468,6 +474,8 @@
         showReturnCheck:false,
         patientList:[],
         id:0,
+        is_check:0,
+        is_sys:0,
       };
     },
     methods: {
@@ -739,6 +747,9 @@
               stockIn: this.recordInfo.recordData,
             };
             console.log("params=---------------",params)
+            console.log("patinet_id-----------",this.patient_id)
+            console.log("warehousing_time-----------",this.warehousing_time)
+            console.log("warehousing_id--------------",this.warehousing_id)
             ModifySelfDrugWarehouse(
               params,
               this.patient_id,
@@ -752,6 +763,8 @@
               } else {
                 this.loading = false;
                 this.$message.success("保存成功");
+                this.showCheck = true
+                this.showReturnCheck = false
                 this.listLoading = false;
                 var list = response.data.data.list
                 var manufacturerList = response.data.data.manufacturerList
@@ -795,8 +808,7 @@
                 this.recordInfo.recordData = []
                 console.log("list========================",list)
                 this.recordInfo.recordData = list
-                this.showCheck = true
-                this.showReturnCheck = false
+               
               }
             });
           } else {
@@ -929,8 +941,10 @@
         });
          var params = {
            warehousing_id:this.warehousing_id,
+           patient_id:this.patient_id
          }
-        toCheckWarehousingInfo(params).then(response=>{
+         console.log("praams------",params)
+        toCheckSelfWarehousingInfo(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
              this.$message.success("审核成功!")
@@ -953,8 +967,9 @@
         });
           var params = {
             warehousing_id:this.warehousing_id,
+            patient_id:this.patient_id,
           }
-        toReturnCheckWarehousing(params).then(response=>{
+        returnSelfCheckWarehouse(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
              this.$message.success("反审核成功!")
@@ -967,18 +982,21 @@
            }
         })
       },
-      changeUnit(val,index){
-    
-      },
-       
-
       //新
       getSelfDrugWarehouseInfoById(id){
         getSelfDrugWarehouseInfoById(id).then(response=>{
            if(response.data.state == 1){
              var info = response.data.data.info
+             if(info.is_check == 2){
+               this.showCheck = true
+               this.showReturnCheck = false
+             }
+             if(info.is_check == 1){
+                this.showCheck = false
+                this.showReturnCheck = true
+             }
              this.patient_id = info.patient_id
-             this.warehousing_time  =this.getTime(info.record_date)
+             this.warehousing_time  =this.getTimeOne(info.record_date)
              this.manufacturerList = response.data.data.manufacturerList
              this.dealerList = response.data.data.dealerList
              this.drugTypeList = response.data.data.drugTypeList
@@ -990,9 +1008,9 @@
              tempObj["drug_name"] = info.drug.drug_name;
              tempObj["max_unit"] = info.max_unit;
              tempObj["min_unit"] = info.min_unit,
-             tempObj["product_date"] = this.getTime(info.product_date);
-             tempObj["expiry_date"] = this.getTime(info.expiry_date);
-             tempObj["warehousing_count"] = info.warehousing_count;
+             tempObj["product_date"] = this.getTimeOne(info.product_date);
+             tempObj["expiry_date"] = this.getTimeOne(info.expiry_date);
+             tempObj["warehousing_count"] = info.warehousing_count.toString();
              tempObj["remark"] = info.remark;
              tempObj["dealer"] =this.getDealer(info.dealer) 
              tempObj["manufacturer"] = this.getManufacturer(info.manufacturer);
@@ -1033,14 +1051,16 @@
             }
             return name
       },
+      
     },
     created() {
       var id =  this.$route.query.id
       var is_sys = this.$route.query.is_sys
+      this.is_sys = is_sys
+      console.log("is_check-=------------------------------------",is_sys)
       var is_check = this.$route.query.is_check
-      console.log("id",id)
-      console.log("is_sys",is_sys)
-      console.log("is_check",is_check)
+      console.log("is_check-=------------------------------------",is_check)
+      this.is_check= is_check
       this.drugTypeList = getDictionaryDataConfig("system", "drug_type");
       this.getallPatientList() 
       this.getSelfDrugWarehouseInfoById(id)

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

@@ -23,6 +23,15 @@
             class="filter-item"
             >审核</el-button
           >
+
+          <el-button
+          size="small"
+          type="primary"
+          v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
+          @click="toReturnCheck"
+          class="filter-item"
+          >反 审 核</el-button
+        >
        
         </div>
       </div>
@@ -346,12 +355,11 @@
   import {
     GetAllConfig,
     GetAllDrugInfoByID,
-    postDrugWarehouse,
   } from "@/api/drug/drug_stock";
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,modifySelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,modifySelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById,checkSelfOutDrugQuery,returnCheckSelfOutDrugQuery} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -1237,6 +1245,56 @@
             }
             return name
       },
+
+      toCheck(){
+         var params = {
+            warehouse_out_id:this.warehouse_out_id,
+            patient_id:this.patient_id,
+         }
+        checkSelfOutDrugQuery(params).then(response=>{
+          if(response.data.state ==1){
+            var warehousingOutInfoList = response.data.data.warehousingOutInfoList
+              var msg =response.data.data.msg
+              if(msg == 1){
+                this.$message.success("审核成功!")
+                this.showCheck = false
+                this.showReturnCheck = true
+                this.$router.back(-1)
+              }
+              if(msg == 2){
+                var drug_name = response.data.data.drug_name
+                var dose = response.data.data.dose
+                var dose_unit = response.data.data.dose_unit
+                var min_number = response.data.data.min_number
+                var min_unit = response.data.data.min_unit
+                var max_unit = response.data.data.max_unit
+                var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+                this.$message.error(str+"库存不足，审核失败!")
+              }
+              loading.close()
+          }
+        })
+      },
+      toReturnCheck(){
+         var params = {
+           warehouse_out_id:this.warehouse_out_id,
+           patient_id:this.patient_id,
+         }
+        returnCheckSelfOutDrugQuery(params).then(response=>{
+           if(response.data.state ==1){
+            var out = response.data.data.out
+            this.$message.success("反审核成功!")
+            this.showCheck = true
+            this.showReturnCheck = false
+            loading.close()
+            this.$router.back(-1)
+           }else{
+            this.$message.error(response.data.msg)
+            loading.close()
+            this.$router.back(-1);
+           }
+        })
+      }
     
     
     },

src/xt_pages/stock/selfPreparedMedicine/stockquery.vue

@@ -131,7 +131,7 @@
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
-import { getSelfStockQuery } from "@/api/drug/drug"
+import { getSelfDrugQuery } from "@/api/drug/drug"
 export default {
   name: "stockIn",
   created() {
@@ -172,15 +172,11 @@ export default {
 
      getlist(){
          var params ={
-           type_name:this.type_name,
-           start_time:this.start_time,
-           end_time:this.end_time,
-           keywords:this.keywords,
            page:this.page,
            limit:this.limit
          }
         console.log("params",params)
-       getSelfStockQuery(params).then(response=>{
+       getSelfDrugQuery(params).then(response=>{
           if(response.data.state == 1){
             var stockQuery =  response.data.data.stockQuery
             console.log("入库",stockQuery)

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -37,7 +37,7 @@
           style="width: 200px"
           v-model.trim="searchKey"
           class="filter-item"
-          placeholder="单据编码/制单人/药品名称"
+          placeholder="药品名称"
         />
         <el-button
           size="small"
@@ -191,6 +191,7 @@
 
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
+           
             {{ getManufacturer(scope.row.manufacturer) }}
           </template>
         </el-table-column>
@@ -207,6 +208,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+             <span v-if="scope.row.is_check ==1">已审核</span>
+             <span v-if="scope.row.is_check ==2">未审核</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
              {{ scope.row.remark }}
@@ -274,7 +282,6 @@ import {
   exportDrugList,
 
 } from "@/api/drug/drug_stock";
-import { getAllDrugList } from "@/api/data";
 import { getDictionaryDataConfig } from "@/utils/data";
 import BreadCrumb from "../../components/bread-crumb";
   import { getallPatientList,getAllSelfDrugWarehouseInfoList,deleteSelfWarehouseInfo} from "@/api/drug/drug"
@@ -368,7 +375,6 @@ export default {
       patient_id:0,
       patientList:[],
       tableList:[],
-      manufacturerList:[],
       dealerList:[],
       drugTypeList:[],
     };
@@ -384,9 +390,9 @@ export default {
         getAllSelfDrugWarehouseInfoList(params).then(response=>{
           if(response.data.state ==1){
             var infoList  =  response.data.data.infoList
-            console.log("infolist22222222222222",infoList)
             this.tableList = infoList
             this.manufacturerList = response.data.data.manufacturerList
+            console.log("infolist22222222222222",this.manufacturerList)
             this.dealerList = response.data.data.dealerList
             this.drugTypeList = response.data.data.drugTypeList
 
@@ -517,39 +523,18 @@ export default {
     },
     handleSearch(id) {
       this.WarehouseInfo.warehouseInfoDate = [];
-      this.GetOrderDetail(id);
       this.dialogVisible = true;
     },
-    GetOrderDetail(order_id) {
-      const params = {
-        id: order_id,
-      };
-
-      this.WarehouseInfo.warehouseInfoDate = [];
-      getDrugWarehouseInfoList(params).then((response) => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          var obj = {total_count:0,is_total:1}
-          for (let i = 0; i < response.data.data.info.length; i++) {
-            response.data.data.info[i].is_total = 0
-            this.showOne = true;
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
-            obj.total_count += (response.data.data.info[i].warehousing_count *response.data.data.info[i].price)
-          }
-          this.WarehouseInfo.warehouseInfoDate.push(obj)
-        
-          this.WarehouseInfo.warehouse = response.data.data.warehousing;
-          this.getAllDrugList();
-        }
-      });
-    },
     handleDelete: function (index, row) {
-
-        this.$confirm('确定删除' + row.name + row.sub_name + '方案吗？', '提示', {
+        if(row.is_check ==1){
+          this.$message.error("该药品已经审核,不能删除!")
+          return false
+        }
+        if(row.is_sys ==1){
+          this.$message.error("该药瓶自动入库,不能删除!")
+          return false
+        }
+        this.$confirm('确定删除吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -650,7 +635,7 @@ export default {
         .catch(() => {});
     },
     handleCurrentChangeOne(val) {
-      this.GetOrderDetail(val.id);
+     
     },
     getTime(val) {
       if (val < 0) {
@@ -671,18 +656,12 @@ export default {
       }
       return name;
     },
-    getAllDrugList() {
-      getAllDrugList().then((response) => {
-        if (response.data.state == 1) {
-          var manufacturerList = response.data.data.manufacturerList;
-          this.manufacturerList = manufacturerList;
-          this.dealerList = response.data.data.dealerList;
-        }
-      });
-    },
+    
     getManufacturer(id) {
       var name = "";
+      console.log("manufacturerList-=------",this.manufacturerList)
       for (let i = 0; i < this.manufacturerList.length; i++) {
+
         if (id == this.manufacturerList[i].id) {
           name = this.manufacturerList[i].manufacturer_name;
         }
@@ -734,9 +713,6 @@ export default {
       });
     },
 
-    lili(){
-      console.log("exportList",this.exportList)
-    },
     toExport() {
       if (this.order_id == "") {
         this.$message.error("请勾选入库单");
@@ -853,7 +829,6 @@ export default {
         getallPatientList().then(response=>{
           if(response.data.state ==1){
             var patient = response.data.data.patient
-            console.log("patient====",patient)
             this.patientList = []
             var obj = {id:0,name:"全部"}
             this.patientList.push(obj)
@@ -872,15 +847,6 @@ export default {
         }
         return name
       },
-      getManufacturer(id){
-         var manufacturer_name = ""
-         for(let i=0;i<this.manufacturerList.length;i++){
-           if(id == this.manufacturerList[i].id){
-            manufacturer_name = this.manufacturerList[i].manufacturer_name
-           }
-         }
-         return
-      },
       getDealerName(id){
         var dealer_name = ""
         for(let i=0;i<this.dealerList.length;i++){