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

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

@@ -2658,6 +2658,18 @@ mu
             }
          }
         }
+        //古镇乐生
+        if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
+          if(this.predialysis!=undefined){
+            if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
+              if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
+                 this.dialysisPrescription.target_ultrafiltration = 0
+             }
+
+            }
+         }
+        }
         if (pre != undefined) {
           this.dialysisPrescription.admin_user_id = pre.id == 0 ? this.$store.getters.xt_user.user.id : pre.admin_user_id
           if (pre.oxygen_uptake == 1) {
@@ -3262,6 +3274,20 @@ mu
           }
         }
 
+
+        //古镇乐生
+         if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
+          if(this.predialysis!=undefined){
+            if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
+              if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
+                 this.dialysisPrescription.target_ultrafiltration = 0
+             }
+
+            }
+         }
+        }
+
       },
       hide() {
         this.isVisibility = false

src/xt_pages/medicalScheduling/index.vue

@@ -1925,20 +1925,21 @@ export default {
 
         copyStaffSchedule(){
             this.newVisible = true
-            const params = {
-                start_time:this.getTimestamp(this.weekDayArr[0]),
-                end_time:this.getTimestamp(this.weekDayArr[6])
-            }
-
-            copyStaffSchedule(params).then(response=>{
-                if(response.data.state == 1){
-                var msg =  response.data.data.msg
-                console.log("msg",msg)
-                this.$message.success("复制成功")
-                }else{
-                this.$message.error("排班已存在")
-                }
-            })
+            // const params = {
+            //     start_time:this.getTimestamp(this.weekDayArr[0]),
+            //     end_time:this.getTimestamp(this.weekDayArr[6]),
+             
+            // }
+
+            // copyStaffSchedule(params).then(response=>{
+            //     if(response.data.state == 1){
+            //     var msg =  response.data.data.msg
+            //     console.log("msg",msg)
+            //     this.$message.success("复制成功")
+            //     }else{
+            //     this.$message.error("排班已存在")
+            //     }
+            // })
         },
         toContinuous(){
             var is_status = 0
@@ -1986,6 +1987,7 @@ export default {
               end_time:this.getTimestamp(this.weekDayArr[6]),
               copy_startime:copy_startime,
               copy_endtime:copy_endtime,
+              remark:this.remark,
             }
            this.$refs[formName].validate(valid=>{
               if(valid){

src/xt_pages/user/deathSummary.vue

@@ -293,7 +293,7 @@
           replace_reason:"",
           transplant:"",
           addShow:false,
-          last_record_date:moment(new Date()).format('YYYY-MM-DD'),
+          last_record_date:"",
           updateShow:false,
           modifyShow:true,
           patientID:0,

src/xt_pages/user/sickHistory.vue

@@ -371,7 +371,7 @@ export default {
     },
     recordTime: function(timestamp) {
       var time = new Date(timestamp * 1000)
-      return parseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
+      return parseTime(time, '{y}-{m}-{d}')
     },
     doctorName: function(doctor_id) {
       for (let index = 0; index < this.doctorOptions.length; index++) {
@@ -393,7 +393,7 @@ export default {
         id:this.edit_current_id,
         patient_id: this.patient_id,
         content: this.edit_new_content,
-        record_time: this.edit_sick_history_time + " 00:00:00",
+        record_time: this.edit_sick_history_time,
         title: this.edit_title,
         is_shenyizhishi:this.edit_is_shenyizhishi,
         is_fumotouxishi:this.edit_is_fumotouxishi,
@@ -441,7 +441,7 @@ export default {
       let params = {
         patient_id: this.patient_id,
         content: this.new_content,
-        record_time: this.sick_history_time +" 00:00:00",
+        record_time: this.sick_history_time,
         title: this.title,
         is_shenyizhishi:this.is_shenyizhishi,
         is_fumotouxishi:this.is_fumotouxishi,

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