前端干粮不显示扣量

public/static/payprint1.html

@@ -322,7 +322,7 @@
                                 <td class="col col-bgc">不完善粒</td>
                                 <td class="col col-bgc">扣重比</td>
                                 <td v-if="printData1[index].type=='潮粮'" class="col col-bgc">扣量%</td>
-                                <td class="col col-bgc"></td>
+                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col col-bgc"></td>
                             </tr>
                             <tr class="row">
                                 <td class="col">{{ printData1[index].pureWeight}}</td>
@@ -348,7 +348,7 @@
                                 <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData1[index].buckleWeightRatio}}</td>
                                 <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                                 <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'"></td>
-                                <td class="col "></td>
+                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col "></td>
                                 <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                             </tr>
                             <tr class="row">
@@ -710,8 +710,8 @@
                         <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 v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc"></td>
                         <!-- <td class="col col-bgc">1卸车扣款</td> -->
                     </tr>
                     <tr class="row">
@@ -736,9 +736,9 @@
                         <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 " 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 " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'"></td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col "></td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
                     <tr class="row">
@@ -760,9 +760,13 @@
                         <!-- <td class="col " v-if="printData.type == '潮粮'">
                             {{ printData.solidGrainPrice}}
                         </td> -->
-                        <td class="col " v-if="pengyuPrint">
+                        <td class="col " v-if="pengyuPrint&&printData.type == '潮粮'">
                             {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
                         </td>
+                        <td class="col " v-if="pengyuPrint&&printData.type != '潮粮'">
+                            {{Number(printData.unitContractPrice/1000*printData.weighingManagement.netWeight).toFixed(2)}}
+                        </td>
+                        
                         <td class="col " v-if="!pengyuPrint">
                             {{printData.calculationPayable}}
                         </td>
@@ -917,8 +921,8 @@
                         <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 v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc"></td>
                         <!-- <td class="col col-bgc">1卸车扣款</td> -->
                     </tr>
                     <tr class="row">
@@ -943,9 +947,9 @@
                         <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 " 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 " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'"></td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col "></td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
                     <tr class="row">
@@ -967,9 +971,12 @@
                         <!-- <td class="col " v-if="printData.type == '潮粮'">
                             {{ printData.solidGrainPrice}}
                         </td> -->
-                        <td class="col " v-if="pengyuPrint">
+                        <td class="col " v-if="pengyuPrint&&printData.type != '潮粮'">
                             {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
                         </td>
+                        <td class="col " v-if="pengyuPrint&&printData.type != '潮粮'">
+                            {{Number(printData.unitContractPrice/1000*printData.weighingManagement.netWeight).toFixed(2)}}
+                        </td>
                         <td class="col " v-if="!pengyuPrint">
                             {{printData.calculationPayable}}
                         </td>