Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

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,36 +145,27 @@
                 {{(scope.row.monthLoadingProportion*100).toFixed(2)}}%
               </template>
             </el-table-column>
-            <el-table-column
-              prop="monthRealTonnage"
-              label="月份结算吨位"
-              width="100px"
+             <el-table-column
+              prop="totalEnTonnage"
+              label="到厂湿吨"
+              width="120px"
               align="center"
             >
-             <template slot-scope="scope">
-                {{(scope.row.monthRealTonnage).toFixed(2)}}
+              <template slot-scope="scope">
+                <el-input type="number" v-model="scope.row.totalEnTonnage"></el-input>
               </template>
             </el-table-column>
             <el-table-column
-              prop="monthMakeTonnage"
-              label="月份开票吨位"
+              prop="monthRealTonnage"
+              label="月份结算吨位"
               width="100px"
               align="center"
             >
              <template slot-scope="scope">
-                {{(scope.row.monthMakeTonnage).toFixed(2)}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="totalEnTonnage"
-              label="到厂湿吨"
-              width="120px"
-              align="center"
-            >
-              <template slot-scope="scope">
-                <el-input type="number" v-model="scope.row.totalEnTonnage"></el-input>
+                {{(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);
     },

src/views/TMS/components/bmsship/updateThreeSectionFeeDetails.vue

@@ -107,7 +107,7 @@ export default {
     },
     findUnitPrice(){
         console.log("form1",this.form1);
-      if(this.form1.sendPortId && this.form1.resultOutPortTime){
+      if(this.form1.startPortId && this.form1.resultOutPortTime){
           let contract=this.unitPrices.find(item=>
           item.portId==this.form1.startPortId
           && sjTime(this.form1.resultOutPortTime)>=sjTime(item.startTime)

src/views/TMS/components/importedMine/addWagonloadCopy.vue

@@ -57,8 +57,7 @@
     </div>
     <div
       class="table item left"
-      style="width:750px;
-        height:300px;
+      style="height:300px;
         float:left;
         overflow:auto"
     >
@@ -798,6 +797,8 @@ export default {
     display: flex;
     .form_box_addWagonLoad {
       width: 340px;
+      margin-left: 30px;
+      margin-right: 20px;
       .el-form {
         .preview-group {
           .el-form-item {