From 13c6f7972d0177c84c9c9fcc7725645078c9d81f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Thu, 18 May 2023 14:44:53 +0800
Subject: [PATCH] up

---
 src/views/order/activeorder.vue | 82 ++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 31 deletions(-)

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 @@
         <LxHeader icon="md-apps" text="活动预约" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
           <div slot="content"></div>
           <slot>
-
-             <div>
-               <el-date-picker class="vm10" v-model="visitRange" value-format="yyyy-MM-dd" type="daterange"
-                 range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
-               </el-date-picker>
-               <el-select class="vm10 vm15" v-model="searchFields.type" placeholder="请选择类型">
-                 <el-option v-for="item in parameters.type_list" :key="item.id" :label="item.value" :value="item.id">
-                 </el-option>
-               </el-select>
-               <Input class="inputwrap" v-model="searchFields.keyword" placeholder="请输入关键词" />
-               <Input class="inputwrap" v-model="searchFields.activity_name" placeholder="请输入活动名称" />
-               <el-select style="margin-right: 10px;width: 120px;" v-model="searchFields.status" placeholder="请选择状态">
-                 <el-option value="">
-                 </el-option>
-                 <el-option v-for="item in parameters.status_list" :key="item.id" :label="item.value" :value="item.id">
-                 </el-option>
-               </el-select>
-               <Button type="primary" style="margin-right:10px" @click="searchload">查询</Button>
-             </div>
+
+            <div>
+              <el-date-picker class="vm10" v-model="visitRange" value-format="yyyy-MM-dd" type="daterange"
+                range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
+              </el-date-picker>
+              <el-select class="vm10 vm15" v-model="searchFields.type" placeholder="请选择类型">
+                <el-option v-for="item in parameters.type_list" :key="item.id" :label="item.value" :value="item.id">
+                </el-option>
+              </el-select>
+              <Input class="inputwrap" v-model="searchFields.keyword" placeholder="请输入关键词" />
+              <Input class="inputwrap" v-model="searchFields.activity_name" placeholder="请输入活动名称" />
+              <el-select style="margin-right: 10px;width: 120px;" v-model="searchFields.status" placeholder="请选择状态">
+                <el-option value="">
+                </el-option>
+                <el-option v-for="item in parameters.status_list" :key="item.id" :label="item.value" :value="item.id">
+                </el-option>
+              </el-select>
+              <Button type="primary" style="margin-right:10px" @click="searchload">查询</Button>
+            </div>
           </slot>
         </LxHeader>
       </div>
@@ -42,6 +42,9 @@
                 <div v-if="column.field=='activityName'">
                   {{scope.row["activity"].name}}
                 </div>
+                <div v-if="column.field=='number'">
+                  {{toShowNumber(scope.row["number"])}}
+                </div>
               </div>
               <div v-else-if="column.type=='type'" v-for="item in parameters.visitType">
                 <div v-if="item.id==scope.row[column.field]">
@@ -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 @@
       }
     }
   };
-</script>
+</script>
 
 <style>
   .inputwrap {