前端

public/static/payprint1.html

@@ -321,7 +321,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 v-if="printData1[index].type=='潮粮'" class="col col-bgc">扣量%</td>
                                 <td class="col col-bgc"></td>
                             </tr>
                             <tr class="row">
@@ -346,8 +346,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 " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
-                                <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></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 class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                             </tr>
@@ -370,9 +370,12 @@
                                 <!-- <td class="col " v-if="printData1[index].type == '潮粮'">
                                     {{ printData1[index].solidGrainPrice}}
                                 </td> -->
-                                <td class="col " v-if="pengyuPrint">
+                                <td class="col " v-if="pengyuPrint&&printData1[index].type=='潮粮'">
                                     {{Number(printData1[index].unitContractPrice/1000*printData1[index].pureWeight).toFixed(2)}}
                                 </td>
+                                <td class="col " v-if="pengyuPrint&&printData1[index].type!='潮粮'">
+                                    {{Number(printData1[index].unitContractPrice/1000*printData1[index].weighingManagement.netWeight).toFixed(2)}}
+                                </td>
                                 <td class="col " v-if="!pengyuPrint">
                                     {{printData1[index].calculationPayable}}
                                 </td>
@@ -462,7 +465,7 @@
                                 <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
                                 <td class="col col-bgc">类型</td>
                                 <td class="col">{{printData1[index].weighingManagement.type}}</td>
-                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容重（克/升）':'蛋白'}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
                                 <td class="col">
                                     {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                                 </td>
@@ -1050,7 +1053,7 @@
                         <td class="col">{{tableData.goodsName}}</td>
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{tableData.type}}</td>
-                        <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容重（克/升）':'蛋白'}}</td>
+                        <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
                         <td class="col">
                             {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
                         </td>