新分支

src/xt_pages/data/basicConfig.vue

@@ -46,9 +46,9 @@
                 <el-switch v-model="good_out_open" @change="changeGoodOutOpen"></el-switch>
             </p>
 
-            <p style="margin-top:20px;">药品耗材在结算时出库：
+            <!-- <p style="margin-top:20px;">药品耗材在结算时出库：
                 <el-switch v-model="drug_settle_open" @change="changeSettleOpen"></el-switch>
-            </p>
+            </p> -->
         </div>
 
 

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1586,7 +1586,7 @@
                           <td width="50" v-if="org_id == 10478 || org_id ==10510">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
-                          <td width="60" v-if="org_id != 9836">
+                          <td width="60" v-if="org_id != 9836 && org_id!=10644">
                             透析液温度(°C)
                           </td>
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
@@ -1597,7 +1597,8 @@
                               org_id != 10121 &&
                               org_id != 9675 &&
                               org_id!=10490  &&
-                              org_id!=10600
+                              org_id!=10600 &&
+                              org_id!=10644
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1757,7 +1758,7 @@
                                 : "/"
                             }}
                           </td>
-                          <td v-if="org_id != 9836">
+                          <td v-if="org_id != 9836 && org_id!=10644">
                             {{
                               monitor_record.dialysate_temperature
                                 ? monitor_record.dialysate_temperature
@@ -1779,7 +1780,8 @@
                               org_id != 10121 &&
                               org_id != 9675 && 
                               org_id!=10490 &&
-                              org_id!=10600
+                              org_id!=10600 &&
+                              org_id!=10644
                             "
                           >
                             {{

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1713,8 +1713,8 @@
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
-                        <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
-                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600">
+                        <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
+                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
                           <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
                           <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span>
@@ -1812,7 +1812,7 @@
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
 
-                         <td v-if="org_id!=9919 && org_id!=9671 && org_id!=9836">
+                         <td v-if="org_id!=9919 && org_id!=9671 && org_id!=9836 && org_id!=10644">
                           {{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}
                         </td>
 
@@ -1826,7 +1826,7 @@
                         </td>
 
 
-                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600">
+                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
                           <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
                           <span v-if="org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                           <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>

src/xt_pages/user/dialysisRecord.vue

@@ -528,7 +528,7 @@ import { uParseTime } from "@/utils/tools";
 import { parseTime } from '@/utils'
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
 import print from "print-js";
-
+const moment = require('moment')
 export default {
   name: "dialysisRecord",
   data() {
@@ -567,6 +567,7 @@ export default {
       dialysisShow:false,
 
       newTime:'',
+      org_id:0
 
     };
   },
@@ -607,11 +608,17 @@ export default {
     },
     getPatientDialysisRecords() {
       console.log("prams",this.queryParams)
+        if(this.org_id ==10679 || this.org_id == 0){
+           this.queryParams.start_time = moment().month(moment().month() - 1).startOf('month').format('YYYY/MM/DD HH:mm:ss')
+           this.queryParams.end_time =  moment().month(moment().month() - 1).endOf('month').format('YYYY/MM/DD HH:mm:ss')       
+        }
+        console.log("hahahhaha",this.queryParams)
       getPatientDialysisRecords(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.total = response.data.data.total;
           this.recordData = response.data.data.records;
           console.log("郭23232323232232323",this.recordData)
+        
         }
       });
     },
@@ -895,6 +902,7 @@ export default {
 
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
+    this.org_id = this.$store.getters.xt_user.template_info.org_id;
 
   },mounted(){