From d48a9e80a503f8e27cce5e11a641bd26aef45594 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 Jan 2025 16:16:08 +0800
Subject: [PATCH] md

---
 .../emisTmsCostFee/EmisTmsCostFeeList.vue     | 177 +++++++++++++-----
 1 file changed, 133 insertions(+), 44 deletions(-)

diff --git a/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue b/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
index 5530b013..7ef6ebe5 100644
--- a/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
+++ b/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
@@ -1,16 +1,8 @@
 <template>
   <XdPageContainer class="app-container">
-    <SearchForm   slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-      <!-- 运输单号、供应商名称、账期、发件地、目的地、运输方式、成本时间 -->
-      <el-form-item label="运输号" prop="transSignNo">
-        <el-input
-          v-model="queryParams.transSignNo"
-          :placeholder="$t('运输号')"
-          clearable
-        />
-      </el-form-item>
-      <el-form-item :label="$t('供应商名称')" prop="feeType">
-          <el-select clearable filterable v-model="queryParams.supplierName" placeholder="请选择" style="width:100%">
+    <SearchForm   slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="30"  label-width="80px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form-item :label="$t('供应商')" prop="feeType">
+          <el-select clearable filterable v-model="queryParams.supplierName" placeholder="请选择" >
             <el-option
               v-for="dict in dict.type.emis_supplier_name"
               :key="dict.value"
@@ -20,10 +12,13 @@
           </el-select>
       </el-form-item>
       <el-form-item label="账期" prop="billMonth">
-          <el-date-picker style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+          <el-date-picker  v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM" style="z-index:9999;width:110px"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="成本时间" prop="dateTimeRange">
+        <elDateAdvPicker  placeholder="成本时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
       </el-form-item>
       <el-form-item label="运输方式" prop="transType">
-              <el-select clearable v-model="queryParams.transType" placeholder="请选择" style="width:100%">
+              <el-select clearable v-model="queryParams.transType" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.emis_biz_shipping_method"
                   :key="dict.value"
@@ -32,14 +27,21 @@
                 ></el-option>
               </el-select>
       </el-form-item>
+      <el-form-item label="运输号" prop="transSignNo">
+        <el-input
+          v-model="queryParams.transSignNo"
+          :placeholder="$t('运输号')"
+          clearable
+        />
+      </el-form-item>
       <el-form-item label="发件地" prop="sendPlace">
-              <el-input v-model="queryParams.sendPlace" placeholder="" />
+              <el-input v-model="queryParams.sendPlace" clearable placeholder="" />
       </el-form-item>
       <el-form-item label="目的地" prop="destPlace">
-              <el-input v-model="queryParams.destPlace" placeholder="" />
+              <el-input v-model="queryParams.destPlace" clearable placeholder="" />
       </el-form-item>
       <el-form-item :label="$t('费用类型')" prop="feeType">
-          <el-select clearable filterable v-model="queryParams.feeType" placeholder="请选择" style="width:100%">
+          <el-select clearable filterable v-model="queryParams.feeType" placeholder="请选择" >
             <el-option
               v-for="dict in dict.type.emis_cost_fee_type"
               :key="dict.value"
@@ -49,7 +51,7 @@
           </el-select>
       </el-form-item>
       <el-form-item :label="$t('分摊类型')" prop="splitType">
-          <el-select clearable v-model="queryParams.splitType" placeholder="请选择" style="width:100%">
+          <el-select clearable v-model="queryParams.splitType" placeholder="请选择" >
             <el-option
               v-for="dict in dict.type.emis_cost_split_type"
               :key="dict.value"
@@ -58,9 +60,7 @@
             ></el-option>
           </el-select>
       </el-form-item>
-      <el-form-item label="成本时间" prop="dateTimeRange">
-        <elDateAdvPicker  placeholder="成本时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
-      </el-form-item>
+
     </SearchForm>
 
     <XdTable
@@ -79,6 +79,8 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+            show-summary
+            :summary-method="getSummaries"
            >
 
       <div slot="toolbar">
@@ -140,11 +142,11 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="index" min-width="60">
+      <!-- <el-table-column label="序号" align="center" prop="index" min-width="60">
              <template slot-scope="scope">
                 <span v-text="getIndex(scope.$index)"> </span>
              </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column :label="$t('成本序号')" align="center" prop="costNo" min-width="100" /> -->
       <!-- <el-table-column :label="$t('成本名称')" align="center" prop="costName" min-width="100" /> -->
       <el-table-column :label="$t('成本类型')" align="center" prop="feeType" min-width="100" >
@@ -157,12 +159,14 @@
             <dict-tag :options="dict.type.emis_cost_split_type" :value="scope.row.splitType"/>
           </template>
        </el-table-column>
+       <el-table-column :label="$t('账期')" align="center" prop="billMonth" min-width="100" />
        <el-table-column :label="$t('成本时间')" align="center" prop="tradeDate" min-width="170" />
       <el-table-column :label="$t('总费用')" align="center" prop="costFee" min-width="100" />
       <el-table-column :label="$t('运单总票数')" align="center" prop="sendPieceSum" min-width="100" />
       <!-- <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" /> -->
-      <el-table-column :label="$t('运单总重')" align="center" prop="totalWeight" min-width="100" />
-      <el-table-column :label="$t('运单总体积')" align="center" prop="totalVolume" min-width="100" />
+      <!-- <el-table-column :label="$t('运单总重')" align="center" prop="totalWeight" min-width="100" /> -->
+      <el-table-column :label="$t('承运重量')" align="center" prop="realTotalWeight" min-width="100" />
+      <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
       <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="100" >
         <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
@@ -170,10 +174,9 @@
        </el-table-column>
       <el-table-column :label="$t('运输单号')" align="center" prop="transSignNo" min-width="100" />
       <!-- <el-table-column :label="$t('供应商代码')" align="center" prop="supplierCode" min-width="100" /> -->
-      <el-table-column :label="$t('供应商名称')" align="center" prop="supplierName" min-width="150" />
+      <el-table-column :label="$t('供应商名称')" align="center" prop="supplierName" min-width="180" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('发件地')" align="center" prop="sendPlace" min-width="100" />
       <el-table-column :label="$t('目的地')" align="center" prop="destPlace" min-width="100" />
-      <el-table-column :label="$t('毛重(kg)')" align="center" prop="realTotalWeight" min-width="100" />
       <el-table-column :label="$t('包裹数')" align="center" prop="realPieceNumber" min-width="100" />
 
       <!-- <el-table-column :label="$t('成本费')" align="center" prop="costFee" min-width="100" /> -->
@@ -181,7 +184,7 @@
       <!-- <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" /> -->
       <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
       <!-- <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" /> -->
-      <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120"    >
+      <!-- <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120"    >
          <template slot-scope="scope">
            <span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
            <el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
@@ -189,19 +192,14 @@
        </el-table-column>
        <el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100"    />
        <el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170"    />
-       <el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100"  />
-
-      <!-- <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="100" />
-      <el-table-column :label="$t('财务确认日期')" align="center" prop="confirmCenterDate" min-width="100" />
-      <el-table-column :label="$t('财务确认备注')" align="center" prop="confirmCenterNote" min-width="100" />
-      <el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManCode" min-width="100" />
-      <el-table-column :label="$t('财务确认站点')" align="center" prop="confirmCenterCode" min-width="100" />
-      <el-table-column :label="$t('站点确认状态')" align="center" prop="blConfirmSite" min-width="100" />
-      <el-table-column :label="$t('站点确认日期')" align="center" prop="confirmSiteDate" min-width="100" />
-      <el-table-column :label="$t('站点确认人')" align="center" prop="confirmSiteManCode" min-width="100" />
-      <el-table-column :label="$t('网点确认备注')" align="center" prop="confirmSiteNote" min-width="100" />
-      <el-table-column :label="$t('确认网点代码')" align="center" prop="confirmSiteCode" min-width="100" /> -->
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+       <el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100"  /> -->
+        <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+        <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
     </XdTable>
 
@@ -214,13 +212,13 @@
 
 <script>
 import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisTmsCostFeeView from '@/views/emis/emisTmsCostFee/emisTmsCostFeeView';
 import EmisTmsCostFeeForm from '@/views/emis/emisTmsCostFee/emisTmsCostFeeForm';
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
 export default {
   name: "emisTmsCostFee",
-  components: { elDateSimplePicker,EmisTmsCostFeeForm },
+  components: { EmisTmsCostFeeForm ,elDateAdvPicker},
   dicts: ['emis_cost_fee_type','emis_supplier_name','emis_cost_split_type','emis_biz_shipping_method','emis_payment_type'],
   data() {
     return {
@@ -274,8 +272,7 @@ export default {
     /** 查询TMS运输成本账单列表 */
     getList() {
       this.loading = true;
-
-      listEmisTmsCostFee(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisTmsCostFee( this.addDateRange(this.queryParams, this.dateTimeRange,'tradeDate')).then(response => {
         this.emisTmsCostFeeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -345,6 +342,98 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+    //指定列求和
+    getSummaries(param) {
+       const { columns, data } = param;
+       const sums = [];
+       columns.forEach((column, index) => {
+             if (index === 0) {
+               sums[index] = '合计';
+               return;
+             }
+             if (
+               column.property === 'costFee'
+               ) {
+                 const values = data.map(item => Number(item.costFee));
+                 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); //保留0位小数
+             }
+
+             else if (
+               column.property === 'sendPieceSum'
+
+               ) {
+                 const values = data.map(item => Number(item.sendPieceSum));
+
+                 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(0); //保留0位小数
+             }
+             else if (
+               column.property === 'realTotalWeight'
+
+               ) {
+                 const values = data.map(item => Number(item.realTotalWeight));
+
+                 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 === 'totalVolume'
+               ) {
+                 const values = data.map(item => Number(item.totalVolume));
+                 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 === 'realPieceNumber'
+                ) {
+                 const values = data.map(item => Number(item.realPieceNumber));
+                 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(0); //保留2位小数
+               }
+       });
+
+
+     console.log(sums);
+     return sums
+   },
+
     /** 导出按钮操作 */
     handleExport() {
     //   this.download('emis/emisTmsCostFee/export', {