admin/jurong_supplier_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整发货相关功能

Browse Source
This commit is contained in:
dzl
2025-10-14 16:27:57 +08:00
parent 2b61b2b6a7
commit bb12ebe636
1 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/views/Orders.vue
View File

@@ -130,7 +130,7 @@
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item <el-dropdown-item
v-if="row.status === 'pending'" v-if="row.status === 'pending'"
@click="updateOrderStatus(row, 'shipped')" @click="deliveryDialogVisible = true; selectedOrder = {id: row.id};"
> >
标记为已发货 标记为已发货
</el-dropdown-item> </el-dropdown-item>
@@ -223,34 +223,32 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button type="primary" size="small" @click="deliveryDialogVisible = true; deliveryForm.id = selectedOrder.id;" class="delivery-btn" v-if="pending"> <el-button type="primary" size="small" @click="deliveryDialogVisible = true; deliveryForm.id = selectedOrder.id;" class="delivery-btn" v-if="selectedOrder.status === 'pending'">
发货 发货
</el-button> </el-button>
</div> </div>
</el-dialog>
<!-- 发货对话框 --> <!-- 发货对话框 -->
<el-dialog <el-dialog
v-model="deliveryDialogVisible" v-model="deliveryDialogVisible"
title="发货" title="发货"
width="400px" width="400px"
:before-close="closeDialog" :before-close="closeDialog"
> >
<el-form :model="deliveryForm" :rules="deliveryRules" ref="deliveryFormRef"> <el-form :model="deliveryForm" :rules="deliveryRules" ref="deliveryFormRef">
<el-form-item label="物流公司" prop="logistics_company"> <el-form-item label="物流公司" prop="logistics_company">
<el-input v-model="deliveryForm.logistics_company" placeholder="请输入物流公司名称" /> <el-input v-model="deliveryForm.logistics_company" placeholder="请输入物流公司名称" />
</el-form-item> </el-form-item>
<el-form-item label="物流单号" prop="logistics_no"> <el-form-item label="物流单号" prop="logistics_no">
<el-input v-model="deliveryForm.logistics_no" placeholder="请输入物流单号" /> <el-input v-model="deliveryForm.logistics_no" placeholder="请输入物流单号" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button type="primary" @click="submitDelivery"> <el-button type="primary" @click="updateOrderStatus(selectedOrder, 'shipped', deliveryForm.logistics_company, deliveryForm.logistics_no)">
提交发货 提交发货
</el-button> </el-button>
</template> </template>
</el-dialog>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@@ -276,7 +274,7 @@ const filters = reactive({
dateRange: null, dateRange: null,
}); });
const pagination = reactive({ const pagination = ref({
page: 1, page: 1,
limit: 20, limit: 20,
total: 0, total: 0,
@@ -284,8 +282,7 @@ const pagination = reactive({
const deliveryForm = reactive({ const deliveryForm = reactive({
logistics_company: '', logistics_company: '',
logistics_no: '', logistics_no: ''
id: '',
}); });
// 加载订单列表 // 加载订单列表
@@ -293,8 +290,8 @@ const loadOrders = async () => {
loading.value = true; loading.value = true;
try { try {
const params = { const params = {
page: pagination.page, page: pagination.value.page,
limit: pagination.limit, limit: pagination.value.limit,
orderNumber: filters.orderNumber, orderNumber: filters.orderNumber,
username: filters.username, username: filters.username,
status: filters.status, status: filters.status,
@@ -307,7 +304,7 @@ const loadOrders = async () => {
const { data } = await api.get('/orders', { params }); const { data } = await api.get('/orders', { params });
orders.value = data.data.orders; orders.value = data.data.orders;
pagination.total = data.data.total; pagination.value.total = data.data.pagination.total;
} catch (error) { } catch (error) {
ElMessage.error('加载订单列表失败'); ElMessage.error('加载订单列表失败');
console.error('加载订单列表失败:', error); console.error('加载订单列表失败:', error);
@@ -340,7 +337,7 @@ const viewOrder = async (order) => {
}; };
// 更新订单状态 // 更新订单状态
const updateOrderStatus = async (order, newStatus) => { const updateOrderStatus = async (order, newStatus, logistics_company, logistics_no) => {
const statusText = getStatusText(newStatus); const statusText = getStatusText(newStatus);
try { try {
await ElMessageBox.confirm( await ElMessageBox.confirm(
@@ -352,12 +349,12 @@ const updateOrderStatus = async (order, newStatus) => {
type: 'warning', type: 'warning',
} }
); );
await api.put(`/orders/${order.id}/status`, { status: newStatus, logistics_company: logistics_company, logistics_no: logistics_no });
await api.put(`/orders/${order.id}/status`, { status: newStatus });
ElMessage.success('订单状态更新成功'); ElMessage.success('订单状态更新成功');
loadOrders(); loadOrders();
} catch (error) { } catch (error) {
if (error !== 'cancel') { if (error !== 'cancel') {
console.log('更新订单状态失败:', error);
ElMessage.error('更新订单状态失败'); ElMessage.error('更新订单状态失败');
} }
} }
@@ -403,18 +400,6 @@ const deliveryRules = reactive({
logistics_no: [{ required: true, message: '请输入物流单号', trigger: 'blur' }], logistics_no: [{ required: true, message: '请输入物流单号', trigger: 'blur' }],
}); });
const submitDelivery = async () => {
try {
await api.shop.delivery(deliveryForm);
ElMessage.success('发货成功');
closeDialog();
loadOrders();
} catch (error) {
ElMessage.error('发货失败');
console.error('发货失败:', error);
}
};
// 格式化日期 // 格式化日期
const formatDate = (dateString) => { const formatDate = (dateString) => {
return dayjs(dateString).format('YYYY-MM-DD HH:mm:ss'); return dayjs(dateString).format('YYYY-MM-DD HH:mm:ss');