From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表

---
 north-glass-erp/northglass-erp/src/components/BasicTable.vue |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index aa0fbd0..e49d379 100644
--- a/north-glass-erp/northglass-erp/src/components/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -8,6 +8,9 @@
 import deepClone from "@/utils/deepClone";
 import {ElMessage} from "element-plus";
 import * as XLSX from "xlsx";
+import {useI18n} from "vue-i18n";
+
+const { t } = useI18n()
 const xGrid = ref()
 let filterData = ref({})
 const gridOptions = reactive({
@@ -22,7 +25,8 @@
   printConfig: {},
   importConfig: {},
   exportConfig: {},
-  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+  scrollY:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
+  scrollX:{ enabled: true,gt:5 },//寮�鍚櫄鎷熸粴鍔�
   showOverflow:true,
   columnConfig: {
     resizable: true,
@@ -44,7 +48,7 @@
       options: [
         [
 
-          { code: 'exportExcelChecked', name: '瀵煎嚭閫変腑', prefixIcon: 'vxe-icon-download', visible: true }
+          { code: 'exportExcelChecked', name: t('components.exportSelected'), prefixIcon: 'vxe-icon-download', visible: true }
         ]
       ]
     }
@@ -69,7 +73,7 @@
     return[
       columns.map((column, columnIndex) => {
         if (columnIndex === 0) {
-          return '鍚堣:'
+          return t('basicData.total')
         }
         if (props.childrenData.footList.includes(column.field)) {
           return sumNum(data, column.field)
@@ -188,8 +192,8 @@
     <el-date-picker
         v-model="basicProp.selectDate"
         type="daterange"
-        start-placeholder="寮�濮嬫椂闂�"
-        end-placeholder="缁撴潫鏃堕棿"
+        :start-placeholder="$t('basicData.startDate')"
+        :end-placeholder="$t('basicData.endDate')"
         format="YYYY-MM-DD"
         value-format="YYYY-MM-DD"
     />
@@ -198,7 +202,7 @@
         id="searchButton"
         type="primary"
         style="margin-top: -5px"
-        :icon="Search">鏌ヨ</el-button>
+        :icon="Search">{{$t('basicData.search')}}</el-button>
     <div class="order-detail">
       <vxe-grid
           @filter-change="filterChanged"
@@ -231,7 +235,7 @@
                       @click="exportExcel(props.childrenData.exportUrl,
                                           props.childrenData.exportName,
                                           basicProp.selectDate)">
-            瀵煎嚭</vxe-button>
+            {{$t('basicData.export')}}</vxe-button>
         </template>
 
         <template #pager>

--
Gitblit v1.8.0