Merge branch 'refs/heads/xinyan' into test

src/views/reportManage/dataCenter/normalDisplay/components/TableDataEntry.vue

@@ -217,6 +217,7 @@ interface RowVO {
   intransitInventory: number;
   overseasStorage: number;
   refundRate: number;
+  currencyCodePlatform: string;
 }
 
 const xGrid = ref<VxeGridInstance<RowVO>>();
@@ -693,7 +694,7 @@ const filteredDayColumns = computed(() => {
 
 const filteredWeekColumns = computed(() => {
   const flat = flatWeekColumns.value;
-  return flat.filter(item => !['平台编号', '平台名称', '国家', '品牌', '操作', '运营', '销售额', '广告销售额', '广告花费', '当月累计销售额', 'Other回款金额', 'Amazon回款金额','回款币种'].includes(item.title));
+  return flat.filter(item => !['平台编号', '平台名称', '国家', '品牌', '操作', '运营', '销售额', '广告销售额', '广告花费', '当月累计销售额', 'Other回款金额', 'Amazon回款金额','回款币种','回款/余额币种'].includes(item.title));
 });
 
 const filteredMonthColumns = computed(() => {
@@ -798,38 +799,6 @@ onMounted(() => {
           </template>
           <el-button :disabled="row.id" link size="small" type="primary" @click="editEvent(row)">创建</el-button>
         </template>
-        <!--<template #sales_header>-->
-        <!--  <div class="first-col">-->
-        <!--    <div class="first-col-top">销售额</div>-->
-        <!--    <div class="first-col-bottom">销售额(本币)</div>-->
-        <!--  </div>-->
-        <!--</template>-->
-        <!--<template #sales_default="{ row }">-->
-        <!--  <div class="flex items-center gap-5">-->
-        <!--    <div>-->
-        <!--      $-->
-        <!--    </div>-->
-        <!--    <div>-->
-        <!--      <div class="font-bold">-->
-        <!--        {{ row.sales }}-->
-        <!--      </div>-->
-        <!--      <div style="color: #929ca5">-->
-        <!--        {{ row.sales_original }}-->
-        <!--      </div>-->
-        <!--    </div>-->
-        <!--  </div>-->
-        <!--</template>-->
-        <!--<template #sales_edit="{ row }">-->
-        <!--  <div class="flex">-->
-        <!--    <div>-->
-        <!--      $-->
-        <!--    </div>-->
-        <!--    <div>-->
-        <!--      {{ row.sales }}-->
-        <!--      <el-input v-model="row.sales_original" size="small"></el-input>-->
-        <!--    </div>-->
-        <!--  </div>-->
-        <!--</template>-->
         <template #sales_original_edit="{ row }">
           <vxe-input v-model="row.sales_original"></vxe-input>
         </template>

src/views/reportManage/dataCenter/utils/columns.ts

@@ -70,7 +70,7 @@ export const weekColumns = ref([
   {field: 'ad_click', title: '广告点击', editRender: {}, slots: {edit: 'ad_click_edit'}, width: 120},
   {field: 'ad_order', title: '广告订单', editRender: {}, slots: {edit: 'ad_order_edit'}, width: 120},
   {field: 'money_by_amazon', title: 'Amazon回款金额', editRender: {}, slots: {edit: 'money_by_amazon_edit'},width: 134},
-  {field: 'currencyCodePlatform', title: '平台货币', editRender: {}, slots: {edit: 'currencyCodePlatform_edit'},width: 112},
+  {field: 'currencyCodePlatform', title: '回款/余额币种',width: 115},
   {field: 'money_by_other', title: 'Other回款金额',editRender: {}, slots: {edit: 'money_by_other_edit'}, width: 134},
   {field: 'session', title: '流量', editRender: {}, slots: {edit: 'session_edit'}, width: 120},
   {field: 'order', title: '订单', editRender: {}, slots: {edit: 'order_edit'}, width: 120},