diff --git a/src/router/modules/sales.js b/src/router/modules/sales.js
index 959767f..0a1d682 100644
--- a/src/router/modules/sales.js
+++ b/src/router/modules/sales.js
@@ -28,16 +28,6 @@ export default [
hidden: true,
},
},
- {
- path: 'ship',
- name: 'OrderShip',
- component: () => import('@/views/sales/order/ship.vue'),
- meta: {
- title: '批量发货',
- icon: 'Van',
- hidden: true,
- },
- },
],
},
{
diff --git a/src/store/modules/sales/order.js b/src/store/modules/sales/order.js
index aa66735..a0f4772 100644
--- a/src/store/modules/sales/order.js
+++ b/src/store/modules/sales/order.js
@@ -16,11 +16,11 @@ const state = () => ({
status: [
{ label: '全部', value: 0, count: 0 },
{ label: '待支付', value: 1, count: 0 },
- { label: '已关闭', value: 2, count: 0 },
- { label: '已支付', value: 3, count: 0 },
+ { label: '待发货', value: 3, count: 0 },
{ label: '已发货', value: 4, count: 0 },
{ label: '已收货', value: 5, count: 0 },
{ label: '已完成', value: 6, count: 0 },
+ { label: '已关闭', value: 2, count: 0 },
],
},
});
@@ -55,7 +55,7 @@ const actions = {
if (res) {
commit(
'setSummary',
- ['allCount', 'unpaidCount', 'closeCount', 'waitDeliveryCount', 'deliveredCount', '', 'finishCount'].map(
+ ['allCount', 'unpaidCount', 'waitDeliveryCount', 'deliveredCount', '', 'finishCount', 'closeCount'].map(
(prop) => res[prop]
)
);
diff --git a/src/store/modules/sales/orderShip.js b/src/store/modules/sales/orderShip.js
index 490be5c..5be8908 100644
--- a/src/store/modules/sales/orderShip.js
+++ b/src/store/modules/sales/orderShip.js
@@ -38,20 +38,25 @@ const actions = {
});
},
save: async ({ rootState }, data) => {
- let res = await api.sendAll(
- data.map((item) => {
- return {
- companyCode: item.logistics.companyCode,
- companyName: dict(rootState.order.opts.company, item.logistics.companyCode),
- orderId: item.orderId,
- trackingNo: item.trackingNo,
- };
- })
- );
- if (res) {
- ElMessage.success('批量发货成功');
+ let res = null;
+ if (data.every((item) => item.companyCode && item.trackingNo)) {
+ res = await api.sendAll(
+ data.map((item) => {
+ return {
+ companyCode: item.logistics.companyCode,
+ companyName: dict(rootState.order.opts.company, item.logistics.companyCode),
+ orderId: item.orderId,
+ trackingNo: item.trackingNo,
+ };
+ })
+ );
+ if (res) {
+ ElMessage.success('批量发货成功');
+ } else {
+ ElMessage.error('批量发货失败');
+ }
} else {
- ElMessage.error('批量发货失败');
+ ElMessage.error('请补充完整发货信息');
}
return res;
},
diff --git a/src/views/sales/order/index.vue b/src/views/sales/order/index.vue
index 3d9e7ba..49901e8 100644
--- a/src/views/sales/order/index.vue
+++ b/src/views/sales/order/index.vue
@@ -54,12 +54,14 @@
+