hurx hai 5 días
pai
achega
4f8001f4e1

+ 4 - 0
src/api/order/orderMain/types.ts

@@ -273,6 +273,10 @@ export interface OrderMainVO {
 
   checkStatus: string;
 
+  assigneeRemark: string;
+
+  assigneeName: string;
+
   assignmentStatus: string;
 
   orderProductList: any[];

+ 2 - 2
src/views/customer/customerFile/contactInfo/index.vue

@@ -130,11 +130,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="生日" prop="birthday">
               <el-date-picker v-model="form.birthday" type="date" placeholder="请选择" class="w-full" value-format="YYYY-MM-DD" style="width: 100%" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">

+ 1 - 1
src/views/customer/customerFile/customerInfo/add.vue

@@ -112,7 +112,7 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="邮政编码" prop="postCode">
-              <el-input v-model="form.postCode" placeholder="请输入邮政编码" />
+              <el-input v-model="form.postCode" placeholder="请输入邮政编码" @input="(val: any) => (form.postCode = val.replace(/\D/g, ''))" />
             </el-form-item>
           </el-col>
           <el-col :span="8">

+ 6 - 1
src/views/customer/customerFile/customerInfo/overview/baseInfo.vue

@@ -121,7 +121,12 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="邮政编码" prop="postCode">
-              <el-input v-model="form.postCode" placeholder="请输入邮政编码" :disabled="isViewMode" />
+              <el-input
+                v-model="form.postCode"
+                placeholder="请输入邮政编码"
+                :disabled="isViewMode"
+                @input="(val: any) => (form.postCode = val.replace(/\D/g, ''))"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">

+ 2 - 2
src/views/customer/customerFile/customerInfo/overview/contactInfo.vue

@@ -115,7 +115,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="生日" prop="birthday">
               <el-date-picker
                 v-model="form.birthday"
@@ -127,7 +127,7 @@
                 :disabled="isViewMode"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">

+ 6 - 1
src/views/customer/customerFile/customerInfo/overview/shippingAddress.vue

@@ -55,7 +55,12 @@
           <el-input v-model="form.phone" placeholder="请输入联系电话" :disabled="isViewMode" />
         </el-form-item>
         <el-form-item label="邮政编码" prop="postal">
-          <el-input v-model="form.postal" placeholder="请输入邮政编码" :disabled="isViewMode" />
+          <el-input
+            v-model="form.postal"
+            placeholder="请输入邮政编码"
+            :disabled="isViewMode"
+            @input="(val: any) => (form.postal = val.replace(/\D/g, ''))"
+          />
         </el-form-item>
         <el-form-item label="详细地址" prop="provincialCityCountry">
           <el-cascader

+ 7 - 16
src/views/order/orderDeliver/index.vue

@@ -50,17 +50,14 @@
 
     <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>
 
@@ -68,14 +65,8 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="发货单编号" align="center" prop="shipmentNo" />
         <el-table-column label="订单编号" align="center" prop="orderNo" />
+        <el-table-column label="关联单号" align="center" prop="parentOrderNo" />
         <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">
-          <template #default="scope">
-            <dict-tag :options="deliver_method" :value="scope.row.deliverMethod" />
-          </template>
-        </el-table-column>
         <el-table-column label="订单状态" align="center" prop="orderStatus">
           <template #default="scope">
             <dict-tag :options="order_status" :value="scope.row.orderStatus" />
@@ -250,7 +241,7 @@ const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
     platformCode: undefined,
     assignmentStatus: undefined,
     assigneeType: 'zy',
-
+    currentLevelStr: '2',
     params: {}
   },
   rules: {

+ 444 - 0
src/views/order/orderDeliver/indexProject.vue

@@ -0,0 +1,444 @@
+<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="">
+              <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 label="提交时间" prop="createTime">
+              <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                value-format="YYYY-MM-DD"
+              />
+            </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" 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-button type="primary" @click="handleDelete()" :disabled="!ids.length" plain>删除订单</el-button>
+            <el-button type="primary" :disabled="!ids.length" plain>导出订单</el-button>
+          </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="shipmentNo" />
+        <el-table-column label="订单编号" align="center" prop="orderNo" />
+        <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">
+            <span>{{ scope.row.customerName || '--' }}</span>
+          </template>
+        </el-table-column>
+        <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" @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>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 发货对话框 -->
+    <DeliverDialog v-model="showDeliverDialog" :order-id="currentOrderId" :order-no="currentOrderNo" @success="handleDeliverSuccess" />
+
+    <LogisticsDetail v-model="showLogisticsDialog" :order-id="logisticsOrderId" />
+  </div>
+</template>
+
+<script setup name="OrderMain" lang="ts">
+import {
+  listOrderMain,
+  getOrderMain,
+  delOrderMain,
+  addOrderMain,
+  updateOrderMain,
+  queryOrderStatusStats,
+  closeOrderMain
+} from '@/api/order/orderMain';
+import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
+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>(
+  proxy?.useDict('order_status', 'fee_type', 'pay_method', 'order_source', 'deliver_method')
+);
+
+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 dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+
+// 发货对话框
+const showDeliverDialog = ref(false);
+const currentOrderId = ref<string | number>();
+const currentOrderNo = ref<string>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const showLogisticsDialog = ref(false);
+const logisticsOrderId = ref<string | number>();
+
+const orderStatusStats = ref({
+  pendingPaymentCount: 0, // 待支付
+  pendingShipmentCount: 0, // 待发货
+  shippedCount: 0, // 已发货(发货完成)
+  completedCount: 0, // 已完成
+  closedCount: 0, // 已关闭
+  totalCount: 0 // 全部订单
+});
+
+const initFormData: OrderMainForm = {
+  id: undefined,
+  orderNo: undefined,
+  isSplitChild: 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,
+  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,
+    purchaseReason: undefined,
+    invoiceType: undefined,
+    payType: undefined,
+    warehouseId: undefined,
+    creditLimit: undefined,
+    expectedDeliveryTime: undefined,
+    businessStaff: undefined,
+    customerService: undefined,
+    businessDept: undefined,
+    userDept: undefined,
+    paymentStatus: undefined,
+    orderSource: undefined,
+    orderStatus: undefined,
+    orderStatuses: '2,3,4',
+    orderTime: undefined,
+    confirmTime: undefined,
+    shippingTime: undefined,
+    receivingTime: undefined,
+    deliveryType: undefined,
+    orderCategory: undefined,
+    productCode: undefined,
+    expenseType: undefined,
+    status: undefined,
+    platformCode: undefined,
+    assignmentStatus: undefined,
+    assigneeType: 'zy',
+    currentLevelStr: '3',
+
+    params: {}
+  },
+  rules: {
+    customerId: [{ required: true, message: '客户ID不能为空', trigger: 'blur' }],
+    payType: [{ required: true, message: '支付方式不能为空', trigger: 'change' }],
+    warehouseId: [{ required: true, message: '发货仓库不能为空', trigger: 'change' }],
+    expectedDeliveryTime: [{ required: true, message: '预计送达时间不能为空', trigger: 'blur' }],
+    shippingFee: [{ required: true, message: '运费不能为空', trigger: 'blur' }],
+    confirmTime: [{ required: true, message: '确认时间不能为空', trigger: 'blur' }],
+    shippingTime: [{ required: true, message: '发货时间不能为空', trigger: 'blur' }],
+    receivingTime: [{ required: true, message: '收货时间不能为空', trigger: 'blur' }],
+    cancelReason: [{ required: true, message: '取消或异常原因不能为空', trigger: 'blur' }],
+    expenseType: [{ required: true, message: '费用类型不能为空', trigger: 'change' }]
+  }
+});
+
+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 queryOrderStatusStatsMethod = async () => {
+  const res = await queryOrderStatusStats();
+  orderStatusStats.value = res as any;
+};
+
+/** 查看物流按钮操作 */
+const handleViewLogistics = (row?: OrderMainVO) => {
+  if (!row?.id) {
+    proxy?.$modal.msgWarning('订单ID不能为空');
+    return;
+  }
+  logisticsOrderId.value = row.id;
+
+  showLogisticsDialog.value = true;
+};
+
+/** 关闭订单操作 */
+const handleCloseOrder = async (row?: OrderMainVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认关闭订单主信息编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
+  await closeOrderMain(_ids);
+  proxy?.$modal.msgSuccess('关闭成功');
+  await getList();
+};
+
+/** 取消按钮 */
+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 handleDeliver = (row?: OrderMainVO) => {
+  if (!row?.id) {
+    proxy?.$modal.msgWarning('订单ID不能为空');
+    return;
+  }
+  currentOrderId.value = row.id;
+  currentOrderNo.value = row.orderNo;
+  showDeliverDialog.value = true;
+};
+
+/** 发货成功回调 */
+const handleDeliverSuccess = () => {
+  getList();
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: OrderMainVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getOrderMain(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改订单主信息';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  orderMainFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateOrderMain(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addOrderMain(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+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>

+ 1 - 1
src/views/order/orderMain/components/addressDialog.vue

@@ -11,7 +11,7 @@
         <el-input v-model="form.phone" placeholder="请输入联系电话" />
       </el-form-item>
       <el-form-item label="邮政编码" prop="postal">
-        <el-input v-model="form.postal" placeholder="请输入邮政编码" />
+        <el-input v-model="form.postal" placeholder="请输入邮政编码" @input="(val: any) => (form.postal = val.replace(/\D/g, ''))" />
       </el-form-item>
       <el-form-item label="详细地址" prop="provincialCityCountry">
         <el-cascader v-model="codeArr" :options="regionData" placeholder="请选择" @change="handleRegionChange" style="width: 100%" />

+ 11 - 2
src/views/order/saleOrder/orderAffirm.vue

@@ -149,7 +149,7 @@
         </div>
       </template>
 
-      <el-form :model="addressInfo" label-width="100px">
+      <el-form :model="addressInfo" label-width="100px" v-if="!orderInfo.dataSource">
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="收货人姓名">
@@ -176,7 +176,16 @@
         </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 v-if="orderInfo.assigneeName" 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>

+ 15 - 2
src/views/order/saleOrder/sendDetail.vue

@@ -22,7 +22,7 @@
     </el-card>
 
     <!-- 订单详情信息 -->
-    <el-card shadow="never" class="mb-2">
+    <el-card shadow="never" class="mb-2" v-if="!orderDetail.dataSource">
       <template #header>
         <span>订单基本信息</span>
       </template>
@@ -52,6 +52,10 @@
             <span class="label">订单备注:</span>
             <span>{{ orderDetail.remark }}</span>
           </div>
+          <div class="detail-item">
+            <span class="label">分配备注:</span>
+            <span>{{ orderDetail.assigneeRemark }}</span>
+          </div>
           <div class="detail-item">
             <span class="label">附件:</span>
             <span>{{ orderDetail.attachmentPath || '' }}</span>
@@ -97,7 +101,7 @@
     </el-card>
 
     <!-- 收货信息 -->
-    <el-card shadow="never" class="mb-2">
+    <el-card shadow="never" class="mb-2" v-if="!orderDetail.dataSource">
       <template #header>
         <span>收货信息</span>
       </template>
@@ -676,6 +680,15 @@ const handlePrint = () => {
 onMounted(() => {
   getOrderDetail();
 });
+// 监听路由 query 中的 id 变化
+watch(
+  () => route.query.id, // 监听 id 的变化
+  (newOrderId) => {
+    if (newOrderId) {
+      getOrderDetail();
+    }
+  }
+);
 </script>
 
 <style scoped lang="scss">