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

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -804,7 +804,7 @@ export default {
    if(all_price >0 ){
     return all_price.toFixed(2)
    }else{
-    return "0.00"
+    return ""
    }
   },
   getWarehouseOut(val){
@@ -911,7 +911,7 @@ export default {
     if (total_price_all > 0) {
        return total_price_all.toFixed(2)
      }else{
-      return  "0.00"
+      return  ""
      }
    },
    getWarehosueOutInfo(val,val2,val3){
@@ -971,7 +971,9 @@ export default {
      all_count_price = count_price +count_one_price - count_two_price
      console.log("数据我哦我我",all_count_price)
      if(all_count_price >0){
-       return all_count_price
+       return all_count_price.toFixed(2)
+     }else{
+      return "0.00"
      }
    },
    stockOutprice(val,val2,val3){
@@ -1288,7 +1290,12 @@ export default {
          }
 
        }
-       return total_price
+       if(total_price>0){
+        return total_price.toFixed(2)
+       }else{
+        return ""
+       }
+      
     },
 
     getAllOutStockIn(val){
@@ -1307,7 +1314,12 @@ export default {
           total_price += val[i].count * val[i].price
          }
        }
-       return total_price
+       if(total_price>0){
+        return total_price.toFixed(2)
+       }else{
+        return ""
+       }
+       
     },
     getAllStockInFlow(val){
       var count = 0
@@ -1325,7 +1337,12 @@ export default {
           total_price+= val[i].count * val[i].total_price
         }
       }
-      return total_price
+      if(total_price>0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+     
     },
     getAllStockOutFlow(val){
       var count = 0
@@ -1343,7 +1360,12 @@ export default {
           total_price+= val[i].count * val[i].price
         }
       }
-      return total_price
+      if(total_price>0){
+         return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+     
     },
     getAllQuery(){
 

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -817,7 +817,12 @@ export default {
          }
 
        }
-       return total_price
+       if(total_price>0){
+        return total_price.toFixed(2)
+       }else{
+        return ""
+       }
+      
     },
     getAllOutStockIn(val){
        var count = 0 
@@ -835,7 +840,12 @@ export default {
           total_price+= val[i].count * val[i].total_price
         }
       }
-      return total_price
+      if(total_price>0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+      
     },
     getAllStockInFlow(val){
       var count = 0
@@ -862,7 +872,12 @@ export default {
           total_price += val[i].count * val[i].price
          }
        }
-       return total_price
+       if(total_price>0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+     
     },
     getAllStockOutFlowPrice(val){
       var total_price = 0
@@ -871,7 +886,12 @@ export default {
           total_price+= val[i].count * val[i].price
         }
       }
-      return total_price
+      if(total_price>0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+    
     },
     getWarehouseInfoOnePrice(val,val2){
       var count_price =0 
@@ -890,7 +910,7 @@ export default {
       all_count_price = count_price + count_one_price
 
       if(all_count_price > 0 ){
-        return all_count_price
+        return all_count_price.toFixed(2)
       }else{
         return 0
       }
@@ -921,7 +941,7 @@ export default {
      all_count_price = count_price +count_one_price - count_two_price
      console.log("数据我哦我我",all_count_price)
      if(all_count_price >0){
-       return all_count_price
+       return all_count_price.toFixed(2)
      }else{
       return 0
      }

src/xt_pages/user/components/PatientSidebar.vue

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

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