Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/user/components/PatientSidebar.vue

@@ -167,10 +167,10 @@ export default {
               name: '3-1',
               label: '病史'
             },
-            // {
-            //   name: '3-4',
-            //   label: '病史新'
-            // },
+            {
+              name: '3-4',
+              label: '病史新'
+            },
             {
               name: '3-2',
               label: '体格检查'
@@ -179,10 +179,10 @@ export default {
             //   name: '3-3',
             //   label: '体格检查新'
             // },
-            //  {
-            //   name: '3-5',
-            //   label: '病程记录新'
-            //  },
+             {
+              name: '3-5',
+              label: '病程记录新'
+             },
             {
               name: '1-11',
               label: '首次病程记录'

src/xt_pages/user/courseOfDisease_new.vue

@@ -531,11 +531,17 @@
         this.add_index = 0
         this.disabled = true
         console.log("haaaaaaaaaaaaaaa",this.$refs)
+
+        if(this.record_date.length == 0) {
+          this.$message.error('请选择时间')
+          return
+        }
         this.new_content = this.$refs.editor.contents
         if (this.new_content.length == 0) {
           this.$message.error('请填写病程内容')
           return
         }
+       
         var params = {
           id:this.id,
           patient_id:this.patient_id,

src/xt_pages/user/sickHistory_new.vue

@@ -115,7 +115,9 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-                <el-input v-if="shen_guomi == 2" v-model="guominyaowu_desc"></el-input>
+              </div>
+              <div style="width: 50%;"  v-if="shen_guomi == 2" >
+                过敏药物备注:  <el-input v-model="guominyaowu_desc" style="width: 300px;"></el-input>
               </div>
             </div>
 
@@ -622,7 +624,25 @@ export default {
         this.$message.error('请填写病程内容')
         return
       }
+      if(this.admin_user_id == 0){
+        this.$message.error('请选择医生')
+        return
+      }
+      if(this.sick_history_time.length  == 0){
+        this.$message.error('请选择时间')
+        return
+      }
       this.uploading_new_record = true
+      if(this.shen_yizhi == ""){
+        this.shen_yizhi = 0
+      }
+      if(this.shen_fumo == ""){
+        this.shen_fumo = 0
+      }
+      if(this.shen_guomi == ""){
+        this.shen_guomi = 0
+      }
+    
       let params = {
         id:this.id,
         patient_id: this.patient_id,
@@ -673,6 +693,24 @@ export default {
         this.$message.error('请填写病程内容')
         return
       }
+      if(this.admin_user_id == 0){
+        this.$message.error('请选择医生')
+        return
+      }
+      if(this.sick_history_time.length  == 0){
+        this.$message.error('请选择时间')
+        return
+      }
+      if(this.shen_yizhi == ""){
+        this.shen_yizhi = 0
+      }
+      if(this.shen_fumo == ""){
+        this.shen_fumo = 0
+      }
+      if(this.shen_guomi == ""){
+        this.shen_guomi = 0
+      }
+    
       let params = {
         id:this.id,
         patient_id: this.patient_id,
@@ -780,25 +818,37 @@ export default {
       return user_name
     },
     getTime (time) {
-      return uParseTime(time, '{y}-{m}-{d}')
+      if(time <0){
+        return  ""
+      }else{
+        return uParseTime(time, '{y}-{m}-{d}')
+      }
+     
     },
     getCurrentChange(val){
+      console.log("val--------------",val)
       this.$refs.editor.contents = val.content
       this.record_time = this.getTime(val.record_time)
       this.id = val.id
       this.guominyaowu_desc = val.hypersusceptibility_desc
       if(val.is_fumo_dialysis_history>0){
         this.shen_fumo = val.is_fumo_dialysis_history
+      }else{
+        this.shen_fumo = ""
       }
       if(val.is_shenyizhi_history>0){
         this.shen_yizhi  = val.is_shenyizhi_history
+      }else{
+        this.shen_yizhi = ""
       }
       if(val.is_hypersusceptibility>0){
         this.shen_guomi = val.is_hypersusceptibility
+      }else{
+        this.shen_guomi = ""
       }
 
       this.patient_id = val.patient_id
-      this.admin_user_id = val.admin_user_id
+      this.admin_user_id = val.recorder?val.doctor_id:"0"
 
     },
     getCurrentChangeOne(val){

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))