|
|
@@ -116,6 +116,7 @@
|
|
|
|
|
|
<!-- 操作 -->
|
|
|
<template #slot-column-option="{scope}">
|
|
|
+
|
|
|
<template v-if="scope.row.status == 0">
|
|
|
<el-button type="text" size="small" disabled>自取</el-button>
|
|
|
<el-button type="text" size="small" disabled>发货</el-button>
|
|
|
@@ -124,23 +125,21 @@
|
|
|
<template v-else-if="['4','5','6'].indexOf(scope.row.status) != -1">
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
-
|
|
|
- <template v-if="scope.row.currentFlow == 1">
|
|
|
- <el-button type="text" size="small" @click="noSendShipFn(scope.row)"
|
|
|
- >自取</el-button
|
|
|
- >
|
|
|
- <el-button type="text" size="small" @click="shipDrawFn(scope.row)"
|
|
|
- >发货</el-button
|
|
|
- >
|
|
|
- </template>
|
|
|
- <template v-else>
|
|
|
- <el-button type="text" size="small" @click="shipDrawFn(scope.row)"
|
|
|
- >继续</el-button
|
|
|
- >
|
|
|
- </template>
|
|
|
-
|
|
|
-
|
|
|
+ <template v-if="scope.row.currentFlow == 1">
|
|
|
+ <el-button type="text" size="small" @click="noSendShipFn(scope.row)"
|
|
|
+ >自取</el-button
|
|
|
+ >
|
|
|
+ <el-button type="text" size="small" @click="shipDrawFn(scope.row)"
|
|
|
+ >发货</el-button
|
|
|
+ >
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <el-button type="text" size="small" @click="shipDrawFn(scope.row)"
|
|
|
+ >继续</el-button
|
|
|
+ >
|
|
|
+ </template>
|
|
|
</template>
|
|
|
+
|
|
|
</template>
|
|
|
</cl-crud>
|
|
|
<!-- 用户详情 -->
|
|
|
@@ -215,7 +214,8 @@ export default {
|
|
|
.then(() => {
|
|
|
this.$service.order.freeShipping({ id: item.id }).then(res => {
|
|
|
this.$message.success('操作成功！');
|
|
|
- item.currentFlow = 1;
|
|
|
+ item.currentFlow = 4;
|
|
|
+ item.status = '5';
|
|
|
});
|
|
|
})
|
|
|
.catch(() => {});
|
shish