完善自编号报表

src/api/ecw/box.js

@@ -350,3 +350,12 @@ export function dealCustomsSplitNotify(notifyId){
     method: "get",
   })
 }
+
+// 自编号报表分页
+export function boxSettlementPage(params) {
+  return request({
+    url: "/shipment/box/pageSettlement",
+    method: "get",
+    params,
+  });
+}

src/utils/dict.js

@@ -218,6 +218,7 @@ export const DICT_TYPE = {
   BOX_CUSTOMS_ERROR_TYPE: "customs_error_type",// 报关异常状态
   BOX_SHIPPING_ERROR_TYPE: "shipping_error_type",// 起运异常状态
   BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
+  SETTLEMENT_STATUS: 'settlement_status', // 结算状态
 
   APP_TYPE:"app_type",   //系统类型
   AIR_SHIPMENT_PROCESS:'air_shipment_process'

src/views/ecw/financial/selfNoReport.vue

@@ -13,9 +13,9 @@
             <el-input v-model="queryParams.selfNo" clearable></el-input>
           </el-form-item>
           <el-form-item :label="$t('始发仓')">
-            <el-select v-model="queryParams.warehouseId" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.startWarehouseIdList" placeholder="请选择" clearable>
               <el-option
-                v-for="item in warehouseList"
+                v-for="item in exportWarehouseList"
                 :key="item.id"
                 :label="$l(item, 'title')"
                 :value="item.id"
@@ -23,19 +23,19 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('目的国')">
-            <el-select v-model="queryParams.countryId" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.destCountryId" placeholder="请选择" clearable filterable >
               <el-option
                 v-for="item in countryList"
                 :key="item.id"
-                :label="item.name"
+                :label="$l(item, 'name')"
                 :value="item.id"
               />
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('目的仓')">
-            <el-select v-model="queryParams.destinationWarehouseId" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.destWarehouseId" placeholder="请选择" clearable>
               <el-option
-                v-for="item in warehouseList"
+                v-for="item in importWarehouseList"
                 :key="item.id"
                 :label="$l(item, 'title')"
                 :value="item.id"
@@ -43,75 +43,62 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('自编号状态')">
-            <el-select v-model="queryParams.status" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in DICT_TYPE.SELF_NO_STATUS"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <dict-selector :type="DICT_TYPE.BOX_ORDER_SHIPMENT_STATE" v-model="queryParams.status" clearable></dict-selector>
           </el-form-item>
           <el-form-item :label="$t('结算时间')" >
-            <el-date-picker
-              clearable
-              v-model="queryParams.settlementTime"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              align="right"
-              value-format="yyyy-MM-dd"
-              :picker-options="pickerOptions"
-            />
+            <el-date-picker v-model="dateFilter" type="datetimerange"  range-separator="-"
+              :start-placeholder="$t('开始日期')"
+              :end-placeholder="$t('结束日期')"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              @change="handleQuery"
+            >
+            </el-date-picker>
           </el-form-item>
           <el-form-item :label="$t('是否结算')">
-            <el-select v-model="queryParams.isSettlement" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in DICT_TYPE.YES_NO"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <dict-selector :type="DICT_TYPE.SETTLEMENT_STATUS" v-model="queryParams.slStatus" clearable></dict-selector>
           </el-form-item>
           <el-form-item>
             <el-button
               type="primary"
               icon="el-icon-search"
               @click="handleQuery"
+              :loading="loading"
             >{{$t('查询')}}</el-button>
             <el-button type="primary" icon="el-icon-plus" @click="handleExport">{{$t('导出搜索')}}</el-button>
           </el-form-item>
       </el-form>
     </el-card>
-    <el-table v-loading="loadings" :data="list" border class="card">
-      <el-table-column :label="$t('是否结算')" align="center" prop="" />
-      <el-table-column :label="$t('No.柜号')" align="center" prop="">
+    <el-table v-loading="loading" :data="list" border class="card">
+      <el-table-column :label="$t('是否结算')" align="center">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.SETTLEMENT_STATUS" :value="scope.row.slStatus"></dict-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('No.柜号')" align="center" prop="selfNo">
         <template slot-scope="scope">
-          <el-button v-if="permissions.indexOf('selfno:report:detail') > -1" type="text" @click="$router.push('./selfno_report_detail?id=' + scope.row.id)">{{scope.row.no}}</el-button>
-          <span v-else>{{scope.row.no}}</span>
+          <el-button v-if="permissions.indexOf('selfno:report:detail') > -1" type="text" @click="$router.push('./self_no_report_detail?containerNumber=' + scope.row.selfNo)">{{scope.row.selfNo}}</el-button>
+          <span v-else>{{scope.row.selfNo}}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('应收款(Accounts receivable)')" align="center" prop=""></el-table-column>
+      <el-table-column :label="$t('应收款(Accounts receivable)')" align="center" prop="summaryInfo.receivableTotalFeeGroup"></el-table-column>
       <el-table-column :label="$t('received in + 目的国国家(目的地实收)')" align="center" prop="">
-        <el-table-column :label="$t('运费')"></el-table-column>
-        <el-table-column :label="$t('清关费')"></el-table-column>
-        <el-table-column :label="$t('额外费用')"></el-table-column>
+        <el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsCollectFreightFeeGroup"></el-table-column>
+        <el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsCollectClearanceFeeGroup"></el-table-column>
+        <el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsCollectOtherFeeGroup"></el-table-column>
       </el-table-column>
       <el-table-column :label="$t('received in China(中国实收)')" align="center" prop="" >
-        <el-table-column :label="$t('运费')"></el-table-column>
-        <el-table-column :label="$t('清关费')"></el-table-column>
-        <el-table-column :label="$t('额外费用')"></el-table-column>
+        <el-table-column :label="$t('运费')" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup"></el-table-column>
+        <el-table-column :label="$t('清关费')" prop="summaryInfo.netReceiptsAdvanceClearanceFeeGroup"></el-table-column>
+        <el-table-column :label="$t('额外费用')" prop="summaryInfo.netReceiptsAdvanceOtherFeeGroup"></el-table-column>
       </el-table-column>
       <el-table-column :label="$t('Discounts 折扣')" align="center" prop="">
-        <el-table-column :label="$t('运费')"></el-table-column>
-        <el-table-column :label="$t('清关费')"></el-table-column>
-        <el-table-column :label="$t('额外费用')"></el-table-column>
+        <el-table-column :label="$t('运费')" prop="summaryInfo.discountFreightFeeGroup"></el-table-column>
+        <el-table-column :label="$t('清关费')" prop="summaryInfo.discountClearanceFeeGroup"></el-table-column>
+        <el-table-column :label="$t('额外费用')" prop="summaryInfo.discountOtherFeeGroup"></el-table-column>
       </el-table-column>
       <el-table-column :label="$t('操作')" v-if="permissions.indexOf('selfno:report:detail') > -1">
         <template slot-scope="scope">
-          <el-button type="text" @click="$router.push('./selfno_report_detail?id=' + scope.row.id)">{{$t('查看')}}</el-button>
+          <el-button type="text" @click="$router.push('./self_no_report_detail?id=' + scope.row.id)">{{$t('查看')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -131,18 +118,23 @@ import { getCurrencyPage } from "@/api/ecw/currency";
 import {getWarehouseList} from '@/api/ecw/warehouse'
 import Template from "@/views/cms/template/index.vue";
 import store from "@/store";
+import {boxSettlementPage} from "@/api/ecw/box";
+import {DICT_TYPE} from "@/utils/dict";
+import {getCountryListAll} from "@/api/ecw/country";
 
 export default {
   components: {Template},
   data() {
     return {
+      loading: false, // 是否加载中
+      dateFilter:[], // 筛选时间
       list: [],
       total: 0,
       queryParams: {
         page: 1,
         rows: 20,
       },
-      tradeCityList: [],
+      // tradeCityList: [],
       currencyList:[],
       warehouseList:[],
       countryList: [],
@@ -153,26 +145,32 @@ export default {
   },
   created() {
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
-    getTradeCityList().then((res) => (this.tradeCityList = res.data));
+    // getTradeCityList().then((res) => (this.tradeCityList = res.data));
     this.getList();
     getWarehouseList().then(res => this.warehouseList = res.data)
+    getCountryListAll().then(r => {
+      this.countryList = r.data
+    })
   },
   computed: {
+    DICT_TYPE() {
+      return DICT_TYPE
+    },
     permissions(){
       return store.getters.permissions
     },
-    exportCityList() {
+    /*exportCityList() {
       return this.tradeCityList.filter((item) => item.type === 2);
     },
     importCityList() {
       return this.tradeCityList.filter((item) => item.type === 1);
-    },
+    },*/
     exportWarehouseList(){
       /* tradeType 1 进口，2出口，3进出口 */
-      return this.warehouseList.filter(item => item.tradeType === 2 || item.tradeType === 3)
+      return this.warehouseList.filter(item => +item.tradeType === 2 || +item.tradeType === 3)
     },
     importWarehouseList(){
-      return this.warehouseList.filter(item => item.tradeType === 1 || item.tradeType === 3)
+      return this.warehouseList.filter(item => +item.tradeType === 1 || +item.tradeType === 3)
     },
   },
   methods: {
@@ -185,24 +183,28 @@ export default {
     getList() {
       this.loading = true;
       let params = {...this.queryParams}
-      this.addBeginAndEndTime(params, this.dateType, "createTime");
+      this.addBeginAndEndTime(params, this.dateFilter, "JsDate", false);
       // 执行查询
-      /* TODO getListApi(params).then((response) => {
+      boxSettlementPage(params).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
+      }).finally(() => {
         this.loading = false;
-      });*/
+      })
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.$refs['queryForm'].resetFields()
       this.queryParams.page = 1;
-      // TODO 重置结算时间
       this.getList();
     },
+    handleReset(){
+      this.$refs['queryForm'].resetFields()
+      this.dateFilter = []
+      this.handleQuery()
+    },
     // 导出搜索
     handleExport(){
-      // TODO 导出搜索
+      this.$message.info("// TODO 导出搜索")
     }
   },
 };