Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/App.vue

@@ -1,12 +1,24 @@
 <template>
   <div id="app">
-    <router-view></router-view>
+    <router-view  v-if="isRouterAlive"></router-view>
   </div>
 </template>
 
 <script>
 export default {
-  name: "App"
+  name: "App",
+  data () {
+    return {
+      isRouterAlive: true
+    }
+  }, methods: {
+    reload () {
+      this.isRouterAlive = false
+      this.$nextTick(function () {
+        this.isRouterAlive = true
+      })
+    }
+  }
 };
 </script>
 

src/router/modules/dialysis.js

@@ -18,6 +18,22 @@ export default {
         title: '透析记录'
       }
     },
+    {
+      path: '/dialysis/watch',
+      component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),
+      name: 'watch',
+      meta: {
+        title: 'watch'
+      }
+    },
+    {
+      path: '/dialysis/board',
+      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
+      name: '数据看板',
+      meta: {
+        title: '数据看板'
+      }
+    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),
@@ -43,14 +59,7 @@ export default {
 
     // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
-    {
-      path: '/dialysis/watch',
-      component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),
-      name: 'watch',
-      meta: {
-        title: 'watch'
-      }
-    },
+
     {
       path: '/dialysis/details',
       component: () => import('@/xt_pages/dialysis/details'),
@@ -189,13 +198,6 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/dialysis/board',
-      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
-      name: '数据看板',
-      meta: {
-        title: '数据看板'
-      }
-    }
+
   ]
 }

src/views/layout/components/Navbar.vue

@@ -64,17 +64,15 @@
       </div>
     </el-menu>-->
     <div class="dropdownBox">
-      <!--<el-dropdown trigger="click" @command="handleOrgCommand">-->
+      <el-dropdown trigger="click" @command="handleOrgCommand">
         <span class="el-dropdown-link">
           {{ org_name }}
           <i class="el-icon-arrow-down el-icon--right"></i>
         </span>
-        <!--<el-dropdown-menu slot="dropdown">-->
-          <!--&lt;!&ndash;<el-dropdown-item   icon="el-icon-plus">{{item.org_name}}</el-dropdown-item>&ndash;&gt;-->
-
-          <!--<el-dropdown-item   icon="el-icon-plus" v-for="(item,index) in orgs" :key="index"  :command="item.id">{{item.org_name}}</el-dropdown-item>-->
-        <!--</el-dropdown-menu>-->
-      <!--</el-dropdown>-->
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item   icon="el-icon-plus" v-for="(item,index) in orgs" :key="index"  :command="item.id">{{item.org_name}}</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
     </div>
     <div class="navRight">
       <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
@@ -137,6 +135,7 @@ import {
   getOrgs,changeOrg
 } from '@/api/config'
 export default {
+  inject:['reload'],
   data() {
     return {
       orgs:[],
@@ -207,11 +206,17 @@ export default {
               // console.log(this.$store.getters.xt_permission.addRouters)
               this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
               //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-              this.$router.replace({ path: '/' })
+              // this.$router.replace({ path: '/' })
+              // window.location.reload()
+              // this.$router.go(0)
+              this.reload()
             })
           })
 
 
+
+
+
         }else{
           this.$message.success(response.data.msg)
         }

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -437,7 +437,10 @@
           return false
         }
         console.log(this.form)
-        let mode = 2
+        let mode = "2"
+        if(this.form.advice_doctor != this.$store.getters.xt_user.user.id){
+           mode = "3"
+        }
         EditDoctorAdvice(this.patient.id, this.form.id, this.form,mode).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -674,7 +677,7 @@
 
         ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime,mode).then(response => {
           if (response.data.state == 0) {
-            this.$message.error('执行失败！')
+            this.$message.error(response.data.msg)
             this.exceLoading = false
             return false
           } else {
@@ -1026,6 +1029,9 @@
           type: 'warning'
         }).then(() => {
           let mode ="4"
+          if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id){
+            mode = "5"
+          }
           DeleteGroupAdvice(groupno,mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -609,6 +609,9 @@ export default {
           type: 'warning'
         }).then(() => {
           let mode = "4"
+          if (this.groupSelectRow.advice_doctor != this.$store.getters.xt_user.user.id){
+             mode = "5"
+          }
           DeleteDoctorAdvice(this.groupSelectRow.id,mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -703,6 +706,9 @@ export default {
                 groupno: _this.groupForm.groupno
               }
               let mode = "2"
+              if (this.groupSelectRow.advice_doctor != this.$store.getters.xt_user.user.id){
+                mode = "3"
+              }
 
               EditDoctorAdvice(this.patientID, this.groupSelectRow.id, submitForm,mode).then(response => {
                 if (response.data.state == 0) {

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -761,6 +761,27 @@
         const ParamsQuery = this.assessmentBeforeDislysis
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['mode'] = "1"
+
+        console.log(this.predialysis_evaluation)
+
+        if(this.predialysis_evaluation.id == 0){
+          ParamsQuery['mode'] = "1"
+
+        }else{
+          if (this.predialysis_evaluation.creater == 0){
+            ParamsQuery['mode'] = "1"
+          }else{
+            ParamsQuery['mode'] = "2"
+            if (this.predialysis_evaluation.creater != this.$store.getters.xt_user.user.id){
+              ParamsQuery['mode'] = "3"
+            }
+
+          }
+
+
+        }
+
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1907,7 +1907,7 @@
                   advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                   advice_type: this.waitUploadAdvices[0].advice_type,
                   parent_id: this.patient_id,
-                  start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                  start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d} {h}{i}'),
                   remark: ''
                 }
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {

src/xt_permission.js

@@ -10,19 +10,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();