|
@@ -116,7 +116,7 @@
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="下单部门">
|
|
<el-form-item label="下单部门">
|
|
|
- <el-input :value="orderInfo.userDept || orderInfo.userDeptName" disabled />
|
|
|
|
|
|
|
+ <el-input :value="orderInfo.userDeptName || orderInfo.userDept" disabled />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
@@ -409,10 +409,10 @@ const getOrderDetail = async (orderId: string | number) => {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 获取并设置下单部门名称
|
|
// 获取并设置下单部门名称
|
|
|
- // if (data?.userDept) {
|
|
|
|
|
- // const deptName = await getDeptDetail(data.userDept);
|
|
|
|
|
- // orderInfo.value.userDeptName = deptName;
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ if (data?.userDept) {
|
|
|
|
|
+ const deptName = await getDeptDetail(data.userDept);
|
|
|
|
|
+ orderInfo.value.userDeptName = deptName;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// 设置收货地址信息
|
|
// 设置收货地址信息
|
|
|
if ((data as any)?.shippingAddressVo) {
|
|
if ((data as any)?.shippingAddressVo) {
|