货物查询

components.d.ts

@@ -5,6 +5,7 @@ import '@vue/runtime-core'
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    ColumnSet: typeof import('./src/components/ColumnSet/index.vue')['default']
     CommonChartsBar: typeof import('./src/components/Echarts/commonChartsBar.vue')['default']
     CommonChartsChinaMap: typeof import('./src/components/Echarts/commonChartsChinaMap.vue')['default']
     Dialog: typeof import('./src/components/dialog/index.vue')['default']

public/config.js

@@ -6,14 +6,14 @@ var LOOP_INTERVAL = {
   goods: 15 * 1000,
 };
 
-const PLATFROM_CONFIG = {
-  baseNewUrl: "http://120.26.64.82:8083/", //登录前的http请求地址
-  baseUrl: "http://120.26.64.82:8095/", // 4A-http请求地址
-  appKeyString: "9inu7zpllz1folzsljm498dcpi0lsog1", //appSecret
-  appId: "q7kdjmmaf0kerwpf", //appid
-  baseURLCA: "http://10.211.67.163:16300", // 登录后的http请求地址-测试
-  baggageMessageURL: "/openApi/query",
-};
+// const PLATFROM_CONFIG = {
+//   baseNewUrl: "http://120.26.64.82:8083/", //登录前的http请求地址
+//   baseUrl: "http://120.26.64.82:8095/", // 4A-http请求地址
+//   appKeyString: "9inu7zpllz1folzsljm498dcpi0lsog1", //appSecret
+//   appId: "q7kdjmmaf0kerwpf", //appid
+//   baseURLCA: "http://10.211.67.163:16300", // 登录后的http请求地址-测试
+//   baggageMessageURL: "/openApi/query",
+// };
 
 var DATACONTENT_ID = {
   /***-----登录------***/
@@ -52,9 +52,9 @@ var DATACONTENT_ID = {
   appTableId: 39, //应用管理
 
   /***-----数据查询------***/
-  flightTabId: 1803439, //数据查询-航班-表格-id
-  waybillTabId: 1803441, //数据查询-运单-表格-id
-  goodsTabId: 1803440, //数据查询-货物-表格-id
+  flightDataQuery: 1803439, //数据查询-航班-表格
+  waybillDataQuery: 1803441, //数据查询-运单-表格
+  freightDataQuery: 1803560, //数据查询-货物-表格
 
   /***-----高级查询------***/
   baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id

public/configLoader.js

@@ -1,8 +1,3 @@
-const baseConfig = document.createElement('script')
-baseConfig.type = 'text/javascript'
-baseConfig.src = './baseConfig.js'
-document.head.appendChild(baseConfig)
-
 setConfigJS()
 
 if (!window.configLoadLoop) {

src/views/realTime/components/ColumnSet/index.vue → src/components/ColumnSet/index.vue

@@ -54,8 +54,7 @@
 import { Tools } from '@element-plus/icons-vue'
 import Dialog from '@/components/dialog/index.vue'
 import { PropType } from 'vue'
-import { CommonTableColumn } from '~/common'
-import { tableColumnGroup } from '../../type'
+import { CommonTableColumn, tableColumnGroup } from '~/common'
 import { useTableSettingsStore } from '@/store/tableSettings'
 
 const simpleClone = (obj: any) => JSON.parse(JSON.stringify(obj))
@@ -137,7 +136,7 @@ const tempKeys = ref<string[]>([])
 
 const checkedColumnKeys = computed<string[]>(() => {
   if (inGroup.value) {
-    return Object.getOwnPropertyNames(checkedGroups.value)
+    return Object.keys(checkedGroups.value)
       .map(prop => checkedGroups.value[prop])
       .flat()
   } else {

src/hooks/useTableFilterAndSort.ts

@@ -89,7 +89,7 @@ export function useTableFilterAndSort(
 
   const sortChangeHandler = (currentKey: string) => {
     if (options.sortMode === 'single') {
-      Object.getOwnPropertyNames(sortRuleMap).forEach(key => {
+      Object.keys(sortRuleMap).forEach(key => {
         if (currentKey !== key) {
           delete sortRuleMap[key]
         }

src/router/routes/routes-file-five.ts

@@ -21,10 +21,10 @@ const HomeRoutes = {
       component: () => import('@/views/dataQuery/waybillQuery/index.vue'),
     },
     {
-      path: '/dataQuery/freightInquiry',
-      name: 'FreightInquiry',
+      path: '/dataQuery/freightQuery',
+      name: 'FreightQuery',
       meta: { title: '货物查询', roles: ['freight_inquiry_page'] },
-      component: () => import('@/views/dataQuery/freightInquiry/index.vue'),
+      component: () => import('@/views/dataQuery/freight/index.vue'),
     },
   ],
 }

src/views/dataQuery/components/DataQueryView/index.vue

@@ -0,0 +1,218 @@
+<template>
+  <div class="data-query scroll-y">
+    <div class="data-query-header">
+      <div class="manageTitle">{{ title }}</div>
+      <el-form
+        ref="formRef"
+        :model="formData"
+        class="data-query-form"
+        :rules="rules"
+      >
+        <div class="form-left">
+          <el-form-item prop="startDate">
+            <el-date-picker
+              v-model="formData.startDate"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              size="default"
+              type="date"
+              placeholder="开始日期"
+              :prefix-icon="datePreTitle('开始')"
+              :clearable="false"
+            />
+          </el-form-item>
+          <el-form-item prop="endDate">
+            <el-date-picker
+              v-model="formData.endDate"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              :disabled-date="disabledEndDate"
+              size="default"
+              type="date"
+              placeholder="结束日期"
+              :prefix-icon="datePreTitle('结束')"
+              :clearable="false"
+            />
+          </el-form-item>
+        </div>
+        <div class="form-right">
+          <el-form-item prop="keyWords">
+            <el-input
+              v-model.trim="formData.keyWords"
+              size="default"
+              placeholder="请输入要搜索的内容"
+              :prefix-icon="Search"
+              clearable
+              @keyup.enter="dataQuery"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+      <el-button size="default" type="primary" @click="dataQuery"
+        >搜索</el-button
+      >
+      <ColumnSet
+        :table-columns="tableColumns"
+        @checked-submit="columnChecked"
+      />
+    </div>
+    <div class="data-query-table">
+      <SimpleTable
+        ref="tableRef"
+        :data="tableData"
+        :columns="filteredColumns"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { Search } from '@element-plus/icons-vue'
+import ColumnSet from '@/components/ColumnSet/index.vue'
+import SimpleTable from '@/components/SimpleTable/index.vue'
+import { ElMessage, FormInstance } from 'element-plus'
+import { parseTime } from '@/utils/validate'
+import { useTable } from './useTable'
+import { useTableColumnSet } from '@/hooks/useTableColumnSet'
+
+const props = defineProps({
+  name: {
+    type: String,
+    required: true,
+  },
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const today = parseTime(new Date(), '{y}-{m}-{d}') as string
+const formData = reactive({
+  startDate: today,
+  endDate: today,
+  keyWords: '',
+})
+watchEffect(() => {
+  if (!formData.startDate || !formData.endDate) {
+    return
+  }
+  const start = new Date(formData.startDate).getTime()
+  const end = new Date(formData.endDate).getTime()
+  if (start > end) {
+    ElMessage.warning('开始时间不能晚于结束时间')
+    formData.endDate = ''
+  }
+  if (start <= end - 2 * 24 * 60 * 60 * 1000) {
+    ElMessage.warning('间隔不能超过2天')
+    formData.endDate = ''
+  }
+})
+const disabledEndDate = (endDate: Date) => {
+  const start = new Date(formData.startDate + ' 00:00:00').getTime()
+  const end = endDate.getTime()
+  return start > end || start <= end - 2 * 24 * 60 * 60 * 1000
+}
+const datePreTitle = (title: string) => {
+  return <div class="date-pre-title">{title}：</div>
+}
+
+const keyWordsValidator = (rule: any, value: any, callback: any) => {
+  const searchTitleMap = {
+    flight: '航班号',
+    waybill: '运单号',
+    freight: '货物编码',
+  }
+  const searchTitle = searchTitleMap[props.name] ?? '关键词'
+  if (!value) {
+    return callback(new Error(`请输入${searchTitle}`))
+  }
+  const regsMap: { [x: string]: RegExp[] } = {
+    flight: [],
+    waybill: [],
+    freight: [/^[0-9]{5}$/, /^[0-9]{3}\-[0-9]{8}\-[0-9]{5}$/],
+  }
+  const regs = regsMap[props.name] ?? []
+  const notMatched = regs.every(reg => !reg.test(value))
+  if (notMatched) {
+    return callback(new Error(`请输入正确的${searchTitle}`))
+  }
+  callback()
+}
+const rules = {
+  startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
+  endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
+  keyWords: [{ validator: keyWordsValidator, trigger: 'blur' }],
+}
+const formRef = ref<FormInstance | null>()
+const dataQuery = () => {
+  formRef.value?.validate(valid => {
+    if (valid) {
+      getTableData()
+    }
+  })
+}
+
+const { tableColumns, tableData, getTableData } = useTable(props.name, formData)
+
+const { filteredColumns, columnChecked } = useTableColumnSet(tableColumns)
+</script>
+
+<style lang="scss" scoped>
+.data-query {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  &-header {
+    width: 100%;
+    height: 32px;
+    margin: 12px 0;
+    display: flex;
+  }
+  &-form :deep {
+    flex: 1;
+    display: flex;
+    margin-right: 12px;
+    .form-left {
+      flex: 1;
+      display: flex;
+      .el-form-item {
+        width: 168px;
+        margin-right: 8px;
+      }
+    }
+    .form-right {
+      display: flex;
+      justify-content: flex-end;
+      .el-form-item {
+        width: 280px;
+      }
+    }
+    .el-form-item {
+      margin: 0;
+
+      .el-input__inner {
+        font-size: 14px;
+        font-family: Helvetica, Microsoft YaHei;
+        color: #303133;
+      }
+      .el-date-editor {
+        .el-input__prefix {
+          flex-basis: 42px;
+          padding-left: 15px;
+          .date-pre-title {
+            font-style: normal;
+            font-size: 14px;
+            font-family: Microsoft YaHei;
+            color: #303133;
+          }
+        }
+      }
+    }
+  }
+  &-table {
+    height: 0;
+    flex: 1;
+  }
+}
+</style>

src/views/dataQuery/components/DataQueryView/useTable.ts

@@ -0,0 +1,96 @@
+import { Query } from '@/api/webApi'
+import { CommonData, CommonTableColumn } from '~/common'
+
+const idGetter = (name: string) => DATACONTENT_ID[name + 'DataQuery']
+
+const tableColumnsMap: {
+  [tableName: string]: ({
+    columnLabel: string
+    columnName: string
+  } & { [x: string]: any })[]
+} = {
+  flight: [],
+  waybill: [],
+  freight: [
+    { columnLabel: '起飞航站', columnName: 'departureAirport' },
+    { columnLabel: '目的航站', columnName: 'arriveAirport' },
+    { columnLabel: '航班号', columnName: 'flightAllNO' },
+    { columnLabel: '航班日期', columnName: 'flightDate' },
+    { columnLabel: '直达/中转', columnName: 'ynTrans' },
+    { columnLabel: '货物牌号', columnName: 'pcsCode' },
+    { columnLabel: '特殊货物类型', columnName: 'specialType' },
+    { columnLabel: '位置', columnName: 'nodeCode' },
+    { columnLabel: '状态', columnName: 'status' },
+    { columnLabel: '运单号', columnName: 'stockCode' },
+    { columnLabel: '值机号', columnName: 'checkNo' },
+    { columnLabel: '安检序号', columnName: 'securityNo' },
+    { columnLabel: '货代', columnName: 'cargoCompany' },
+    { columnLabel: '货代等级', columnName: 'Grade' },
+    { columnLabel: '批次号', columnName: 'batchNo' },
+  ],
+}
+
+export function useTable(tableName: string, formData: CommonData) {
+  const tableColumns = ref<CommonTableColumn[]>([])
+  const tableData = ref<CommonData[]>([])
+  const getTableColumns = () => {
+    if (!tableColumnsMap[tableName]) {
+      return
+    }
+    tableColumns.value = tableColumnsMap[tableName].map(column => ({
+      columnDescribe: '',
+      dataType: '',
+      listqueryTemplateID: null,
+      needCount: null,
+      needFilters: null,
+      needGroup: null,
+      needSearch: null,
+      needShow: 1,
+      needSort: null,
+      orderNumber: null,
+      queryTemplateColumnSetID: null,
+      queryTemplateID: null,
+      ...column,
+    }))
+  }
+
+  const getTableData = async () => {
+    if (!idGetter(tableName)) {
+      return
+    }
+    try {
+      const { startDate, endDate, keyWords } = formData
+      const dataContent = [startDate, endDate, keyWords]
+      const {
+        code,
+        returnData: { listValues },
+        message,
+      } = await Query<CommonData>({
+        id: idGetter(tableName),
+        dataContent,
+      })
+      if (Number(code) !== 0) {
+        throw new Error(message || '失败')
+      }
+      tableData.value = listValues.filter(
+        row =>
+          !Object.values(row).some(
+            cellValue =>
+              typeof cellValue === 'string' && cellValue.includes('undefined')
+          )
+      )
+    } catch (error) {
+      console.error(error)
+    }
+  }
+
+  onMounted(() => {
+    getTableColumns()
+  })
+
+  return {
+    tableColumns,
+    tableData,
+    getTableData,
+  }
+}

src/views/dataQuery/flight/index.vue

@@ -0,0 +1,14 @@
+<template>
+  <DataQueryView name="flight" title="航班查询" />
+</template>
+
+<script lang="ts">
+import DataQueryView from '../components/DataQueryView/index.vue'
+
+export default defineComponent({
+  name: 'FlightQuery',
+  components: { DataQueryView },
+})
+</script>
+
+<style scoped></style>

src/views/dataQuery/freight/index.vue

@@ -0,0 +1,14 @@
+<template>
+  <DataQueryView name="freight" title="货物查询" />
+</template>
+
+<script lang="ts">
+import DataQueryView from '../components/DataQueryView/index.vue'
+
+export default defineComponent({
+  name: 'FreightQuery',
+  components: { DataQueryView },
+})
+</script>
+
+<style scoped></style>

src/views/dataQuery/waybill/index.vue

@@ -0,0 +1,14 @@
+<template>
+  <DataQueryView name="waybill" title="货物查询" />
+</template>
+
+<script lang="ts">
+import DataQueryView from '../components/DataQueryView/index.vue'
+
+export default defineComponent({
+  name: 'WaybillQuery',
+  components: { DataQueryView },
+})
+</script>
+
+<style scoped></style>

src/views/realTime/components/AirportView/index.vue

@@ -82,11 +82,11 @@
 </template>
 <script lang="tsx" setup>
 import AirportForm from './AirportForm.vue'
-import ColumnSet from '../../components/ColumnSet/index.vue'
+import ColumnSet from '@/components/ColumnSet/index.vue'
 import CountBox from '../../components/CountBox/index.vue'
 import CommonSwitch from '../../components/CommonSwitch/index.vue'
 import TableHeaderCell from '@/components/TableHeaderCell/index.vue'
-import { useTableColumnSet } from '../../hooks/useTableColumnSet'
+import { useTableColumnSet } from '@/hooks/useTableColumnSet'
 import { useAirportTable } from './useAirportTable'
 import { useTableStyle } from '../../hooks/useTableStyle'
 import { useTableCellClick } from '../../hooks/useTableCellClick'

src/views/realTime/components/FlightView/index.vue

@@ -84,9 +84,9 @@ import { CaretRight, Download, Refresh } from '@element-plus/icons-vue'
 import ContainerWaybillDialog from './ContainerWaybillDialog.vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
 import CommonSwitch from '../../components/CommonSwitch/index.vue'
-import ColumnSet from '../../components/ColumnSet/index.vue'
+import ColumnSet from '@/components/ColumnSet/index.vue'
 import { useTable } from '../../hooks/useTable'
-import { useTableColumnSet } from '../../hooks/useTableColumnSet'
+import { useTableColumnSet } from '@/hooks/useTableColumnSet'
 import { useTableExport } from '../../hooks/useTableExport'
 import { useTableStyle } from '../../hooks/useTableStyle'
 import { useTableCellClick } from '../../hooks/useTableCellClick'

src/views/realTime/components/GoodsView/index.vue

@@ -85,11 +85,11 @@
 import { Download } from '@element-plus/icons-vue'
 import Search from '@/components/search/index.vue'
 import Steps from '@/components/steps/index.vue'
-import ColumnSet from '../../components/ColumnSet/index.vue'
+import ColumnSet from '@/components/ColumnSet/index.vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
 import { useTrackData } from '../../hooks/useTrackData'
 import { useTable } from '../../hooks/useTable'
-import { useTableColumnSet } from '../../hooks/useTableColumnSet'
+import { useTableColumnSet } from '@/hooks/useTableColumnSet'
 import { useTableExport } from '../../hooks/useTableExport'
 import { useTableStyle } from '../../hooks/useTableStyle'
 import { useTableCellClick } from '../../hooks/useTableCellClick'

src/views/realTime/components/WaybillView/index.vue

@@ -97,11 +97,11 @@
 import { Download } from '@element-plus/icons-vue'
 import Search from '@/components/search/index.vue'
 import Steps from '@/components/steps/index.vue'
-import ColumnSet from '../../components/ColumnSet/index.vue'
+import ColumnSet from '@/components/ColumnSet/index.vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
 import { useTrackData } from '../../hooks/useTrackData'
 import { useTable } from '../../hooks/useTable'
-import { useTableColumnSet } from '../../hooks/useTableColumnSet'
+import { useTableColumnSet } from '@/hooks/useTableColumnSet'
 import { useTableExport } from '../../hooks/useTableExport'
 import { useTableStyle } from '../../hooks/useTableStyle'
 import { useTableCellClick } from '../../hooks/useTableCellClick'
@@ -136,64 +136,81 @@ useLoop([getWaybillInfo, getTableData], 'waybill')
 
 const { trackAirlines, trackBoxStyle } = useTrackData(props.name, trackData)
 
-const tableData = computed(() =>
-  trackData.value.reduce((data, current) => {
-    const sameRow = data.find(row =>
-      ['stockCode', 'flightNO', 'flightDate', 'CargoSN'].every(
-        key => row[key] === current[key]
+const tableData = computed(() => {
+  const mergedTableData = trackData.value.reduce(
+    (data: CommonData[], current) => {
+      const sameRow = data.find(row =>
+        ['stockCode', 'flightNO', 'flightDate', 'cargoSN'].every(
+          key => row[key] === current[key]
+        )
       )
-    )
-    const {
-      stockCode,
-      flightNO,
-      flightDate,
-      departureAirport, // 装载机场
-      arriveAirport, // 卸载机场
-      ULDNO,
-      CargoSN,
-      pullMark,
-      returnMark,
-      // transMark,
-      exceptionCustomsMark,
-      execPosition, // 读取位置
-      nodeCode, // 节点名称
-      ConsignmentItemPackagingQuantityQuantity, // 跟踪节点件数
-      execResult,
-      execTime,
-    } = current
-    const nodeValue = `${execPosition ?? ''}\n${
-      execResult ? '通过' : '未通过'
-    }\n${execTime ?? ''}`
-    if (sameRow) {
-      sameRow[String(nodeCode)] = nodeValue
-      ;[
-        'ULDNO',
-        // 'CargoSN'
-      ].forEach(key => {
-        const oldValue = sameRow[key]
-        const currentValue = current[key]
-        if (typeof currentValue === 'string' && currentValue !== oldValue) {
-          if (typeof oldValue === 'string') {
-            sameRow[key] = [
-              ...new Set([...oldValue.split(','), ...currentValue.split(',')]),
-            ].join(',')
-          } else {
-            sameRow[key] = currentValue
+      const {
+        stockCode,
+        flightNO,
+        flightDate,
+        departureAirport, // 装载机场
+        arriveAirport, // 卸载机场
+        ULDNO,
+        cargoSN,
+        pullMark,
+        returnMark,
+        // transMark,
+        exceptionCustomsMark,
+        execPosition, // 读取位置
+        nodeCode, // 节点名称
+        ConsignmentItemPackagingQuantityQuantity, // 跟踪节点件数
+        execResult,
+        execTime,
+      } = current
+      const nodeValue = `${execPosition ?? ''}\n${
+        execResult ? '通过' : '未通过'
+      }\n${execTime ?? ''}`
+      if (sameRow) {
+        sameRow[String(nodeCode)] = nodeValue
+        ;[
+          'ULDNO',
+          // 'cargoSN'
+        ].forEach(key => {
+          const oldValue = sameRow[key]
+          const currentValue = current[key]
+          if (typeof currentValue === 'string' && currentValue !== oldValue) {
+            if (typeof oldValue === 'string') {
+              sameRow[key] = [
+                ...new Set([
+                  ...oldValue.split(','),
+                  ...currentValue.split(','),
+                ]),
+              ].join(',')
+            } else {
+              sameRow[key] = currentValue
+            }
           }
-        }
-      })
-      ;['pullMark', 'returnMark'].forEach(key => {
-        sameRow[key] = sameRow[key] ?? current[key]
-      })
-    } else {
-      data.push({
+        })
+        ;['pullMark', 'returnMark'].forEach(key => {
+          sameRow[key] = sameRow[key] ?? current[key]
+        })
+      } else {
+        data.push({
+          ...current,
+          [String(nodeCode)]: nodeValue,
+        })
+      }
+      return data
+    },
+    []
+  )
+  return mergedTableData.reduce((data: CommonData[], current) => {
+    const { cargoSN } = current
+    if (typeof cargoSN === 'string') {
+      const splitedRows = cargoSN.split(',').map(splitedCargoSN => ({
         ...current,
-        [String(nodeCode)]: nodeValue,
-      })
+        cargoSN: splitedCargoSN,
+      }))
+      data.push(...splitedRows)
     }
     return data
-  }, [] as CommonData[])
-)
+  }, [])
+})
 
 const formatter = (row, column, cellValue, index) => {
   const value = String(cellValue ?? '').split('\n')

src/views/realTime/hooks/useTable.ts

@@ -106,7 +106,7 @@ const tableColumnsMap: {
       width: 100,
       needFilters: 1,
     },
-    { columnLabel: '货物编码', columnName: 'CargoSN', needFilters: 1 },
+    { columnLabel: '货物编码', columnName: 'cargoSN', needFilters: 1 },
     { columnLabel: '拉下', columnName: 'pullMark', needFilters: 1, width: 60 },
     {
       columnLabel: '退运',
@@ -282,7 +282,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '货物编码',
-      columnName: 'CargoSN',
+      columnName: 'cargoSN',
       needFilters: 1,
       width: 100,
     },
@@ -506,7 +506,7 @@ const tableColumnsMap: {
       width: 100,
       needFilters: 1,
     },
-    { columnLabel: '货物编码', columnName: 'CargoSN', needFilters: 1 },
+    { columnLabel: '货物编码', columnName: 'cargoSN', needFilters: 1 },
     { columnLabel: '拉下', columnName: 'pullMark', needFilters: 1, width: 60 },
     {
       columnLabel: '退运',
@@ -635,7 +635,7 @@ const tableColumnsMap: {
       needFilters: 1,
       width: 70,
     },
-    { columnLabel: '货物编码', columnName: 'C1', needFilters: 1, width: 100 },
+    { columnLabel: '货物编码', columnName: 'cargoSN', needFilters: 1, width: 100 },
     // { columnLabel: '中转', columnName: 'C2', needFilters: 1 },
     {
       columnLabel: '退运',

src/views/realTime/trackMap/index.vue

@@ -196,7 +196,6 @@ const trackNodesMap = {
 
 const formRef = ref<FormInstance | null>(null)
 const waybillValidator = (rule: any, value: any, callback: any) => {
-  console.log(value)
   if (!value) {
     return callback(new Error('请输入运单号'))
   }

src/views/realTime/type.d.ts

@@ -2,10 +2,6 @@ import type { Ref, CSSProperties } from 'vue'
 import { ElTable } from 'element-plus'
 import { CommonData, CommonTableColumn, CommonValue, MaybeRef } from '~/common'
 
-type tableColumnGroup = {
-  title: string
-  columns: CommonTableColumn[]
-}
 type HeaderRenderProps = {
   column: CommonTableColumn
   columns: CommonTableColumn[]

typings/common.d.ts

@@ -74,6 +74,10 @@ interface CommonTableColumn {
   queryTemplateID: number | null
   [propName: string]: any
 }
+interface tableColumnGroup {
+  title: string
+  columns: CommonTableColumn[]
+}
 
 type CommonValue = string | number | null
 interface CommonData {

vite.config.ts

@@ -147,7 +147,7 @@ export default ({ command, mode }: any) => {
           // Inject data into ejs template
           data: {
             title: setting.title,
-            injectScript: `<script src="./config.js"></script>`,
+            injectScript: `<script src="./baseConfig.js"></script><script src="./configLoader.js"></script>`,
           },
         },
       }),