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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2681,15 +2681,15 @@ export default {
           }
           for (let i = 0; i < this.prescriptions.length; i++) {
             for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
-              if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
-                this.$message.error('药品处方总量不能为0')
+              if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == ''  || Number.isNaN(this.prescriptions[i].advices[b].prescribing_number)) {
+                this.$message.error('药品处方总量不能为0或者不能为NAN')
                 return
               }
             }
           }
           for (let i = 0; i < this.prescriptions.length; i++) {
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
-              if (this.prescriptions[i].project[b].total == 0 || this.prescriptions[i].project[b].total == '') {
+              if (this.prescriptions[i].project[b].total == 0 || this.prescriptions[i].project[b].total == '' || Number.isNaN(this.prescriptions[i].project[b].total)) {
                 this.$message.error('项目处方总量不能为0')
                 return
               }

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