Merge remote-tracking branch 'origin/master' into master

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;
+
   /**
    * 所属公司
    */
@@ -263,6 +275,10 @@ export interface OrderMainVO {
 
   assignmentStatus: string;
 
+  assigneeRemark: string;
+
+  assigneeName: string;
+
   orderProductList: any[];
 
   deliverProductList: any[];
@@ -279,16 +295,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 +560,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;
+
   /**
    * 所属公司
    */
@@ -770,6 +811,8 @@ export interface OrderMainQuery extends PageQuery {
 
   assignmentStatus?: string;
 
+  assigneeType?: 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/orderDeliver/index.vue

@@ -23,12 +23,12 @@
                 <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="">
+            <!-- <el-form-item label="业务员" prop="">
               <el-select v-model="queryParams.orderStatus" placeholder="请选择业务员" clearable> </el-select>
             </el-form-item>
             <el-form-item label="部门" prop="">
               <el-select v-model="queryParams.orderStatus" placeholder="请选择部门" clearable> </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="提交时间" prop="createTime">
               <el-date-picker
                 v-model="dateRange"
@@ -50,33 +50,33 @@
 
     <el-card shadow="never">
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="19"> 发货单信息列表 </el-col>
-          <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
+          <!-- 左侧标题 -->
+          <span style="font-size: 16px; font-weight: 500">发货单信息列表</span>
+          <div style="display: flex; flex-wrap: nowrap; gap: 10px">
             <el-button type="primary" @click="handleCloseOrder()" :disabled="!ids.length" plain>关闭订单</el-button>
-          </el-col>
-          <el-col :span="1.5">
             <el-button type="primary" @click="handleDelete()" :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>
+          </div>
         </el-row>
       </template>
 
       <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" />
-        <el-table-column label="签收时间" align="center" prop="deliverTime" />
-        <el-table-column label="发货方式" align="center" prop="deliverMethod">
+        <el-table-column label="关联单号" align="center" prop="parentOrderNo" />
+        <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="customerName">
           <template #default="scope">
-            <dict-tag :options="deliver_method" :value="scope.row.deliverMethod" />
+            <span>{{ scope.row.customerName || '--' }}</span>
           </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>
@@ -86,6 +86,13 @@
             <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,8 @@
 
     <!-- 发货对话框 -->
     <DeliverDialog v-model="showDeliverDialog" :order-id="currentOrderId" :order-no="currentOrderNo" @success="handleDeliverSuccess" />
+
+    <LogisticsDetail v-model="showLogisticsDialog" :order-id="logisticsOrderId" />
   </div>
 </template>
 
@@ -110,7 +119,8 @@ 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';
+import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { order_status, fee_type, pay_method, order_source, deliver_method } = toRefs<any>(
   proxy?.useDict('order_status', 'fee_type', 'pay_method', 'order_source', 'deliver_method')
@@ -139,6 +149,9 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const showLogisticsDialog = ref(false);
+const logisticsOrderId = ref<string | number>();
+
 const orderStatusStats = ref({
   pendingPaymentCount: 0, // 待支付
   pendingShipmentCount: 0, // 待发货
@@ -225,7 +238,7 @@ const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
     paymentStatus: undefined,
     orderSource: undefined,
     orderStatus: undefined,
-    orderStatuses: '2,3,4',
+    orderStatuses: '1,2,3,4',
     orderTime: undefined,
     confirmTime: undefined,
     shippingTime: undefined,
@@ -258,12 +271,44 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listOrderMain(proxy?.addDateRange(queryParams.value, dateRange.value));
+  const rows = res.rows;
+  await fetchCrrcOrderNos(rows);
   orderMainList.value = res.rows;
   total.value = res.total;
   loading.value = false;
   queryOrderStatusStatsMethod();
 };
 
+// 批量获取平台订单号
+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 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 +379,9 @@ const handleDeliver = (row?: OrderMainVO) => {
 };
 
 /** 发货成功回调 */
-const handleDeliverSuccess = () => {};
+const handleDeliverSuccess = () => {
+  getList();
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: OrderMainVO) => {

src/views/order/partaddress/index.vue

@@ -23,10 +23,20 @@
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['partnerAddress:partaddress:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['partnerAddress:partaddress:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['partnerAddress:partaddress:edit']"
+              >修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['partnerAddress:partaddress:remove']">删除</el-button>
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['partnerAddress:partaddress:remove']"
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['partnerAddress:partaddress:export']">导出</el-button>
@@ -65,35 +75,13 @@
     </el-card>
 
     <!-- 添加或修改伙伴商地址对话框 -->
-    <el-dialog
-      v-model="dialog.visible"
-      :title="dialog.title"
-      width="650px"
-      :close-on-click-modal="false"
-      append-to-body
-    >
-      <el-form
-        ref="partaddressFormRef"
-        :model="form"
-        :rules="rules"
-        label-width="120px"
-      >
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="650px" :close-on-click-modal="false" append-to-body>
+      <el-form ref="partaddressFormRef" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="企业名称：" prop="partnerId" required>
-              <el-select 
-                v-model="form.partnerId" 
-                placeholder="请选择企业名称" 
-                clearable 
-                filterable
-                @change="handlePartnerChange"
-              >
-                <el-option
-                  v-for="item in partnerOptions"
-                  :key="item.id"
-                  :label="item.partnerName"
-                  :value="item.id"
-                />
+              <el-select v-model="form.partnerId" placeholder="请选择企业名称" clearable filterable @change="handlePartnerChange">
+                <el-option v-for="item in partnerOptions" :key="item.id" :label="item.partnerName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -103,7 +91,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="收货人：" prop="shipperName" required>
@@ -123,7 +111,6 @@
               <el-input v-model="form.shippingPostCode" placeholder="请输入邮政编码" />
             </el-form-item>
           </el-col>
-          
         </el-row>
 
         <el-row :gutter="20">
@@ -135,7 +122,7 @@
                 placeholder="请选择"
                 clearable
                 filterable
-                style="width: 100%;"
+                style="width: 100%"
                 @change="handleAddressRegionChange"
               />
             </el-form-item>
@@ -145,12 +132,7 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="详细地址：" prop="shippingAddress" required>
-              <el-input
-                v-model="form.shippingAddress"
-                type="textarea"
-                :rows="3"
-                placeholder="请输入详细地址"
-              />
+              <el-input v-model="form.shippingAddress" placeholder="请输入详细地址" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -158,10 +140,9 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="默认地址：">
-              <el-switch v-model="form.isSelf" :active-value="1" :inactive-value="0" />
+              <el-switch v-model="form.isSelf" :active-value="'1'" :inactive-value="'0'" />
             </el-form-item>
           </el-col>
-          
         </el-row>
       </el-form>
 
@@ -210,7 +191,7 @@ const getPartnerNameList = async () => {
 };
 
 const handlePartnerChange = (val: string | number) => {
-  const selected = partnerOptions.value.find(item => item.id === val);
+  const selected = partnerOptions.value.find((item) => item.id === val);
   if (selected) {
     form.value.partnerNo = selected.partnerNo;
     form.value.partnerName = selected.partnerName;
@@ -246,27 +227,26 @@ const initFormData: PartaddressForm = {
   shippingCounty: undefined,
   shippingAddress: undefined,
   pushStatus: undefined,
-  isSelf: undefined,
+  isSelf: '1',
   type: undefined,
   addressNo: undefined,
   status: undefined,
-  remark: undefined,
-}
+  remark: undefined
+};
 const data = reactive<PageData<PartaddressForm, PartaddressQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     partnerNo: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
-    partnerId: [{ required: true, message: "企业名称不能为空", trigger: "change" }],
-    shipperName: [{ required: true, message: "发货人姓名不能为空", trigger: "blur" }],
-    shipperPhone: [{ required: true, message: "发货人电话不能为空", trigger: "blur" }],
-    shippingProvincial: [{ required: true, message: "地址不能为空", trigger: "change" }],
-    shippingAddress: [{ required: true, message: "详细地址不能为空", trigger: "blur" }]
+    partnerId: [{ required: true, message: '企业名称不能为空', trigger: 'change' }],
+    shipperName: [{ required: true, message: '发货人姓名不能为空', trigger: 'blur' }],
+    shipperPhone: [{ required: true, message: '发货人电话不能为空', trigger: 'blur' }],
+    shippingProvincial: [{ required: true, message: '地址不能为空', trigger: 'change' }],
+    shippingAddress: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }]
   }
 });
 
@@ -279,51 +259,51 @@ const getList = async () => {
   partaddressList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   selectedAddressRegion.value = [];
   partaddressFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: PartaddressVO[]) => {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加伙伴商地址";
-}
+  dialog.title = '添加伙伴商地址';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: PartaddressVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getPartaddress(_id);
   Object.assign(form.value, res.data);
   if (res.data.shippingProvincial && res.data.shippingCity && res.data.shippingCounty) {
@@ -359,8 +339,8 @@ const handleUpdate = async (row?: PartaddressVO) => {
     }
   }
   dialog.visible = true;
-  dialog.title = "修改伙伴商地址";
-}
+  dialog.title = '修改伙伴商地址';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -368,37 +348,45 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updatePartaddress(form.value).finally(() =>  buttonLoading.value = false);
+        await updatePartaddress(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addPartaddress(form.value).finally(() =>  buttonLoading.value = false);
+        await addPartaddress(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: PartaddressVO) => {
   const _ids = row?.id || ids.value;
-  proxy?.$modal.confirm('是否确认删除伙伴商地址编号为"' + _ids + '"的数据项？').then(async () => {
-    loading.value = true;
-    return await delPartaddress(_ids);
-  }).then(() => {
-    getList();
-    proxy?.$modal.msgSuccess("删除成功");
-  }).finally(() => {
-    loading.value = false;
-  });
-}
+  proxy?.$modal
+    .confirm('是否确认删除伙伴商地址编号为"' + _ids + '"的数据项？')
+    .then(async () => {
+      loading.value = true;
+      return await delPartaddress(_ids);
+    })
+    .then(() => {
+      getList();
+      proxy?.$modal.msgSuccess('删除成功');
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('partnerAddress/partaddress/export', {
-    ...queryParams.value
-  }, `partaddress_${new Date().getTime()}.xlsx`)
-}
+  proxy?.download(
+    'partnerAddress/partaddress/export',
+    {
+      ...queryParams.value
+    },
+    `partaddress_${new Date().getTime()}.xlsx`
+  );
+};
 
 onMounted(() => {
   getList();

src/views/order/saleOrder/index.vue

@@ -389,7 +389,7 @@ const handleReview = (row?: OrderMainVO) => {
 const handleAffirm = (row?: OrderMainVO) => {
   router.push({
     path: '/order-manage/order-affirm',
-    query: { id: row.id }
+    query: { id: row.id, source: 'list' }
   });
 };
 

src/views/order/saleOrder/orderAffirm.vue

@@ -8,7 +8,7 @@
     </el-card>
 
     <!-- 订单基本信息 -->
-    <el-card shadow="never" class="mb-2">
+    <el-card shadow="never" class="mb-2" v-if="!orderInfo.dataSource">
       <template #header>
         <div class="card-header">
           <span>订单基本信息</span>
@@ -142,7 +142,7 @@
     </el-card>
 
     <!-- 收货地址 -->
-    <el-card shadow="never" class="mb-2">
+    <el-card shadow="never" class="mb-2" v-if="!orderInfo.dataSource">
       <template #header>
         <div class="card-header">
           <span>收货地址</span>
@@ -176,7 +176,36 @@
         </el-row>
       </el-form>
     </el-card>
-
+    <!-- 分配信息 -->
+    <el-card shadow="never" class="mb-2">
+      <template #header>
+        <span>分配信息</span>
+      </template>
+      <el-descriptions :column="2" border class="custom-descriptions">
+        <el-descriptions-item label="伙伴商名称">{{ orderInfo.assigneeName }}</el-descriptions-item>
+        <el-descriptions-item label="分配备注">{{ orderInfo.assigneeRemark }}</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+    <!-- 项目订单扩展信息 -->
+    <el-card v-if="orderInfo.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>
@@ -262,7 +291,8 @@ import { getWarehouse } from '@/api/company/warehouse';
 import { getCustomerInfo } from '@/api/customer/customerFile/customerInfo';
 import { getDept } from '@/api/system/dept';
 import { useRoute, useRouter } from 'vue-router';
-
+import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
+import { OrderMainCrrcExtVO } from '@/api/order/orderMainCrrcExt/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { pay_method, fee_type } = toRefs<any>(proxy?.useDict('pay_method', 'fee_type'));
 
@@ -277,7 +307,8 @@ const orderInfo = ref<any>({});
 const addressInfo = ref<any>({});
 // 商品列表
 const productList = ref<any[]>([]);
-
+// 中车订单扩展信息
+const crrcExtInfo = ref<OrderMainCrrcExtVO>({} as OrderMainCrrcExtVO);
 // 计算商品总数
 const totalQuantity = computed(() => {
   return productList.value.reduce((sum, item) => {
@@ -415,7 +446,23 @@ const getOrderDetail = async (orderId: string | number) => {
       const deptName = await getDeptDetail(data.userDept);
       orderInfo.value.userDeptName = deptName;
     }
-
+    // 获取中车订单扩展信息
+    //如果data.parentOrderId存在，则使用data.parentOrderId查询，否则使用data.id查询
+    if (data?.parentOrderId) {
+      try {
+        const extRes = await getOrderMainCrrcExt(data.parentOrderId);
+        crrcExtInfo.value = extRes.data || ({} as OrderMainCrrcExtVO);
+      } catch (error) {
+        console.error('获取中车订单扩展信息失败:', error);
+      }
+    } else if (data?.id) {
+      try {
+        const extRes = await getOrderMainCrrcExt(data.id);
+        crrcExtInfo.value = extRes.data || ({} as OrderMainCrrcExtVO);
+      } catch (error) {
+        console.error('获取中车订单扩展信息失败:', error);
+      }
+    }
     // 设置收货地址信息
     if ((data as any)?.shippingAddressVo) {
       addressInfo.value = (data as any).shippingAddressVo;
@@ -491,7 +538,13 @@ const confirmOrder = async () => {
     proxy?.$modal.msgSuccess('订单确认成功');
 
     // 返回订单列表
-    router.push('/order-manage/order-list');
+    // 根据来源返回对应列表页
+    const source = route.query.source;
+    if (source === 'list') {
+      router.push('/order-manage/order-list');
+    } else {
+      router.push('/order-manage/order-deliver-list');
+    }
   } catch (error) {
     console.error('确认订单失败:', error);
     proxy?.$modal.msgError('确认订单失败，请重试');

src/views/order/saleOrder/sendDetail.vue

@@ -4,11 +4,13 @@
       <!-- 订单信息 -->
       <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="项目/平台订单号">{{ 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="支付状态">
+        <!-- <el-descriptions-item label="支付状态">
           <dict-tag :options="payment_status" :value="orderDetail.paymentStatus" />
-        </el-descriptions-item>
+        </el-descriptions-item> -->
         <el-descriptions-item label="订单状态">
           <dict-tag :options="order_status" :value="orderDetail.orderStatus" />
         </el-descriptions-item>
@@ -20,7 +22,7 @@
     </el-card>
 
     <!-- 订单详情信息 -->
-    <el-card shadow="never" class="mb-2">
+    <!-- <el-card shadow="never" class="mb-2">
       <template #header>
         <span>订单基本信息</span>
       </template>
@@ -92,10 +94,10 @@
           </div>
         </el-col>
       </el-row>
-    </el-card>
+    </el-card> -->
 
     <!-- 收货信息 -->
-    <el-card shadow="never" class="mb-2">
+    <!-- <el-card shadow="never" class="mb-2">
       <template #header>
         <span>收货信息</span>
       </template>
@@ -104,8 +106,36 @@
         <el-descriptions-item label="联系电话">{{ shippingAddress.phone }}</el-descriptions-item>
         <el-descriptions-item label="收货地址">{{ shippingAddress.provincialCityCountry }} {{ shippingAddress.address }}</el-descriptions-item>
       </el-descriptions>
+    </el-card> -->
+    <el-card shadow="never" class="mb-2">
+      <template #header>
+        <span>分配信息</span>
+      </template>
+      <el-descriptions :column="2" border class="custom-descriptions">
+        <el-descriptions-item label="伙伴商名称">{{ orderDetail.assigneeName }}</el-descriptions-item>
+        <el-descriptions-item label="分配备注">{{ orderDetail.assigneeRemark }}</el-descriptions-item>
+      </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>
@@ -265,6 +295,8 @@ import { InvoiceTypeVO } from '@/api/customer/invoiceType/types';
 import { selectNewOneLog } from '@/api/order/orderStatusLog';
 import { getDept } from '@/api/system/dept';
 import LogisticsDetail from './logisticsDetail.vue';
+import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
+import { OrderMainCrrcExtVO } from '@/api/order/orderMainCrrcExt/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { order_status, payment_status, fee_type, pay_method, deliver_method } = toRefs<any>(
   proxy?.useDict('order_status', 'payment_status', 'fee_type', 'pay_method', 'deliver_method')
@@ -297,6 +329,9 @@ const deliverProductList = ref<DeliverProductVO[]>([]);
 // 收货地址信息
 const shippingAddress = ref<ShippingAddressVO>({} as ShippingAddressVO);
 
+// 中车订单扩展信息
+const crrcExtInfo = ref<OrderMainCrrcExtVO>({} as OrderMainCrrcExtVO);
+
 const operateType = ref('add');
 
 // 发货对话框
@@ -409,6 +444,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);
@@ -620,6 +673,15 @@ const handlePrint = () => {
 onMounted(() => {
   getOrderDetail();
 });
+// 监听路由 query 中的 id 变化
+watch(
+  () => route.query.id, // 监听 id 的变化
+  (newOrderId) => {
+    if (newOrderId) {
+      getOrderDetail();
+    }
+  }
+);
 </script>
 
 <style scoped lang="scss">