瀏覽代碼

新分支

28169 10 月之前
父節點
當前提交
65a1cdb7b4

+ 3 - 1
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue 查看文件

@@ -1032,6 +1032,8 @@ export default {
1032 1032
       console.log('体重减少',  this.form.weight_after)
1033 1033
       this.form.weight_loss = ((this.predialysis_evaluation.weight_before - this.predialysis_evaluation.additional_weight) - (this.form.weight_after - this.form.additional_weight)).toFixed(1)
1034 1034
 
1035
+      this.form.after_weight = (this.form.weight_after - this.form.additional_weight).toFixed(2) 
1036
+
1035 1037
       if (this.form.weight_loss < 0) {
1036 1038
         this.form.weight_loss = ''
1037 1039
       }
@@ -1052,7 +1054,7 @@ export default {
1052 1054
        }
1053 1055
     },
1054 1056
     'form.after_weight':function(){
1055
-      this.form.after_weight = this.form.weight_after - this.form.additional_weight 
1057
+      this.form.after_weight = (this.form.weight_after - this.form.additional_weight).toFixed(2) 
1056 1058
     }
1057 1059
   },
1058 1060
   methods: {

+ 1 - 1
src/xt_pages/dialysis/details/index.vue 查看文件

@@ -3100,7 +3100,7 @@ export default {
3100 3100
         name ="HFHD+HP"
3101 3101
       }
3102 3102
       if(val == 10){
3103
-        name ="HFHD+HP"
3103
+        name ="HFD"
3104 3104
       }
3105 3105
       if(val == 11){
3106 3106
         name ="HFR"

+ 7 - 2
src/xt_pages/stock/detail/stockOutDetail.vue 查看文件

@@ -906,11 +906,13 @@ export default {
906 906
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
907 907
         }else if(this.orgId==10537){
908 908
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
909
+        }else if(this.orgId==10445){
910
+          this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
909 911
         }else{
910 912
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
911 913
         }
912 914
 
913
-        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0 || this.org_id==10445){
915
+        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0){
914 916
 
915 917
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
916 918
         }
@@ -918,7 +920,10 @@ export default {
918 920
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
919 921
          
920 922
         }
921
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610&&this.orgId==0){
923
+        if(this.orgId ==10445){
924
+          this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
925
+        }
926
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445){
922 927
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
923 928
         }
924 929
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)