Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/payprint.html

@@ -258,11 +258,12 @@
                   <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">扣杂重</td>
                   <td class="col col-bgc">净重</td>
-                  <td class="col col-bgc">纯重</td>
+                  <!-- <td class="col col-bgc">纯重</td> -->
                 </tr>
                 <tr class="row">
                   <td class="col">{{ printData1[index].goodsName}}</td>
@@ -277,6 +278,7 @@
                   <td class="col">
                     {{ printData1[index].qualityInspectionManagement.impurity}}
                   </td>
+                  <td class="col">{{printData.qualityInspectionManagement.bulkDensity}}</td>
                   <td class="col">{{ printData1[index].grossWeight}}</td>
                   <td class="col">{{ printData1[index].tare}}</td>
                   <td class="col">
@@ -284,9 +286,10 @@
                     printData1[index].weighingManagement.buckleMiscellaneous}}
                   </td>
                   <td class="col">{{ printData1[index].netWeight}}</td>
-                  <td class="col">{{ printData1[index].pureWeight}}</td>
+                  <!-- <td class="col">{{ printData1[index].pureWeight}}</td> -->
                 </tr>
                 <tr class="row">
+                  <td class="col col-bgc">纯重</td>
                   <td class="col col-bgc" v-if="printData1[index].type == '潮粮'">
                     净重单价
                   </td>
@@ -301,9 +304,10 @@
                   <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">
+                  <td class="col">{{ printData1[index].pureWeight}}</td>
                   <td class="col " v-if="printData1[index].type == '潮粮'">
                     {{printData1[index].tidalGrainPrice}}
                   </td>
@@ -318,9 +322,10 @@
                   <td class="col ">{{ printData1[index].otherSubsidy}}</td>
                   <td class="col ">{{ printData1[index].weighingDeduction}}</td>
                   <td class="col ">{{ printData1[index].freightDeduction}}</td>
-                  <td class="col ">{{ printData1[index].unloadDeduction}}</td>
+                  <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                 </tr>
                 <tr class="row">
+                  <td class="col col-bgc">卸车扣款</td>
                   <td class="col col-bgc">质量扣款</td>
                   <td class="col col-bgc">其他扣款</td>
                   <td class="col col-bgc" v-if="printData.type == '潮粮'">
@@ -329,9 +334,10 @@
                   <td class="col col-bgc">合计应付</td>
                   <td class="col col-bgc">购粮性质</td>
                   <td class="col col-bgc">车牌号</td>
-                  <td class="col col-bgc" colspan="5">记事</td>
+                  <td class="col col-bgc" colspan="4">记事</td>
                 </tr>
                 <tr class="row">
+                  <td class="col ">{{ printData1[index].unloadDeduction}}</td>
                   <td class="col ">{{ printData1[index].qualityDeduction}}</td>
                   <td class="col ">{{ printData1[index].otherDeduction}}</td>
                   <td class="col " v-if="printData1[index].type == '潮粮'">
@@ -345,7 +351,7 @@
                     printData1[index].qualityInspectionManagement.natureOfGrainPurchase}}
                   </td>
                   <td class="col ">{{ printData1[index].carNo}}</td>
-                  <td class="col " colspan="5">
+                  <td class="col " colspan="4">
                     {{ printData1[index].remarks}}
                   </td>
                 </tr>

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -47,11 +47,12 @@
         <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">扣杂重</td>
         <td class="col col-bgc">净重</td>
-        <td class="col col-bgc">纯重</td>
+        <!-- <td class="col col-bgc">纯重</td> -->
       </tr>
       <tr class="row">
         <td class="col">{{ printData.goodsName}}</td>
@@ -59,13 +60,14 @@
         <td class="col">{{ printData.qualityInspectionManagement.grade}}</td>
         <td class="col">{{ printData.qualityInspectionManagement.waterContent}}</td>
         <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
+        <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>
         <td class="col">{{ printData.netWeight}}</td>
-        <td class="col">{{ printData.pureWeight}}</td>
       </tr>
       <tr class="row">
+        <td class="col col-bgc">纯重</td>
         <td class="col col-bgc"  v-if="printData.type == '潮粮'">净重单价</td>
         <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
         <td class="col col-bgc">扣单价</td>
@@ -76,9 +78,10 @@
         <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">
+        <td class="col">{{ printData.pureWeight}}</td>
         <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
         <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
         <td class="col ">{{ printData.unitDeduction}}</td>
@@ -89,25 +92,27 @@
         <td class="col ">{{ printData.otherSubsidy}}</td>
         <td class="col ">{{ printData.weighingDeduction}}</td>
         <td class="col ">{{ printData.freightDeduction}}</td>
-        <td class="col ">{{ printData.unloadDeduction}}</td>
+        <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
       </tr>
       <tr class="row">
+        <td class="col col-bgc">卸车扣款</td>
         <td class="col col-bgc">质量扣款</td>
         <td class="col col-bgc">其他扣款</td>
         <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td>
         <td class="col col-bgc">合计应付</td>
         <td class="col col-bgc">购粮性质</td>
         <td class="col col-bgc">车牌号</td>
-        <td class="col col-bgc" colspan="5">记事</td>
+        <td class="col col-bgc" colspan="4">记事</td>
       </tr>
       <tr class="row">
+        <td class="col ">{{ printData.unloadDeduction}}</td>
         <td class="col ">{{ printData.qualityDeduction}}</td>
         <td class="col ">{{ printData.otherDeduction}}</td>
         <td class="col " v-if="printData.type == '潮粮'">{{ printData.solidGrainPrice}}</td>
         <td class="col ">{{ printData.calculationPayable}}</td>
         <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
         <td class="col ">{{ printData.carNo}}</td>
-        <td class="col " colspan="5">{{ printData.remarks}}</td>
+        <td class="col " colspan="4">{{ printData.remarks}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">实付金额</td>