diff --git a/src/views/order/activeorder.vue b/src/views/order/activeorder.vue index 380ccb6..f9a8399 100644 --- a/src/views/order/activeorder.vue +++ b/src/views/order/activeorder.vue @@ -6,25 +6,25 @@
- -
- - - - - - - - - - - - - - - -
+ +
+ + + + + + + + + + + + + + + +
@@ -42,6 +42,9 @@
{{scope.row["activity"].name}}
+
+ {{toShowNumber(scope.row["number"])}} +
@@ -212,15 +215,15 @@ clientHeight: 0, //查询条件字段 searchFields: { - keyword: "", - start_date: "", - end_date: "", - is_export: 0, - type: "", - activity_name: "", + keyword: "", + start_date: "", + end_date: "", + is_export: 0, + type: "", + activity_name: "", status: "" - }, - visitRange:null, + }, + visitRange: null, tableData: [], paginations: { page: 1, @@ -243,9 +246,18 @@ field: "activityName", title: "活动名称", type: "string", - align: "center", - type: "format" + align: "left", + type: "format", + width: 260, + fixed:"left" + }, { + field: "number", + title: "场次", + type: "format", + align: "left", + width: 360, + fixed:"left" }, { field: "leader", title: "联系人", @@ -298,6 +310,14 @@ }, mounted() {}, methods: { + toShowNumber(number) { + var str = "" + if (number.length > 0) { + str = number[0].name + " 活动时间:" + this.$moment(number[0].start_time).format("yyyy-MM-DD hh:mm") + "到" + this + .$moment(number[0].end_time).format("hh:mm") + "" + } + return str; + }, searchload() { if (this.visitRange) { this.searchFields.start_date = this.visitRange[0] @@ -327,7 +347,7 @@ listactiveorder({ page: this.paginations.page, page_size: this.paginations.page_size, - activity_id: activityId, + activity_id: activityId, ...this.searchFields }).then(res => { this.tableData = res.data; @@ -363,7 +383,7 @@ } } }; - +