Selaa lähdekoodia

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

yq1 4 viikkoa sitten
vanhempi
commit
6fc7177a8a

+ 29 - 7
src/xt_pages/stock/query/purchaseNewStockQuery.vue Näytä tiedosto

@@ -804,7 +804,7 @@ export default {
804 804
    if(all_price >0 ){
805 805
     return all_price.toFixed(2)
806 806
    }else{
807
-    return "0.00"
807
+    return ""
808 808
    }
809 809
   },
810 810
   getWarehouseOut(val){
@@ -911,7 +911,7 @@ export default {
911 911
     if (total_price_all > 0) {
912 912
        return total_price_all.toFixed(2)
913 913
      }else{
914
-      return  "0.00"
914
+      return  ""
915 915
      }
916 916
    },
917 917
    getWarehosueOutInfo(val,val2,val3){
@@ -971,7 +971,9 @@ export default {
971 971
      all_count_price = count_price +count_one_price - count_two_price
972 972
      console.log("数据我哦我我",all_count_price)
973 973
      if(all_count_price >0){
974
-       return all_count_price
974
+       return all_count_price.toFixed(2)
975
+     }else{
976
+      return "0.00"
975 977
      }
976 978
    },
977 979
    stockOutprice(val,val2,val3){
@@ -1288,7 +1290,12 @@ export default {
1288 1290
          }
1289 1291
 
1290 1292
        }
1291
-       return total_price
1293
+       if(total_price>0){
1294
+        return total_price.toFixed(2)
1295
+       }else{
1296
+        return ""
1297
+       }
1298
+      
1292 1299
     },
1293 1300
 
1294 1301
     getAllOutStockIn(val){
@@ -1307,7 +1314,12 @@ export default {
1307 1314
           total_price += val[i].count * val[i].price
1308 1315
          }
1309 1316
        }
1310
-       return total_price
1317
+       if(total_price>0){
1318
+        return total_price.toFixed(2)
1319
+       }else{
1320
+        return ""
1321
+       }
1322
+       
1311 1323
     },
1312 1324
     getAllStockInFlow(val){
1313 1325
       var count = 0
@@ -1325,7 +1337,12 @@ export default {
1325 1337
           total_price+= val[i].count * val[i].total_price
1326 1338
         }
1327 1339
       }
1328
-      return total_price
1340
+      if(total_price>0){
1341
+        return total_price.toFixed(2)
1342
+      }else{
1343
+        return ""
1344
+      }
1345
+     
1329 1346
     },
1330 1347
     getAllStockOutFlow(val){
1331 1348
       var count = 0
@@ -1343,7 +1360,12 @@ export default {
1343 1360
           total_price+= val[i].count * val[i].price
1344 1361
         }
1345 1362
       }
1346
-      return total_price
1363
+      if(total_price>0){
1364
+         return total_price.toFixed(2)
1365
+      }else{
1366
+        return ""
1367
+      }
1368
+     
1347 1369
     },
1348 1370
     getAllQuery(){
1349 1371
 

+ 26 - 6
src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue Näytä tiedosto

@@ -817,7 +817,12 @@ export default {
817 817
          }
818 818
 
819 819
        }
820
-       return total_price
820
+       if(total_price>0){
821
+        return total_price.toFixed(2)
822
+       }else{
823
+        return ""
824
+       }
825
+      
821 826
     },
822 827
     getAllOutStockIn(val){
823 828
        var count = 0 
@@ -835,7 +840,12 @@ export default {
835 840
           total_price+= val[i].count * val[i].total_price
836 841
         }
837 842
       }
838
-      return total_price
843
+      if(total_price>0){
844
+        return total_price.toFixed(2)
845
+      }else{
846
+        return ""
847
+      }
848
+      
839 849
     },
840 850
     getAllStockInFlow(val){
841 851
       var count = 0
@@ -862,7 +872,12 @@ export default {
862 872
           total_price += val[i].count * val[i].price
863 873
          }
864 874
        }
865
-       return total_price
875
+       if(total_price>0){
876
+        return total_price.toFixed(2)
877
+      }else{
878
+        return ""
879
+      }
880
+     
866 881
     },
867 882
     getAllStockOutFlowPrice(val){
868 883
       var total_price = 0
@@ -871,7 +886,12 @@ export default {
871 886
           total_price+= val[i].count * val[i].price
872 887
         }
873 888
       }
874
-      return total_price
889
+      if(total_price>0){
890
+        return total_price.toFixed(2)
891
+      }else{
892
+        return ""
893
+      }
894
+    
875 895
     },
876 896
     getWarehouseInfoOnePrice(val,val2){
877 897
       var count_price =0 
@@ -890,7 +910,7 @@ export default {
890 910
       all_count_price = count_price + count_one_price
891 911
 
892 912
       if(all_count_price > 0 ){
893
-        return all_count_price
913
+        return all_count_price.toFixed(2)
894 914
       }else{
895 915
         return 0
896 916
       }
@@ -921,7 +941,7 @@ export default {
921 941
      all_count_price = count_price +count_one_price - count_two_price
922 942
      console.log("数据我哦我我",all_count_price)
923 943
      if(all_count_price >0){
924
-       return all_count_price
944
+       return all_count_price.toFixed(2)
925 945
      }else{
926 946
       return 0
927 947
      }

+ 4 - 4
src/xt_pages/user/components/PatientSidebar.vue Näytä tiedosto

@@ -179,10 +179,10 @@ export default {
179 179
             //   name: '3-3',
180 180
             //   label: '体格检查新'
181 181
             // },
182
-             {
183
-              name: '3-5',
184
-              label: '病程记录新'
185
-             },
182
+            //  {
183
+            //   name: '3-5',
184
+            //   label: '病程记录新'
185
+            //  },
186 186
             {
187 187
               name: '1-11',
188 188
               label: '首次病程记录'

+ 13 - 13
src/xt_permission.js Näytä tiedosto

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28 28
  // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))