页面调整及优化

src/utils/excel.ts

@@ -195,9 +195,9 @@ export function setRangeBackground(range: Recordable, bg: string, isChangeSheet:
  * 解析后数据，处理表头和表格数据
  * @param data
  */
-export function filterRunData(data: any) {
+export function filterRunData(data: any, config: boolean = false) {
   const res: Recordable[] = []
-  const titles: string[] = []
+  const titles: Set<string> = new Set()
   // 映射字段配置生成
   const configs: Recordable = {}
   const temConf = {
@@ -216,8 +216,8 @@ export function filterRunData(data: any) {
     const rw: Recordable = {}
     row.order.forEach((itm: any) => {
       Reflect.set(rw, itm.title, itm.value)
-      if (!titles.includes(itm.title)) {
-        titles.push(itm.title)
+      titles.add(itm.title)
+      if (!Reflect.has(configs, itm.title) && config) {
         Reflect.set(configs, itm.title, temConf)
       }
     })
@@ -241,7 +241,7 @@ export function filterRunData(data: any) {
 
   return {
     res,
-    titles,
+    titles: [...titles],
     configs
   }
 }

src/views/customer/CustomerEmail/CustomerEmail.vue

@@ -36,10 +36,8 @@
         :data="tableData"
       >
         <vxe-column type="checkbox" width="50"></vxe-column>
-        <!-- <vxe-column field="customerEmailId" title="id" width="200"></vxe-column> -->
         <vxe-column field="customerId_dictText" title="客户名称" width="200"></vxe-column>
         <vxe-column field="email" title="邮箱地址"></vxe-column>
-        <vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
 
         <vxe-column field="action" title="操作" width="100">
           <template #default="{ row }">

src/views/customer/ResponsibleCustomer/ResponsibleCustomer.vue

@@ -40,8 +40,7 @@
         :data="tableData"
       >
         <vxe-column type="checkbox" width="50"></vxe-column>
-        <!-- <vxe-column field="customerEmailId" title="id" width="200"></vxe-column> -->
-        <vxe-column field="customerId_dictText" title="客户名称" width="200"></vxe-column>
+        <vxe-column field="customerId_dictText" title="客户名称"></vxe-column>
         <vxe-column field="userId_dictText" title="用户名称"></vxe-column>
         <vxe-column field="action" title="操作" width="100">
           <template #default="{ row }">

src/views/order/convertOrder/index.vue

@@ -26,13 +26,19 @@
       border
       :data="tableData"
       :loading="loading"
+      show-overflow="tooltip"
       size="small"
     >
       <vxe-column type="checkbox" width="40"></vxe-column>
-      <vxe-column field="customerId_dictText" title="客户名称"></vxe-column>
-      <vxe-column field="convertOrderId" title="convertOrderId"></vxe-column>
-      <vxe-column field="excelOrderId" title="excelOrderId"></vxe-column>
-      <vxe-column field="createTime" title="创建时间"></vxe-column>
+      <vxe-column field="customerId_dictText" title="客户名称" width="200"></vxe-column>
+      <vxe-column field="filePath" title="订单文件">
+        <template #default="{ row }">
+            <el-link target="_blank" :href="'/api/sys/static/' + row.filePath">{{
+              row.filePath
+            }}</el-link>
+          </template>
+      </vxe-column>
+      <vxe-column field="createTime" title="创建时间" width="200"></vxe-column>
       <vxe-column field="action" title="操作" width="100">
         <template #default="{ row }">
           <el-button type="primary" text size="small" @click="toDetail(row)">查看</el-button>

src/views/order/orderChange/OrderChange.vue

@@ -29,6 +29,7 @@
         ref="xTable"
         size="small"
         min-height="460"
+        show-overflow="tooltip"
         border
         :loading="loading"
         :data="tableData"
@@ -41,7 +42,7 @@
             }}</el-link>
           </template>
         </vxe-column>
-        <vxe-column field="status_dictText" title="订单状态" width="200"></vxe-column>
+        <vxe-column field="status_dictText" title="订单状态" width="120"></vxe-column>
         <vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
         <vxe-column field="action" title="操作" width="120">
           <template #default="{ row }">
@@ -264,6 +265,7 @@ const scriptPs = ref<Recordable>({})
 const scriptList = ref<Recordable[]>([])
 /**所有映射字段 */
 const orderFieldList = ref<Recordable[]>([])
+const variableField = ref([])
 
 const xTable = ref<VxeTableInstance>()
 const tableData = ref([])
@@ -332,7 +334,6 @@ watch(
   }
 )
 
-const variableField = ref([])
 const allFields = computed(() => {
   return [
     {
@@ -420,7 +421,10 @@ const getOrderFields = async () => {
 
 const getOrderVariableField = async () => {
   const { data } = await getVariableField(currentRow.excelOrderId)
-  variableField.value = data.result
+  if (data.code != 200) {
+    ElMessage.warning(data.message)
+  }
+  variableField.value = data.result || []
 }
 
 /**确认解析/转换的订单的状态 */
@@ -497,9 +501,8 @@ const toDetail = async (row: any) => {
   allMapConfigs.value = {}
   Object.assign(currentRow, row)
 
-  const { res, titles, configs } = filterRunData(row.orders)
+  const { res, titles, configs } = filterRunData(row.orders, true)
   await getOrderVariableField()
-  console.log('allFields', allFields)
   const { data } = await getConfByExcelOrderId(row.excelOrderId)
   if (data.result.length) {
     const tmp = {

src/views/order/orderList/OrderList.vue

@@ -26,7 +26,7 @@
         size="small"
         min-height="460"
         border
-        show-overflow="ellipsis"
+        show-overflow="tooltip"
         :loading="loading"
         :data="tableData"
       >

src/views/product/productCompare/ProductCompare.vue

@@ -38,6 +38,7 @@
         size="mini"
         min-height="460"
         border
+        show-overflow="tooltip"
         :loading="loading"
         :data="tableData"
       >

src/views/product/productList/ProductList.vue

@@ -19,6 +19,7 @@
         size="small"
         min-height="460"
         border
+        show-overflow="tooltip"
         :loading="loading"
         :data="tableData"
       >