|
|
@@ -84,7 +84,7 @@
|
|
|
</div>
|
|
|
<div class="detail-item">
|
|
|
<span class="label">下单部门：</span>
|
|
|
- <span>{{ orderDetail.userDept }}</span>
|
|
|
+ <span>{{ orderDetail.userDeptName }}</span>
|
|
|
</div>
|
|
|
<div class="detail-item">
|
|
|
<span class="label">订单状态：</span>
|
|
|
@@ -133,9 +133,9 @@
|
|
|
<el-table-column prop="unsentQuantity" label="未发货数量" />
|
|
|
</el-table>
|
|
|
</el-card>
|
|
|
- <div class="mt-2 text-right">
|
|
|
+ <div class="mt-2 text-right" style="margin-right: 8px; margin-bottom: 10px">
|
|
|
<span
|
|
|
- >商品数：{{ totalQuantity }}, 其中有<span style="color: #f56c6c">{{ totalQuantitySent }}已经发货</span></span
|
|
|
+ >商品数：{{ totalQuantity }} , 其中有 <span style="color: #f56c6c">{{ totalQuantitySent }} 已经发货</span></span
|
|
|
>
|
|
|
</div>
|
|
|
<!-- 信息汇总 -->
|
|
|
@@ -182,9 +182,9 @@
|
|
|
<span>发货单号:{{ (deliver as any).deliverCode || '--' }}</span>
|
|
|
<span>发货时间:{{ (deliver as any).createTime || '--' }}</span>
|
|
|
<span>发货方式:{{ getDictLabel(deliver_method, deliver.deliverMethod || '--') }}</span>
|
|
|
- <span>送货人:{{ deliver.deliverMan || '--' }}</span>
|
|
|
- <span>手机:{{ deliver.phone || '--' }}</span>
|
|
|
- <span style="margin-left: 30px">物流状态:{{ deliver.logisticsStatus || '--' }}</span>
|
|
|
+ <span v-if="deliver.deliverMethod == '0'">收货人:{{ deliver.deliverMan || '--' }}</span>
|
|
|
+ <span>手机:{{ deliver.phone || deliver.consigneePhone }}</span>
|
|
|
+ <span style="margin-left: 30px" v-if="deliver.deliverMethod == '1'">物流单号:{{ deliver.logisticNo || '--' }}</span>
|
|
|
<span style="margin-left: 20px">发货备注:{{ deliver.deliverRemark || '--' }}</span>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
@@ -263,7 +263,7 @@ import { CustomerInfoVO } from '@/api/customer/customerFile/customerInfo/types';
|
|
|
import { getInvoiceType } from '@/api/customer/invoiceType';
|
|
|
import { InvoiceTypeVO } from '@/api/customer/invoiceType/types';
|
|
|
import { selectNewOneLog } from '@/api/order/orderStatusLog';
|
|
|
-
|
|
|
+import { getDept } from '@/api/system/dept';
|
|
|
import LogisticsDetail from './logisticsDetail.vue';
|
|
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
|
const { order_status, payment_status, fee_type, pay_method, deliver_method } = toRefs<any>(
|
|
|
@@ -333,6 +333,16 @@ const totalQuantitySent = computed(() => {
|
|
|
}, 0);
|
|
|
});
|
|
|
|
|
|
+// 获取部门详细信息
|
|
|
+const getDeptDetail = async (deptId: string) => {
|
|
|
+ try {
|
|
|
+ const res = await getDept(deptId);
|
|
|
+ return res.data?.deptName || deptId;
|
|
|
+ } catch (error) {
|
|
|
+ return deptId;
|
|
|
+ }
|
|
|
+};
|
|
|
+
|
|
|
// 获取订单详情
|
|
|
const getOrderDetail = async () => {
|
|
|
const orderId = route.query.id || route.params.id;
|
|
|
@@ -383,6 +393,9 @@ const getOrderDetail = async () => {
|
|
|
if (orderDetail.value.customerId) {
|
|
|
await getCustomerDetail(orderDetail.value.customerId);
|
|
|
}
|
|
|
+ if (orderDetail.value.userDept) {
|
|
|
+ orderDetail.value.userDeptName = await getDeptDetail(orderDetail.value.userDept);
|
|
|
+ }
|
|
|
|
|
|
// 获取发票类型信息
|
|
|
// if (orderDetail.value.invoiceType) {
|
hurx