feat✨: 翻译，应收报表和财务菜单层级改变

src/api/ecw/financial.js

@@ -929,3 +929,31 @@ export function loadReceivablePage(data) {
     params
   })
 }
+
+//应收报表列表
+export function loadStatementsReceivableList(data) {
+  let params = {
+    page: data.page,
+    rows: data.rows
+  }
+  return request({
+    url: "/ecw/receivable/box/report",
+    method: "post",
+    data,
+    params
+  })
+}
+
+//应收报表列表-自编号的订单费用汇总
+export function loadSelfNoSummaryList(data) {
+  let params = {
+    page: data.page,
+    rows: data.rows
+  }
+  return request({
+    url: "/ecw/orderCount/containerNumber/orderSummary/new",
+    method: "post",
+    data,
+    params
+  })
+}

src/i18n/languages/en_US.json

@@ -4837,5 +4837,43 @@
   "开票税率": "Tax rate of billing",
   "汇率有效期": "Validity period of exchange rate",
   "收款明细税率": "Collection details tax rate",
-  "请输入收款明细税率": "Please enter the tax rate of the collection details"
+  "请输入收款明细税率": "Please enter the tax rate of the collection details",
+  "财务结算": "financial settlement",
+  "应收款(Accounts receivable)": "Accounts receivable",
+  "汇总 Total": "Total",
+  "结算币种 settlement currency": "settlement currency",
+  "应收款明细 RECEIVABLE DEATAILS": "RECEIVABLE DEATAILS",
+  "额外费用(副币种) EXTRAL FEE": " EXTRAL FEE(Vice currency)",
+  "目的国实收": "Actual receipt in the destination country",
+  "应收款明细": "Details of receivables",
+  "应收款-原币": "Receivables - original currency",
+  "始发国实收": "Received in the country of origin",
+  "未收款明细": "No payment details",
+  "应收款": "account receivable",
+  "额外费用(副币种)": "EXTRAL FEE(Vice currency)",
+  "筛选合计信息:": "Filter total information:",
+  "未收款明细 Accounts receivable": "Accounts receivable",
+  "订单时间类型": "Order time type",
+  "是否泡货": "Whether to bubble or not",
+  "折后总金额": "Total discounted amount:",
+  "折扣金额": "discount amount",
+  "未收总金额": "Total amount not received:",
+  "折后应收金额": "Discounted amount receivable",
+  "已收金额": "amount received",
+  "未收金额": "Amount not received",
+  "应收": "receivable",
+  "批量处理成功": "Batch processing is successful",
+  "批量处理失败": "Batch processing failed",
+  "请选择需要批量操作的任务。": "Select the task that you want to batch.",
+  "批量通过": "Pass in batches",
+  "批量不通过": "Batch does not pass",
+  "审批意见不能为空。": "The approval opinion cannot be empty.",
+  "请输入审批意见": "Please enter the approval opinion",
+  "审批意见": "approval opinion",
+  "结算币种金额合计": "Total amount of settlement currency",
+  "实收金额合计": "Total amount received",
+  "收款账号": "shroff account number",
+  "结算币种": "settlement currency",
+  "汇总": "total",
+  "实收金额汇总": "Summary of amount received"
 }

src/utils/dict.js

@@ -285,7 +285,9 @@ export const DICT_TYPE = {
   RECEIPT_GENERATE_PATH: "receipt_generate_path", //收款单生成路径
   RECEIPT_LINK: "receipt_link", //应收款日志环节
   ECW_INCOME_RELATION_SYMBOL: "income_relation_symbol", //银行收支明细查询关系符号
-  LADING_BILL_STATUS_DATA: "lading_Bill_Status_Data"
+  LADING_BILL_STATUS_DATA: "lading_Bill_Status_Data", //提单制作
+  ATTRIBUTION_OF_INCOME: "attribution_of_income", //收入归属
+  PICKUP_RATE_COMPARISON_SYMBOLS: "pickup_rate_comparison_symbols" //提货率比较符号
 }
 
 /**

src/views/ecw/bankAccount/index.vue

@@ -43,9 +43,11 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('收入归属')" prop="baIncomeBelong">
-        <el-select v-model="queryParams.baIncomeBelong" :placeholder="$t('请选择')" clearable>
+        <dict-selector :type="DICT_TYPE.ATTRIBUTION_OF_INCOME" v-model="queryParams.baIncomeBelong" clearable></dict-selector>
+
+        <!-- <el-select v-model="queryParams.baIncomeBelong" :placeholder="$t('请选择')" clearable>
           <el-option v-for="countryItem in countryList" :key="countryItem.id" :label="$l(countryItem, 'title')" :value="countryItem.id" />
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-form-item :label="$t('币种')" prop="baCurrency">
         <el-select v-model="queryParams.baCurrency" :placeholder="$t('请选择')" clearable>
@@ -77,8 +79,8 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('银行账号编号')" align="center" prop="id" />
-      <el-table-column :label="$t('户名')" align="center" prop="baAccountName" />
+      <el-table-column :label="$t('银行账号编号')" fixed="left" align="center" prop="id" />
+      <el-table-column :label="$t('户名')" fixed="left" align="center" prop="baAccountName" />
       <el-table-column :label="$t('开户银行')" align="center" prop="baBankName" />
       <el-table-column :label="$t('银行账号')" align="center" prop="baAccountNum" />
       <el-table-column :label="$t('银行代码')" align="center" prop="baSwiftCode" />
@@ -89,7 +91,11 @@
           <dict-tag :type="DICT_TYPE.ECW_BANK_TYPE" :value="scope.row.baType" />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('收入归属')" align="center" :prop="$l('baIncomeBelong')" />
+      <el-table-column :label="$t('收入归属')" align="center">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.ATTRIBUTION_OF_INCOME" :value="scope.row.baIncomeBelong" />
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('币种')" align="center" prop="baCurrency">
         <template slot-scope="scope">
           {{ $l(getCurrencyData(scope.row.baCurrency), "title") }}
@@ -113,10 +119,13 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('操作')" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ecw:bank-account:update']">{{ $t("修改") }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['ecw:bank-account:delete']">{{ $t("删除") }}</el-button>
+          <el-button size="mini" type="text" @click="$router.push({ path: '/financial/bankAccount/bankBalanceDetails', query: { platformAccountIds: scope.row.id } })">{{ $t("收支明细") }}</el-button>
+
+          <!-- /financial/bankAccount/bankBalanceDetails -->
         </template>
       </el-table-column>
     </el-table>
@@ -208,7 +217,7 @@ export default {
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 银行账户列表

src/views/ecw/financial/bankBalanceDetails/index.vue

@@ -44,7 +44,7 @@
     </div>
     <div class="table-box">
       <el-table v-loading="loading" :data="list" border>
-        <el-table-column type="index" :index="indexMethod" />
+        <el-table-column type="index" :index="indexMethod" :label="$t('序号')" />
         <el-table-column :label="$t('开户银行')" width="160" align="center" prop="accountBankName"> </el-table-column>
         <el-table-column :label="$t('支/收')" width="160" align="center">
           <template slot-scope="scope">
@@ -114,6 +114,10 @@ export default {
     }
   },
   async created() {
+    if (this.$route.query.platformAccountIds != null) {
+      this.queryParams.platformAccountIds = [this.$route.query.platformAccountIds * 1]
+    }
+
     const { data } = await getBankAccountPage({ pageNo: 1, pageSize: 1000 })
     this.bankData = data.list
     this.handleQuery()

src/views/ecw/financial/chargeDetails/index.vue

@@ -362,6 +362,10 @@ export default {
     })
     getChannelList().then((res) => (this.channelList = res.data))
     this.init()
+    const orderNo = this.$route.query.orderNo || ""
+    if (orderNo) {
+      this.queryParams.orderNo = orderNo
+    }
     this.handleQuery()
   },
   methods: {

src/views/ecw/financial/collectionApprovalList/index.vue

@@ -26,7 +26,7 @@
           <user-selector style="width: 260px" multiple manage v-model="formQuery.salesmanIds" clearable :placeholder="$t('请选择')" />
         </el-form-item>
         <el-form-item :label="$t('客户') + ':'" style="margin-bottom: 0; margin-top: 20px" label-width="100px" prop="customerName">
-          <el-input style="width: 260px" v-model="formQuery.customerName" :placeholder="$t('输入客户')"> ></el-input>
+          <el-input style="width: 260px" v-model="formQuery.customerName" :placeholder="$t('请输入客户')"> ></el-input>
         </el-form-item>
         <el-form-item :label="$t('提交时间') + ':'" style="margin-bottom: 0; margin-top: 20px" label-width="100px" prop="endTimeData">
           <el-date-picker v-model="formQuery.endTimeData" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')"></el-date-picker>

src/views/ecw/financial/invoiceOperate/index.vue

@@ -652,7 +652,7 @@ export default {
                   message: this.$t("成功"),
                   type: "success"
                 })
-                this.$router.push({ path: "/financial/voucher" })
+                this.$router.push({ path: "/financial/receivable/voucher" })
               }
             })
           })

src/views/ecw/financial/receivable.vue

@@ -255,8 +255,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      if (!row) return this.$router.push("creatCollection")
-      return this.$router.push("creatCollection?orderId=" + row.orderId)
+      if (!row) return this.$router.push("/financial/creatCollection")
+      return this.$router.push("/financial/creatCollection?orderId=" + row.orderId)
     },
     submitForm() {}
   }

src/views/ecw/financial/voucher.vue

@@ -65,7 +65,7 @@
         </template>
       </el-table-column>
       <!--lanbm 2024-06-06 添加链接-->
-      <el-table-column :label="$t('收款单号')" fixed="left" align="center" prop="receiptNo">
+      <el-table-column :label="$t('收款单号')" width="150" fixed="left" align="center" prop="receiptNo">
         <template slot-scope="scope">
           <span style="color: #1890ff" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</span>
         </template>
@@ -324,6 +324,7 @@ export default {
       queryParams: {
         page: 1,
         rows: 20,
+        numberNo: null,
         dateType: null,
         date: null,
         originId: null,
@@ -377,7 +378,10 @@ export default {
 
     let that = this
     listSimpleUsers().then((res) => (that.creatorData = res.data))
-
+    const orderNo = this.$route.query.orderNo || ""
+    if (orderNo) {
+      this.queryParams.numberNo = orderNo
+    }
     this.getList()
   },
   methods: {
@@ -509,7 +513,7 @@ export default {
     },
     verificationCancelClick(row) {
       const id = row.id
-      return this.$router.push("receiptDetail?id=" + id)
+      return this.$router.push("/financial/receiptDetail?id=" + id)
       // this.$modal
       //   .confirm("您确认要反核销吗？")
       //   .then(function () {
@@ -740,13 +744,13 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(id) {
-      return this.$router.push("creatCollection?id=" + id)
+      return this.$router.push("/financial/creatCollection?id=" + id)
     },
     toprint(id) {
-      return this.$router.push("printVoucher?id=" + id)
+      return this.$router.push("/financial/printVoucher?id=" + id)
     },
     openInvoice(id) {
-      return this.$router.push("openInvoice?id=" + id)
+      return this.$router.push("/financial/openInvoice?id=" + id)
     },
     exportReceipt(id) {
       this.open = true