修改

src/api/order/orderMain/types.ts

@@ -9,16 +9,28 @@ export interface OrderMainVO {
    */
   orderNo: string;
 
-  /**
-   * 发货单号
-   */
-  shipmentNo: string;
+  parentOrderId: string | number;
+
+  parentOrderNo: string;
+
+  subOrderId: string | number;
 
   /**
    * 子订单编号
    */
   subOrderNo: string;
 
+  currentLevel: number;
+
+  orderType: string;
+
+  shipmentsType: string;
+
+  /**
+   * 发货单号
+   */
+  shipmentNo: string;
+
   /**
    * 所属公司
    */
@@ -279,16 +291,28 @@ export interface OrderMainForm extends BaseEntity {
    */
   orderNo?: string;
 
-  /**
-   * 发货单号
-   */
-  shipmentNo?: string;
+  parentOrderId?: string | number;
+
+  parentOrderNo?: string;
+
+  subOrderId?: string | number;
 
   /**
    * 子订单编号
    */
   subOrderNo?: string;
 
+  currentLevel?: number;
+
+  orderType?: string;
+
+  shipmentsType?: string;
+
+  /**
+   * 发货单号
+   */
+  shipmentNo?: string;
+
   /**
    * 所属公司
    */
@@ -532,16 +556,29 @@ export interface OrderMainQuery extends PageQuery {
    */
   orderNo?: string;
 
-  /**
-   * 发货单号
-   */
-  shipmentNo?: string;
+  parentOrderId?: string | number;
+
+  parentOrderNo?: string;
+
+  subOrderId?: string | number;
 
   /**
    * 子订单编号
    */
   subOrderNo?: string;
 
+  currentLevel?: number;
+
+  currentLevelStr?: string;
+
+  orderType?: string;
+
+  shipmentsType?: string;
+  /**
+   * 发货单号
+   */
+  shipmentNo?: string;
+
   /**
    * 所属公司
    */

src/api/order/orderMainCrrcExt/index.ts

@@ -0,0 +1,123 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { OrderMainCrrcExtVO, OrderMainCrrcExtForm, OrderMainCrrcExtQuery } from '@/api/order/orderMainCrrcExt/types';
+
+/**
+ * 查询中车电子商城订单扩展列表
+ * @param query
+ * @returns {*}
+ */
+export const listOrderMainCrrcExt = (query?: OrderMainCrrcExtQuery): AxiosPromise<OrderMainCrrcExtVO[]> => {
+  return request({
+    url: '/order/mainCrrcExt/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询中车电子商城订单扩展详细
+ * @param id
+ */
+export const getOrderMainCrrcExt = (id: string | number): AxiosPromise<OrderMainCrrcExtVO> => {
+  return request({
+    url: '/order/mainCrrcExt/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增中车电子商城订单扩展
+ * @param data
+ */
+export const addOrderMainCrrcExt = (data: OrderMainCrrcExtForm) => {
+  return request({
+    url: '/order/mainCrrcExt',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改中车电子商城订单扩展
+ * @param data
+ */
+export const updateOrderMainCrrcExt = (data: OrderMainCrrcExtForm) => {
+  return request({
+    url: '/order/mainCrrcExt',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除中车电子商城订单扩展
+ * @param id
+ */
+export const delOrderMainCrrcExt = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/order/mainCrrcExt/' + id,
+    method: 'delete'
+  });
+};
+
+/**
+ * 导出中车电子商城订单扩展
+ * @param query
+ */
+export const exportOrderMainCrrcExt = (query?: OrderMainCrrcExtQuery) => {
+  return request({
+    url: '/order/mainCrrcExt/export',
+    method: 'post',
+    params: query
+  });
+};
+
+/**
+ * 一键确定订单
+ * @param orderIds 订单ID列表，多个用逗号分隔
+ */
+export const oneKeyConfirmOrder = (orderIds: string) => {
+  return request({
+    url: '/order/mainCrrcExt/oneKeyConfirmOrder/' + orderIds,
+    method: 'post'
+  });
+};
+
+/**
+ * 导入订单发货数据
+ * @param file 导入文件
+ */
+export const importDeliverData = (file: File) => {
+  const formData = new FormData();
+  formData.append('file', file);
+  return request({
+    url: '/order/mainCrrcExt/importDeliverData',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  });
+};
+
+/**
+ * 获取订单发货导入模板
+ */
+export const importDeliverTemplate = () => {
+  return request({
+    url: '/order/mainCrrcExt/importDeliverTemplate',
+    method: 'post',
+    responseType: 'blob'
+  });
+};
+/**
+ * 导出发货信息
+ */
+export const exportOrderDeliverInfo = () => {
+  return request({
+    url: '/order/mainCrrcExt/exportOrderDeliverInfo',
+    method: 'post',
+    responseType: 'blob'
+  });
+};

src/api/order/orderMainCrrcExt/types.ts

@@ -0,0 +1,534 @@
+/**
+ * 中车电子商城订单扩展 VO
+ */
+export interface OrderMainCrrcExtVO {
+  /**
+   * 主键ID，建议与 order_main.id 保持一致（一对一）
+   */
+  id: string | number;
+
+  /**
+   * 中车电子商城订单号（orderNo），幂等判断关键字段
+   */
+  crrcOrderNo: string;
+
+  /**
+   * 采购平台订单号（purchaserOrderNo），中车内部采购系统订单编号
+   */
+  purchaserOrderNo: string;
+
+  /**
+   * 订单类型（preOrder）：0普通订单 1预购单 2预存单
+   */
+  preOrder: number;
+
+  /**
+   * 中车订单状态（orderStatus），原始状态值，做状态映射用
+   */
+  crrcOrderStatus: string;
+
+  /**
+   * 电商系统订单号（mallOrderNo），中车确认接单后返回
+   */
+  mallOrderNo: string;
+
+  /**
+   * 收货人姓名（name）
+   */
+  receiverName: string;
+
+  /**
+   * 一级地址编码：收货人省份地址编码
+   */
+  provinceId: string;
+
+  /**
+   * 省名称
+   */
+  provinceName: string;
+
+  /**
+   * 二级地址编码：收货人市级地址编码
+   */
+  cityId: string;
+
+  /**
+   * 市名称
+   */
+  cityName: string;
+
+  /**
+   * 三级地址编码：收货人县（区）级地址编码
+   */
+  countyId: string;
+
+  /**
+   * 区名称
+   */
+  countyName: string;
+
+  /**
+   * 四级地址编码：收货人乡镇地址编码(如果该地区有四级地址，则必须传递四级地址，没有四级地址则传 0)
+   */
+  townId: string;
+
+  /**
+   * 乡镇名称
+   */
+  townName: string;
+
+  /**
+   * 收货详细地址（address）
+   */
+  detailAddress: string;
+
+  /**
+   * 邮编（zip）
+   */
+  zip: string;
+
+  /**
+   * 收货人手机号（mobile）
+   */
+  mobile: string;
+
+  /**
+   * 收货人座机号（phone）
+   */
+  phone: string;
+
+  /**
+   * 收货人邮箱（email）
+   */
+  email: string;
+
+  /**
+   * 下单人姓名（buyer）
+   */
+  buyerName: string;
+
+  /**
+   * 下单人手机号（buyerMobile）
+   */
+  buyerMobile: string;
+
+  /**
+   * 采购单位名称（purchaserName）
+   */
+  purchaserName: string;
+
+  /**
+   * 采购部门名称（purchaserDeptName），多级结构字符串
+   */
+  purchaserDeptName: string;
+
+  /**
+   * 支付方式（paymentType）：01账期 02按单 03混合支付
+   */
+  paymentType: string;
+
+  /**
+   * 支付渠道（payClient）：1微信 2支付宝
+   */
+  payClient: string;
+
+  /**
+   * 支付流水号（paySerialNum）
+   */
+  paySerialNum: string;
+
+  /**
+   * 账期支付金额（payAccount），混合支付时必填
+   */
+  payAccount: number;
+
+  /**
+   * 现金支付金额（payMoney），混合支付时必填
+   */
+  payMoney: number;
+
+  /**
+   * 预存款支付金额（payPrestore）
+   */
+  payPrestore: number;
+
+  /**
+   * 是否需要发货凭证（voucher）：0否 1货物照片
+   */
+  voucher: string;
+
+  /**
+   * 中车订单创建时间（orderTime），格式YYYY-MM-DD HH:MM:SS
+   */
+  orderTime: string;
+
+  /**
+   * 中车接口原始返回JSON报文（留存做审计与问题排查）
+   */
+  rawJson: string;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status: string;
+
+  /**
+   * 分配原因
+   */
+  remark: string;
+}
+
+/**
+ * 中车电子商城订单扩展 BO
+ */
+export interface OrderMainCrrcExtForm extends BaseEntity {
+  /**
+   * 主键ID，建议与 order_main.id 保持一致（一对一）
+   */
+  id?: string | number;
+
+  /**
+   * 中车电子商城订单号（orderNo），幂等判断关键字段
+   */
+  crrcOrderNo?: string;
+
+  /**
+   * 采购平台订单号（purchaserOrderNo），中车内部采购系统订单编号
+   */
+  purchaserOrderNo?: string;
+
+  /**
+   * 订单类型（preOrder）：0普通订单 1预购单 2预存单
+   */
+  preOrder?: number;
+
+  /**
+   * 中车订单状态（orderStatus），原始状态值，做状态映射用
+   */
+  crrcOrderStatus?: string;
+
+  /**
+   * 电商系统订单号（mallOrderNo），中车确认接单后返回
+   */
+  mallOrderNo?: string;
+
+  /**
+   * 收货人姓名（name）
+   */
+  receiverName?: string;
+
+  /**
+   * 一级地址编码：收货人省份地址编码
+   */
+  provinceId?: string;
+
+  /**
+   * 省名称
+   */
+  provinceName?: string;
+
+  /**
+   * 二级地址编码：收货人市级地址编码
+   */
+  cityId?: string;
+
+  /**
+   * 市名称
+   */
+  cityName?: string;
+
+  /**
+   * 三级地址编码：收货人县（区）级地址编码
+   */
+  countyId?: string;
+
+  /**
+   * 区名称
+   */
+  countyName?: string;
+
+  /**
+   * 四级地址编码：收货人乡镇地址编码(如果该地区有四级地址，则必须传递四级地址，没有四级地址则传 0)
+   */
+  townId?: string;
+
+  /**
+   * 乡镇名称
+   */
+  townName?: string;
+
+  /**
+   * 收货详细地址（address）
+   */
+  detailAddress?: string;
+
+  /**
+   * 邮编（zip）
+   */
+  zip?: string;
+
+  /**
+   * 收货人手机号（mobile）
+   */
+  mobile?: string;
+
+  /**
+   * 收货人座机号（phone）
+   */
+  phone?: string;
+
+  /**
+   * 收货人邮箱（email）
+   */
+  email?: string;
+
+  /**
+   * 下单人姓名（buyer）
+   */
+  buyerName?: string;
+
+  /**
+   * 下单人手机号（buyerMobile）
+   */
+  buyerMobile?: string;
+
+  /**
+   * 采购单位名称（purchaserName）
+   */
+  purchaserName?: string;
+
+  /**
+   * 采购部门名称（purchaserDeptName），多级结构字符串
+   */
+  purchaserDeptName?: string;
+
+  /**
+   * 支付方式（paymentType）：01账期 02按单 03混合支付
+   */
+  paymentType?: string;
+
+  /**
+   * 支付渠道（payClient）：1微信 2支付宝
+   */
+  payClient?: string;
+
+  /**
+   * 支付流水号（paySerialNum）
+   */
+  paySerialNum?: string;
+
+  /**
+   * 账期支付金额（payAccount），混合支付时必填
+   */
+  payAccount?: number;
+
+  /**
+   * 现金支付金额（payMoney），混合支付时必填
+   */
+  payMoney?: number;
+
+  /**
+   * 预存款支付金额（payPrestore）
+   */
+  payPrestore?: number;
+
+  /**
+   * 是否需要发货凭证（voucher）：0否 1货物照片
+   */
+  voucher?: string;
+
+  /**
+   * 中车订单创建时间（orderTime），格式YYYY-MM-DD HH:MM:SS
+   */
+  orderTime?: string;
+
+  /**
+   * 中车接口原始返回JSON报文（留存做审计与问题排查）
+   */
+  rawJson?: string;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status?: string;
+
+  /**
+   * 分配原因
+   */
+  remark?: string;
+}
+
+/**
+ * 中车电子商城订单扩展查询参数
+ */
+export interface OrderMainCrrcExtQuery extends PageQuery {
+  /**
+   * 中车电子商城订单号（orderNo），幂等判断关键字段
+   */
+  crrcOrderNo?: string;
+
+  /**
+   * 采购平台订单号（purchaserOrderNo），中车内部采购系统订单编号
+   */
+  purchaserOrderNo?: string;
+
+  /**
+   * 订单类型（preOrder）：0普通订单 1预购单 2预存单
+   */
+  preOrder?: number;
+
+  /**
+   * 中车订单状态（orderStatus），原始状态值，做状态映射用
+   */
+  crrcOrderStatus?: string;
+
+  /**
+   * 电商系统订单号（mallOrderNo），中车确认接单后返回
+   */
+  mallOrderNo?: string;
+
+  /**
+   * 收货人姓名（name）
+   */
+  receiverName?: string;
+
+  /**
+   * 一级地址编码：收货人省份地址编码
+   */
+  provinceId?: string;
+
+  /**
+   * 省名称
+   */
+  provinceName?: string;
+
+  /**
+   * 二级地址编码：收货人市级地址编码
+   */
+  cityId?: string;
+
+  /**
+   * 市名称
+   */
+  cityName?: string;
+
+  /**
+   * 三级地址编码：收货人县（区）级地址编码
+   */
+  countyId?: string;
+
+  /**
+   * 区名称
+   */
+  countyName?: string;
+
+  /**
+   * 四级地址编码：收货人乡镇地址编码(如果该地区有四级地址，则必须传递四级地址，没有四级地址则传 0)
+   */
+  townId?: string;
+
+  /**
+   * 乡镇名称
+   */
+  townName?: string;
+
+  /**
+   * 收货详细地址（address）
+   */
+  detailAddress?: string;
+
+  /**
+   * 邮编（zip）
+   */
+  zip?: string;
+
+  /**
+   * 收货人手机号（mobile）
+   */
+  mobile?: string;
+
+  /**
+   * 收货人座机号（phone）
+   */
+  phone?: string;
+
+  /**
+   * 收货人邮箱（email）
+   */
+  email?: string;
+
+  /**
+   * 下单人姓名（buyer）
+   */
+  buyerName?: string;
+
+  /**
+   * 下单人手机号（buyerMobile）
+   */
+  buyerMobile?: string;
+
+  /**
+   * 采购单位名称（purchaserName）
+   */
+  purchaserName?: string;
+
+  /**
+   * 采购部门名称（purchaserDeptName），多级结构字符串
+   */
+  purchaserDeptName?: string;
+
+  /**
+   * 支付方式（paymentType）：01账期 02按单 03混合支付
+   */
+  paymentType?: string;
+
+  /**
+   * 支付渠道（payClient）：1微信 2支付宝
+   */
+  payClient?: string;
+
+  /**
+   * 支付流水号（paySerialNum）
+   */
+  paySerialNum?: string;
+
+  /**
+   * 账期支付金额（payAccount），混合支付时必填
+   */
+  payAccount?: number;
+
+  /**
+   * 现金支付金额（payMoney），混合支付时必填
+   */
+  payMoney?: number;
+
+  /**
+   * 预存款支付金额（payPrestore）
+   */
+  payPrestore?: number;
+
+  /**
+   * 是否需要发货凭证（voucher）：0否 1货物照片
+   */
+  voucher?: string;
+
+  /**
+   * 中车订单创建时间（orderTime），格式YYYY-MM-DD HH:MM:SS
+   */
+  orderTime?: string;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status?: string;
+
+  /**
+   * 分配原因
+   */
+  remark?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/views/order/orderAssignment/index.vue

@@ -40,7 +40,7 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="18"> 订单分配列表 </el-col>
+          <el-col :span="18"> 自营订单列表 </el-col>
           <!-- <el-col :span="1.5">
             <el-button type="primary" :disabled="!ids.length" plain @click="handleAssignment(null)">批量整单分配</el-button>
           </el-col>
@@ -215,7 +215,9 @@ const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
     orderTime: undefined,
     confirmTime: undefined,
     status: undefined,
-    isSplitChild: '1',
+    // isSplitChild: '1',
+    currentLevelStr: '1',
+    assigneeType: 'mkt',
     params: {}
   },
   rules: {}

src/views/order/orderAssignment/indexProject.vue

@@ -0,0 +1,357 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="订单编号" prop="orderNo">
+              <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="客户编号" prop="customerCode">
+              <el-input v-model="queryParams.customerCode" placeholder="请输入客户编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="客户名称" prop="customerName">
+              <el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="订单来源" prop="orderSource">
+              <el-select v-model="queryParams.orderSource" placeholder="请选择订单来源" clearable>
+                <el-option v-for="dict in order_source" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="订单状态" prop="orderStatus">
+              <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
+                <el-option v-for="dict in order_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item> -->
+
+            <el-form-item label="订单时间" prop="dateRange">
+              <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery()">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="18"> 项目订单列表 </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="primary" :disabled="!ids.length" plain @click="handleAssignment(null)">批量整单分配</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" :disabled="!ids.length" plain>关闭订单</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" :disabled="!ids.length" plain>删除订单</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" :disabled="!ids.length" plain>导出订单</el-button>
+          </el-col> -->
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="orderMainList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" :resizable="false" />
+        <el-table-column label="订单时间" align="center" prop="orderTime" :resizable="false" />
+        <el-table-column label="订单编号" align="center" prop="orderNo" :resizable="false" />
+        <el-table-column label="平台\项目订单号" align="center" prop="projectOrderNo">
+          <template #default="scope">
+            <span>{{ scope.row._crrcOrderNo || '' }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="客户编号" align="center" prop="customerCode" :resizable="false" /> -->
+        <el-table-column label="订单总金额" align="center" prop="totalAmount" :resizable="false" />
+        <!-- <el-table-column label="支付方式" align="center" prop="payType" :resizable="false">
+          <template #default="scope">
+            <dict-tag :options="pay_method" :value="scope.row.payType" />
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column label="业务员" align="center" prop="businessStaff" :resizable="false" />
+        <el-table-column label="客服" align="center" prop="customerService" :resizable="false" /> -->
+        <!-- <el-table-column label="归属部门" align="center" prop="businessDept" :resizable="false" /> -->
+        <el-table-column label="订单来源" align="center" prop="orderSource">
+          <template #default="scope">
+            <dict-tag :options="order_source" :value="scope.row.orderSource" />
+          </template>
+        </el-table-column>
+        <el-table-column label="所属项目" align="center" prop="dataSource">
+          <template #default="scope">
+            {{ scope.row.dataSource == 'zhongche' ? '中车' : '--' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="分配状态" align="center" prop="assignmentStatus" :resizable="false">
+          <template #default="scope">
+            <dict-tag :options="order_assignment_status" :value="scope.row.assignmentStatus" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="当前平台" align="center" prop="platformCode">
+          <template #default="scope">
+            <dict-tag :options="sys_platform_code" :value="scope.row.platformCode" />
+          </template>
+        </el-table-column> -->
+
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180" :resizable="false">
+          <template #default="scope">
+            <el-button link type="primary" @click="handleReview(scope.row)">详情</el-button>
+            <el-button link type="primary" v-if="scope.row.assignmentStatus != '1'" @click="handleAssignment(scope.row)">分配</el-button>
+            <el-button link type="primary" v-if="scope.row.assignmentStatus == '1'" @click="handleAssignment(scope.row)">分配记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 订单分配对话框 -->
+    <assignment-dialog ref="assignmentDialogRef" @success="getList" />
+    <!-- 拆单分配对话框 -->
+    <split-assign-dialog ref="splitAssignDialogRef" @success="getList" />
+  </div>
+</template>
+
+<script setup name="OrderAssignment" lang="ts">
+import { listOrderAssignment, getOrderMain, delOrderMain } from '@/api/order/orderMain';
+import { OrderMainVO, OrderMainQuery, OrderMainForm } from '@/api/order/orderMain/types';
+import AssignmentDialog from './assignmentDialog.vue';
+import SplitAssignDialog from './splitAssignDialog.vue';
+import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { order_assignment_status, order_check_status, pay_method, order_source, sys_platform_code } = toRefs<any>(
+  proxy?.useDict('order_assignment_status', 'order_check_status', 'pay_method', 'order_source', 'sys_platform_code')
+);
+
+const orderMainList = ref<OrderMainVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const router = useRouter();
+const queryFormRef = ref<ElFormInstance>();
+const orderMainFormRef = ref<ElFormInstance>();
+const assignmentDialogRef = ref<InstanceType<typeof AssignmentDialog>>();
+const splitAssignDialogRef = ref<InstanceType<typeof SplitAssignDialog>>();
+
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: OrderMainForm = {
+  id: undefined,
+  orderNo: undefined,
+  shipmentNo: undefined,
+  subOrderNo: undefined,
+  companyId: undefined,
+  customerId: undefined,
+  customerCode: undefined,
+  userId: undefined,
+  shippingAddressId: undefined,
+  purchaseReason: undefined,
+  invoiceType: undefined,
+  payType: undefined,
+  warehouseId: undefined,
+  creditLimit: undefined,
+  expectedDeliveryTime: undefined,
+  businessStaff: undefined,
+  customerService: undefined,
+  businessDept: undefined,
+  userDept: undefined,
+  productQuantity: undefined,
+  shippingFee: undefined,
+  totalAmount: undefined,
+  payableAmount: undefined,
+  paymentStatus: undefined,
+  orderSource: undefined,
+  orderStatus: undefined,
+  orderTime: undefined,
+  confirmTime: undefined,
+  shippingTime: undefined,
+  receivingTime: undefined,
+  shippedQuantity: undefined,
+  unshippedQuantity: undefined,
+  packageCount: undefined,
+  signedQuantity: undefined,
+  afterSaleCompleted: undefined,
+  afterSalePending: undefined,
+  deliveryDesc: undefined,
+  pushStatus: undefined,
+  attachmentPath: undefined,
+  deliveryType: undefined,
+  orderCategory: undefined,
+  productCode: undefined,
+  cancelReason: undefined,
+  expenseType: undefined,
+  userNo: undefined,
+  status: undefined,
+  remark: undefined,
+  isSplitChild: undefined,
+  orderProductBos: [],
+  customerSalesInfoVo: {}
+};
+const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    orderNo: undefined,
+    shipmentNo: undefined,
+    subOrderNo: undefined,
+    companyId: undefined,
+    customerCode: undefined,
+    customerId: undefined,
+    userId: undefined,
+    payType: undefined,
+    warehouseId: undefined,
+    expectedDeliveryTime: undefined,
+    businessStaff: undefined,
+    customerService: undefined,
+    businessDept: undefined,
+    productQuantity: undefined,
+    totalAmount: undefined,
+    payableAmount: undefined,
+    paymentStatus: undefined,
+    orderSource: undefined,
+    orderStatus: undefined,
+    orderTime: undefined,
+    confirmTime: undefined,
+    status: undefined,
+    // isSplitChild: '1',
+    currentLevelStr: '2',
+    assigneeType: 'mkt',
+    params: {}
+  },
+  rules: {}
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询订单主信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listOrderAssignment(proxy?.addDateRange(queryParams.value, dateRange.value));
+  const rows = res.rows;
+  await fetchCrrcOrderNos(rows);
+  orderMainList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+// 批量获取平台订单号
+const fetchCrrcOrderNos = async (rows: OrderMainVO[]) => {
+  const results = await Promise.allSettled(
+    rows.map((row) => {
+      const id = row.parentOrderId || row.id;
+      if (!id) return Promise.resolve(null);
+      return getOrderMainCrrcExt(id);
+    })
+  );
+  rows.forEach((row, i) => {
+    const result = results[i];
+    if (result.status === 'fulfilled') {
+      (row as any)._crrcOrderNo = result.value?.data?.crrcOrderNo || '';
+    } else {
+      (row as any)._crrcOrderNo = '';
+    }
+  });
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  orderMainFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = (orderStatus?: string) => {
+  if (orderStatus) {
+    queryParams.value.orderStatus = orderStatus;
+  } else {
+    queryParams.value.orderStatus = undefined;
+  }
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: OrderMainVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+const handleReview = (row?: OrderMainVO) => {
+  router.push({
+    path: '/order-manage/order-sendDetail',
+    query: { id: row.id }
+  });
+};
+
+/** 订单分配按钮操作 */
+const handleAssignment = async (row?: OrderMainVO | null) => {
+  let orderIds: Array<string | number>;
+
+  if (row) {
+    // 单个订单分配 - 直接打开统一的分配抽屉
+    splitAssignDialogRef.value?.open(row.id, row.assignmentStatus);
+  } else {
+    // 批量分配 - 只支持整单分配
+    if (!ids.value || ids.value.length === 0) {
+      proxy?.$modal.msgWarning('请选择要分配的订单');
+      return;
+    }
+    orderIds = ids.value;
+    assignmentDialogRef.value?.open(orderIds, undefined, undefined);
+  }
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: OrderMainVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除订单主信息编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delOrderMain(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'order/orderMain/export',
+    {
+      ...queryParams.value
+    },
+    `orderMain_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+
+onActivated(() => {
+  getList();
+});
+</script>

src/views/order/orderAssignment/splitAssignDialog.vue

@@ -268,7 +268,7 @@ const orderInfo = ref<any>({
 
 // 分配表单
 const assignForm = reactive({
-  targetType: 'srm', // 分配对象类型：srm-供应商
+  targetType: 'zy', // 分配对象类型：srm-供应商
   targetId: '', // 分配目标ID
   productList: [] as any[]
 });

src/views/order/orderDeliver/index.vue

@@ -66,7 +66,7 @@
 
       <el-table v-loading="loading" border :data="orderMainList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="发货单编号" align="center" prop="deliverCode" />
+        <el-table-column label="发货单编号" align="center" prop="shipmentNo" />
         <el-table-column label="订单编号" align="center" prop="orderNo" />
         <el-table-column label="客户名称" align="center" prop="customerName" />
         <el-table-column label="发货时间" align="center" prop="deliverTime" />
@@ -76,16 +76,23 @@
             <dict-tag :options="deliver_method" :value="scope.row.deliverMethod" />
           </template>
         </el-table-column>
-        <el-table-column label="包裹状态" align="center" prop="orderStatus">
+        <el-table-column label="订单状态" align="center" prop="orderStatus">
           <template #default="scope">
             <dict-tag :options="order_status" :value="scope.row.orderStatus" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" v-if="scope.row.orderStatus != '4'" @click="handleDeliver(scope.row)">发货</el-button>
+            <!-- <el-button link type="primary" v-if="scope.row.orderStatus != '4'" @click="handleDeliver(scope.row)">发货</el-button> -->
             <el-button link type="primary" @click="handleReview(scope.row)">查看发货信息</el-button>
             <el-button link type="primary">取消订单</el-button>
+            <el-button
+              link
+              type="primary"
+              v-if="scope.row.orderStatus == '3' || scope.row.orderStatus == '4' || scope.row.orderStatus == '5'"
+              @click="handleViewLogistics(scope.row)"
+              >查看物流</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -95,6 +102,7 @@
 
     <!-- 发货对话框 -->
     <DeliverDialog v-model="showDeliverDialog" :order-id="currentOrderId" :order-no="currentOrderNo" @success="handleDeliverSuccess" />
+    <LogisticsDetail v-model="showLogisticsDialog" :order-id="logisticsOrderId" />
   </div>
 </template>
 
@@ -110,6 +118,7 @@ import {
 } from '@/api/order/orderMain';
 import { OrderMainVO, OrderMainQuery, OrderMainForm } from '@/api/order/orderMain/types';
 import DeliverDialog from '../saleOrder/deliverDialog.vue';
+import LogisticsDetail from '../saleOrder/logisticsDetail.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { order_status, fee_type, pay_method, order_source, deliver_method } = toRefs<any>(
@@ -139,6 +148,9 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const showLogisticsDialog = ref(false);
+const logisticsOrderId = ref<string | number>();
+
 const orderStatusStats = ref({
   pendingPaymentCount: 0, // 待支付
   pendingShipmentCount: 0, // 待发货
@@ -235,7 +247,10 @@ const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
     productCode: undefined,
     expenseType: undefined,
     status: undefined,
-    platformCode: undefined,
+    assignmentStatus: undefined,
+    currentLevelStr: '2,3',
+    assigneeType: 'srm',
+
     params: {}
   },
   rules: {
@@ -264,6 +279,17 @@ const getList = async () => {
   queryOrderStatusStatsMethod();
 };
 
+/** 查看物流按钮操作 */
+const handleViewLogistics = (row?: OrderMainVO) => {
+  if (!row?.id) {
+    proxy?.$modal.msgWarning('订单ID不能为空');
+    return;
+  }
+  logisticsOrderId.value = row.id;
+
+  showLogisticsDialog.value = true;
+};
+
 const queryOrderStatusStatsMethod = async () => {
   const res = await queryOrderStatusStats();
   orderStatusStats.value = res as any;
@@ -334,7 +360,9 @@ const handleDeliver = (row?: OrderMainVO) => {
 };
 
 /** 发货成功回调 */
-const handleDeliverSuccess = () => {};
+const handleDeliverSuccess = () => {
+  getList();
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: OrderMainVO) => {

src/views/order/saleOrder/sendDetail.vue

@@ -4,7 +4,9 @@
       <!-- 订单信息 -->
       <el-descriptions title="订单信息" :column="2" border class="custom-descriptions">
         <el-descriptions-item label="订单编号">{{ orderDetail.orderNo }}</el-descriptions-item>
-        <el-descriptions-item label="发货单编号">{{ shipmentNoList }}</el-descriptions-item>
+        <el-descriptions-item label="关联单号">{{ orderDetail.parentOrderNo }}</el-descriptions-item>
+        <el-descriptions-item label="项目/平台订单号" v-if="crrcExtInfo.crrcOrderNo">{{ crrcExtInfo.crrcOrderNo }}</el-descriptions-item>
+        <el-descriptions-item label="发货单编号">{{ orderDetail.shipmentNo }}</el-descriptions-item>
         <el-descriptions-item label="订单总金额">{{ orderDetail.totalAmount }}</el-descriptions-item>
         <el-descriptions-item label="支付状态">
           <dict-tag :options="payment_status" :value="orderDetail.paymentStatus" />
@@ -75,8 +77,8 @@
         </el-col>
         <el-col :span="8">
           <div class="detail-item">
-            <span class="label">所属项目</span>
-            <span>{{ '--' }}</span>
+            <span class="label">所属项目：</span>
+            <span>{{ orderDetail.dataSource == 'zhongche' ? '中车' : '--' }}</span>
           </div>
           <div class="detail-item">
             <span class="label">业务部门：</span>
@@ -106,6 +108,27 @@
       </el-descriptions>
     </el-card>
 
+    <!-- 项目订单扩展信息 -->
+    <el-card v-if="orderDetail.dataSource" shadow="never" class="mb-2">
+      <template #header>
+        <span>项目订单扩展信息</span>
+      </template>
+      <el-descriptions :column="3" border class="custom-descriptions">
+        <el-descriptions-item label="收货人">{{ crrcExtInfo.receiverName || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="收货人手机号" :span="2">{{ crrcExtInfo.mobile || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="收货人邮箱">{{ crrcExtInfo.email || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="收货地址" :span="2">
+          {{ crrcExtInfo.provinceName || '' }}-{{ crrcExtInfo.cityName || '' }}-{{ crrcExtInfo.countyName || '' }}-{{ crrcExtInfo.townName || '' }}-{{
+            crrcExtInfo.detailAddress || ''
+          }}
+        </el-descriptions-item>
+        <el-descriptions-item label="下单人姓名">{{ crrcExtInfo.buyerName || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="下单人手机号" :span="2">{{ crrcExtInfo.buyerMobile || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="采购单位名称" :span="3">{{ crrcExtInfo.purchaserName || '--' }}</el-descriptions-item>
+        <el-descriptions-item label="采购部门名称" :span="3">{{ crrcExtInfo.purchaserDeptName || '--' }}</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+
     <!-- 商品明细 -->
     <el-card shadow="never" class="mb-2">
       <template #header>
@@ -264,6 +287,8 @@ import { getInvoiceType } from '@/api/customer/invoiceType';
 import { InvoiceTypeVO } from '@/api/customer/invoiceType/types';
 import { selectNewOneLog } from '@/api/order/orderStatusLog';
 import { getDept } from '@/api/system/dept';
+import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
+import { OrderMainCrrcExtVO } from '@/api/order/orderMainCrrcExt/types';
 import LogisticsDetail from './logisticsDetail.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { order_status, payment_status, fee_type, pay_method, deliver_method } = toRefs<any>(
@@ -297,6 +322,9 @@ const deliverProductList = ref<DeliverProductVO[]>([]);
 // 收货地址信息
 const shippingAddress = ref<ShippingAddressVO>({} as ShippingAddressVO);
 
+// 中车订单扩展信息
+const crrcExtInfo = ref<OrderMainCrrcExtVO>({} as OrderMainCrrcExtVO);
+
 const operateType = ref('add');
 
 // 发货对话框
@@ -409,6 +437,24 @@ const getOrderDetail = async () => {
       orderDetail.value.userDeptName = await getDeptDetail(orderDetail.value.userDept);
     }
 
+    // 获取中车订单扩展信息
+    //如果data.parentOrderId存在，则使用data.parentOrderId查询，否则使用data.id查询
+    if (orderDetail.value.parentOrderId) {
+      try {
+        const extRes = await getOrderMainCrrcExt(orderDetail.value.parentOrderId);
+        crrcExtInfo.value = extRes.data || ({} as OrderMainCrrcExtVO);
+      } catch (error) {
+        console.error('获取中车订单扩展信息失败:', error);
+      }
+    } else if (orderDetail.value.id) {
+      try {
+        const extRes = await getOrderMainCrrcExt(orderDetail.value.id);
+        crrcExtInfo.value = extRes.data || ({} as OrderMainCrrcExtVO);
+      } catch (error) {
+        console.error('获取中车订单扩展信息失败:', error);
+      }
+    }
+
     // 获取发票类型信息
     // if (orderDetail.value.invoiceType) {
     //   await getInvoiceTypeDetail(orderDetail.value.invoiceType);
@@ -536,6 +582,16 @@ const getShippingAddressDetail = async (addressId: string | number) => {
   }
 };
 
+// 获取中车订单扩展信息
+const getCrrcExtDetail = async (orderId: string | number) => {
+  try {
+    const res = await getOrderMainCrrcExt(orderId);
+    crrcExtInfo.value = res.data || ({} as OrderMainCrrcExtVO);
+  } catch (error) {
+    console.error('获取中车订单扩展信息失败:', error);
+  }
+};
+
 // 计算商品总金额（所有商品的小计之和）
 const totalAmount = computed(() => {
   return productList.value.reduce((sum, item) => {