md

src/views/emis/emisCreditSalesmen/index.vue

@@ -125,7 +125,7 @@
       </el-table-column>
       <el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="130" :sortable="true">
         <template slot-scope="scope">
-          {{ ( ((scope.row.creditMoney + scope.row.tempCreditMoney - scope.row.useMoney)/(scope.row.creditMoney + scope.row.tempCreditMoney))*100 ).toFixed(2)  }}%
+          {{ ( ((scope.row.tempCreditMoney - scope.row.useMoney)/(scope.row.tempCreditMoney))*100 ).toFixed(2)  }}%
         </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="200" :show-overflow-tooltip="true">

src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue

@@ -351,6 +351,16 @@
                 <span v-else>{{scope.row.waybillDetail.freight}}</span>
             </template>
         </el-table-column>
+        <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
+        <el-table-column :label="$t('运费差')" align="center" prop="diffFee" min-width="80"    >
+            <template slot-scope="scope">
+                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">
+                  {{scope.row.waybillDetail.freight-scope.row.waybillDetail.realFee}}
+                </span>
+                <span v-else>0</span>
+            </template>
+        </el-table-column>
+
 
         <el-table-column :label="$t('已收款金额')" align="center" prop="recedMoney" width="120" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('已开票金额')" align="center" prop="invoicedMoney" width="120" :show-overflow-tooltip="true"/>
@@ -378,7 +388,6 @@
                 </template>
         </el-table-column>
 
-       <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"   />
 
        <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true"  />
@@ -948,7 +957,22 @@ export default {
                  }, 0);
                  sums[index] = sums[index].toFixed(2); //保留2位小数
              }
+             else if (
+               column.property === 'waybillDetail.realFee'
 
+               ) {
+                 const values = data.map(item => Number(item.waybillDetail.realFee));
+
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
              else if (
                column.property === 'waybillDetail.totalVolume'
                ) {

src/views/emis/emisTmsSiteBatchMiss/index.vue

@@ -1,6 +1,6 @@
 <template>
   <XdPageContainer class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="30"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="30"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item :label="$t('运单号')" prop="billCode">
         <XdTextareaInput
@@ -78,6 +78,11 @@
 
     <XdTable
            v-loading="loading"
+
+           slot="pageContent"
+           slot-scope="slotProps"
+           :height="(slotProps.contentHeight)+'px'"
+
            border
            stripe
 
@@ -187,7 +192,7 @@ import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 
 export default {
-  name: "emisTmsSiteBatchMiss",
+  name: "EmisTmsSiteBatchMiss",
   components: {
     elDateAdvPicker,
     emisTransPlanRuleForm,