liyg 2 vuotta sitten
vanhempi
commit
da5bfb35ae
1 muutettua tiedostoa jossa 43 lisäystä ja 41 poistoa
  1. 43 41
      src/views/TMS/components/bmsship/detailsStatement.vue

+ 43 - 41
src/views/TMS/components/bmsship/detailsStatement.vue

@@ -78,6 +78,7 @@
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
             class="table"
+            fit
             :span-method="objectSpanMethod"
           >
             <el-table-column
@@ -144,27 +145,7 @@
                 {{(scope.row.monthLoadingProportion*100).toFixed(2)}}%
               </template>
             </el-table-column>
-            <el-table-column
-              prop="monthRealTonnage"
-              label="月份结算吨位"
-              width="100px"
-              align="center"
-            >
-             <template slot-scope="scope">
-                {{(scope.row.monthRealTonnage).toFixed(2)}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="monthMakeTonnage"
-              label="月份开票吨位"
-              width="100px"
-              align="center"
-            >
-             <template slot-scope="scope">
-                {{(scope.row.monthMakeTonnage).toFixed(2)}}
-              </template>
-            </el-table-column>
-            <el-table-column
+             <el-table-column
               prop="totalEnTonnage"
               label="到厂湿吨"
               width="120px"
@@ -174,6 +155,17 @@
                 <el-input type="number" v-model="scope.row.totalEnTonnage"></el-input>
               </template>
             </el-table-column>
+            <!-- <el-table-column
+              prop="monthRealTonnage"
+              label="月份结算吨位"
+              width="100px"
+              align="center"
+            >
+             <template slot-scope="scope">
+                {{(scope.row.monthRealTonnage).toFixed(2)}}
+              </template>
+            </el-table-column> -->
+           
             <el-table-column
               prop="unitPrice"
               label="合同单价"
@@ -210,11 +202,21 @@
               <template slot-scope="scope" v-if="scope.row.totalPreviewFee">
                 {{(scope.row.totalPreviewFee).toFixed(2)}}
               </template>
+            </el-table-column>
+            <el-table-column
+              prop="monthMakeTonnage"
+              label="月份开票吨位"
+              width="100px"
+              align="center"
+            >
+             <template slot-scope="scope">
+                {{(scope.row.monthMakeTonnage).toFixed(2)}}
+              </template>
             </el-table-column>
              <el-table-column
               prop="statementTotalAmount"
               label="开票金额"
-              width="100px"
+              min-width="150px"
               align="center"
             >
             </el-table-column>
@@ -299,14 +301,6 @@
               min-width="100px"
               align="center"
             >
-            </el-table-column>
-            <el-table-column
-              prop="monthMakeTonnage"
-              label="月份开票吨位"
-              width="100px"
-              align="center"
-            >
-             
             </el-table-column>
             <el-table-column
               prop="unitPrice"
@@ -314,13 +308,6 @@
               width="100px"
               align="center"
             >
-            </el-table-column>
-            <el-table-column
-              prop="inspectionsFee"
-              label="水分检测费"
-              min-width="120px"
-              align="center"
-            >
             </el-table-column>
              <el-table-column
               prop="totalPreviewTonnage"
@@ -335,6 +322,14 @@
               min-width="120px"
               align="center"
             >
+            </el-table-column>
+             <el-table-column
+              prop="monthMakeTonnage"
+              label="开票吨位"
+              width="100px"
+              align="center"
+            >
+             
             </el-table-column>
              <el-table-column
               prop="statementTotalAmount"
@@ -367,6 +362,13 @@
               align="center"
             >
             </el-table-column>
+             <el-table-column
+              prop="inspectionsFee"
+              label="水分检测费"
+              min-width="120px"
+              align="center"
+            >
+            </el-table-column>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -480,13 +482,13 @@ export default {
           item.totalEnTonnage = data[index - 1].totalEnTonnage;
         }
         //总计预开票金额
-        item.totalPreviewFee=item.totalPreviewTonnage*item.unitPrice;
+        item.totalPreviewFee=Math.round(item.totalPreviewTonnage*item.unitPrice*100)/100;
         //月份结算吨位/
-        item.monthRealTonnage = item.totalEnTonnage*item.monthLoadingProportion;
+        item.monthRealTonnage = Math.round(item.totalEnTonnage*item.monthLoadingProportion*100)/100;
         //月份开票吨位
-        item.monthMakeTonnage = item.monthRealTonnage-item.totalPreviewTonnage;
+        item.monthMakeTonnage = Math.round((item.monthRealTonnage-item.totalPreviewTonnage)*100)/100;
         //月份开票金额
-        item.statementTotalAmount=(item.monthMakeTonnage.toFixed(2)*item.unitPrice-item.inspectionsFee).toFixed(2);
+        item.statementTotalAmount=Math.round((item.monthMakeTonnage*item.unitPrice-item.inspectionsFee)*100)/100;
       });
       this.getSpanArr(this.tableData);
     },