Merge pull request '销账功能' (#190) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/190

src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue

@@ -69,7 +69,7 @@
       <!-- <el-table-column :label="$t('开票状态')" align="center" prop="batchNo" min-width="100" /> -->
       <el-table-column :label="$t('申请人')" align="center" prop="applyManName" min-width="130"
         :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('运费')" align="center" prop="emisWaybill.freight" min-width="100" >
+      <el-table-column :label="$t('账单金额')" align="center" prop="emisWaybill.freight" min-width="100" >
           <template slot-scope="scope">
                 <!-- 求和 -->
                 {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0) }}
@@ -81,11 +81,30 @@
                 {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0) }}
           </template>
       </el-table-column>   
-      <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="100" />
+      <el-table-column :label="$t('本次销账金额')" align="center" prop="writeoffAmount" min-width="150" />
+      <!-- <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="100" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.satisfyMoney || 0), 0) }}
+          </template>
+      </el-table-column>    -->
+      <!-- <el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="100" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.allowanceMoney || 0), 0) }}
+          </template>
+      </el-table-column>    -->
+      <!-- <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.deductionMoney || 0), 0) }}
+          </template>
+      </el-table-column>    -->
+      <!-- <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.otherMoney || 0), 0) }}
+          </template>
+      </el-table-column>    -->
       <el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
           <template slot-scope="scope">
-                <!-- 求和 -->
+                 {{ unrecedMoney(scope.row) }}
-                {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight -item.emisSettleSubBill.recedMoney - item.applyMoney || 0), 0) }}
           </template>
       </el-table-column>   
       <el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">
@@ -294,6 +313,10 @@ export default {
     },
     cancelForm() {
       this.openForm = false;
+    },
+    unrecedMoney(row) {
+      // return (row.detailList.reduce((total, item) => total + (item.emisWaybill.freight - item.emisSettleSubBill.recedMoney - item.emisSettleSubBill.satisfyMoney  - item.emisSettleSubBill.allowanceMoney  - item.emisSettleSubBill.deductionMoney  - item.emisSettleSubBill.otherMoney || 0), 0)) - (row.writeoffAmount);
+      return (row.detailList.reduce((total, item) => total + (item.emisWaybill.freight - item.emisSettleSubBill.recedMoney  || 0), 0));
     }
   }
 };

src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue

@@ -12,7 +12,7 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column :label="$t('序号')" align="center" type="index" width="50" />
             <el-table-column :label="$t('运单号')" align="center" prop="emisWaybill.billCode" min-width="170" />
-            <el-table-column :label="$t('运费')" align="center" prop="emisWaybill.freight" min-width="80"
+            <el-table-column :label="$t('账单金额')" align="center" prop="emisWaybill.freight" min-width="80"
                 :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
                   {{scope.row.emisWaybill.freight}}
@@ -24,7 +24,7 @@
             </el-table-column>
             <el-table-column :label="$t('未收金额 ')" align="center" prop="" min-width="100" >
                 <template slot-scope="scope">
-                  {{scope.row.emisWaybill.freight - scope.row.emisSettleSubBill.recedMoney - scope.row.applyMoney}}
+                  {{scope.row.emisWaybill.freight - scope.row.emisSettleSubBill.recedMoney}}
                 </template>
             </el-table-column>
             <el-table-column :label="$t('寄件日期')" align="center" prop="emisWaybill.sendDate" min-width="170"

src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue

@@ -77,7 +77,7 @@
             <!-- <el-table-column :label="$t('开票状态')" align="center" prop="batchNo" min-width="100" /> -->
             <el-table-column :label="$t('申请人')" align="center" prop="applyManName" min-width="130"
                 :show-overflow-tooltip="true" />
-            <el-table-column :label="$t('运费')" align="center" prop="emisWaybill.freight" min-width="100" >
+            <el-table-column :label="$t('账单金额')" align="center" prop="emisWaybill.freight" min-width="100" >
                 <template slot-scope="scope">
                      <!-- 求和 -->
                       {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0) }}
@@ -89,11 +89,11 @@
                       {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0) }}
                 </template>
             </el-table-column>   
-            <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="100" />
+            <el-table-column :label="$t('本次销账金额')" align="center" prop="writeoffAmount" min-width="140" />
             <el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
                 <template slot-scope="scope">
                      <!-- 求和 -->
-                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight -item.emisSettleSubBill.recedMoney - item.applyMoney || 0), 0) }}
+                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight -item.emisSettleSubBill.recedMoney || 0), 0) }}
                 </template>
             </el-table-column>   
             <el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">