更新

public/static/payprint1.html

@@ -299,9 +299,14 @@
                                 </td>
                                 <td class="col">{{ printData1[index].grossWeight}}</td>
                                 <td class="col">{{ printData1[index].tare}}</td>
-                                <td class="col">
+                                <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                                ||  printData1[index].netWeight == null 
+                                ||  printData1[index].pureWeight == null">
                                     {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
                                 </td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                                && printData1[index].netWeight != null 
+                                && printData1[index].pureWeight != null ">{{printData1[index].netWeight-printData1[index].pureWeight}}</td>
                                 <td class="col">{{ printData1[index].netWeight}}</td>
                             </tr>
                             <tr class="row">
@@ -318,7 +323,7 @@
                                 <td class="col col-bgc">热损伤</td>
                                 <td class="col col-bgc">不完善粒</td>
                                 <td class="col col-bgc">扣重比</td>
-                                <td class="col col-bgc">运费扣款</td>
+                                <td class="col col-bgc">扣量%</td>
                                 <td class="col col-bgc"></td>
                             </tr>
                             <tr class="row">
@@ -335,7 +340,8 @@
                                 <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}</td>
                                 <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}</td>
                                 <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData1[index].buckleWeightRatio}}</td>
-                                <td class="col ">{{ printData1[index].freightDeduction}}</td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                                <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
                                 <td class="col "></td>
                                 <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                             </tr>
@@ -492,7 +498,15 @@
                                 <td class="col col-bgc">皮重（公斤）</td>
                                 <td class="col">{{printData1[index].weighingManagement.tare}}</td>
                                 <td class="col col-bgc">扣重（公斤）</td>
-                                <td class="col">{{printData1[index].weighingManagement.buckleMiscellaneous}}</td>
+                                <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                                ||  printData1[index].netWeight == null 
+                                ||  printData1[index].pureWeight == null">
+                                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
+                                </td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                                && printData1[index].netWeight != null 
+                                && printData1[index].pureWeight != null ">{{printData1[index].netWeight-printData1[index].pureWeight}}</td>
+                                <!-- <td class="col">{{printData1[index].weighingManagement.buckleMiscellaneous}}</td> -->
                                 <td class="col col-bgc">净重（公斤）</td>
                                 <td class="col">{{printData1[index].weighingManagement.netWeight}}</td>
                             </tr>
@@ -647,9 +661,17 @@
                         <td class="col">{{ printData.qualityInspectionManagement.bulkDensity}}</td>
                         <td class="col">{{ printData.grossWeight}}</td>
                         <td class="col">{{ printData.tare}}</td>
-                        <td class="col">
-                            {{ printData.weighingManagement.buckleMiscellaneous}}
+                        <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                        ||  printData.netWeight == null 
+                        ||  printData.pureWeight == null">
+                            {{printData.weighingManagement?printData.weighingManagement.buckleMiscellaneous:''}}
                         </td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                        && printData.netWeight != null 
+                        && printData.pureWeight != null ">{{printData.netWeight-printData.pureWeight}}</td>
+                        <!-- <td class="col">
+                            {{ printData.weighingManagement.buckleMiscellaneous}}
+                        </td> -->
                         <td class="col">{{ printData.netWeight}}</td>
                         <!-- <td class="col">{{ printData.pureWeight}}</td> -->
                     </tr>
@@ -665,7 +687,7 @@
                         <td class="col col-bgc">热损伤</td>
                         <td class="col col-bgc">不完善粒</td>
                         <td class="col col-bgc">扣重比</td>
-                        <td class="col col-bgc">运费扣款</td>
+                        <td class="col col-bgc">扣量%</td>
                         <td class="col col-bgc"></td>
                         <!-- <td class="col col-bgc">1卸车扣款</td> -->
                     </tr>
@@ -683,7 +705,8 @@
                         <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
                         <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
                         <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
-                        <td class="col ">{{ printData.freightDeduction}}</td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
                         <td class="col "></td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>

src/views/houseSelfCollect/settlement.vue

@@ -397,46 +397,86 @@
           if (!this.paymentList.unitDeduction) {
             this.paymentList.unitDeduction = 0
           }
-          // this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
-          if(this.paymentList.qualityInspectionManagement.waterContent >= 30){
-            this.paymentList.buckleWeightRatio = 1.3
-          }
-          else if(this.paymentList.qualityInspectionManagement.waterContent <= 15){
-            this.paymentList.buckleWeightRatio = 1.15
+          let compIdTmp  = localStorage.getItem('ws-pf_compId')
+          //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分15
+          if(compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d'){
+            // this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
+            this.paymentList.buckleWeightRatio = 1.25
+            this.ganwater = 14.5
+            this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
+            if (this.paymentList.qualityInspectionManagement.paramType == '2') {
+              this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
+                  .qualityInspectionManagement.waterContent - 15) *
+                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 = 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 - 14) *
-              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)
+            // this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
+            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 - 14) *
+                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
+            } 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)
               }
-              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
+            if (!this.paymentList.dryGrainPrice) {
+              this.paymentList.dryGrainPrice = this.paymentList.qualityInspectionManagement.tidalGrainPrice / this
+                .paymentList.base
+            }
           }
           this.grainMoney()
         })