新分支

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -94,6 +94,12 @@
            </template>
         </el-table-column>
 
+        <el-table-column label="透析模式" align="center" width="60">
+           <template slot-scope="scope">
+            {{getModeId(scope.row.mode_id)}}
+           </template>
+        </el-table-column>
+
         <el-table-column label="推送医嘱" align="center" width="1280">
            <template slot-scope="scope">
              <span v-if="config.is_open !=1">{{getAdviceContent(scope.row.patient_id)}}</span> 
@@ -291,6 +297,115 @@
        this.templateList = []
        this.getlist()
       },
+      getModeId(val){
+      var name =""
+      if(val == 1){
+        name ="HD"
+      }
+      if(val == 2){
+        name ="HDF"
+      }
+      if(val == 3){
+        name ="HD+HP"
+      }
+      if(val == 4){
+        name ="HP"
+      }
+      if(val == 5){
+        name ="HF"
+      }
+      if(val == 6){
+        name ="SCUF"
+      }
+      if(val == 7){
+        name ="IUF"
+      }
+      if(val == 8){
+        name ="IUF"
+      }
+      if(val == 9){
+        name ="HFHD+HP"
+      }
+      if(val == 10){
+        name ="PHF"
+      }
+      if(val == 11){
+        name ="HFR"
+      }
+      if(val == 12){
+        name ="HDF+HP"
+      }
+      if(val == 13){
+        name ="CRRT"
+      }
+      if(val == 14){
+        name ="腹水回输"
+      }
+      if(val == 19){
+        name ="IUF+HD"
+      }
+      if(val == 20){
+        name ="UF"
+      }
+      if(val == 21){
+        name ="HD+"
+      }
+      if(val == 22){
+        name ="血浆胆红素吸附+HDF"
+      }
+      if(val == 23){
+        name ="血浆胆红素吸附"
+      }
+      if(val == 24){
+        name ="I-HDF"
+      }
+      if(val == 25){
+        name ="HD高通"
+      }
+      if(val == 26){
+        name ="CVVH"
+      }
+      if(val == 27){
+        name ="CVVHD"
+      }
+      if(val == 28){
+        name ="CVVHDF"
+      }
+      if(val == 29){
+        name ="PE"
+      }
+      if(val == 30){
+        name ="血浆胆红素吸附+HP"
+      }
+      if(val == 31){
+        name ="HPD"
+      }
+      if(val == 32){
+        name ="HDP"
+      }
+      if(val == 33){
+        name = "HFD"
+      }
+      if(val == 34){
+        name = "HDF100"
+      }
+      if(val == 35){
+        name = "HDF600"
+      }
+      if(val == 36){
+        name = "HDF800"
+      }
+      if(val == 37){
+        name = "HDF1000"
+      }
+      if(val == 38){
+        name = "HDF80"
+      }
+      if(val == 39){
+        name = "HF16"
+      }
+      return name
+      },
       getlist(){
         
         getDialysisAdviceTemplateList(this.query).then(response=>{

src/xt_pages/dialysis/details/consumable/dialysisDrugPrint.vue

@@ -29,6 +29,7 @@
                 <td width="100">透析机号</td>
                 <td width="100">姓名</td>
                 <td width="100">透析号</td>
+                <td width="100">透析模式</td>
                 <td width="800">推送医嘱</td>
              
               </tr>
@@ -39,6 +40,7 @@
                 <td> {{item.device_number.zone.name}}  {{item.device_number.number}}</td>
                 <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
+                <td>{{getModeId(item.mode_id)}}</td>
                  <td width="800">
                      <span v-if="config.is_open !=1">{{getAdviceContent(item.patient_id)}}</span> 
                      <span v-if="config.is_open == 1"> {{getHisAdviceContent(item.patient_id)}}</span>
@@ -111,7 +113,115 @@
      this.getlist()
     },
     methods: {
-
+     getModeId(val){
+      var name =""
+      if(val == 1){
+        name ="HD"
+      }
+      if(val == 2){
+        name ="HDF"
+      }
+      if(val == 3){
+        name ="HD+HP"
+      }
+      if(val == 4){
+        name ="HP"
+      }
+      if(val == 5){
+        name ="HF"
+      }
+      if(val == 6){
+        name ="SCUF"
+      }
+      if(val == 7){
+        name ="IUF"
+      }
+      if(val == 8){
+        name ="IUF"
+      }
+      if(val == 9){
+        name ="HFHD+HP"
+      }
+      if(val == 10){
+        name ="PHF"
+      }
+      if(val == 11){
+        name ="HFR"
+      }
+      if(val == 12){
+        name ="HDF+HP"
+      }
+      if(val == 13){
+        name ="CRRT"
+      }
+      if(val == 14){
+        name ="腹水回输"
+      }
+      if(val == 19){
+        name ="IUF+HD"
+      }
+      if(val == 20){
+        name ="UF"
+      }
+      if(val == 21){
+        name ="HD+"
+      }
+      if(val == 22){
+        name ="血浆胆红素吸附+HDF"
+      }
+      if(val == 23){
+        name ="血浆胆红素吸附"
+      }
+      if(val == 24){
+        name ="I-HDF"
+      }
+      if(val == 25){
+        name ="HD高通"
+      }
+      if(val == 26){
+        name ="CVVH"
+      }
+      if(val == 27){
+        name ="CVVHD"
+      }
+      if(val == 28){
+        name ="CVVHDF"
+      }
+      if(val == 29){
+        name ="PE"
+      }
+      if(val == 30){
+        name ="血浆胆红素吸附+HP"
+      }
+      if(val == 31){
+        name ="HPD"
+      }
+      if(val == 32){
+        name ="HDP"
+      }
+      if(val == 33){
+        name = "HFD"
+      }
+      if(val == 34){
+        name = "HDF100"
+      }
+      if(val == 35){
+        name = "HDF600"
+      }
+      if(val == 36){
+        name = "HDF800"
+      }
+      if(val == 37){
+        name = "HDF1000"
+      }
+      if(val == 38){
+        name = "HDF80"
+      }
+      if(val == 39){
+        name = "HF16"
+      }
+      return name
+      },
       getlist(){
          var params = {
           schedule_date:this.$route.query.schedule_date,

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -91,6 +91,12 @@
            </template>
         </el-table-column>
 
+        <el-table-column  align="center"  width="60" label="透析模式">
+           <template slot-scope="scope">
+            {{getModeId(scope.row.mode_id)}}
+           </template>
+        </el-table-column>
+
         <el-table-column
           align="center"
           prop="name"
@@ -172,6 +178,12 @@
            </template>
         </el-table-column>
 
+        <el-table-column  align="center"  width="60" label="透析模式">
+           <template slot-scope="scope">
+            {{getModeId(scope.row.mode_id)}}
+           </template>
+        </el-table-column>
+
         <el-table-column
           align="center"
           prop="name"
@@ -524,7 +536,115 @@
       this.getlist()
     },
     methods: {
-
+     getModeId(val){
+      var name =""
+      if(val == 1){
+        name ="HD"
+      }
+      if(val == 2){
+        name ="HDF"
+      }
+      if(val == 3){
+        name ="HD+HP"
+      }
+      if(val == 4){
+        name ="HP"
+      }
+      if(val == 5){
+        name ="HF"
+      }
+      if(val == 6){
+        name ="SCUF"
+      }
+      if(val == 7){
+        name ="IUF"
+      }
+      if(val == 8){
+        name ="IUF"
+      }
+      if(val == 9){
+        name ="HFHD+HP"
+      }
+      if(val == 10){
+        name ="PHF"
+      }
+      if(val == 11){
+        name ="HFR"
+      }
+      if(val == 12){
+        name ="HDF+HP"
+      }
+      if(val == 13){
+        name ="CRRT"
+      }
+      if(val == 14){
+        name ="腹水回输"
+      }
+      if(val == 19){
+        name ="IUF+HD"
+      }
+      if(val == 20){
+        name ="UF"
+      }
+      if(val == 21){
+        name ="HD+"
+      }
+      if(val == 22){
+        name ="血浆胆红素吸附+HDF"
+      }
+      if(val == 23){
+        name ="血浆胆红素吸附"
+      }
+      if(val == 24){
+        name ="I-HDF"
+      }
+      if(val == 25){
+        name ="HD高通"
+      }
+      if(val == 26){
+        name ="CVVH"
+      }
+      if(val == 27){
+        name ="CVVHD"
+      }
+      if(val == 28){
+        name ="CVVHDF"
+      }
+      if(val == 29){
+        name ="PE"
+      }
+      if(val == 30){
+        name ="血浆胆红素吸附+HP"
+      }
+      if(val == 31){
+        name ="HPD"
+      }
+      if(val == 32){
+        name ="HDP"
+      }
+      if(val == 33){
+        name = "HFD"
+      }
+      if(val == 34){
+        name = "HDF100"
+      }
+      if(val == 35){
+        name = "HDF600"
+      }
+      if(val == 36){
+        name = "HDF800"
+      }
+      if(val == 37){
+        name = "HDF1000"
+      }
+      if(val == 38){
+        name = "HDF80"
+      }
+      if(val == 39){
+        name = "HF16"
+      }
+      return name
+      },
       exportList(){
         import('@/vendor/Export2Excel').then(excel => {
 

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -29,6 +29,7 @@
                 <td width="100">透析机号</td>
                 <td width="100">姓名</td>
                 <td width="100">透析号</td>
+                <td width="100">透析模式</td>
                 <td width="200" v-for="(item,index) in rowList" :key="index">
                   {{item.filed_name_cn}} 
                 </td>
@@ -43,6 +44,7 @@
                   </td>
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
+                <td>{{ getModeId(item.mode_id) }}</td>
                 <td v-for="(it,index) in rowList" :key="index">
                   <!-- {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}} -->
                   <span v-if="org_id !=10599">
@@ -65,6 +67,7 @@
                 <td width="100">透析机号</td>
                 <td width="100">姓名</td>
                 <td width="100">透析机号</td>
+                <td width="100">透析模式</td>
                 <td width="200" v-for="(item,index) in typeList" :key="index">
                   {{item.type_name}} 
                 </td>
@@ -78,6 +81,7 @@
                   </td>
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
+                <td>{{ getModeId(item.mode_id) }}</td>
                 <td v-for="(it,index) in typeList" :key="index">
                   <span v-if="item.his_prescription_project.length>0"> {{getStr(item.typeList[index].id,item.his_prescription_project,item.patient_id)}}</span>
                   <span v-if="item.his_prescription_project.length==0">{{getStr(item.typeList[index].id,item.projectList,item.patient_id)}}</span>
@@ -159,6 +163,115 @@
       this.getlist()
     },
     methods: {
+     getModeId(val){
+      var name =""
+      if(val == 1){
+        name ="HD"
+      }
+      if(val == 2){
+        name ="HDF"
+      }
+      if(val == 3){
+        name ="HD+HP"
+      }
+      if(val == 4){
+        name ="HP"
+      }
+      if(val == 5){
+        name ="HF"
+      }
+      if(val == 6){
+        name ="SCUF"
+      }
+      if(val == 7){
+        name ="IUF"
+      }
+      if(val == 8){
+        name ="IUF"
+      }
+      if(val == 9){
+        name ="HFHD+HP"
+      }
+      if(val == 10){
+        name ="PHF"
+      }
+      if(val == 11){
+        name ="HFR"
+      }
+      if(val == 12){
+        name ="HDF+HP"
+      }
+      if(val == 13){
+        name ="CRRT"
+      }
+      if(val == 14){
+        name ="腹水回输"
+      }
+      if(val == 19){
+        name ="IUF+HD"
+      }
+      if(val == 20){
+        name ="UF"
+      }
+      if(val == 21){
+        name ="HD+"
+      }
+      if(val == 22){
+        name ="血浆胆红素吸附+HDF"
+      }
+      if(val == 23){
+        name ="血浆胆红素吸附"
+      }
+      if(val == 24){
+        name ="I-HDF"
+      }
+      if(val == 25){
+        name ="HD高通"
+      }
+      if(val == 26){
+        name ="CVVH"
+      }
+      if(val == 27){
+        name ="CVVHD"
+      }
+      if(val == 28){
+        name ="CVVHDF"
+      }
+      if(val == 29){
+        name ="PE"
+      }
+      if(val == 30){
+        name ="血浆胆红素吸附+HP"
+      }
+      if(val == 31){
+        name ="HPD"
+      }
+      if(val == 32){
+        name ="HDP"
+      }
+      if(val == 33){
+        name = "HFD"
+      }
+      if(val == 34){
+        name = "HDF100"
+      }
+      if(val == 35){
+        name = "HDF600"
+      }
+      if(val == 36){
+        name = "HDF800"
+      }
+      if(val == 37){
+        name = "HDF1000"
+      }
+      if(val == 38){
+        name = "HDF80"
+      }
+      if(val == 39){
+        name = "HF16"
+      }
+      return name
+      },
      getlist(){
       var params = {
         keywords:this.$route.query.keywords,

src/xt_pages/medicalScheduling/index.vue

@@ -684,6 +684,7 @@ export default {
             }
             this.weekNum = this.weekNum - 1
             this.getNextWeekList()
+            this.getStaffScheduleRemarkList()
         },
             //下一周
         nextclick(){
@@ -698,6 +699,7 @@ export default {
                 this.nowYear = this.nowYear + 1
             }
             this.getNextWeekList()
+            this.getStaffScheduleRemarkList()
         },
 
         getYearWeek(year,month,date){
@@ -1355,7 +1357,8 @@ export default {
                                 user_type:staffList[i].doctor_type,
                                 is_sort:staffList[i].is_sort,
                                 sort:staffList[i].sort,
-                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}]
+                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}],
+                                remark:staffList[i].remark
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {

src/xt_pages/workforce/remind_print_setting_two.vue

@@ -665,7 +665,7 @@
         name ="HFHD+HP"
       }
       if(val == 10){
-        name ="HFHD+HP"
+        name ="PHF"
       }
       if(val == 11){
         name ="HFR"
@@ -721,6 +721,27 @@
       if(val == 32){
         name ="HDP"
       }
+      if(val == 33){
+        name = "HFD"
+      }
+      if(val == 34){
+        name = "HDF100"
+      }
+      if(val == 35){
+        name = "HDF600"
+      }
+      if(val == 36){
+        name = "HDF800"
+      }
+      if(val == 37){
+        name = "HDF1000"
+      }
+      if(val == 38){
+        name = "HDF80"
+      }
+      if(val == 39){
+        name = "HF16"
+      }
       return name
       },
       getBloodAccess(id){

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()
   // console.log(store.getters.current_role_urls.indexOf(to.path))