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

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9529"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2687,7 +2687,7 @@
             this.current_index = 0
 
             this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+            // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
 
           }
 

src/xt_pages/workforce/components/tableWeeks.vue

@@ -457,8 +457,14 @@
           }
         }
 
+
         return ''
 
+      },getAnticoagulantName(id) {
+
+        return this.$store.getters.anticoagulants_confit[id] != undefined ? this.$store.getters.anticoagulants_confit[id].name: ""
+
+
       },
       getModeDesc(list) {
         let modes = []
@@ -638,10 +644,7 @@
           modes.push(obj)
 
         }
-        let dialysate_formulation_options = getDataConfig(
-          'hemodialysis',
-          'dialysate_formulation'
-        )
+
         modes = this.uniqueDialysisFormulation(modes)
         for (let i = 0; i < list.length; i++) {
           for (let c = 0; c < modes.length; c++) {
@@ -758,9 +761,35 @@
       }
       ,
       getAnticoagulantDesc(list) {
+        let modes = []
+        for (let b = 0; b < list.length; b++) {
+          let obj = {
+            id: list[b].dialysissolution.anticoagulant,
+            name: this.getAnticoagulantName(list[b].dialysissolution.anticoagulant),
+            count: 0
 
-      }
-      ,
+          }
+          modes.push(obj)
+
+        }
+        modes = this.uniqueAnticoagulant(modes)
+        for (let i = 0; i < list.length; i++) {
+          for (let c = 0; c < modes.length; c++) {
+            if (modes[c].id == list[i].dialysissolution.anticoagulant) {
+              modes[c].count = modes[c].count + 1
+            }
+          }
+        }
+        let desc = ''
+        for (let b = 0; b < modes.length; b++) {
+          if (desc.length == 0) {
+            desc = modes[b].name + ': ' + modes[b].count + '次'
+          } else {
+            desc = desc + ' \n\r ' + modes[b].name + ': ' + modes[b].count + '次'
+          }
+        }
+        return desc
+      },
       getEPODesc(list) {
         let EPO = []
         for (let b = 0; b < list.length; b++) {
@@ -870,6 +899,10 @@
         const res = new Map()
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
       }
+      , uniqueAnticoagulant(arr) {
+        const res = new Map()
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+      }
       ,
 
       getScheduleList() {

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //       store.dispatch('VerifyConfigList', []).then(() => {
-  //         next()
-  //       })
-  //     }
-  //     if (store.getters.permission_routers === undefined) {
-  //       store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //         next()
-  //       })
-  //     } else {
-  //       next()
-  //     }
-  //   return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+        store.dispatch('VerifyConfigList', []).then(() => {
+          next()
+        })
+      }
+      if (store.getters.permission_routers === undefined) {
+        store.dispatch('xt_GenerateRoutes', []).then(() => {
+          next()
+        })
+      } else {
+        next()
+      }
+    return
   // 线上注释
 
   NProgress.start()