1

src/components/page/FormPage.vue

@@ -114,13 +114,7 @@ function doExport() {
     return
   }
   loading.value = true
-  props.exportHandler(searchForm.$clone() as F)
-    .then((res) => {
-      const {content, filename} = res.data ?? {}
-      if (content != null && filename != null) {
-        saveFile(content, filename)
-      }
-    })
+  saveFile(props.exportHandler(searchForm.$clone() as F))
     .finally(() => {
       loading.value = false
     })

src/dts/components.d.ts

@@ -5,7 +5,6 @@
 // ------
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import { GlobalComponents } from 'vue'
 
 export {}
 
@@ -122,4 +121,4 @@ declare global {
   const ElUpload: typeof import('element-plus/es')['ElUpload']
   const RouterLink: typeof import('vue-router')['RouterLink']
   const RouterView: typeof import('vue-router')['RouterView']
-}
+}

src/pages/order/book-order/constants.ts

@@ -0,0 +1,113 @@
+import { createEnum } from '@/common/utils/enums.ts'
+
+const orderCategoryList = [
+  {
+    val: 'HuiShouYuYue',
+    txt: '回收预约单',
+  },
+  {
+    val: 'XiaoShouYuYue',
+    txt: '销售预约单',
+  },
+  {
+    val: 'DuanBoRu',
+    txt: '短驳入',
+  },
+  {
+    val: 'DuanBoChu',
+    txt: '短驳出',
+  },
+] as const
+export const orderCategory = createEnum(orderCategoryList)
+
+const orderStatusList = [
+  {
+    val: 'YiYuYue',
+    txt: '已预约',
+  },
+  {
+    val: 'JinXingZhong',
+    txt: '进行中',
+  },
+  {
+    val: 'YiWanCheng',
+    txt: '已完成',
+  },
+  {
+    val: 'YiQuXiao',
+    txt: '已取消',
+  },
+] as const
+export const orderStatus = createEnum(orderStatusList)
+
+const transStatusList = [
+  {
+    val: 'DaiPaiDan',
+    txt: '待派单',
+  },
+  {
+    val: 'DaiJieDan',
+    txt: '待接单',
+  },
+  {
+    val: 'YiJieDan',
+    txt: '已接单',
+  },
+  {
+    val: 'YunShuZhong',
+    txt: '运输中',
+  },
+  {
+    val: 'YiJinChang',
+    txt: '已进场',
+  },
+  {
+    val: 'YiChuChang',
+    txt: '已出场',
+  },
+  {
+    val: 'YiWanCheng',
+    txt: '已完成',
+  },
+  {
+    val: 'YiQuXiao',
+    txt: '已取消',
+  },
+] as const
+export const transStatus = createEnum(transStatusList)
+
+const checkStatusList = [
+  {
+    val: 'Wu',
+    txt: '无需勘料',
+  },
+  {
+    val: 'YiKanLiao',
+    txt: '已勘料',
+  },
+  {
+    val: 'WeiKanLiao',
+    txt: '未勘料',
+  },
+] as const
+export const checkStatus = createEnum(checkStatusList)
+
+const paymentStatusList = [
+  {
+    val: 'MianFei',
+    txt: '免费',
+  },
+  {
+    val: 'WeiZhiFu',
+    txt: '未支付',
+  },
+  {
+    val: 'YiZhiFu',
+    txt: '已支付',
+  },
+  {
+    val: 'YiTuiKuan',
+    txt: '已退款',
+  },
+] as const
+export const paymentStatus = createEnum(paymentStatusList)

src/pages/order/book-order/order.d.ts

@@ -59,7 +59,7 @@ declare global {
     interface PaymentRecord {
       // Id
       id?: string
-      // 订单收费项 Id，QiTa-->其他、ChanPin-->产品、YunFei-->运费
+      // 订单收费项 Id
       expenseItemId?: string
       // 付费方；字典代码：payer，PingTai-->平台、ChanFei-->产废方、YunShu-->运输方、XiaoNa-->消纳方、CaiGou-->采购方
       payer?: string