Sfoglia il codice sorgente

Merge branch 'hurx'

hurx 3 giorni fa
parent
commit
19f55d90d6

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

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

+ 21 - 17
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" />
@@ -83,7 +74,12 @@
         </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 == '0' || scope.row.orderStatus == '1'" @click="handleAffirm(scope.row)"
+              >确认订单</el-button
+            >
+            <el-button link type="primary" v-if="scope.row.orderStatus == '2' || scope.row.orderStatus == '3'" @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
@@ -238,7 +234,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,
@@ -249,6 +245,7 @@ const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
     expenseType: undefined,
     status: undefined,
     platformCode: undefined,
+    currentLevelStr: '2',
     params: {}
   },
   rules: {
@@ -346,6 +343,13 @@ const handleReview = (row?: OrderMainVO) => {
   });
 };
 
+const handleAffirm = (row?: OrderMainVO) => {
+  router.push({
+    path: '/order-manage/order-affirm',
+    query: { id: row.id }
+  });
+};
+
 /** 发货按钮操作 */
 const handleDeliver = (row?: OrderMainVO) => {
   if (!row?.id) {

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

@@ -0,0 +1,454 @@
+<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 == '0' || scope.row.orderStatus == '1'" @click="handleAffirm(scope.row)"
+              >确认订单</el-button
+            >
+            <el-button link type="primary" v-if="scope.row.orderStatus == '2' || scope.row.orderStatus == '3'" @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 { 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')
+);
+
+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: '1,2,3,4',
+    orderTime: undefined,
+    confirmTime: undefined,
+    shippingTime: undefined,
+    receivingTime: undefined,
+    deliveryType: undefined,
+    orderCategory: undefined,
+    productCode: undefined,
+    expenseType: undefined,
+    status: undefined,
+    platformCode: undefined,
+    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 handleAffirm = (row?: OrderMainVO) => {
+  router.push({
+    path: '/order-manage/order-affirm',
+    query: { id: row.id }
+  });
+};
+
+// 批量获取平台订单号
+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;
+};
+
+/** 关闭订单操作 */
+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>

+ 8 - 129
src/views/order/saleOrder/orderAffirm.vue

@@ -8,141 +8,20 @@
     </el-card>
 
     <!-- 订单基本信息 -->
+
+    <!-- 分配信息 -->
     <el-card shadow="never" class="mb-2">
       <template #header>
-        <div class="card-header">
-          <span>订单基本信息</span>
-          <span> 订单日期:{{ orderInfo.orderTime }}</span>
-        </div>
+        <span>分配信息</span>
       </template>
-
-      <el-form ref="orderMainFormRef" :model="orderInfo" label-width="100px">
-        <el-row :gutter="20">
-          <!-- 第一行 -->
-          <el-col :span="8">
-            <el-form-item label="归属公司">
-              <el-input :value="orderInfo.companyName || orderInfo.companyId" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="客户名称">
-              <el-input :value="orderInfo.customerName || orderInfo.customerId" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <!-- 第二行 -->
-          <el-col :span="8">
-            <el-form-item label="信用额度">
-              <el-input v-model="orderInfo.creditLimit" placeholder="0" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="临时额度">
-              <el-input v-model="orderInfo.temporaryQuota" placeholder="0" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="剩余额度">
-              <el-input v-model="orderInfo.remainingQuota" placeholder="0" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <!-- 第三行 -->
-          <el-col :span="8">
-            <el-form-item label="业务人员">
-              <el-input v-model="orderInfo.businessStaff" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="客服人员">
-              <el-input v-model="orderInfo.customerService" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="业务部门">
-              <el-input v-model="orderInfo.businessDept" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <!-- 第四行 -->
-          <el-col :span="8">
-            <el-form-item label="发票类型">
-              <el-select v-model="orderInfo.invoiceType" placeholder="请选择" style="width: 100%" disabled>
-                <el-option label="普通发票" value="1" />
-                <el-option label="增值税发票" value="2" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="支付方式">
-              <el-select v-model="orderInfo.payType" placeholder="请选择" style="width: 100%" disabled>
-                <el-option v-for="dict in pay_method" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="预收货日">
-              <el-date-picker
-                v-model="orderInfo.expectedDeliveryTime"
-                type="date"
-                placeholder="请选择"
-                value-format="YYYY-MM-DD"
-                style="width: 100%"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <!-- 第五行 -->
-          <el-col :span="8">
-            <el-form-item label="发货仓库">
-              <el-input :value="orderInfo.warehouseName || orderInfo.warehouseId" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="费用类型">
-              <el-select v-model="orderInfo.expenseType" style="width: 100%" disabled>
-                <el-option v-for="dict in fee_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="下单部门">
-              <el-input :value="orderInfo.userDeptName || orderInfo.userDept" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <!-- 第六行 -->
-          <el-col :span="24">
-            <el-form-item label="采购事由">
-              <el-input v-model="orderInfo.purchaseReason" placeholder="请输入采购事由" type="textarea" :rows="2" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <!-- 第七行 -->
-          <el-col :span="24">
-            <el-form-item label="订单备注">
-              <el-input v-model="orderInfo.remark" placeholder="请输入订单备注" type="textarea" :rows="2" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <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 shadow="never" class="mb-2">
+    <el-card shadow="never" class="mb-2" v-if="!orderInfo.dataSource">
       <template #header>
         <div class="card-header">
           <span>收货地址</span>

+ 22 - 5
src/views/order/saleOrder/sendDetail.vue

@@ -16,13 +16,11 @@
         </el-descriptions-item>
         <el-descriptions-item label="下单时间">{{ orderDetail.orderTime }}</el-descriptions-item>
         <el-descriptions-item label="确认时间">{{ orderDetail.confirmTime }}</el-descriptions-item>
-        <!-- <el-descriptions-item label="发货时间">{{ orderDetail.shippingTime }}</el-descriptions-item> -->
-        <el-descriptions-item label="签收时间">{{ orderDetail.receivingTime }}</el-descriptions-item>
       </el-descriptions>
     </el-card>
 
     <!-- 订单详情信息 -->
-    <el-card shadow="never" class="mb-2">
+    <!-- <el-card shadow="never" class="mb-2">
       <template #header>
         <span>订单基本信息</span>
       </template>
@@ -94,10 +92,10 @@
           </div>
         </el-col>
       </el-row>
-    </el-card>
+    </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>
@@ -107,6 +105,16 @@
         <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 v-if="orderDetail.assigneeName" 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">
@@ -676,6 +684,15 @@ const handlePrint = () => {
 onMounted(() => {
   getOrderDetail();
 });
+// 监听路由 query 中的 id 变化
+watch(
+  () => route.query.id, // 监听 id 的变化
+  (newOrderId) => {
+    if (newOrderId) {
+      getOrderDetail();
+    }
+  }
+);
 </script>
 
 <style scoped lang="scss">

+ 54 - 71
src/views/supplier/address/index.vue

@@ -23,10 +23,14 @@
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['customer:address:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['customer:address:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['customer:address:edit']"
+              >修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['customer:address:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['customer:address:remove']"
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['customer:address:export']">导出</el-button>
@@ -39,7 +43,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="主键ID" align="center" prop="id" v-if="false" />
         <el-table-column label="供应商编号" align="center" prop="supplierNo" />
-        <el-table-column label="企业名称" align="center" prop="enterpriseName" width="250"/>
+        <el-table-column label="企业名称" align="center" prop="enterpriseName" width="250" />
         <el-table-column label="地址编码" align="center" prop="addressNo" />
         <el-table-column label="姓名" align="center" prop="shipperName" />
         <el-table-column label="手机号" align="center" prop="shipperPhone" />
@@ -64,35 +68,13 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改供应商地址对话框 -->
-    <el-dialog
-      v-model="dialog.visible"
-      :title="dialog.title"
-      width="650px"
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="addressFormRef"
-        :model="form"
-        :rules="rules"
-        label-width="120px"
-        :disabled="false"
-      >
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="650px" :close-on-click-modal="false">
+      <el-form ref="addressFormRef" :model="form" :rules="rules" label-width="120px" :disabled="false">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="企业名称:" prop="supplierId" required>
-              <el-select 
-                v-model="form.supplierId" 
-                placeholder="请选择企业名称" 
-                clearable 
-                filterable
-                @change="handleSupplierChange"
-              >
-                <el-option
-                  v-for="item in supplierOptions"
-                  :key="item.id"
-                  :label="item.enterpriseName"
-                  :value="item.id"
-                />
+              <el-select v-model="form.supplierId" placeholder="请选择企业名称" clearable filterable @change="handleSupplierChange">
+                <el-option v-for="item in supplierOptions" :key="item.id" :label="item.enterpriseName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,7 +84,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="收货人:" prop="shipperName" required>
@@ -133,7 +115,7 @@
                 placeholder="请选择"
                 clearable
                 filterable
-                style="width: 100%;"
+                style="width: 100%"
                 @change="handleAddressRegionChange"
               />
             </el-form-item>
@@ -143,12 +125,7 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="详细地址:" prop="shippingAddress">
-              <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>
@@ -193,7 +170,7 @@ const getSupplierNameList = async () => {
 };
 
 const handleSupplierChange = (val: string | number) => {
-  const selected = supplierOptions.value.find(item => item.id === val);
+  const selected = supplierOptions.value.find((item) => item.id === val);
   if (selected) {
     form.value.supplierNo = selected.supplierNo;
     form.value.enterpriseName = selected.enterpriseName;
@@ -247,23 +224,21 @@ const initFormData: AddressForm = {
   shippingCounty: undefined,
   shippingAddress: undefined,
   pushStatus: undefined,
-  isSelf: undefined,
+  isSelf: 1,
   type: undefined,
   addressNo: undefined,
   status: undefined,
-  remark: undefined,
-}
+  remark: undefined
+};
 const data = reactive<PageData<AddressForm, AddressQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     supplierNo: undefined,
-    params: {
-    }
+    params: {}
   },
-  rules: {
-  }
+  rules: {}
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -274,7 +249,11 @@ const getList = async () => {
   if (!userStore.supplierId) {
     await userStore.getSupplierInfo();
   }
-  queryParams.value.supplierId = (userStore.supplierId ?? route.query?.supplierId ?? route.query?.id ?? route.params?.supplierId ?? route.params?.id) as any;
+  queryParams.value.supplierId = (userStore.supplierId ??
+    route.query?.supplierId ??
+    route.query?.id ??
+    route.params?.supplierId ??
+    route.params?.id) as any;
   if (!queryParams.value.supplierId) {
     loading.value = false;
     return;
@@ -283,51 +262,51 @@ const getList = async () => {
   addressList.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 = [];
   addressFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: AddressVO[]) => {
-  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?: AddressVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getAddress(_id);
   Object.assign(form.value, res.data);
   if (res.data.shippingProvincial && res.data.shippingCity && res.data.shippingCounty) {
@@ -364,8 +343,8 @@ const handleUpdate = async (row?: AddressVO) => {
     }
   }
   dialog.visible = true;
-  dialog.title = "修改供应商地址";
-}
+  dialog.title = '修改供应商地址';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -373,32 +352,36 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateAddress(form.value).finally(() =>  buttonLoading.value = false);
+        await updateAddress(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addAddress(form.value).finally(() =>  buttonLoading.value = false);
+        await addAddress(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: AddressVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除供应商地址编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除供应商地址编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
   await delAddress(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('customer/address/export', {
-    ...queryParams.value
-  }, `address_${new Date().getTime()}.xlsx`)
-}
+  proxy?.download(
+    'customer/address/export',
+    {
+      ...queryParams.value
+    },
+    `address_${new Date().getTime()}.xlsx`
+  );
+};
 
 onMounted(() => {
   getList();