添加订单转换

src/api/order.ts

@@ -45,3 +45,48 @@ export const deleteCustomerEmails = (customerEmailIds: string) => {
     headers: formHeader
   })
 }
+
+/** excel文件解析列表 */
+export const getExcelFileOrderPage = (params: any) => {
+  return axios.get('/api/excelFileOrder/page', {
+    params,
+    headers: formHeader
+  })
+}
+
+/** 设置订单字段 */
+export const saveConfExcelFileOrderPage = (data: any) => {
+  return axios.post('/api/excelFileOrder/saveConf', data)
+}
+
+/** 批量删除 */
+export const deleteExcelFileOrderById = (ids: any) => {
+  return axios.get('/api/excelFileOrder/batchDeleteByIds', {
+    params: { ids },
+    headers: formHeader
+  })
+}
+
+/** 转换订单 */
+export const convertExcelFileOrder = (excelOrderId: string) => {
+  return axios.get('/api/excelFileOrder/convert', {
+    params: { excelOrderId },
+    headers: formHeader
+  })
+}
+
+/** 解析后确认订单 */
+export const unconvertExcelFileOrder = (excelOrderId: string) => {
+  return axios.get('/api/excelFileOrder/unconvert', {
+    params: { excelOrderId },
+    headers: formHeader
+  })
+}
+
+/** 转换后确认订单 */
+export const confirmExcelFileOrderById = (excelOrderId: string) => {
+  return axios.get('/api/excelFileOrder/confirmById', {
+    params: { excelOrderId },
+    headers: formHeader
+  })
+}

src/router/index.ts

@@ -42,6 +42,14 @@ export const routes = [
           title: '订单文件'
         }
       },
+      {
+        path: '/order/change',
+        name: 'OrderChange',
+        component: () => import('@/views/order/orderChange/OrderChange.vue'),
+        meta: {
+          title: '订单转换'
+        }
+      },
       {
         path: '/order/customer',
         name: 'OrderCustomer',

src/utils/excel.ts

@@ -83,6 +83,7 @@ export function handleRangeTitle(range: any) {
     const title = {
       title: '',
       sheet: sheetNum,
+      numFlag: 'N',
       row: !isVertical ? +beginRow + rowLen - 1 : endRow - rowLen - 1,
       colum: isVertical ? +beginColum + columnLen - 1 : endColum - columnLen - 1
     }
@@ -176,7 +177,7 @@ export function setRangeBackground(range: Recordable, bg: string, isChangeSheet:
     r.endColum = range.colum
     r.sheetNum = range.sheet
   }
-  
+
   isChangeSheet && setCurrentSheet(r.sheetNum)
 
   luckysheet.menuButton.customUpdateFormat(
@@ -190,3 +191,58 @@ export function setRangeBackground(range: Recordable, bg: string, isChangeSheet:
     false
   )
 }
+
+/**
+ * 解析后数据，处理表头和表格数据
+ * @param data
+ */
+export function filterRunData(data: any) {
+  const res: Recordable[] = []
+  const titles: string[] = []
+  // 映射字段配置生成
+  const configs: Recordable = {}
+  const temConf = {
+    title: '',
+    content: '',
+    mapField: '',
+    scriptName: '',
+    groupTitle: '',
+    templateFileId: '',
+    excelOrderFiledConfId: '',
+    params: {},
+    orderFiled: {}
+  }
+
+  data.forEach((row: 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)
+        Reflect.set(configs, itm.title, temConf)
+      }
+    })
+    // 是否有附加信息
+    // if (row?.groups?.length) {
+    //   Reflect.set(rw, 'expendData', {})
+    //   row.groups.forEach((itm: any) => {
+    //     rw['expendData'][itm.title] = []
+    //     const r: Recordable = {}
+    //     itm.item.forEach((v: any) => {
+    //       r[v.title] = v.value
+    //     Reflect.set(configs, itm.title+'__'+v.title, temConf)
+
+    //     })
+    //     rw['expendData'][itm.title].push(r)
+    //   })
+    // }
+
+    res.push(rw)
+  })
+
+  return {
+    res,
+    titles,
+    configs
+  }
+}

src/views/customer/CustomerEmail/CustomerEmail.vue

@@ -39,6 +39,8 @@
         <!-- <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 }">
             <el-button type="primary" text size="small" @click="editRow(row)">修改</el-button>
@@ -109,7 +111,7 @@ const formState = reactive({
   customerId: '',
   currentPage: 1,
   pageSize: 10,
-  total: 0
+  total: 0,
 })
 
 const modalType = ref('')

src/views/order/orderChange/components/configForm.vue

+<template>
+    <div>
+        123
+    </div>
+</template>
\ No newline at end of file

src/views/order/orderList/OrderList.vue

@@ -26,18 +26,20 @@
         size="small"
         min-height="460"
         border
+        show-overflow='ellipsis'
         :loading="loading"
         :data="tableData"
       >
         <vxe-column type="checkbox" width="50"></vxe-column>
         <!-- <vxe-column field="orderFileId" title="文件id" width="200"></vxe-column> -->
-        <vxe-column field="customerId_dictText" title="客户名称" width="200"></vxe-column>
+        <vxe-column field="customerId_dictText" title="客户名称" width="120"></vxe-column>
         <vxe-column field="filePath" title="原始文件地址"></vxe-column>
         <vxe-column field="mergeFilePath" title="标注文件地址"></vxe-column>
-        <vxe-column field="action" title="操作" width="140">
+        <vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
+        <vxe-column field="action" title="操作" width="80">
           <template #default="{row}">
-            <el-button type="primary" text size="small" @click="toDetail(row)">查看</el-button>
-            <el-button type="primary" text size="small" @click="toDetail2(row)">查看新</el-button>
+            <el-button type="primary" text size="small" @click="toDetail2(row)">查看</el-button>
+            <!-- <el-button type="primary" text size="small" @click="toDetail2(row)">查看新</el-button> -->
           </template>
         </vxe-column>
       </vxe-table>
@@ -72,7 +74,7 @@ const formState = reactive({
   currentPage: 1,
   pageSize: 10,
   total: 0,
-  column: 'orderFileId',
+  column: 'createTime',
   order: 'desc'
 })