|
@@ -186,6 +186,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" width="200" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
+ <p class="table-btn-group">
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
@click="handleViewOrder(scope.$index, scope.row)"
|
|
@@ -203,6 +204,12 @@
|
|
|
v-show="scope.row.status === 1"
|
|
|
>订单发货</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ @click="handleOverOrder(scope.$index, scope.row)"
|
|
|
+ v-show="scope.row.status === 1"
|
|
|
+ >完成订单</el-button
|
|
|
+ >
|
|
|
<!-- <el-button
|
|
|
size="mini"
|
|
|
@click="handleViewLogistics(scope.$index, scope.row)"
|
|
@@ -214,6 +221,7 @@
|
|
|
v-show="scope.row.status === 4"
|
|
|
>删除订单</el-button
|
|
|
> -->
|
|
|
+ </p>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -290,7 +298,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { fetchList, closeOrder, deleteOrder } from "@/api/order";
|
|
|
+import { fetchList, closeOrder, deleteOrder, updateOrderSuccess } from "@/api/order";
|
|
|
import { formatDate } from "@/utils/date";
|
|
|
import { Export } from "@/utils/downLoadFile";
|
|
|
import dayjs from 'dayjs'
|
|
@@ -469,6 +477,26 @@ export default {
|
|
|
query: { list: [listItem] },
|
|
|
});
|
|
|
},
|
|
|
+ /** 完成订单 */
|
|
|
+ handleOverOrder(index, row) {
|
|
|
+ this.$confirm("是否要完成订单?", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ }).then(() => {
|
|
|
+ // let obj = {
|
|
|
+ // ids:ids.join(',')
|
|
|
+ // }
|
|
|
+ updateOrderSuccess([row.id]).then((response) => {
|
|
|
+ this.$message({
|
|
|
+ message: "完成成功!",
|
|
|
+ type: "success",
|
|
|
+ duration: 1000,
|
|
|
+ });
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
+ });
|
|
|
+ },
|
|
|
handleViewLogistics(index, row) {
|
|
|
this.logisticsDialogVisible = true;
|
|
|
},
|
|
@@ -644,6 +672,12 @@ export default {
|
|
|
.input-width {
|
|
|
width: 203px;
|
|
|
}
|
|
|
+.table-btn-group {
|
|
|
+ .el-button {
|
|
|
+ margin: 5px 3px;
|
|
|
+ }
|
|
|
+
|
|
|
+}
|
|
|
</style>
|
|
|
|
|
|
|