|
|
@@ -409,7 +409,7 @@
|
|
|
},
|
|
|
unitDeduction: 0
|
|
|
},
|
|
|
- ganwater:15,
|
|
|
+ ganwater:14.5,
|
|
|
disabled: false,
|
|
|
types: '',
|
|
|
isShowPrint: false,
|
|
|
@@ -831,49 +831,7 @@
|
|
|
.paymentList.base
|
|
|
}
|
|
|
}
|
|
|
- else if(compIdTmp == 'bb902450e53e4145bb34d79d33af5b76' ){
|
|
|
- this.ganwater = 14.5
|
|
|
- if(this.paymentList.qualityInspectionManagement.waterContent >= 30){
|
|
|
- this.paymentList.buckleWeightRatio = 1.3
|
|
|
- }
|
|
|
- else if(this.paymentList.qualityInspectionManagement.waterContent <= 15){
|
|
|
- this.paymentList.buckleWeightRatio = 1.15
|
|
|
- }
|
|
|
- else{
|
|
|
- this.paymentList.buckleWeightRatio = 1.3 - (30 - this.paymentList.qualityInspectionManagement.waterContent)*0.01
|
|
|
- }
|
|
|
- this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
|
|
|
- if (this.paymentList.qualityInspectionManagement.paramType == '2') {
|
|
|
- this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
|
|
|
- .qualityInspectionManagement.waterContent - this.ganwater) *
|
|
|
- this.paymentList.buckleWeightRatio
|
|
|
- this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
|
|
|
- .qualityInspectionManagement.weightDeduction.toFixed(2)
|
|
|
- this.paymentList.base = (100 - this.paymentList.qualityInspectionManagement.weightDeduction) / 100
|
|
|
- this.paymentList.base = this.paymentList.base.toFixed(3)
|
|
|
- if (this.paymentList.type == '潮粮') {
|
|
|
- if(this.paymentList.base > 1){
|
|
|
- this.paymentList.base = 1
|
|
|
- }
|
|
|
- this.paymentList.pureWeight = this.paymentList.base * this.paymentList.weighingManagement.netWeight
|
|
|
- this.paymentList.pureWeight = Math.round(this.paymentList.pureWeight)
|
|
|
- }
|
|
|
-
|
|
|
- } else {
|
|
|
- if (this.paymentList.type == '潮粮') {
|
|
|
- let paramtmp = (100 - this.paymentList.param) / 100
|
|
|
- if(paramtmp > 1){
|
|
|
- paramtmp = 1
|
|
|
- }
|
|
|
- this.paymentList.pureWeight = this.paymentList.weighingManagement.netWeight * paramtmp
|
|
|
- this.paymentList.pureWeight = Math.round(this.paymentList.pureWeight)
|
|
|
- }
|
|
|
- }
|
|
|
- if (!this.paymentList.dryGrainPrice) {
|
|
|
- this.paymentList.dryGrainPrice = this.paymentList.qualityInspectionManagement.tidalGrainPrice / this
|
|
|
- .paymentList.base
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
else{
|
|
|
// this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
|
|
|
if(this.paymentList.qualityInspectionManagement.waterContent >= 30){
|
|
|
@@ -888,7 +846,7 @@
|
|
|
this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
|
|
|
if (this.paymentList.qualityInspectionManagement.paramType == '2') {
|
|
|
this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
|
|
|
- .qualityInspectionManagement.waterContent - 15) *
|
|
|
+ .qualityInspectionManagement.waterContent - this.ganwater) *
|
|
|
this.paymentList.buckleWeightRatio
|
|
|
this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
|
|
|
.qualityInspectionManagement.weightDeduction.toFixed(2)
|
