From 82670436d2d70dc749a03c1281b5f66bbfd4ae79 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 16 Sep 2025 14:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E3=80=81=E7=8E=B0=E9=87=91?=
 =?UTF-8?q?=E3=80=81=E6=9C=88=E7=BB=93=E5=87=BA=E8=B4=A6=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SubBillConfirmByMoneyList.vue             | 22 ++++++++++++++--
 .../SubBillConfirmByMonthList.vue             | 26 +++++++++++++++++--
 .../SubBillConfirmBySiteList.vue              | 15 +++++++++++
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index b5d44afd..cd76c95a 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -333,9 +333,12 @@
                 <span v-else>{{scope.row.waybillDetail.freight}}</span>
             </template>
        </el-table-column>
-       <el-table-column :label="$t('运费差')" align="center" prop="waybillDetail.fee" min-width="80" >
+       <el-table-column :label="$t('运费差')" align="center" prop="diffFee" min-width="80" >
             <template slot-scope="scope">
-              <span v-if="scope.row.waybillDetail.realFee">{{ scope.row.waybillDetail.realFee-scope.row.waybillDetail.freight }}</span>
+                <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="paymentStatus" width="100" >
@@ -1437,6 +1440,21 @@ export default {
         if (j === 'waybillDetail.paymentType') {
           return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
         }
+        if(j === 'diffFee'){
+          if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
+            return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
+          }else{
+            return 0;
+          }
+        }
+        if(j === 'blSpecialQuote'){
+          if(v['waybillDetail']['blSpecialQuote'] == '0'){
+            return '否';
+          }
+          else if(v['waybillDetail']['blSpecialQuote'] == '1'){
+            return '是';
+          }
+        }
         return v[j]
       }))
     },
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 7a1616f2..6204601c 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -355,13 +355,21 @@
               <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
               <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80"   />
               <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="120" :sortable="true"  />
+              <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
               <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" 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}}</span>
                         <span v-else>{{scope.row.waybillDetail.freight}}</span>
                     </template>
               </el-table-column>
-
+              <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="paymentStatus" width="100" >
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
@@ -385,7 +393,6 @@
                     <el-tag v-if="scope.row.waybillDetail.blSpecialQuote=='1'" type="error">是</el-tag>
                   </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.paymentType" min-width="80" :show-overflow-tooltip="true"   >
                 <template slot-scope="scope">
@@ -1552,6 +1559,21 @@ export default {
         if (j === 'waybillDetail.paymentType') {
           return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
         }
+        if(j === 'diffFee'){
+          if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
+            return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
+          }else{
+            return 0;
+          }
+        }
+        if(j === 'blSpecialQuote'){
+          if(v['waybillDetail']['blSpecialQuote'] == '0'){
+            return '否';
+          }
+          else if(v['waybillDetail']['blSpecialQuote'] == '1'){
+            return '是';
+          }
+        }
         return v[j]
       }))
     },
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 19791000..23d75e65 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -1598,6 +1598,21 @@ export default {
         if (j === 'waybillDetail.paymentType') {
           return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
         }
+        if(j === 'diffFee'){
+          if(v['waybillDetail']['freight'] != v['waybillDetail']['realFee']){
+            return v['waybillDetail']['freight'] - v['waybillDetail']['realFee'];
+          }else{
+            return 0;
+          }
+        }
+        if(j === 'blSpecialQuote'){
+          if(v['waybillDetail']['blSpecialQuote'] == '0'){
+            return '否';
+          }
+          else if(v['waybillDetail']['blSpecialQuote'] == '1'){
+            return '是';
+          }
+        }
         return v[j]
       }))
     },