hah阿凡达

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -255,10 +255,15 @@ export default {
       }  
      
       var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price).toFixed(2)
+      if(total >0){
+        return ""
+      }else{
+        return total
+      }
        
-       return total
     },
     drugAddInfoOnePirce(arr,min_number,min_unit,max_unit,arr2){
+      
         var total = 0
         var totalone_price = 0
         var total_two_price = 0
@@ -268,14 +273,18 @@ export default {
           }
         }
         if(arr2!=null && arr2.length >0){
-          for(let i=0;i<arr2.length;i++){
-            total_two_price += arr2[i].count * arr[i].price
+          for(let i=0;i<arr2.length;i++){ 
+            total_two_price += arr2[i].count * arr2[i].price
           }
         }
         total = totalone_price + total_two_price
 
+        if(total>0){
+          return total.toFixed(2)
+        }else{
+          return ""
+        }
         
-        return total
     },
     getDrugOutPriceOne(arr,min_number,min_unit,max_unit,arr2,arr3){
     var total = 0
@@ -290,29 +299,35 @@ export default {
     }
     if(arr2!=null && arr2.length>0){
       for(let i=0;i<arr2.length;i++){
-        total_two_price +=arr2[i].count * arr[i].price
+        total_two_price +=arr2[i].count * arr2[i].price
       }
     }
     if(arr3!=null && arr3.length>0){
       for(let i=0;i<arr3.length;i++){
-        total_three_price +=arr3[i].count * arr[i].price
+        total_three_price +=arr3[i].count * arr3[i].price
       }
     }
  
     total = (totalone_price + total_two_price - total_three_price).toFixed(2)
-
-    return total
+    if(total >0){
+      return total
+    }else{
+      return ""
+    }
+    
    },
    GetDrugOverOnePrice(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
 
-    console.log("hahhahha",totalone)
-    console.log("totaltwo",totaltwo)
-    console.log("totalthree",totalthree)
-      var total = 0
-      
-      total = (totalone + totaltwo - totalthree).toFixed(2)
-       
-      return total
+   
+     var total = 0
+      total = (parseFloat(totalone)  + parseFloat(totaltwo)  - parseFloat(totalthree))
+      console.log("total-=---------------",total)
+      if(total >0){
+        return total.toFixed(2)
+      }else{
+        return ""
+      }
+     
        
     },
     changeStorehouseName(){
@@ -540,7 +555,7 @@ export default {
            
             }
 
-            console.log("list23323223322332232323322323wode",list)
+           
             for(let i=0;i<list.length;i++){
               list[i].last_price_in = 0
               list[i].drugAddOne= 0
@@ -580,6 +595,7 @@ export default {
               }else if(this.org_id == 0 || this.org_id == 10644){
                 list[i].drugAddPrice = "/"
                 list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+                console.log("本期增加加淀粉",list[i].drugAddSalePrice)
               } else{
                 list[i].drugAddPrice = "/"
                 list[i].drugAddSalePrice = "/"
@@ -613,6 +629,7 @@ export default {
                 list[i].overDrugPrice = list[i].retail_price
                 list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
             }else if(this.org_id == 0 || this.org_id ==10644){
+              console.log("加个2323323",list[i].drugAddSalePrice)
                 list[i].overDrugPrice = ""
                 list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)
             } else{

src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue

@@ -382,6 +382,7 @@ export default {
                 }else if(this.org_id == 0 || this.org_id ==10644){
                   list[i].drugAddPrice = "/"
                   list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+                  console.log("本期增加加淀粉",list[i].drugAddSalePrice)
                 } else{
                   list[i].drugAddPrice = "/"
                   list[i].drugAddSalePrice = "/"
@@ -1525,62 +1526,81 @@ export default {
          }
       }  
      
-      var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price).toFixed(2)
+      var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price)
+       
+      if(total >0){
+        return total.toFixed(2)
+      }else{
+        return ""
+      }
        
-       return total
     },
     drugAddInfoOnePirce(arr,min_number,min_unit,max_unit,arr2){
-        var total = 0
-        var totalone_price = 0
-        var total_two_price = 0
-        if(arr!=null && arr.length > 0){
-          for(let i=0;i<arr.length;i++){
-            totalone_price += arr[i].count * arr[i].price
-          }
+      
+      var total = 0
+      var totalone_price = 0
+      var total_two_price = 0
+      if(arr!=null && arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+          totalone_price += arr[i].count * arr[i].price
         }
-        if(arr2!=null && arr2.length >0){
-          for(let i=0;i<arr2.length;i++){
-            total_two_price += arr2[i].count * arr[i].price
-          }
+      }
+      if(arr2!=null && arr2.length >0){
+        for(let i=0;i<arr2.length;i++){ 
+          total_two_price += arr2[i].count * arr2[i].price
         }
-        total = totalone_price + total_two_price
+      }
+      total = totalone_price + total_two_price
 
-        
-        return total
-    },
+      if(total>0){
+        return total.toFixed(2)
+      }else{
+        return ""
+      }
+      
+   },
     getDrugOutPriceOne(arr,min_number,min_unit,max_unit,arr2,arr3){
-    var total = 0
-    var totalone_price = 0
-    var total_two_price = 0
-    var total_three_price = 0
-   
-    if(arr!=null&&arr.length > 0){
-      for(let i=0;i<arr.length;i++){
-        totalone_price +=arr[i].count * arr[i].price
+      var total = 0
+      var totalone_price = 0
+      var total_two_price = 0
+      var total_three_price = 0
+    
+      if(arr!=null&&arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+          totalone_price +=arr[i].count * arr[i].price
+        }
       }
-    }
-    if(arr2!=null && arr2.length>0){
-      for(let i=0;i<arr2.length;i++){
-        total_two_price +=arr2[i].count * arr[i].price
+      if(arr2!=null && arr2.length>0){
+        for(let i=0;i<arr2.length;i++){
+          total_two_price +=arr2[i].count * arr2[i].price
+        }
       }
-    }
-    if(arr3!=null && arr3.length>0){
-      for(let i=0;i<arr3.length;i++){
-        total_three_price +=arr3[i].count * arr[i].price
+      if(arr3!=null && arr3.length>0){
+        for(let i=0;i<arr3.length;i++){
+          total_three_price +=arr3[i].count * arr3[i].price
+        }
       }
-    }
- 
-    total = (totalone_price + total_two_price - total_three_price).toFixed(2)
-
-    return total
+  
+      total = (totalone_price + total_two_price - total_three_price)
+      if(total >0){
+        return total.toFixed(2)
+      }else{
+        return ""
+      }
+    
    },
    GetDrugOverOnePrice(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      console.log("totalone----------------",totalone)
+      console.log("totaltwo----------------",totalone)
+      console.log("totalthree----------------",totalthree)
       var total = 0
-      
-      total = (totalone + totaltwo - totalthree).toFixed(2)
-       
-      return total
-       
+      total = totalone  + totaltwo  - totalthree
+      if(total >0 || total!="NaN"){
+        console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+        return total.toFixed(2)
+      }else{
+        return ""
+      }
     },
    },
     created(){

src/xt_pages/user/components/PatientSidebar.vue

@@ -167,10 +167,10 @@ export default {
               name: '3-1',
               label: '病史'
             },
-            // {
-            //   name: '3-4',
-            //   label: '病史新'
-            // },
+            {
+              name: '3-4',
+              label: '病史新'
+            },
             {
               name: '3-2',
               label: '体格检查'

src/xt_pages/user/courseOfDisease_new.vue

@@ -351,9 +351,8 @@
         dialysisOrderList:[],
         patient:{},
         AuToShow:false,
-
         num:"",
-        longAdvice:[]
+        longAdvice:[],
       //   name:"",
       //  gander:"",
       //  age:0,
@@ -1245,7 +1244,7 @@
 
             this.inpectionList = inpectionList
             
-            this.patient = {}
+           
             var patient = response.data.data.patient
            
             if(patient.gender == 1){
@@ -1404,7 +1403,8 @@
             
            
            var longAdvice = response.data.data.longAdvice
-           console.log("longAdvice-------------------------",longAdvice)
+        
+           this.longAdvice = []
            this.longAdvice = longAdvice
 
             this.auto_dialog  =  true

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