xxxx

public/locales/en-US.json

@@ -2283,7 +2283,10 @@
                     "orderstatusdisplay": "Delivery status:",
                     "remark": "Remarks:",
                     "deliverycharge": "Delivery handling fee:",
-                    "closetime": "Completion time:"
+                    "closetime": "Completion time:",
+                    "totalpricemove": "总升贴水",
+                    "totalshippingfee": "总运费",
+                    "totalotherfee": "总其它费用"
                 },
                 "pay": {
                     "message": "Confirm that the delivery service provider pays the goods payment to the seller?"
@@ -3244,6 +3247,8 @@
             "cycletype": "Report Type",
             "tradedate": "Date",
             "quarter": "Quarter",
+            "areaname": "会员代码/名称",
+            "yxareauserid": "所属营销中心",
             "isson": "Include Sub-organizations",
             "areatype": "Role",
             "areaaccountid": "Settlement Fund Account",
@@ -3867,6 +3872,27 @@
             "enable": "Enable",
             "disable": "Disable",
             "lock": "Lock"
+        },
+        "reporttype": {
+            "day": "Day",
+            "week": "Week",
+            "month": "Month",
+            "quarter": "Quarter",
+            "year": "Year"
+        },
+        "quarter": {
+            "first": "The First Quarter",
+            "second": "The Second Quarter",
+            "third": "The Third Quarter",
+            "fourth": "The Fourth Quarter"
+        },
+        "buyorsell": {
+            "buy": "Buy",
+            "sell": "Sell"
+        },
+        "feealgorithm": {
+            "ratio": "Ratio",
+            "fixed": "Fixed"
         }
     }
 }

public/locales/th-TH.json

@@ -2283,7 +2283,10 @@
                     "orderstatusdisplay": "สถานะการแลกเปลี่ยน",
                     "remark": "หมายเหตุ",
                     "deliverycharge": "ค่าธรรมเนียมการแลกเปลี่ยน",
-                    "closetime": "เวลาที่เสร็จสิ้น"
+                    "closetime": "เวลาที่เสร็จสิ้น",
+                    "totalpricemove": "总升贴水",
+                    "totalshippingfee": "总运费",
+                    "totalotherfee": "总其它费用"
                 },
                 "pay": {
                     "message": "ยืนยันการชำระเงินสินค้าให้กับผู้ขายโดยบริษัทให้บริการการแลกเปลี่ยนใช่หรือไม่?"
@@ -3244,6 +3247,8 @@
             "cycletype": "ประเภทรายงาน",
             "tradedate": "วันที่",
             "quarter": "ไตรมาส",
+            "areaname": "会员代码/名称",
+            "yxareauserid": "所属营销中心",
             "isson": "รวมองค์กรย่อยหรือไม่",
             "areatype": "บทบาท",
             "areaaccountid": "บัญชีเงินทุนสำหรับการชำระบัญชี",
@@ -3867,6 +3872,27 @@
             "enable": "启用",
             "disable": "停用",
             "lock": "锁定"
+        },
+        "reporttype": {
+            "day": "日报表",
+            "week": "周报表",
+            "month": "月报表",
+            "quarter": "季报表",
+            "year": "年报表"
+        },
+        "quarter": {
+            "first": "第一季度",
+            "second": "第二季度",
+            "third": "第三季度",
+            "fourth": "第四季度"
+        },
+        "buyorsell": {
+            "buy": "买",
+            "sell": "卖"
+        },
+        "feealgorithm": {
+            "ratio": "比率",
+            "fixed": "固定值"
         }
     }
 }

public/locales/vi-VN.json

@@ -2283,7 +2283,10 @@
                     "orderstatusdisplay": "Tình trạng giao dịch:",
                     "remark": "Ghi chú:",
                     "deliverycharge": "Phí thủ tục giao dịch:",
-                    "closetime": "Thời gian hoàn thành:"
+                    "closetime": "Thời gian hoàn thành:",
+                    "totalpricemove": "总升贴水",
+                    "totalshippingfee": "总运费",
+                    "totalotherfee": "总其它费用"
                 },
                 "pay": {
                     "message": "Xác nhận dịch vụ giao dịch thanh toán tiền hàng cho người bán?"
@@ -3244,6 +3247,8 @@
             "cycletype": "Loại báo cáo",
             "tradedate": "Ngày",
             "quarter": "Qúy",
+            "areaname": "会员代码/名称",
+            "yxareauserid": "所属营销中心",
             "isson": "Bao gồm tổ chức con？",
             "areatype": "Vai trò",
             "areaaccountid": "Tài khoản thanh toán",
@@ -3867,6 +3872,27 @@
             "enable": "启用",
             "disable": "停用",
             "lock": "锁定"
+        },
+        "reporttype": {
+            "day": "日报表",
+            "week": "周报表",
+            "month": "月报表",
+            "quarter": "季报表",
+            "year": "年报表"
+        },
+        "quarter": {
+            "first": "第一季度",
+            "second": "第二季度",
+            "third": "第三季度",
+            "fourth": "第四季度"
+        },
+        "buyorsell": {
+            "buy": "买",
+            "sell": "卖"
+        },
+        "feealgorithm": {
+            "ratio": "比率",
+            "fixed": "固定值"
         }
     }
 }

public/locales/zh-CN.json

@@ -2283,7 +2283,10 @@
                     "orderstatusdisplay": "交收状态：",
                     "remark": "备注：",
                     "deliverycharge": "交收手续费：",
-                    "closetime": "完成时间："
+                    "closetime": "完成时间：",
+                    "totalpricemove": "总升贴水",
+                    "totalshippingfee": "总运费",
+                    "totalotherfee": "总其它费用"
                 },
                 "pay": {
                     "message": "确认交收服务商向卖方支付货款？"
@@ -3244,6 +3247,8 @@
             "cycletype": "报表类型",
             "tradedate": "日期",
             "quarter": "季度",
+            "areaname": "会员代码/名称",
+            "yxareauserid": "所属营销中心",
             "isson": "是否包含子机构",
             "areatype": "角色",
             "areaaccountid": "结算资金账户",
@@ -3867,6 +3872,27 @@
             "enable": "启用",
             "disable": "停用",
             "lock": "锁定"
+        },
+        "reporttype": {
+            "day": "日报表",
+            "week": "周报表",
+            "month": "月报表",
+            "quarter": "季报表",
+            "year": "年报表"
+        },
+        "quarter": {
+            "first": "第一季度",
+            "second": "第二季度",
+            "third": "第三季度",
+            "fourth": "第四季度"
+        },
+        "buyorsell": {
+            "buy": "买",
+            "sell": "卖"
+        },
+        "feealgorithm": {
+            "ratio": "比率",
+            "fixed": "固定值"
         }
     }
 }

public/locales/zh-TW.json

@@ -2283,7 +2283,10 @@
                     "orderstatusdisplay": "交收狀態：",
                     "remark": "備註：",
                     "deliverycharge": "交收手續費：",
-                    "closetime": "完成時間："
+                    "closetime": "完成時間：",
+                    "totalpricemove": "总升贴水",
+                    "totalshippingfee": "总运费",
+                    "totalotherfee": "总其它费用"
                 },
                 "pay": {
                     "message": "確認交收服務商向賣方支付貨款？"
@@ -3244,6 +3247,8 @@
             "cycletype": "報表類型",
             "tradedate": "日期",
             "quarter": "季度",
+            "areaname": "会员代码/名称",
+            "yxareauserid": "所属营销中心",
             "isson": "是否包含子機構",
             "areatype": "角色",
             "areaaccountid": "結算資金賬戶",
@@ -3867,6 +3872,27 @@
             "enable": "启用",
             "disable": "停用",
             "lock": "锁定"
+        },
+        "reporttype": {
+            "day": "日报表",
+            "week": "周报表",
+            "month": "月报表",
+            "quarter": "季报表",
+            "year": "年报表"
+        },
+        "quarter": {
+            "first": "第一季度",
+            "second": "第二季度",
+            "third": "第三季度",
+            "fourth": "第四季度"
+        },
+        "buyorsell": {
+            "buy": "买",
+            "sell": "卖"
+        },
+        "feealgorithm": {
+            "ratio": "比率",
+            "fixed": "固定值"
         }
     }
 }

src/constants/order.ts

@@ -1,3 +1,5 @@
+import { i18n } from "@/stores"
+
 /**
  * 买卖方向
  */
@@ -12,8 +14,8 @@ export enum BuyOrSell {
  */
 export function getBuyOrSellList() {
     return [
-        { label: '买', value: BuyOrSell.Buy },
-        { label: '卖', value: BuyOrSell.Sell },
+        { label: i18n.global.t('enum.buyorsell.buy'), value: BuyOrSell.Buy },
+        { label: i18n.global.t('enum.buyorsell.sell'), value: BuyOrSell.Sell },
     ]
 }
 
@@ -41,8 +43,8 @@ export enum FeeAlgorithm {
  */
 export function getFeeAlgorithmList() {
     return [
-        { label: '比率', value: FeeAlgorithm.Ratio },
-        { label: '固定值', value: FeeAlgorithm.Fixed }
+        { label: i18n.global.t('enum.feealgorithm.ratio'), value: FeeAlgorithm.Ratio },
+        { label: i18n.global.t('enum.feealgorithm.fixed'), value: FeeAlgorithm.Fixed }
     ]
 }
 

src/constants/report.ts

@@ -1,3 +1,5 @@
+import { i18n } from "@/stores"
+
 /**
  * 报表类型
  */
@@ -15,11 +17,11 @@ export enum ReportType {
  */
 export function getReportTypeList() {
     return [
-        { label: '日报表', value: ReportType.Day },
-        { label: '周报表', value: ReportType.Week },
-        { label: '月报表', value: ReportType.Month },
-        { label: '季报表', value: ReportType.Quarter },
-        { label: '年报表', value: ReportType.Year },
+        { label: i18n.global.t('enum.reporttype.day'), value: ReportType.Day },
+        { label: i18n.global.t('enum.reporttype.week'), value: ReportType.Week },
+        { label: i18n.global.t('enum.reporttype.month'), value: ReportType.Month },
+        { label: i18n.global.t('enum.reporttype.quarter'), value: ReportType.Quarter },
+        { label: i18n.global.t('enum.reporttype.year'), value: ReportType.Year },
     ]
 }
 
@@ -39,10 +41,10 @@ export enum Quarter {
  */
 export function getQuarterList() {
     return [
-        { label: '第一季度', value: Quarter.First },
-        { label: '第二季度', value: Quarter.Second },
-        { label: '第三季度', value: Quarter.Third },
-        { label: '第四季度', value: Quarter.Fourth },
+        { label: i18n.global.t('enum.quarter.first'), value: Quarter.First },
+        { label: i18n.global.t('enum.quarter.second'), value: Quarter.Second },
+        { label: i18n.global.t('enum.quarter.third'), value: Quarter.Third },
+        { label: i18n.global.t('enum.quarter.fourth'), value: Quarter.Fourth },
     ]
 }
 

src/packages/pc/views/query/internal/offlinedelivery/index.vue

@@ -34,7 +34,7 @@
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 import { ElMessage } from 'element-plus'
-import { BuyOrSell, getBuyOrSellList } from '@/constants/order'
+import { BuyOrSell, getBuyOrSellList, getBuyOrSellName } from '@/constants/order'
 import { useDataFilter } from '@/hooks/datatable-v2'
 import { useEnum } from '@/hooks/enum'
 import { useRequest } from '@/hooks/request'
@@ -67,7 +67,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'deliveryorderid', label: 'query.internal.offlinedelivery.deliveryorderid' },
     { field: 'username', label: 'query.internal.offlinedelivery.username' },
     { field: 'goodsdisplay', label: 'query.internal.offlinedelivery.goodsdisplay' },
-    { field: 'buyorselldisplay', label: 'query.internal.offlinedelivery.buyorselldisplay' },
+    { field: 'buyorsell', label: 'query.internal.offlinedelivery.buyorselldisplay', formatValue: (val) => getBuyOrSellName(val) },
     { field: 'deliveryqty', label: 'query.internal.offlinedelivery.deliveryqty' },
     { field: 'sucdeliveryqty', label: 'query.internal.offlinedelivery.sucdeliveryqty' },
     { field: 'deliveryprice', label: 'query.internal.offlinedelivery.deliveryprice' },

src/types/model/order.d.ts

@@ -1514,7 +1514,7 @@ declare namespace Model {
         goodsdisplay: string; // 交收商品
         goodunitid: number;
         matchname: string; // 对手方
-        orderstatusdisplay: number; // 交收状态
+        orderstatusdisplay: string; // 交收状态
         remark: string; // 备注
         reqtime: string; // 申请时间
         sucdeliveryqty: number; // 实际交收数量