.env.test

@@ -1,6 +1,6 @@
 # backend service base url, test environment
 
-# VITE_SERVICE_BASE_URL=https://b8dbdde.r39.cpolar.top #王
+# VITE_SERVICE_BASE_URL=https://522d2ea1.r39.cpolar.top #王
 # VITE_SERVICE_BASE_URL=http://89561bkaq794.vicp.fun:53846 #张
 # VITE_SERVICE_BASE_URL=http://192.168.1.89:8080#田
 # VITE_SERVICE_BASE_URL=https://425f86e6.r24.cpolar.top #邓
@@ -9,8 +9,8 @@
 # VITE_SERVICE_BASE_URL=https://735a1bda.r24.cpolar.top #黄
 # VITE_SERVICE_BASE_URL=http://89561bkaq794.vicp.fun:53846
 
-# VITE_SERVICE_BASE_URL=http://47.109.84.152:8081#打包测试本地服务器
-VITE_SERVICE_BASE_URL=https://smqjh.api.zswlgz.com #服务器
+VITE_SERVICE_BASE_URL=http://47.109.84.152:8081#打包测试本地服务器
+# VITE_SERVICE_BASE_URL=https://smqjh.api.zswlgz.com #服务器
 
 # other backend service base url, test environment
 VITE_OTHER_SERVICE_BASE_URL= `{

src/layouts/modules/global-content/index.vue

@@ -23,6 +23,8 @@ const appStore = useAppStore();
 const themeStore = useThemeStore();
 const routeStore = useRouteStore();
 const tabStore = useTabStore();
+const inclludeCacheRoutes = routeStore.cacheRoutes;
+inclludeCacheRoutes.push('order-manage_normal-order');
 
 const transitionName = computed(() => (themeStore.page.animate ? themeStore.page.animateMode : ''));
 
@@ -42,7 +44,7 @@ function resetScroll() {
       @after-leave="resetScroll"
       @after-enter="appStore.setContentXScrollable(false)"
     >
-      <KeepAlive :include="routeStore.cacheRoutes" :exclude="routeStore.excludeCacheRoutes">
+      <KeepAlive :include="inclludeCacheRoutes" :exclude="routeStore.excludeCacheRoutes">
         <component
           :is="Component"
           v-if="appStore.reloadFlag"

src/service/api/order-manage/normal-order/index.ts

@@ -20,9 +20,10 @@ export function fetchGetDeliveryOrderList(data: any) {
  */
 export function fetchExportOrderList(data: any) {
   return request({
-    url: '/platform/order/export',
-    method: 'get',
-    params: data
+    url: '/smqjh-oms/api/v1/order/export',
+    method: 'post',
+    params: data,
+    data
   });
 }
 
@@ -33,21 +34,21 @@ export function fetchExportOrderList(data: any) {
  */
 export function fetchExportList(data: any) {
   return request({
-    url: '/platform/exportTask/page',
+    url: '/smqjh-oms/api/v1/order/export/records',
     method: 'get',
     params: data
   });
 }
 
 /**
- * 下载
+ * 中断下载
  * @param data
  * @returns
  */
 export function fetchBreakDownload(fileId: any) {
   return request({
-    url: `/platform/exportTask/cancel/${fileId}`,
-    method: 'get'
+    url: `/smqjh-oms/api/v1/order/export/interrupt/${fileId}`,
+    method: 'put'
   });
 }
 
@@ -93,7 +94,8 @@ export function fetchGetDevList(data: any) {
  */
 export function fetchDeliveryOrder(data: any) {
   return request({
-    url: '/platform/order/delivery',
+    // url: '/platform/order/delivery',
+    url: '/smqjh-oms/api/v1/order/delivery',
     method: 'PUT',
     data
   });
@@ -109,3 +111,25 @@ export function fetchAudit(data: any) {
     params: data
   });
 }
+
+/**
+ * 快递公司
+ */
+export function fetchExpressDeliveryList(data: any) {
+  return request({
+    url: '/smqjh-oms/api/v1/order/expressDeliveryList',
+    method: 'get',
+    params: data
+  });
+}
+
+/**
+ * 物流追踪
+ */
+export function fetchDeliveryNode(data: any) {
+  return request({
+    url: '/smqjh-oms/api/v1/order/deliveryNode',
+    method: 'get',
+    params: data
+  });
+}

src/service/api/xsb-manage/store-info/index.ts

@@ -1,5 +1,14 @@
 import { request } from '@/service/request';
 
+/** 获取所属企业列表 */
+export function fetchBackendChannelSelect(params?: any) {
+  return request<Api.System.DictDataList>({
+    url: `/smqjh-oms/api/v1/order/backendChannelSelect`,
+    method: 'get',
+    params
+  });
+}
+
 /**
  * 分页获取门店详细列表
  * @param data

src/typings/components.d.ts

@@ -57,6 +57,7 @@ declare module 'vue' {
     NCollapse: typeof import('naive-ui')['NCollapse']
     NCollapseItem: typeof import('naive-ui')['NCollapseItem']
     NColorPicker: typeof import('naive-ui')['NColorPicker']
+    NCountdown: typeof import('naive-ui')['NCountdown']
     NDataTable: typeof import('naive-ui')['NDataTable']
     NDatePicker: typeof import('naive-ui')['NDatePicker']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']

src/views/manage/user/index.vue

@@ -99,8 +99,11 @@ const [registerTable, { refresh, setTableLoading }] = useTable({
     schemas: [
       {
         field: 'keywords',
-        label: '用户名',
-        component: 'NInput'
+        label: '关键字',
+        component: 'NInput',
+        componentProps: {
+          placeholder: '请输入用户名/昵称/手机号'
+        }
       }
     ],
     inline: false,

src/views/order-manage/after-sales-order/index.vue

@@ -1,5 +1,6 @@
 <script setup lang="tsx">
-import { useRouter } from 'vue-router';
+import { onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 import { NTag } from 'naive-ui';
 import {
   // fetchAudit,
@@ -17,6 +18,9 @@ import {
   orderStatus,
   refundOrderStatus
 } from '../normal-order/normal-order';
+
+const route = useRoute();
+
 const router = useRouter();
 // const ShipmentModal = useTemplateRef('Shipment');
 const columns: NaiveUI.TableColumn<Api.delivery.deliveryOrder>[] = [
@@ -111,7 +115,7 @@ const columns: NaiveUI.TableColumn<Api.delivery.deliveryOrder>[] = [
   }
 ];
 
-const [registerTable] = useTable({
+const [registerTable, { refresh, setFieldsValue }] = useTable({
   searchFormConfig: {
     schemas: [
       ...getSearchForm(),
@@ -155,6 +159,13 @@ function handleAfterSalesOrderDetail(row: Api.delivery.deliveryOrder) {
     }
   });
 }
+
+onMounted(() => {
+  setTimeout(async () => {
+    await setFieldsValue({ orderNumber: route.query.orderNumber });
+    refresh();
+  }, 1000);
+});
 </script>
 
 <template>

src/views/order-manage/normal-order/index.vue

@@ -14,7 +14,7 @@ import {
 // import { fetchGetLoginUserList } from '@/service/api/common';
 // import { useAuth } from '@/hooks/business/auth';
 // import { copyTextToClipboard } from '@/utils/zt';
-import { commonExport } from '@/utils/common';
+// import { commonExport } from '@/utils/common';
 import { useModal } from '@/components/zt/Modal/hooks/useModal';
 import { useTable } from '@/components/zt/Table/hooks/useTable';
 // import { type } from '../../../../packages/axios/src/index';
@@ -52,6 +52,12 @@ const columns: NaiveUI.TableColumn<Api.delivery.deliveryOrder>[] = [
       return <NTag>{businessType[row.businessType as keyof typeof businessType] || row.businessType}</NTag>;
     }
   },
+  {
+    key: 'channelName',
+    title: '所属企业',
+    align: 'center',
+    width: 120
+  },
   {
     key: 'info',
     title: '客户信息',
@@ -71,13 +77,9 @@ const columns: NaiveUI.TableColumn<Api.delivery.deliveryOrder>[] = [
   },
   {
     key: 'orderMoney',
-    title: '订单金额(元)',
+    title: '订单金额（元）',
     align: 'center',
-    width: 140,
-    render: row => {
-      const amount = Number(row.orderMoney);
-      return <span>{Number.isFinite(amount) ? amount.toFixed(2) : '--'}</span>;
-    }
+    width: 120
   },
   {
     key: 'status',
@@ -112,7 +114,7 @@ const columns: NaiveUI.TableColumn<Api.delivery.deliveryOrder>[] = [
   }
 ];
 
-const [registerTable, { refresh, setTableLoading, getSeachForm, getTableData, setFieldsValue }] = useTable({
+const [registerTable, { refresh, getSeachForm, getTableData, setFieldsValue }] = useTable({
   searchFormConfig: {
     schemas: [...getSearchForm()]
   },
@@ -125,6 +127,17 @@ const [registerTable, { refresh, setTableLoading, getSeachForm, getTableData, se
   }
 });
 
+const [registerLogTable, { refresh: refresh1, setTableLoading }] = useTable({
+  tableConfig: {
+    keyField: 'id',
+    title: '',
+    showAddButton: false,
+    showTableHeaderAction: true,
+    showSearch: false,
+    minHeight: 400
+  }
+});
+
 const exportColumns: NaiveUI.TableColumn<InternalRowData>[] = [
   {
     key: 'index',
@@ -142,32 +155,23 @@ const exportColumns: NaiveUI.TableColumn<InternalRowData>[] = [
     minWidth: 100
   },
   {
-    key: 'updateTime',
+    key: 'createTime',
     title: '时间',
-    align: 'center',
-    minWidth: 100,
-    render: row => {
-      return (
-        <div>
-          <div>创建时间：{row.createTime}</div>
-          <div>完成时间：{row.updateTime}</div>
-        </div>
-      );
-    }
+    align: 'center'
   },
   {
-    key: 'operator',
+    key: 'operatorAccount',
     title: '操作人',
     align: 'center',
     minWidth: 100
   },
   {
-    key: 'exportStatus',
+    key: 'status',
     title: '状态',
     align: 'center',
     minWidth: 100,
     render: row => {
-      if (row.exportStatus == 0) {
+      if (row.status == 0) {
         return (
           <div>
             请耐心等待，正在导出中...
@@ -176,43 +180,46 @@ const exportColumns: NaiveUI.TableColumn<InternalRowData>[] = [
             </n-button>
           </div>
         );
-      } else if (row.exportStatus == 1) {
-        return (
-          <div>
-            未下载
-            <n-button text type="info" onClick={() => handleDownload(row.id as string)}>
-              下载
-            </n-button>
-          </div>
-        );
-      } else if (row.exportStatus == 2) {
-        return <div class={'text-gray-500'}>生成文件失败</div>;
-      } else if (row.exportStatus == 3) {
+      } else if (!row.fileUrl) {
+        return <div>导出失败</div>;
+      } else if (row.status == 1) {
         return (
           <div>
-            已下载&nbsp;
-            <n-button text type="info" onClick={() => handleDownload(row.id as string)}>
+            完成 {row.fileSize}
+            <n-button text type="info" onClick={() => handleDownload(row.fileUrl as string)}>
               下载
             </n-button>
           </div>
         );
-      } else if (row.exportStatus == 4) {
-        return <div>导出失败</div>;
       }
+      // else if (row.exportStatus == 2) {
+      //   return <div class={'text-gray-500'}>生成文件失败</div>;
+      // } else if (row.exportStatus == 3) {
+      //   return (
+      //     <div>
+      //       已下载&nbsp;
+      //       <n-button text type="info" onClick={() => handleDownload(row.id as string)}>
+      //         下载
+      //       </n-button>
+      //     </div>
+      //   );
+      // }
+
       return <div>进行中</div>;
     }
   }
 ];
 
-async function handleDownload(id: string) {
-  setTableLoading(true);
-  await commonExport('/platform/exportTask/download', { fileId: id }, '正常订单列表.xlsx');
-  refresh();
+async function handleDownload(fileUrl: string) {
+  // setTableLoading(true);
+  window.open(fileUrl);
+  // await commonExport('/platform/exportTask/download', { fileId: id }, '正常订单列表.xlsx');
+  refresh1();
 }
 async function handleBreak(id: string) {
   setTableLoading(true);
   await fetchBreakDownload(id);
-  refresh();
+  refresh1();
 }
 
 const [registerModalPrice, { openModal }] = useModal({
@@ -245,6 +252,18 @@ function handleOrderDetail(row: Api.delivery.deliveryOrder) {
   // orderMoadl.value?.open(String(row.orderNumber));
 }
 
+function handleSaleOrder(row: Api.delivery.deliveryOrder) {
+  if (!row.orderNumber) {
+    window.$message?.error('订单异常');
+  }
+  router.push({
+    path: '/order-manage/after-sales-order',
+    query: {
+      orderNumber: row.orderNumber
+    }
+  });
+}
+
 // async function handleAudit(row: any) {
 //   window.$dialog?.info({
 //     title: '提示',
@@ -316,7 +335,7 @@ getNums();
 //   await copyTextToClipboard(row[key]);
 // }
 
-async function handleExport() {
+async function handleExport(exportType: any) {
   setTableLoading(true);
   try {
     // await commonExport(
@@ -324,7 +343,7 @@ async function handleExport() {
     //   { ...getFieldsValue(), orderStatus: activeTab.value },
     //   '正常订单列表.xlsx'
     // );
-    await fetchExportOrderList({ ...getSeachForm(), orderStatus: activeTab.value });
+    await fetchExportOrderList({ exportType });
     dialog.success({
       title: '提示',
       content: () => {
@@ -376,11 +395,24 @@ function handleSelect(key: string) {
   console.log(key);
 
   if (key === 'goods') {
-    handleExport();
+    handleExport('PRODUCT');
   } else if (key === 'order') {
-    handleExportLog();
+    handleExport('ORDER');
   }
 }
+
+function handleship(row: Api.delivery.deliveryOrder) {
+  if (!row.orderNumber) {
+    window.$message?.error('订单异常');
+  }
+  router.push({
+    path: '/order-manage/order-detail',
+    query: {
+      orderNumber: row.orderNumber,
+      type: 'ship'
+    }
+  });
+}
 </script>
 
 <template>
@@ -394,7 +426,30 @@ function handleSelect(key: string) {
       @search="getNums"
     >
       <template #op="{ row }">
-        <NButton size="small" type="primary" ghost @click="handleOrderDetail(row)">订单详情</NButton>
+        <div>
+          <NButton size="small" type="primary" ghost @click="handleOrderDetail(row)">订单详情</NButton>
+          <NButton
+            v-if="row.backendOrderRefundButton"
+            class="mt-10px"
+            size="small"
+            type="primary"
+            ghost
+            @click="handleSaleOrder(row)"
+          >
+            售后订单
+          </NButton>
+
+          <NButton
+            v-if="row.dvyType === 10 && row.hbOrderStatus === 40"
+            class="mt-10px"
+            size="small"
+            type="primary"
+            ghost
+            @click="handleship(row)"
+          >
+            {{ row.dvyno ? '修改发货信息' : '发货' }}
+          </NButton>
+        </div>
         <!--
  <NButton
           v-if="row.businessType === 'DJK' && row.isWriteOff == 1 && row.hbOrderStatus != 80"
@@ -427,15 +482,8 @@ function handleSelect(key: string) {
       </template>
       <template #prefix="{ loading }">
         <div class="flex items-center">
-          <NDropdown trigger="hover" :options="options" @select="handleSelect">
-            <NButton
-              size="small"
-              type="primary"
-              ghost
-              :loading="loading"
-              :disabled="getData().length === 0"
-              @click="handleExport"
-            >
+          <NDropdown trigger="click" :options="options" @select="handleSelect">
+            <NButton size="small" type="primary" ghost :loading="loading" :disabled="getData().length === 0">
               <template #icon>
                 <SvgIcon icon="mingcute:file-export-line"></SvgIcon>
               </template>
@@ -455,8 +503,7 @@ function handleSelect(key: string) {
           :show-table-action="false"
           :columns="exportColumns"
           :api="fetchExportList"
-          :default-params="{ exportType: 1, orderNumber }"
-          @register="registerTable"
+          @register="registerLogTable"
         ></ZTable>
       </LayoutTable>
     </BasicModal>

src/views/order-manage/normal-order/normal-order.ts

@@ -1,21 +1,13 @@
 import { h } from 'vue';
 import { NFlex, NImage, NTag } from 'naive-ui';
 // import { fetchGetAllStoreList } from '@/service/api/goods/desk-category';
-import { fetchGetStoreList } from '@/service/api/xsb-manage/store-info';
+import { fetchBackendChannelSelect, fetchGetStoreList } from '@/service/api/xsb-manage/store-info';
 import { fetchGetDictDataList } from '@/service/api/system-manage';
 // import { useAuth } from '@/hooks/business/auth';
 import { useAuthStore } from '@/store/modules/auth';
+import { useAuth } from '@/hooks/business/auth';
 import type { FormSchema } from '@/components/zt/Form/types/form';
 
-export const businessType = {
-  XSB: '星闪豹',
-  CD: '充电',
-  DYY: '电影演出',
-  DJK: '大健康',
-  XNSP: '虚拟商品',
-  JY: '加油'
-};
-
 export const SearchForm: FormSchema[] = [
   {
     label: '业务类型',
@@ -31,6 +23,17 @@ export const SearchForm: FormSchema[] = [
       }
     }
   },
+  {
+    label: '所属企业',
+    field: 'channelIdList',
+    component: 'ApiSelect',
+    componentProps: {
+      api: fetchBackendChannelSelect,
+      multiple: true,
+      labelFeild: 'name',
+      valueFeild: 'id'
+    }
+  },
   {
     label: '门店名称',
     component: 'ApiSelect',
@@ -43,93 +46,184 @@ export const SearchForm: FormSchema[] = [
     }
   },
 
-  // {
-  //   label: '订单类型',
-  //   component: 'NSelect',
-  //   field: 'dvyType',
-  //   componentProps: {
-  //     options: [
-  //       {
-  //         label: '全部',
-  //         value: ''
-  //       },
-  //       {
-  //         label: '快递',
-  //         value: 1
-  //       },
-  //       {
-  //         label: '配送',
-  //         value: 3
-  //       }
-  //     ]
-  //   }
-  // },
-  // {
-  //   label: '父订单编号',
-  //   component: 'NInput',
-  //   field: 'parentOrderNumber'
-  // },
   {
     label: '订单编号',
     component: 'NInput',
     field: 'orderNumber'
   },
   {
-    label: '收货人姓名',
+    label: '下单时间',
+    component: 'NDatePicker',
+    field: 'createTime',
+    componentProps: {
+      type: 'datetimerange',
+      defaultTime: ['00:00:00', '23:59:59']
+    }
+  },
+  {
+    label: '客户姓名',
     component: 'NInput',
     field: 'consigneeName'
   },
   {
-    label: '收货人电话',
+    label: '客户手机号',
     component: 'NInput',
     field: 'consigneeMobile'
   },
-  // {
-  //   label: '售后状态',
-  //   component: 'NSelect',
-  //   field: 'refundStatus',
-  //   componentProps: {
-  //     options: [
-  //       {
-  //         label: '申请退款',
-  //         value: 1
-  //       },
-  //       {
-  //         label: '退款成功',
-  //         value: 2
-  //       },
-  //       {
-  //         label: '部分退款成功',
-  //         value: 3
-  //       },
-  //       {
-  //         label: '退款失败',
-  //         value: 4
-  //       }
-  //     ]
-  //   }
-  // },
   {
-    label: '下单时间',
-    component: 'NDatePicker',
-    field: 'createTime',
+    label: '买家姓名',
+    component: 'NInput',
+    field: 'buyerName'
+  },
+  {
+    label: '买家手机号',
+    component: 'NInput',
+    field: 'buyerMobile'
+  },
+  {
+    field: 'userAttrType',
+    label: '买家属性',
+    component: 'dictSelect',
     componentProps: {
-      type: 'datetimerange',
-      defaultTime: ['00:00:00', '23:59:59']
+      dictCode: 'user_attr_type',
+      immediate: true
+    },
+    show: useAuth().hasAuth('order:user:attr:type')
+  },
+  {
+    label: '退款类型',
+    component: 'NSelect',
+    field: 'refundStatus',
+    componentProps: {
+      options: [
+        {
+          label: '整单退款',
+          value: 2
+        },
+        {
+          label: '部分退款',
+          value: 1
+        },
+        {
+          label: '无售后订单',
+          value: 0
+        }
+      ]
+    }
+  },
+  {
+    label: '发货情况',
+    component: 'NSelect',
+    field: 'deliveryStatus',
+    componentProps: {
+      options: [
+        {
+          label: '已发货',
+          value: 'Shipped'
+        },
+        {
+          label: '未发货',
+          value: 'NoShipped'
+        },
+        {
+          label: '未发货-无需发货',
+          value: 'NoNeedShipped'
+        }
+      ]
+    },
+    ifShow({ model }) {
+      return model.businessType == 'XSB';
+    }
+  },
+  {
+    label: '配送方式',
+    component: 'NSelect',
+    field: 'dvyTypeList',
+    componentProps: {
+      multiple: true,
+      options: [
+        {
+          label: '快递',
+          value: 1
+        },
+        {
+          label: '自提',
+          value: 2
+        },
+        {
+          label: '即时配送',
+          value: 3
+        },
+        {
+          label: '其他方式',
+          value: 4
+        },
+        {
+          label: '商家自送',
+          value: 10
+        }
+      ]
+    },
+    ifShow({ model }) {
+      return model.businessType == 'XSB';
+    }
+  },
+  {
+    label: '业务状态',
+    component: 'NSelect',
+    field: 'hbOrderStatus',
+    componentProps: {
+      options: [
+        {
+          label: '待支付',
+          value: 0
+        },
+        {
+          label: '订单已接单(待拣货)',
+          value: 20
+        },
+        {
+          label: '订单待配送',
+          value: 30
+        },
+        {
+          label: '订单配送中',
+          value: 40
+        },
+        {
+          label: '订单取消待审核',
+          value: 50
+        },
+        {
+          label: '订单取消',
+          value: 60
+        },
+        {
+          label: '订单已送达',
+          value: 70
+        },
+        {
+          label: '订单已完成',
+          value: 80
+        }
+      ]
+    },
+    ifShow({ model }) {
+      return model.businessType == 'XSB';
     }
   }
-  // {
-  //   field: 'userAttrType',
-  //   label: '人员属性',
-  //   component: 'dictSelect',
-  //   componentProps: {
-  //     dictCode: 'user_attr_type',
-  //     immediate: true
-  //   },
-  //   show: useAuth().hasAuth('user:attr:type')
-  // }
 ];
 
+export const businessType = {
+  XSB: '星闪豹',
+  CD: '充电',
+  DYY: '电影演出',
+  DJK: '大健康',
+  XNSP: '虚拟商品',
+  JY: '加油',
+  JDMP: '景区门票'
+};
+
 /**
  * 获取搜索表单schema，业务类型下拉框根据当前用户权限过滤
  * ROOT用户：显示全量字典选项
@@ -347,28 +441,85 @@ export const orderColumns: NaiveUI.TableColumn<Api.delivery.OrderItemElement>[]
   },
   {
     title: '单价（元）',
-    key: 'price',
-    width: 100
+    key: 'price'
+    // width: 100
   },
   {
     title: '数量',
     key: 'prodCount',
-    width: 250,
+    // width: 250,
     render: row => {
       const nodes = [h('div', { class: 'mr-2' }, row.prodCount)];
-      if (row.refundSuccessCount) {
-        nodes.push(h(NTag, { class: 'ml2', type: 'success' }, () => `退款成功：${row.refundSuccessCount}`));
-      }
-      if (row.refundIngCount && !row.refundSuccessCount) {
-        nodes.push(h(NTag, { class: 'ml2', type: 'error' }, () => `售后处理：${row.refundIngCount}`));
-      }
+      // if (row.refundSuccessCount) {
+      //   nodes.push(h(NTag, { class: 'ml2', type: 'success' }, () => `退款成功：${row.refundSuccessCount}`));
+      // }
+      // if (row.refundIngCount && !row.refundSuccessCount) {
+      //   nodes.push(h(NTag, { class: 'ml2', type: 'error' }, () => `售后处理：${row.refundIngCount}`));
+      // }
       return h(NFlex, { align: 'center' }, () => nodes);
     }
   },
+  {
+    title: '退款成功数量',
+    key: 'refundSuccessCount'
+  },
   {
     title: '小计/元',
-    key: 'productTotalAmount',
-    width: 100
+    key: 'productTotalAmount'
+  }
+];
+
+export const orderShipColumns: NaiveUI.TableColumn<Api.delivery.OrderItemElement>[] = [
+  {
+    title: '商品',
+    key: 'goods',
+    width: 300,
+    render: row => {
+      const goodsNodes = [
+        h(NImage, { src: row.pic, width: 80, height: 80 }),
+        h('div', { class: 'ml-2 ' }, [
+          h('div', { class: 'text-15px font-semibold' }, row.skuName),
+          h('div', { class: 'text-gray' }, `规格：${row.spec || '--'}`)
+        ])
+      ];
+      return h('div', { class: 'flex items-center' }, goodsNodes);
+    }
+  },
+  {
+    title: '原商品数量',
+    key: 'prodCount',
+    width: 120,
+    render: row => {
+      const nodes = [h('div', { class: 'mr-2' }, row.prodCount)];
+      // if (row.refundSuccessCount) {
+      //   nodes.push(h(NTag, { class: 'ml2', type: 'success' }, () => `退款成功：${row.refundSuccessCount}`));
+      // }
+      // if (row.refundIngCount && !row.refundSuccessCount) {
+      //   nodes.push(h(NTag, { class: 'ml2', type: 'error' }, () => `售后处理：${row.refundIngCount}`));
+      // }
+      return h(NFlex, { align: 'center' }, () => nodes);
+    }
+  },
+  {
+    title: '退款成功数量',
+    width: 120,
+    key: 'refundSuccessCount'
+  },
+  {
+    title: '状态',
+    key: 'status',
+    width: 120,
+    render: () => {
+      return '等待发货';
+    }
+  },
+  {
+    title: '可发货数量',
+    key: 'prodCount',
+    width: 120,
+    render: row => {
+      return h('div', { class: '' }, Number(row.prodCount) - Number(row.refundSuccessCount));
+    }
   }
 ];
 
@@ -538,3 +689,9 @@ export const payType = {
   1: '微信支付',
   2: '支付宝'
 };
+
+export const cancelState = {
+  0: '申请中',
+  1: '取消成功',
+  2: '取消被拒绝'
+};

src/views/order-manage/order-detail/index.vue

@@ -1,18 +1,28 @@
-<script setup lang="ts">
-import { ref } from 'vue';
-import { useRoute } from 'vue-router';
+<script setup lang="tsx">
+import { onMounted, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 // import { NFlex } from 'naive-ui';
+import { NDataTable } from 'naive-ui';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
-import { fetchGetNomalOrderInfo } from '@/service/api/order-manage/normal-order';
+import {
+  fetchDeliveryNode,
+  fetchDeliveryOrder,
+  fetchExpressDeliveryList,
+  fetchGetNomalOrderInfo
+} from '@/service/api/order-manage/normal-order';
+import { useModalFrom } from '@/components/zt/ModalForm/hooks/useModalForm';
 // import { useAppStore } from '@/store/modules/app';
 // import { copyTextToClipboard } from '@/utils/zt';
 import {
   businessType,
+  cancelState,
   chargeMethod,
+  dvyStatus,
   orderColumns,
   orderDJKColumns,
   orderDJKLogColumns,
+  orderShipColumns,
   orderStatus,
   orderStatusEnum,
   payType,
@@ -24,22 +34,143 @@ const orderInfo = ref<Api.delivery.deliveryOrder>();
 const TimeDown = ref<number>(0);
 dayjs.extend(duration);
 const route = useRoute();
+const router = useRouter();
+const deliveryNode = ref<any[]>([]);
+const [
+  registerModalForm,
+  {
+    openModal: openModalForm,
+    setFieldsValue: setModalFormValue,
+    getFieldsValue: getModalFormValue,
+    closeModal: closeModalForm,
+    setSubLoading
+  }
+] = useModalFrom({
+  modalConfig: {
+    title: '订单发货',
+    isShowHeaderText: false,
+    width: 1000,
+    height: 700
+  },
+  formConfig: {
+    schemas: [
+      {
+        field: 'orderNumber',
+        label: '',
+        component: 'NInput',
+        render: () => {
+          return (
+            <div>
+              <div class="py-20px font-semibold">商品信息</div>
+              <NDataTable columns={orderShipColumns} data={orderInfo.value?.orderItemList} bordered={false} />
+
+              <div class="py-20px font-semibold">订单信息</div>
+              <div>配送方式：{dvyStatus[orderInfo.value?.dvyType as keyof typeof dvyStatus]}</div>
+              <div>收货人姓名：{orderInfo.value?.consigneeName}</div>
+              <div>收货人手机号：{orderInfo.value?.consigneeMobile}</div>
+              <div>收货地址：{orderInfo.value?.consigneeAddress}</div>
+            </div>
+          );
+        }
+      },
+      {
+        field: 'orderNumber',
+        label: '单号',
+        component: 'NInput',
+        show: false
+      },
+
+      {
+        field: 'deliveryType',
+        component: 'NRadioGroup',
+        label: '发货方式',
+        required: true,
+        defaultValue: 1,
+        componentProps: {
+          options: [
+            {
+              label: '快递',
+              value: 0
+            },
+            {
+              label: '其他',
+              value: 1
+            }
+          ]
+        }
+      },
+      {
+        label: '快递公司',
+        field: 'dvyId',
+        required: true,
+        component: 'ApiSelect',
+        componentProps: {
+          api: fetchExpressDeliveryList,
+          labelFeild: 'name',
+          valueFeild: 'id'
+        },
+
+        ifShow({ model }) {
+          return model.deliveryType === 0;
+        }
+      },
+      {
+        field: 'dvyFlowId',
+        label: '快递单号',
+        required: true,
+        component: 'NInput',
+
+        ifShow({ model }) {
+          return model.deliveryType === 0;
+        }
+      },
+      {
+        field: 'remark',
+        label: '备注',
+        required: true,
+        component: 'NInput',
+        ifShow({ model }) {
+          return model.deliveryType === 1;
+        }
+      }
+    ],
+    labelWidth: 80,
+    layout: 'horizontal',
+    gridProps: {
+      cols: '1',
+      itemResponsive: true
+    }
+  }
+});
+
 async function open(orderNumber: string) {
   const { data, error } = await fetchGetNomalOrderInfo(orderNumber);
   if (!error) {
     orderInfo.value = data;
-    if (orderInfo.value.hbLogisticStatus == orderStatusEnum.WAIT_PAY) {
+    if (orderInfo.value.hbOrderStatus == orderStatusEnum.WAIT_PAY) {
       const createTime = dayjs(orderInfo.value.createTime);
       const currentTime = dayjs();
       const elapsed = currentTime.diff(createTime);
       const fifteenMinutesInMillis = 15 * 60 * 1000;
       TimeDown.value = fifteenMinutesInMillis - elapsed;
+    } else if (
+      orderInfo.value.hbOrderStatus !== orderStatusEnum.ORDER_DELIVERY &&
+      orderInfo.value.businessType == 'XSB'
+    ) {
+      getDeliveryNode();
     }
   }
 }
 console.log(route.query.orderNumber);
+async function getDeliveryNode() {
+  const { data, error } = await fetchDeliveryNode({ orderNumber: String(route.query.orderNumber) });
+
+  if (!error) {
+    deliveryNode.value = data;
+    console.log(data, '节点信息');
+  }
+}
 
-open(String(route.query.orderNumber));
 defineExpose({ open });
 
 // const isRefund = computed(() => {
@@ -89,6 +220,95 @@ function secondsToTime(seconds: number) {
   return `00:${formatTime(minutes)}:${formatTime(secs)}`;
 }
 
+function handleShip() {
+  openModalForm();
+  setModalFormValue({
+    orderNumber: orderInfo.value?.orderNumber,
+    dvyId: orderInfo.value?.dvyId,
+    dvyFlowId: orderInfo.value?.dvyFlowId,
+    deliveryType: orderInfo.value?.deliveryType || 0,
+    remark: orderInfo.value?.dvyName
+  });
+}
+
+async function handleSubmit() {
+  const form = await getModalFormValue();
+  if (form.deliveryType == 0) {
+    delete form.remark;
+  } else {
+    delete form.dvyId;
+    delete form.dvyFlowId;
+  }
+  console.log(form, '表单');
+  const { error } = await fetchDeliveryOrder(form);
+  if (!error) {
+    window.$message?.success('保存成功');
+  }
+  setSubLoading(false);
+  closeModalForm();
+  open(String(route.query.orderNumber));
+}
+
+function handleFinish() {
+  open(String(orderInfo.value?.orderNumber));
+}
+
+function filterStatus(val: number) {
+  if (val == 0) {
+    return '待支付';
+  } else if (val == 70 || val == 80 || val == 61) {
+    return '已完成';
+  } else if (val == 60 || val == 62) {
+    return '已取消';
+  }
+  return '进行中';
+}
+// 证件类型，0 身份证 1 学生证 2 军官证 3 护照 4 户口本(儿童请选择此项) 5 港澳通行证 6 台湾居民来往大陆通行证 7 台湾通行证 8 入台证 9 香港居民往来内地通行证 10 警官证 11 驾驶证 12 海员证 13 外国人在中国永久居留证 14澳门居民往来内地通行证 15港澳居民来往内地通行证 16港澳台居民来往内地通行证 17港澳台居民居住证 18中华人民共和国旅行证 19回乡证 20台胞证 21香港身份证
+function filterType(val: number) {
+  const typeObj = {
+    0: '身份证',
+    1: '学生证',
+    2: '军官证',
+    3: '护照',
+    4: '户口本',
+    5: '港澳通行证',
+    6: '台湾居民来往大陆通行证',
+    7: '台湾通行证',
+    8: '入台证',
+    9: '港澳居民往来内地通行证',
+    10: '警官证',
+    11: '驾驶证',
+    12: '海员证',
+    13: '外国人在中国永久居留证',
+    14: '澳门居民往来内地通行证',
+    15: '港澳居民来往内地通行证',
+    16: '港澳台居民来往内地通行证',
+    17: '港澳台居民居住证',
+    18: '中华人民共和国旅行证',
+    19: '回乡证',
+    20: '台胞证',
+    21: '香港身份证'
+  };
+  return typeObj[val as keyof typeof typeObj];
+}
+
+function handleSaleOrder(row: Api.delivery.deliveryOrder) {
+  if (!row.orderNumber) {
+    window.$message?.error('订单异常');
+  }
+  router.push({
+    path: '/order-manage/after-sales-order',
+    query: {
+      orderNumber: orderInfo.value?.orderNumber
+    }
+  });
+}
+onMounted(async () => {
+  await open(String(route.query.orderNumber));
+  if (route.query.type == 'ship') {
+    handleShip();
+  }
+});
 function getRefundRecordText() {
   const info = orderInfo.value as any;
   if (!info) return '暂无';
@@ -107,7 +327,7 @@ function getRefundRecordText() {
         <div class="mb-10px text-16px font-semibold">
           统一状态：
           <template v-if="orderInfo.businessType != 'DYY'">
-            {{ orderStatus[orderInfo.hbOrderStatus as keyof typeof orderStatus] }}
+            {{ filterStatus(orderInfo.hbOrderStatus) }}
           </template>
           <template v-else>
             {{ yppStatus[orderInfo.yppDetail?.orderState as keyof typeof yppStatus] }}
@@ -122,12 +342,12 @@ function getRefundRecordText() {
             订单状态：
             <template v-if="orderInfo.businessType != 'DYY'">
               {{
-                orderInfo.hbOrderStatus == 20 ||
-                orderInfo.hbOrderStatus == 30 ||
-                orderInfo.hbOrderStatus == 40 ||
-                orderInfo.hbOrderStatus == 70
-                  ? '进行中'
-                  : orderStatus[orderInfo.hbOrderStatus as keyof typeof orderStatus]
+              orderInfo.hbOrderStatus == 20 ||
+              orderInfo.hbOrderStatus == 30 ||
+              orderInfo.hbOrderStatus == 40 ||
+              orderInfo.hbOrderStatus == 1
+              ? '进行中'
+              : orderStatus[orderInfo.hbOrderStatus as keyof typeof orderStatus]
               }}
             </template>
             <template v-else>
@@ -152,7 +372,9 @@ function getRefundRecordText() {
         </NCard>
         <NCard size="small" class="mt-20px" title="支付信息" :bordered="false">
           <div>支付状态：{{ orderInfo.isPayed ? '已支付' : '未支付' }}</div>
-          <div>支付金额：{{ orderInfo.actualTotal }}元</div>
+          <div v-if="orderInfo.businessType == 'JY'">支付金额：{{ orderInfo.omsOrderOilVO?.realMoney || '---' }}元</div>
+
+          <div v-else>支付金额：{{ orderInfo.actualTotal }}元</div>
           <div>
             付款方式：{{
               orderInfo.hbOrderStatus == orderStatusEnum.WAIT_PAY ||
@@ -163,21 +385,63 @@ function getRefundRecordText() {
           </div>
           <div>支付时间：{{ orderInfo.payTime || '暂无' }}</div>
           <div>交易号：{{ orderInfo.outTradeNo || '---' }}</div>
-          <div>退款记录：{{ getRefundRecordText() }}</div>
+          <!--
+ <div>
+            退款记录：{{ orderInfo.refundOrderList ? orderInfo.refundOrderList.length : '暂无' }}
+            <NButton
+              v-if="orderInfo.refundOrderList && orderInfo.refundOrderList.length > 0"
+              size="small"
+              quaternary
+              type="primary"
+              @click="handleSaleOrder(orderInfo)"
+            >
+              查看
+            </NButton>
+          </div>
+-->
+          <div>
+            退款记录：{{ getRefundRecordText() }}
+            <NButton
+              v-if="orderInfo.refundOrderList && orderInfo.refundOrderList.length > 0"
+              size="small"
+              quaternary
+              type="primary"
+              @click="handleSaleOrder(orderInfo)"
+            >
+              查看
+            </NButton>
+          </div>
         </NCard>
       </div>
       <div class="flex-1">
-        <div class="flex">
-          <div class="mb-10px text-16px font-semibold">
-            业务状态：
-            <template v-if="orderInfo.businessType != 'DYY'">
-              {{ orderStatus[orderInfo.hbOrderStatus as keyof typeof orderStatus] }}
-            </template>
-            <template v-else>
-              {{ yppStatus[orderInfo.yppDetail?.orderState as keyof typeof yppStatus] }}
-            </template>
+        <div class="flex justify-between">
+          <div class="flex">
+            <div class="mb-10px text-16px font-semibold">
+              业务状态：
+              <template v-if="orderInfo.businessType != 'DYY'">
+                {{ orderStatus[orderInfo.hbOrderStatus as keyof typeof orderStatus] }}
+                {{ orderInfo.deliveryType && orderInfo.deliveryType == 1 ? '(已发货 其他方式)' : '' }}
+              </template>
+              <template v-else>
+                {{ yppStatus[orderInfo.yppDetail?.orderState as keyof typeof yppStatus] }}
+              </template>
+            </div>
+            <div v-if="orderInfo.hbOrderStatus == orderStatusEnum.WAIT_PAY" class="text-gray">
+              如买家未在
+              <NTag :type="TimeDown > 300094 ? 'success' : 'error'">
+                <NCountdown :duration="TimeDown" @finish="handleFinish" />
+              </NTag>
+              内付款，订单将 自动关闭。
+            </div>
+            <div v-else class="mb-10px ml-20px text-16px font-semibold">
+              第三方订单编号：{{ orderInfo.thirdOrderId }}
+            </div>
           </div>
-          <div class="mb-10px ml-20px text-16px font-semibold">第三方订单编号：{{ orderInfo.thirdOrderId }}</div>
+
+          <!-- v-if="orderInfo.dvyType === 10 && orderInfo.hbOrderStatus === 40" -->
+          <NButton size="small" type="primary" @click="handleShip">
+            {{ orderInfo.dvyNo ? '修改发货信息' : '发货' }}
+          </NButton>
         </div>
         <NCard size="small" title="业务信息" :bordered="false">
           <template v-if="orderInfo.businessType == 'XSB'">
@@ -223,6 +487,20 @@ function getRefundRecordText() {
                 </NTr>
               </NTbody>
             </NTable>
+
+            <template v-if="orderInfo.dvyType == 3 && orderInfo.hbOrderStatus != orderStatusEnum.WAIT_PAY">
+              <div class="py-20px font-semibold">03 订单追踪</div>
+              <div v-if="orderInfo.deliveryType == 1">信息记录：{{ orderInfo.dvyName || '暂无' }}</div>
+              <NTimeline v-else>
+                <NTimelineItem
+                  v-for="(item, index) in deliveryNode"
+                  :key="item.id"
+                  :type="index == 0 ? 'success' : undefined"
+                  :content="item.content"
+                  :time="item.updateTime"
+                />
+              </NTimeline>
+            </template>
           </template>
           <template v-else-if="orderInfo.businessType == 'DYY'">
             <div class="pb-20px font-semibold">01 影片与场次信息</div>
@@ -296,6 +574,7 @@ function getRefundRecordText() {
           <template v-else-if="orderInfo.businessType == 'CD'">
             <div class="flex flex-wrap items-center">
               <div class="mr10px flex-shrink-0">
+                <div>车牌号：{{ orderInfo.chargeOrder.plateNum || '--' }}</div>
                 <div>终端编号：{{ orderInfo.chargeOrder.connectorId || '--' }}</div>
                 <div>充电电站：{{ orderInfo.chargeOrder.powerStationName || '--' }}</div>
                 <div>充电开始时间：{{ orderInfo.chargeOrder.startTime || '--' }}</div>
@@ -333,8 +612,18 @@ function getRefundRecordText() {
                   </NTr>
                   <NTr>
                     <NTd>积分抵扣</NTd>
-                    <NTd>{{ orderInfo.actualTotal }}</NTd>
-                    <!-- <NTd>{{ orderInfo.actualTotal - orderInfo.platformVolume }}</NTd> -->
+                    <!-- <NTd>{{ orderInfo.actualTotal }}</NTd> -->
+                    <NTd>
+                      -{{
+                        (
+                          Number(orderInfo?.actualTotal || 0) - Number(orderInfo?.chargeOrder?.platformVolume || 0)
+                        ).toFixed(2)
+                      }}
+                    </NTd>
+                  </NTr>
+                  <NTr>
+                    <NTd>平台券</NTd>
+                    <NTd>-{{ Number(orderInfo?.chargeOrder?.platformVolume || 0) }}</NTd>
                   </NTr>
                 </NTbody>
               </NTable>
@@ -431,20 +720,106 @@ function getRefundRecordText() {
             <div>加油量：{{ orderInfo.omsOrderOilVO?.quantity + 'L' || '---' }}</div>
 
             <div class="mt-20px pb-20px font-semibold">04 加油明细</div>
-            <div>门店价：{{ orderInfo.omsOrderOilVO?.storePrice || '---' }}</div>
-            <div>平台价：{{ orderInfo.omsOrderOilVO?.vipPrice || '---' }}</div>
-            <div>订单金额：{{ orderInfo.omsOrderOilVO?.totalMoney || '---' }}</div>
-            <div>抵扣金额：{{ orderInfo.omsOrderOilVO?.promotionAmount || '---' }}</div>
-            <div>服务费：{{ orderInfo.omsOrderOilVO?.serviceFee || '---' }}</div>
-            <div>实付金额：{{ orderInfo.omsOrderOilVO?.realMoney || '---' }}</div>
+            <div>门店价：￥{{ orderInfo.omsOrderOilVO?.storePrice || '---' }}/L</div>
+            <div>平台价：￥{{ orderInfo.omsOrderOilVO?.vipPrice || '---' }}/L</div>
+            <div>订单金额：￥{{ orderInfo.omsOrderOilVO?.totalMoney || '---' }}</div>
+            <div>抵扣金额：-￥{{ orderInfo.omsOrderOilVO?.promotionAmount || '---' }}</div>
+            <div>服务费：+￥{{ orderInfo.omsOrderOilVO?.serviceFee || '---' }}</div>
+            <div>实付金额：￥{{ orderInfo.omsOrderOilVO?.realMoney || '---' }}</div>
 
             <div class="mt-20px pb-20px font-semibold">05 抵扣信息</div>
             <div>抵扣券ID：{{ orderInfo.omsOrderOilVO?.allowanceId || '---' }}</div>
             <div>优惠描述：{{ orderInfo.omsOrderOilVO?.activityName || '---' }}</div>
           </template>
+          <template v-else-if="orderInfo.businessType == 'JDMP'">
+            <div>产品编号：{{ orderInfo.backendOrderScenic.productNo || '---' }}</div>
+            <div>产品名称：{{ orderInfo.backendOrderScenic.productName || '---' }}</div>
+            <div>景区名称：{{ orderInfo.backendOrderScenic.viewName || '---' }}</div>
+            <div>
+              游玩日期：{{ orderInfo.backendOrderScenic.travelDate || '---' }}
+              {{ orderInfo.backendOrderScenic.endTravelDate ? '-' + orderInfo.backendOrderScenic.endTravelDate : '' }}
+            </div>
+            <div>备注：{{ orderInfo.backendOrderScenic.orderMemo || '---' }}</div>
+
+            <div>联系人：{{ orderInfo.backendOrderScenic.linkMan || '---' }}</div>
+            <div>联系电话：{{ orderInfo.backendOrderScenic.linkPhone || '---' }}</div>
+
+            <div
+              v-for="(item, index) in orderInfo.backendOrderScenic.omsOrderScenicPeopleList"
+              :key="index"
+              class="mt-10px border rounded-4px p-8px"
+            >
+              <div>游客姓名{{ index + 1 }}：{{ item.linkMan || '---' }}</div>
+              <div>证据类型：{{ filterType(item.linkCreditType) || '---' }}</div>
+              <div>证件号码：{{ item.linkCreditNo || '---' }}</div>
+            </div>
+
+            <NTable class="mt-20px" :single-line="false">
+              <NThead>
+                <NTr>
+                  <NTh>产品</NTh>
+                  <NTh>数量</NTh>
+                  <NTh>金额/元</NTh>
+                </NTr>
+              </NThead>
+              <NTbody>
+                <NTr>
+                  <NTd>{{ orderInfo.backendOrderScenic.productName || '---' }}</NTd>
+                  <NTd>x{{ orderInfo.backendOrderScenic.num }}</NTd>
+                  <NTd>{{ orderInfo.total }}</NTd>
+                </NTr>
+              </NTbody>
+            </NTable>
+
+            <NTable class="mt-20px" :single-line="false">
+              <NThead>
+                <NTr>
+                  <NTh>订单金额</NTh>
+                  <NTh>{{ orderInfo.backendOrderScenic.orderMoney }}</NTh>
+                </NTr>
+              </NThead>
+              <NTbody>
+                <NTr>
+                  <NTd>积分抵扣</NTd>
+                  <NTd>-{{ (Number(orderInfo.backendOrderScenic.offsetPoints) / 100).toFixed(2) || 0 }}</NTd>
+                </NTr>
+                <NTr>
+                  <NTd>微信支付</NTd>
+                  <NTd>{{ orderInfo.backendOrderScenic.actualTotal || 0 }}</NTd>
+                </NTr>
+              </NTbody>
+            </NTable>
+
+            <NTable v-if="orderInfo.backendOrderScenic.refundCreateTime" class="mt-20px" :single-line="false">
+              <NThead>
+                <NTr>
+                  <NTh>退款信息</NTh>
+                  <NTh></NTh>
+                </NTr>
+              </NThead>
+              <NTbody>
+                <NTr>
+                  <NTd>申请时间</NTd>
+                  <NTd>{{ orderInfo.backendOrderScenic.refundCreateTime || '---' }}</NTd>
+                </NTr>
+                <NTr>
+                  <NTd>申请说明</NTd>
+                  <NTd>{{ orderInfo.backendOrderScenic.cancelMemo || '---' }}</NTd>
+                </NTr>
+                <NTr>
+                  <NTd>处理状态</NTd>
+                  <NTd>
+                    {{ cancelState[orderInfo.backendOrderScenic.cancelState as keyof typeof cancelState] || '---' }}
+                  </NTd>
+                </NTr>
+              </NTbody>
+            </NTable>
+          </template>
         </NCard>
       </div>
     </div>
+
+    <BasicModelForm @register-modal-form="registerModalForm" @submit-form="handleSubmit"></BasicModelForm>
   </div>
 </template>