28169 il y a 2 semaines
Parent
révision
09f087926e

+ 2 - 2
.idea/shelf/在进行更新之前于_2023_11_22_9_30_取消提交了更改_[更改]/doctorAdvice.vue Voir le fichier

1766
                 >&nbsp;{{ tranAge(currentPatient.birthday) }}岁</span
1766
                 >&nbsp;{{ tranAge(currentPatient.birthday) }}岁</span
1767
               >
1767
               >
1768
             </li>
1768
             </li>
1769
-            <li v-if="currentPatient.user_org_id!=10090">
1769
+            <!-- <li v-if="currentPatient.user_org_id!=10090">
1770
               <span class="name" style="width:30px;">科:</span>
1770
               <span class="name" style="width:30px;">科:</span>
1771
 
1771
 
1772
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1772
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1784
             <li v-if="currentPatient.user_org_id!=10090">
1784
             <li v-if="currentPatient.user_org_id!=10090">
1785
               <span class="name" style="width:30px;">床:</span>
1785
               <span class="name" style="width:30px;">床:</span>
1786
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1786
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1787
-            </li>
1787
+            </li> -->
1788
             <li>
1788
             <li>
1789
               <span class="name" style="width:70px;">透析号:</span>
1789
               <span class="name" style="width:70px;">透析号:</span>
1790
               <span class="InputBox"
1790
               <span class="InputBox"

+ 2 - 1
src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsone.vue Voir le fichier

622
     },
622
     },
623
     chooseWay(way) {
623
     chooseWay(way) {
624
       this.wayType = way
624
       this.wayType = way
625
-    }, getCurrentOrgPatients() {
625
+    }, 
626
+    getCurrentOrgPatients() {
626
       getCurrentOrgPatients().then(response => {
627
       getCurrentOrgPatients().then(response => {
627
         if (response.data.state == 1) {
628
         if (response.data.state == 1) {
628
           var patients = response.data.data.patients
629
           var patients = response.data.data.patients

+ 19 - 9
src/xt_pages/Pharmacy/PatientDispensing.vue Voir le fichier

155
             <el-button type="primary" @click="endispense" v-if="state == 2"
155
             <el-button type="primary" @click="endispense" v-if="state == 2"
156
               >退药</el-button
156
               >退药</el-button
157
             >
157
             >
158
-            <el-button type="primary" @click="toPrint">打印</el-button>
158
+            <el-button type="primary" @click="toPrint" v-if="printShow">打印</el-button>
159
             <!--                    <el-button @click="tiaoshi">调试</el-button>-->
159
             <!--                    <el-button @click="tiaoshi">调试</el-button>-->
160
             <el-button type="primary" v-if="state == 1" @click="toSetting"
160
             <el-button type="primary" v-if="state == 1" @click="toSetting"
161
               >设置</el-button
161
               >设置</el-button
424
       total_count:0,
424
       total_count:0,
425
       newArrList:[],
425
       newArrList:[],
426
       textAreaList:[],
426
       textAreaList:[],
427
-      scan_code:""
427
+      scan_code:"",
428
+      printShow:false,
428
     };
429
     };
429
   },
430
   },
430
  
431
  
542
       if (this.state == 1) {
543
       if (this.state == 1) {
543
         this.tableData = []
544
         this.tableData = []
544
         this.patients = {}
545
         this.patients = {}
546
+        this.printShow  = false
545
         this.getpatientdetails(0);
547
         this.getpatientdetails(0);
546
       }
548
       }
547
       if (this.state == 2) {
549
       if (this.state == 2) {
548
         this.patients = {}
550
         this.patients = {}
549
         this.tableData = []
551
         this.tableData = []
552
+        this.printShow  = false
550
         this.getpatientdetails(1);
553
         this.getpatientdetails(1);
551
       }
554
       }
552
     },
555
     },
859
       getpharmacycontent(params).then((res) => {
862
       getpharmacycontent(params).then((res) => {
860
         if (res.data.state == 1) {
863
         if (res.data.state == 1) {
861
           //  loading.close()
864
           //  loading.close()
865
+         
862
            var list = res.data.data.list;
866
            var list = res.data.data.list;
863
            console.log("hhhhawoowowow",res.data.data)
867
            console.log("hhhhawoowowow",res.data.data)
864
            this.baseList =[]
868
            this.baseList =[]
889
             this.tableData = []
893
             this.tableData = []
890
             this.tableData = list
894
             this.tableData = list
891
           }
895
           }
896
+          this.printShow = true
892
           // console.log("tableDatawoowow",this.tableData)
897
           // console.log("tableDatawoowow",this.tableData)
893
           // loading.close()
898
           // loading.close()
894
         } else {
899
         } else {
1283
     getDrugCode(id,DataSources,DrugCode,index,DrugId){
1288
     getDrugCode(id,DataSources,DrugCode,index,DrugId){
1284
       
1289
       
1285
      // 针对百霖
1290
      // 针对百霖
1286
-       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id==0){
1291
+       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id==0|| this.$store.getters.xt_user.org.id==10726){
1287
           var params = {
1292
           var params = {
1288
             drug_id:DrugId,
1293
             drug_id:DrugId,
1289
             start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
1294
             start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
1412
 
1417
 
1413
         
1418
         
1414
          
1419
          
1415
-        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
1420
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10726){
1416
 
1421
 
1417
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
1422
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
1418
              
1423
              
1463
                    is_err_check = true
1468
                    is_err_check = true
1464
                  }
1469
                  }
1465
 
1470
 
1466
-                 if(drugindentificaitoncode>0){
1467
-                  if(arr[i].substring(0,7)!= drugindentificaitoncode){
1468
-                    this.$message.error("药品标识码格式不正确,请重新扫码")
1469
-                    is_err_check = true
1470
-                  }
1471
+
1472
+                 if(this.$store.getters.xt_user.org.id != 10726){
1473
+                    if(drugindentificaitoncode>0){
1474
+                      if(arr[i].substring(0,7)!= drugindentificaitoncode){
1475
+                        this.$message.error("药品标识码格式不正确,请重新扫码")
1476
+                        is_err_check = true
1477
+                      }
1478
+                    }
1471
                  }
1479
                  }
1480
+
1481
+               
1472
                 
1482
                 
1473
 
1483
 
1474
                }
1484
                }

+ 3 - 2
src/xt_pages/dialysis/PatientBox.vue Voir le fichier

23
           <div>
23
           <div>
24
             <div class="right">
24
             <div class="right">
25
               <h3 class="name">
25
               <h3 class="name">
26
-                {{ schedule.patient.name
27
-                }}<span class="yc" v-show="isAbnormal(schedule)">异常</span>
26
+                {{ schedule.patient.name}}
27
+                <span v-if="$store.getters.xt_user.org.id==10744 || $store.getters.xt_user.org.id==0">{{ schedule.patient.dialysis_no }}</span> 
28
+                <span class="yc" v-show="isAbnormal(schedule)">异常</span>
28
               </h3>
29
               </h3>
29
               <span class="num">
30
               <span class="num">
30
                 {{ genderText(schedule) }} | {{ getAge(schedule)>200 ? schedule.patient.age : getAge(schedule) }} 岁
31
                 {{ genderText(schedule) }} | {{ getAge(schedule)>200 ? schedule.patient.age : getAge(schedule) }} 岁

+ 4 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue Voir le fichier

1400
                     <td width="60" style="line-height: 20px">
1400
                     <td width="60" style="line-height: 20px">
1401
                       电导度<br />mS/cm
1401
                       电导度<br />mS/cm
1402
                     </td>
1402
                     </td>
1403
-                    <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />ml/min</td>
1403
+                    <td width="60" style="line-height:20px" v-if="org_id == 10015 || org_id == 0">置换液流量<br />ml/min</td>
1404
                     <td width="" style="line-height: 20px">病情变化及处理</td>
1404
                     <td width="" style="line-height: 20px">病情变化及处理</td>
1405
                   </tr>
1405
                   </tr>
1406
 
1406
 
1491
                         monitor.conductivity ? monitor.conductivity : ""
1491
                         monitor.conductivity ? monitor.conductivity : ""
1492
                       }}
1492
                       }}
1493
                     </td>
1493
                     </td>
1494
-                    <td v-if="org_id == 10015">
1494
+                    <td v-if="org_id == 10015 || org_id == 0">
1495
                      &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
1495
                      &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
1496
                     </td>
1496
                     </td>
1497
                     <td>
1497
                     <td>
2486
         "腹痛",
2486
         "腹痛",
2487
       ],
2487
       ],
2488
       isShowZero: false,
2488
       isShowZero: false,
2489
+      org_id:0,
2489
     };
2490
     };
2490
   },
2491
   },
2491
   created() {
2492
   created() {
2492
     var xtuser = this.$store.getters.xt_user;
2493
     var xtuser = this.$store.getters.xt_user;
2493
     this.orgname = xtuser.org.org_name;
2494
     this.orgname = xtuser.org.org_name;
2495
+    this.org_id = this.$store.getters.xt_user.org.id;
2494
     //   this.orgname = "遂溪方济医院";
2496
     //   this.orgname = "遂溪方济医院";
2495
     this.modeOptions = this.$store.getters.treatment_mode;
2497
     this.modeOptions = this.$store.getters.treatment_mode;
2496
     //   this.replacementWays = this.$store.getters.replacement_ways;
2498
     //   this.replacementWays = this.$store.getters.replacement_ways;

+ 2 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Voir le fichier

932
             align="center"
932
             align="center"
933
             label="置换液流量(ml/h)"
933
             label="置换液流量(ml/h)"
934
             width="100"
934
             width="100"
935
-            v-if="isShow('置换液流量') && template_id != 27 && template_id != 60"
935
+            v-if="isShow('置换液流量') && template_id != 27 && template_id != 60&& org_id != 10015"
936
           >
936
           >
937
             <template slot-scope="scope">
937
             <template slot-scope="scope">
938
               {{
938
               {{
947
             align="center"
947
             align="center"
948
             label="置换液流量(ml/min)"
948
             label="置换液流量(ml/min)"
949
             width="100"
949
             width="100"
950
-            v-if="isShow('置换液流量') && (template_id == 27 || template_id == 60)"
950
+            v-if="isShow('置换液流量') && (template_id == 27 || template_id == 60 || org_id ==10015)"
951
           >
951
           >
952
             <template slot-scope="scope">
952
             <template slot-scope="scope">
953
               {{
953
               {{

+ 5 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue Voir le fichier

879
               <td width="60" style="line-height:20px">血流量<br />ml/min</td>
879
               <td width="60" style="line-height:20px">血流量<br />ml/min</td>
880
               <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
880
               <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
881
 
881
 
882
-              <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />ml/min</td>
882
+              <td width="60" style="line-height:20px" v-if="org_id == 10015 || org_id == 0">置换液流量<br />ml/min</td>
883
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
883
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
884
           <td width="80">透析液温度<br/>℃</td>
884
           <td width="80">透析液温度<br/>℃</td>
885
           <td width="60">置换率<br/>ml/min</td> -->
885
           <td width="60">置换率<br/>ml/min</td> -->
936
               <td>
936
               <td>
937
                 &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
937
                 &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
938
               </td>
938
               </td>
939
-              <td v-if="org_id == 10015">
939
+              <td v-if="org_id == 10015 || org_id == 0">
940
                 &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
940
                 &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
941
               </td>
941
               </td>
942
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
942
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
1897
       doctorForm: {
1897
       doctorForm: {
1898
         doctor: '',
1898
         doctor: '',
1899
         url: ''
1899
         url: ''
1900
-      }
1900
+      },
1901
+      org_id:0,
1901
     }
1902
     }
1902
   },
1903
   },
1903
   methods: {
1904
   methods: {
2695
 
2696
 
2696
     var xtuser = this.$store.getters.xt_user
2697
     var xtuser = this.$store.getters.xt_user
2697
     this.orgname = xtuser.org.org_name
2698
     this.orgname = xtuser.org.org_name
2699
+    this.org_id = this.$store.getters.xt_user.org.id;
2698
     // this.orgname = "遂溪方济医院";
2700
     // this.orgname = "遂溪方济医院";
2699
     this.modeOptions = this.$store.getters.treatment_mode
2701
     this.modeOptions = this.$store.getters.treatment_mode
2700
     this.replacementWays = this.$store.getters.replacement_ways
2702
     this.replacementWays = this.$store.getters.replacement_ways

+ 14 - 14
src/xt_permission.js Voir le fichier

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
28
- // 线上注释
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28
+//  // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
31
   // alert('path:' + to.path)
31
   // alert('path:' + to.path)