XMLWAN 3 年前
父节点
当前提交
a227844bdb

+ 2 - 2
config/index.js 查看文件

@@ -29,8 +29,8 @@ module.exports = {
29 29
 
30 30
     // host: 'xt.test.sgjyun.com',
31 31
     //  host: 'xt.kuyicloud.com',
32
-   host: 'xt.test.sgjyun.com',
33
-  //  host: 'localhost',
32
+    host: 'xt.test.sgjyun.com',
33
+    // host: 'localhost',
34 34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
35 35
     autoOpenBrowser: true,
36 36
     errorOverlay: true,

+ 5 - 3
src/xt_pages/workforce/components/tableWeeks.vue 查看文件

@@ -421,7 +421,7 @@
421 421
         prescription_status: false,
422 422
         week: false,
423 423
         name: false,
424
-        zone: false,
424
+        zone_name: false,
425 425
         classes: false,
426 426
         number: false,
427 427
         mode: false,
@@ -874,6 +874,7 @@
874 874
       ,
875 875
       signPrint() {
876 876
         var zone = this.zone
877
+        console.log("zone23232",zone)
877 878
         var newArr = []
878 879
         for(let i=0;i<this.zoneList.length;i++){
879 880
            newArr.push(this.zoneList[i].id)
@@ -1287,6 +1288,7 @@
1287 1288
       }
1288 1289
       ,
1289 1290
       printActionSetting() {
1291
+        this.getAllZoneList()
1290 1292
         this.getlist()
1291 1293
         this.dialogVisible = true
1292 1294
 
@@ -1463,10 +1465,10 @@
1463 1465
               this.week = false
1464 1466
             }
1465 1467
             if (list.zone == 1) {
1466
-              this.zone = true
1468
+              this.zone_name = true
1467 1469
             }
1468 1470
             if (list.zone == 2) {
1469
-              this.zone = false
1471
+              this.zone_name = false
1470 1472
             }
1471 1473
             if (list.mode == 1) {
1472 1474
               this.mode = true

+ 7 - 0
src/xt_pages/workforce/remind_print_setting.vue 查看文件

@@ -29,6 +29,8 @@
29 29
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
30 30
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
31 31
                 </div> 
32
+               <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
33
+                <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
32 34
                 <div>用量:  
33 35
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
34 36
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
@@ -42,6 +44,9 @@
42 44
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
43 45
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
44 46
                 </div> 
47
+                <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
48
+                <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
49
+                <div v-if="org_id == 10188">体重增加:{{main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight}}</div>
45 50
                 <div>用法:静脉注射</div> 
46 51
                 <div>打印时间:{{currentDate}}</div>
47 52
               </div>
@@ -96,6 +101,7 @@
96 101
      this.type = this.$route.query.type
97 102
      this.getPrintList()
98 103
      this.org_id = this.$store.getters.xt_user.org.id
104
+     console.log("机构ID",this.org_id)
99 105
      this.currentDate = this.getCurrentDate()
100 106
    
101 107
      this.modeOptions = this.$store.getters.treatment_mode
@@ -115,6 +121,7 @@
115 121
        getScheduleList(params).then(response=>{
116 122
          if(response.data.state ==1){
117 123
            var list = response.data.data.list
124
+           console.log("本周信息",list)
118 125
            for(let i=0;i<list.length;i++){
119 126
               list[i].sort = list[i].number.sort
120 127
            }

+ 12 - 12
src/xt_permission.js 查看文件

@@ -13,18 +13,18 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15 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
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 28
   // 线上注释
29 29
 
30 30
   NProgress.start()