Merge remote-tracking branch 'origin/release2.2' into release2.2

src/api/ecw/order.js

@@ -804,3 +804,14 @@ export function orderSummaryByContainerNumber(params){
     params
   })
 }
+
+// 导出自编号订单汇总列表
+export function exportOrderSummaryByContainerNumber(params){
+  return request({
+    url: '/ecw/order/export/export-order-summary',
+    method: 'get',
+    params,
+    timeout: 5 * 60000,
+    responseType: 'blob'
+  })
+}

src/views/ecw/financial/selfNoReportDetail.vue

@@ -66,14 +66,14 @@
               icon="el-icon-search"
               @click="handleQuery"
             >{{$t('查询')}}</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="handleExport">{{$t('导出搜索')}}</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="handleExport" :loading="exporting">{{$t('导出搜索')}}</el-button>
           </el-form-item>
       </el-form>
     </el-card>
-    <el-table v-loading="loading" :data="list" border class="card">
+    <el-table v-loading="loading" :data="list" border class="card" :element-loading-text="$t('汇总计算中...')">
       <el-table-column :label="$t('序号')" width="50">
-        <template slot-scope="{row, index}">
-          {{index + 1}}
+        <template slot-scope="{row, $index}">
+          {{startNo + $index}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('订单号')" prop="orderNo" />
@@ -104,82 +104,114 @@
       <el-table-column :label="$t('订单状态')" prop="statusMsg"></el-table-column>
       <el-table-column :label="$t('应收总金额')">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.receivableTotalFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('订单优惠金额')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.discountTotalFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('实收总金额')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.netReceiptsTotalFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('已收总金额')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.writeOffTotalFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('应收运费')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.receivableFreightFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('运费优惠金额')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.discountFreightFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('实收运费')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.netReceiptsFreightFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('已收运费')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.writeOffFreightFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('应收清关费')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.receivableClearanceFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('实收清关费')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.netReceiptsClearanceFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('清关费优惠金额')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.discountClearanceFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('已收清关费')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.writeOffClearanceFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('应收额外费用')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.receivableOtherFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('实收额外费用')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.netReceiptsOtherFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('额外费用优惠金额')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.discountOtherFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('已收额外费用')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          <div v-for="item in row.writeOffOtherFeeGroupDtoList || []" :key="item.currencyId">
+            {{item.amount}}{{item.currencyName}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('是否全部核销')" width="150">
@@ -189,15 +221,15 @@
           <span v-else>{{$t('未核销')}}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户经理')" prop="name">// TODO</el-table-column>
+      <el-table-column :label="$t('客户经理')" prop="salesmanName"></el-table-column>
       <el-table-column :label="$t('订单入仓时间')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          {{ row.inTime|parseTime }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('订单装柜时间')" width="150">
         <template slot-scope="{row}">
-          // TODO
+          {{row.loadTime|parseTime}}
         </template>
       </el-table-column>
     </el-table>
@@ -217,10 +249,12 @@ import { getCurrencyPage } from "@/api/ecw/currency";
 import {getWarehouseList} from '@/api/ecw/warehouse'
 import store from "@/store";
 import UserSelector from "@/components/UserSelector/index.vue";
-import {orderSummaryByContainerNumber} from "@/api/ecw/order";
+import {exportOrderSummaryByContainerNumber, orderSummaryByContainerNumber} from "@/api/ecw/order";
 import {DICT_TYPE} from "@/utils/dict";
+import {parseTime} from "@/utils/ruoyi";
 
 export default {
+  filters: {parseTime},
   components: {UserSelector},
   data() {
     return {
@@ -231,12 +265,14 @@ export default {
       total: 0,
       queryParams: {
         page: 1,
-        rows: 20,
+        rows: 10,
       },
       tradeCityList: [],
       currencyList:[],
       warehouseList:[],
       countryList: [],
+      // 导出中状态
+      exporting: false
     };
   },
   activated(){
@@ -268,6 +304,10 @@ export default {
     importWarehouseList(){
       return this.warehouseList.filter(item => +item.tradeType === 1 || +item.tradeType === 3)
     },
+    // 序号起始
+    startNo(){
+      return (this.queryParams.page - 1) * this.queryParams.rows + 1
+    }
   },
   methods: {
     getCurrencyLabel(id){
@@ -300,7 +340,14 @@ export default {
     },
     // 导出搜索
     handleExport(){
-      this.$alert('// TODO')
+      this.exporting = true
+      let params = {...this.queryParams, containerNumber: this.$route.query.containerNumber}
+      this.addBeginAndEndTime(params, this.dateFilter, this.dateFilterType, false);
+      exportOrderSummaryByContainerNumber(params).then(res => {
+        this.$download.excel(res, params.containerNumber + '.xls');
+      }).finally(() => {
+        this.exporting = false
+      })
     }
   },
 };