28169 před 4 měsíci
rodič
revize
104bfc5cda

+ 29 - 7
src/xt_pages/stock/query/purchaseNewStockQuery.vue Zobrazit soubor

804
    if(all_price >0 ){
804
    if(all_price >0 ){
805
     return all_price.toFixed(2)
805
     return all_price.toFixed(2)
806
    }else{
806
    }else{
807
-    return "0.00"
807
+    return ""
808
    }
808
    }
809
   },
809
   },
810
   getWarehouseOut(val){
810
   getWarehouseOut(val){
911
     if (total_price_all > 0) {
911
     if (total_price_all > 0) {
912
        return total_price_all.toFixed(2)
912
        return total_price_all.toFixed(2)
913
      }else{
913
      }else{
914
-      return  "0.00"
914
+      return  ""
915
      }
915
      }
916
    },
916
    },
917
    getWarehosueOutInfo(val,val2,val3){
917
    getWarehosueOutInfo(val,val2,val3){
971
      all_count_price = count_price +count_one_price - count_two_price
971
      all_count_price = count_price +count_one_price - count_two_price
972
      console.log("数据我哦我我",all_count_price)
972
      console.log("数据我哦我我",all_count_price)
973
      if(all_count_price >0){
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
    stockOutprice(val,val2,val3){
979
    stockOutprice(val,val2,val3){
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
     getAllOutStockIn(val){
1301
     getAllOutStockIn(val){
1307
           total_price += val[i].count * val[i].price
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
     getAllStockInFlow(val){
1324
     getAllStockInFlow(val){
1313
       var count = 0
1325
       var count = 0
1325
           total_price+= val[i].count * val[i].total_price
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
     getAllStockOutFlow(val){
1347
     getAllStockOutFlow(val){
1331
       var count = 0
1348
       var count = 0
1343
           total_price+= val[i].count * val[i].price
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
     getAllQuery(){
1370
     getAllQuery(){
1349
 
1371
 

+ 26 - 6
src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue Zobrazit soubor

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
     getAllOutStockIn(val){
827
     getAllOutStockIn(val){
823
        var count = 0 
828
        var count = 0 
835
           total_price+= val[i].count * val[i].total_price
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
     getAllStockInFlow(val){
850
     getAllStockInFlow(val){
841
       var count = 0
851
       var count = 0
862
           total_price += val[i].count * val[i].price
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
     getAllStockOutFlowPrice(val){
882
     getAllStockOutFlowPrice(val){
868
       var total_price = 0
883
       var total_price = 0
871
           total_price+= val[i].count * val[i].price
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
     getWarehouseInfoOnePrice(val,val2){
896
     getWarehouseInfoOnePrice(val,val2){
877
       var count_price =0 
897
       var count_price =0 
890
       all_count_price = count_price + count_one_price
910
       all_count_price = count_price + count_one_price
891
 
911
 
892
       if(all_count_price > 0 ){
912
       if(all_count_price > 0 ){
893
-        return all_count_price
913
+        return all_count_price.toFixed(2)
894
       }else{
914
       }else{
895
         return 0
915
         return 0
896
       }
916
       }
921
      all_count_price = count_price +count_one_price - count_two_price
941
      all_count_price = count_price +count_one_price - count_two_price
922
      console.log("数据我哦我我",all_count_price)
942
      console.log("数据我哦我我",all_count_price)
923
      if(all_count_price >0){
943
      if(all_count_price >0){
924
-       return all_count_price
944
+       return all_count_price.toFixed(2)
925
      }else{
945
      }else{
926
       return 0
946
       return 0
927
      }
947
      }

+ 4 - 4
src/xt_pages/user/components/PatientSidebar.vue Zobrazit soubor

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

+ 13 - 13
src/xt_permission.js Zobrazit soubor

12
 
12
 
13
 router.beforeEach((to, from, next) => {
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
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))