From d76fa50b7385025c374bcacd2632c3bf60b97f2e Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 27 May 2025 14:21:52 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat(ticket):=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E8=B4=AD=E7=A5=A8=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ticket.js                             |  49 +++
 src/router/module/tickets.js                  |  36 ++
 src/views/marketing/ticket/addTicket.vue      | 409 ++++++++++++++++++
 src/views/marketing/ticket/index.vue          | 341 +++++++++++++++
 src/views/marketing/ticketQueryList/index.vue | 368 ++++++++++++++++
 5 files changed, 1203 insertions(+)
 create mode 100644 src/api/ticket.js
 create mode 100644 src/router/module/tickets.js
 create mode 100644 src/views/marketing/ticket/addTicket.vue
 create mode 100644 src/views/marketing/ticket/index.vue
 create mode 100644 src/views/marketing/ticketQueryList/index.vue

diff --git a/src/api/ticket.js b/src/api/ticket.js
new file mode 100644
index 0000000..8a85f1a
--- /dev/null
+++ b/src/api/ticket.js
@@ -0,0 +1,49 @@
+
+import request from '@/utils/request'
+
+// 新零售门票活动-列表
+export function ticketList(params) {
+  return request({
+    url: '/activity/manage/ticket/list',
+    method: 'get',
+    params
+  })
+}
+// 新零售门票活动-新增
+export function ticketSave(data) {
+  return request({
+    url: '/activity/manage/ticket/save',
+    method: 'post',
+    data
+  })
+}
+// 新零售门票活动-修改
+export function ticketUpdate(data) {
+  return request({
+    url: '/activity/manage/ticket/update',
+    method: 'post',
+    data
+  })
+}
+// 新零售门票活动-删除
+export function delTicket(id) {
+  return request({
+    url: '/activity/manage/ticket/' + id,
+    method: 'delete'
+  })
+}
+// 获取单条门票活动
+export function getOneTicket(id) {
+  return request({
+    url: '/activity/manage/ticket/getOne/' + id,
+    method: 'get'
+  })
+}
+// 会员消费赠送-查看
+export function memberConsumeRule(params) {
+  return request({
+    url: '/activity/manage/member-consume-rule/detail',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/router/module/tickets.js b/src/router/module/tickets.js
new file mode 100644
index 0000000..d978697
--- /dev/null
+++ b/src/router/module/tickets.js
@@ -0,0 +1,36 @@
+import ParentView from '@/components/ParentView'
+export const tickets = [
+  {
+    path: 'ticket',
+    name: 'Ticket',
+    component: ParentView,
+    children: [
+      {
+        path: 'ticketList',
+        name: 'TicketList',
+        component: () => import('@/views/marketing/ticket/index'),
+        meta: { title: '门票活动' }
+      },
+      {
+        path: 'addTicket',
+        name: 'AddTicket',
+        component: () => import('@/views/marketing/ticket/addTicket'),
+        meta: { title: '基本信息' },
+        hidden: true
+      }
+    ]
+  },
+  {
+    path: 'ticketQuery',
+    name: 'TicketQuery',
+    component: ParentView,
+    children: [
+      {
+        path: 'ticketQueryList',
+        name: 'TickeQuerytList',
+        component: () => import('@/views/marketing/ticketQueryList/index'),
+        meta: { title: '自助购票' }
+      }
+    ]
+  }
+]
diff --git a/src/views/marketing/ticket/addTicket.vue b/src/views/marketing/ticket/addTicket.vue
new file mode 100644
index 0000000..8d04e83
--- /dev/null
+++ b/src/views/marketing/ticket/addTicket.vue
@@ -0,0 +1,409 @@
+
+<template>
+  <div class="page">
+    <div class="topbox">
+      <div
+        v-for="(item, index) in topList"
+        :key="index"
+        class="levelList_i"
+        :class="tabActive == item.id ? 'act' : ''"
+        @click.prevent="handleLink(item.id)"
+      >
+        {{ item.name }}
+      </div>
+    </div>
+
+    <!-- <div class="main_a"> -->
+    <div class="main">
+      <div v-show="tabActive == 0">
+        <div class="tit">{{ '基本信息' }}</div>
+        <div class="xian" />
+        <el-form
+          ref="ruleForm"
+          :model="ruleForm"
+          :rules="rules"
+          label-width="auto"
+          class="demo-ruleForm"
+        >
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="'活动名称'" prop="actName">
+                <el-input
+                  v-model="ruleForm.actName"
+                  clearable
+                  :disabled="lookOver"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <el-form-item :label="'活动说明'" prop="actExplain">
+                <!-- <el-input clearable
+                          type="textarea"
+                          v-model="ruleForm.actExplain"
+                          :disabled="lookOver"></el-input> -->
+                <editor
+                  ref="sptwEditor"
+                  v-model="ruleForm.actExplain"
+                  :read-only="lookOver"
+                  :min-height="196"
+                  :upload-url="uploadImgUrl"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="'活动封面'" prop="actCover">
+                <imageUpload v-model="ruleForm.actCover" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="$t('门票金额')" required>
+                <el-input
+                  v-model="ruleForm.payMoney"
+                  :disabled="lookOver"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="$t('数量')" required>
+                <el-input
+                  v-model="ruleForm.quantity"
+                  :disabled="lookOver"
+                  clearable
+                  type="number"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="$t('限购数量')" required>
+                <el-input
+                  v-model="ruleForm.limitQuantity"
+                  :disabled="lookOver"
+                  clearable
+                  type="number"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="'活动时间'" prop="ruleFormTime">
+                <el-date-picker
+                  v-model="ruleForm.ruleFormTime"
+                  :disabled="lookOver"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="'展示时间'" prop="ruleFormTime1">
+                <el-date-picker
+                  v-model="ruleForm.ruleFormTime1"
+                  :disabled="lookOver"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime1"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- <directUpdata v-show="tabActive==2"
+                    ref="directUpdata"></directUpdata> -->
+    </div>
+    <div v-show="controlType != 4" class="footer">
+      <el-button size="small" class="cancelBtn" @click="cancel">
+        {{ '取消' }}
+      </el-button>
+      <el-button size="small" class="sureBtn" @click="submit('ruleForm')">
+        {{ '确认' }}
+      </el-button>
+    </div>
+    <!-- </div> -->
+  </div>
+</template>
+
+<script>
+import Editor from '@/components/Editor'
+
+import * as api from '@/api/ticket.js'
+import ImageUpload from '@/components/ImageUpload'
+// import directUpdata from '@/views/marketing/benefitsGift/directUpdata'
+export default {
+  name: 'AddTicket',
+  components: {
+    ImageUpload,
+    // directUpdata,
+    Editor
+  },
+  data() {
+    return {
+      tabActive: 0,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
+      ruleForm: {
+        payMoney: '',
+        quantity: '',
+        limitQuantity: '',
+        ruleFormTime: [],
+        ruleFormTime1: []
+      },
+      rules: {
+        actName: [
+          { required: true, message: this.$t('请输入活动名称'), trigger: 'blur' }
+        ],
+        actExplain: [
+          { required: true, message: this.$t('请输入活动说明'), trigger: 'blur' }
+        ],
+        actCover: [
+          { required: true, message: this.$t('请上传活动封面'), trigger: 'change' }
+        ],
+        payMoney: [
+          { required: true, message: this.$t('请输入金额'), trigger: 'blur' }
+        ],
+        quantity: [
+          { required: true, message: this.$t('请输入数量'), trigger: 'blur' },
+          { type: 'number', min: 1, max: 999999, message: this.$t('数量必须在1~999999之间'), trigger: 'blur' }
+        ],
+        limitQuantity: [
+          { required: true, message: this.$t('请输入限购数量'), trigger: 'blur' },
+          { type: 'number', min: 1, max: 999999, message: this.$t('限购数量必须在1~999999之间'), trigger: 'blur' }
+        ],
+        ruleFormTime: [
+          { required: true, message: this.$t('请输入活动时间'), trigger: 'change' }
+        ],
+        ruleFormTime1: [
+          { required: true, message: this.$t('请输入展示时间'), trigger: 'change' }
+        ]
+      },
+      lookOver: false,
+      pkId: '',
+      controlType: '',
+      addData: {}
+    }
+  },
+  mounted() {
+    this.getData()
+    // （1=新增,2=修改,3=删除）4查看
+    if (
+      this.$route.query.controlType == 4 ||
+      this.$route.query.controlType == 3
+    ) {
+      this.lookOver = true
+    } else {
+      this.lookOver = false
+    }
+    this.controlType = this.$route.query.controlType
+    this.pkId = this.$route.query.pkId || ''
+    if (this.pkId) {
+      this.getDetails()
+    }
+  },
+  methods: {
+    cancel() {
+      this.$router.go(-1)
+    },
+    getDetails() {
+      api.getOneTicket(this.pkId).then((res) => {
+        this.addData = res.data
+        this.$set(this.ruleForm, 'actName', res.data.actName)
+        this.$set(this.ruleForm, 'actExplain', res.data.actExplain)
+        this.$set(this.ruleForm, 'actCover', res.data.actCover)
+        this.ruleForm.pkId = res.data.pkId
+        this.ruleForm.actStartDate = res.data.actStartDate
+        this.ruleForm.actEndDate = res.data.actEndDate
+        this.ruleForm.disStartDate = res.data.disStartDate
+        this.ruleForm.disEndDate = res.data.disEndDate
+        this.ruleForm.payMoney = res.data.payMoney
+        this.ruleForm.quantity = res.data.quantity
+        this.ruleForm.limitQuantity = res.data.limitQuantity
+        this.$set(this.ruleForm, 'ruleFormTime', [
+          res.data.actStartDate,
+          res.data.actEndDate
+        ])
+        this.$set(this.ruleForm, 'ruleFormTime1', [
+          res.data.disStartDate,
+          res.data.disEndDate
+        ])
+        // let that = this;
+        // setTimeout(() => {
+        //   that.getCheck();
+        // }, 50);
+      })
+    },
+    // 切换tab
+    handleLink(id) {
+      this.tabActive = id
+    },
+    changeTime(val) {
+      this.ruleForm.actStartDate = val[0]
+      this.ruleForm.actEndDate = val[1]
+    },
+    changeTime1(val) {
+      this.ruleForm.disStartDate = val[0]
+      this.ruleForm.disEndDate = val[1]
+    },
+
+    submit() {
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          let obj = {}
+          obj = this.ruleForm
+          if (this.controlType == 1) {
+            api.ticketSave(obj).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                })
+                this.$router.push({
+                  path: 'TicketList'
+                })
+              }
+            })
+          } else {
+            api.ticketUpdate(obj).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                })
+                this.$router.push({
+                  path: 'TicketList'
+                })
+              }
+            })
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+  padding: 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+
+  .main_a {
+    height: calc(100vh - 144px);
+    display: flex;
+    flex-direction: column;
+  }
+
+  .main {
+    background: #ffffff;
+    border-radius: 8px;
+    // height: calc(100vh - 124px);
+    box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+  }
+
+  ::v-deep .el-select {
+    width: 100%;
+  }
+}
+
+.footer {
+  height: 68px;
+  background: #ffffff;
+  box-shadow: 0px -3px 20px 0px rgba(204, 204, 204, 0.5);
+  // margin: 0 20px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .thebtn1 {
+    background: #3181e5;
+    color: #ffffff;
+    padding: 9px 45px;
+  }
+
+  .thebtn2 {
+    background: #cccccc;
+    color: #ffffff;
+    padding: 9px 45px;
+  }
+}
+
+.tit {
+  font-size: 14px;
+  font-weight: bold;
+  color: #333333;
+  padding: 0 20px;
+  border-left: 5px solid #c8161d;
+  margin: 20px 0 10px 0;
+}
+
+.xian {
+  height: 1px;
+  background: rgba(0, 0, 0, 0.1);
+}
+
+.demo-ruleForm {
+  padding: 20px 0;
+}
+
+::v-deep .el-date-editor--datetimerange {
+  width: auto !important;
+}
+
+.flexed {
+  display: flex;
+}
+
+.flexed_l {
+  margin-right: 20px;
+}
+
+.topbox {
+  align-items: center;
+  padding: 0px 0 5px 0;
+  display: flex;
+  //   background: skyblue;
+  .levelList_i {
+    padding: 4px 15px;
+    margin-left: 20px;
+    position: relative;
+    cursor: pointer;
+    min-width: 88px;
+    // height: 28px;
+    border-radius: 17px;
+    border: 1px solid #cccccc;
+    font-size: 12px;
+    font-family: MicrosoftYaHei;
+    text-align: center;
+    // line-height: 28px;
+  }
+
+  .act {
+    color: #ffffff;
+    background: #c8161d;
+  }
+}
+
+::v-deep .el-form-item {
+  margin-bottom: 20px !important;
+}
+</style>
diff --git a/src/views/marketing/ticket/index.vue b/src/views/marketing/ticket/index.vue
new file mode 100644
index 0000000..d058261
--- /dev/null
+++ b/src/views/marketing/ticket/index.vue
@@ -0,0 +1,341 @@
+<!--
+ * @Descripttion:
+ * @version:
+ * @Author: kBank
+ * @Date: 2022-10-24 15:45:01
+-->
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <div class="main">
+      <div class="form_all">
+        <el-form ref="select" :model="select" label-width="auto">
+          <el-row :gutter="40">
+            <!-- 一层 -->
+            <el-col :span="4">
+              <el-form-item :label="'活动名称'">
+                <el-input v-model="select.actName" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="$t('活动时间')">
+                <el-date-picker
+                  v-model="creationTime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-button type="primary" size="small" @click="getDataList">
+                {{ '搜索' }}</el-button>
+              <el-button size="small" class="resetBtn" @click="reset">
+                {{ '重置' }}</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="main_a">
+        <div class="mainbtn">
+          <el-button
+            v-hasButtons="['TourismActAdd']"
+            size="small"
+            class="addBtn"
+            @click="openDig"
+          >{{ '添加' }}</el-button>
+        </div>
+        <div class="maintable">
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            style="width: 100%"
+            height="710px"
+            :header-cell-style="{ background: '#EEEEEE' }"
+            :row-class-name="tableRowClassName"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" width="55" />
+            <el-table-column
+              align="center"
+              prop="actName"
+              width="150"
+              :label="'活动名称'"
+            />
+            <el-table-column
+              align="center"
+              prop="actCover"
+              :label="$t('活动封面')"
+            >
+              <template slot-scope="scope">
+                <img
+                  style="width: 48px; height: 48px"
+                  :src="scope.row.actCover"
+                  alt=""
+                >
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="payMoney"
+              width="120"
+              :label="$t('门票金额')"
+            />
+
+            <el-table-column align="center" prop="quantity" :label="$t('数量')" width="120" />
+
+            <el-table-column align="center" prop="limitQuantity" :label="$t('限购数量')" width="120" />
+
+            <el-table-column
+              align="center"
+              prop="actStartDate"
+              width="150"
+              :label="$t('活动开始时间')"
+            />
+            <el-table-column
+              align="center"
+              prop="actEndDate"
+              width="150"
+              :label="$t('活动结束时间')"
+            />
+            <el-table-column
+              align="center"
+              prop="disStartDate"
+              width="150"
+              :label="$t('活动显示开始时间')"
+            />
+            <el-table-column
+              align="center"
+              prop="disEndDate"
+              width="150"
+              :label="$t('活动显示结束时间')"
+            />
+            <el-table-column
+              align="center"
+              prop="time"
+              :label="'操作'"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  style="color: #48b2fd"
+                  size="small"
+                  @click="toFixed(scope.row.pkId, 4)"
+                >
+                  {{ '查看' }}
+                </el-button>
+                <el-button
+                  v-hasButtons="['TourismActUp']"
+                  type="text"
+                  style="color: #f3a900"
+                  size="small"
+                  @click="toFixed(scope.row.pkId, 2)"
+                >
+                  {{ '修改' }}
+                </el-button>
+                <el-button
+                  v-hasButtons="['TourismActDel']"
+                  type="text"
+                  size="small"
+                  style="color: #c8161d"
+                  @click="toFixed(scope.row.pkId, 3)"
+                >
+                  {{ '删除' }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script>
+import topBar from '@/components/topBar'
+import * as api from '@/api/ticket.js'
+export default {
+  name: 'Bzpz',
+  components: {
+    topBar
+  },
+  filters: {
+    isAgree(val) {
+      if (!val) {
+        return this.$t('ENU_POPUP_TYPE_1')
+      } else {
+        return this.$t('ENU_POPUP_TYPE_2')
+      }
+    }
+  },
+  data() {
+    return {
+      creationTime: [],
+      creationTime1: [],
+      creationTime2: [],
+      select: {},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50
+      },
+      addOrEdit: '',
+      total: 0,
+      dialogVisible: false,
+      tableData: [],
+      loading: false,
+      moren: 'ticketList',
+      topList: [
+        {
+          name: '门票活动',
+          path: 'ticketList'
+        }
+      ],
+      form: {
+        name: ''
+      }
+    }
+  },
+  mounted() {
+    // 获取列表
+    this.getDataList()
+  },
+  methods: {
+    // 重置
+    reset() {
+      this.select = {}
+      this.creationTime = []
+      this.creationTime1 = []
+      this.creationTime2 = []
+      this.getDataList()
+    },
+
+    changeTime(val) {
+      this.select.actStartDate = val ? val[0] : ''
+      this.select.actEndDate = val ? val[1] : ''
+    },
+    // 点击修改
+    toFixed(id, index) {
+      if (index == 3) {
+        this.$confirm('是否确认删除该活动?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            api.delTicket(id).then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                })
+                this.getDataList()
+              }
+            })
+          })
+          .catch(() => {})
+      } else {
+        this.$router.push({
+          path: 'AddTicket',
+          query: {
+            pkId: id,
+            controlType: index
+          }
+        })
+      }
+    },
+
+    openDig() {
+      this.$router.push({
+        path: 'AddTicket',
+        query: {
+          controlType: 1
+        }
+      })
+    },
+
+    // 获取列表
+    getDataList() {
+      this.loading = true
+      api
+        .ticketList(Object.assign({}, this.queryParams, this.select))
+        .then((res) => {
+          this.tableData = res.rows
+          this.total = res.total
+          this.loading = false
+        })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return 'warning-row'
+      } else if (rowIndex % 2 == 0) {
+        return 'success-row'
+      }
+      return ''
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+
+::v-deep .el-table .success-row {
+  background: #ffffff;
+}
+::v-deep .el-table thead {
+  color: #000000;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+.page {
+  padding: 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .main {
+    // background: #ffffff;
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    .main_a {
+      background: #fff;
+      border-radius: 8px;
+      justify-content: space-between;
+      align-items: center;
+      box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+    }
+    .mainbtn {
+      padding: 0;
+    }
+    .maintable {
+      flex: 1;
+    }
+  }
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 100%;
+}
+.form_all {
+  padding: 0 20px;
+  margin-bottom: 10px;
+  background: #fff;
+}
+</style>
diff --git a/src/views/marketing/ticketQueryList/index.vue b/src/views/marketing/ticketQueryList/index.vue
new file mode 100644
index 0000000..48ef5fa
--- /dev/null
+++ b/src/views/marketing/ticketQueryList/index.vue
@@ -0,0 +1,368 @@
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <div class="main">
+      <div class="form_all">
+        <el-form ref="select" :model="select" label-width="auto">
+          <el-row :gutter="40">
+            <el-col :span="4">
+              <el-form-item label="会员编号">
+                <el-input v-model="select.memberCode" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="会员姓名">
+                <el-input v-model="select.memberName" clearable />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4">
+              <el-form-item label="活动名称">
+                <el-input v-model="select.actName" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="订单编号">
+                <el-input v-model="select.orderCode" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="姓名">
+                <el-input v-model="select.buyName" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="手机号">
+                <el-input v-model="select.phone" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="隶属体系">
+                <el-select
+                  v-model="select.pkTeamListStr"
+                  multiple
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.pkId"
+                    :label="item.vertexName"
+                    :value="item.pkId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="隶属团队">
+                <el-select
+                  v-model="select.pkTeamCodeListStr"
+                  multiple
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in teamNameList"
+                    :key="item.pkId"
+                    :label="`${item.vertexName}--${item.teamName} `"
+                    :value="item.pkId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-button type="primary" size="small" @click="getDataList">
+                {{ '搜索' }}</el-button>
+              <el-button size="small" class="resetBtn" @click="reset">
+                {{ '重置' }}</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="main_a">
+        <div class="mainbtn">
+          <el-button
+            v-hasButtons="['TicketQueryExport']"
+            size="small"
+            class="addBtn"
+            @click="handleExport"
+          >导出</el-button>
+        </div>
+        <div class="maintable">
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            style="width: 100%"
+            height="710px"
+            :header-cell-style="{ background: '#EEEEEE' }"
+            :row-class-name="tableRowClassName"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" width="55" />
+            <el-table-column
+              align="center"
+              prop="actName"
+              width="150"
+              :label="'活动名称'"
+            />
+            <el-table-column
+              align="center"
+              prop="actStartDate"
+              width="150"
+              :label="$t('门票开始日期')"
+            />
+            <el-table-column
+              align="center"
+              prop="actEndDate"
+              width="150"
+              :label="$t('门票结束日期')"
+            />
+            <el-table-column
+              align="center"
+              prop="memberCode"
+              :label="$t('会员编号')"
+            />
+            <el-table-column
+              align="center"
+              prop="memberName"
+              :label="$t('会员姓名')"
+            />
+            <el-table-column
+              align="center"
+              prop="orderCode"
+              :label="$t('订单编号')"
+            />
+            <el-table-column
+              align="center"
+              prop="orderAmount"
+              :label="$t('订单金额')"
+            />
+            <el-table-column align="center" prop="price" :label="$t('单价')" />
+            <!-- <el-table-column align="center" prop="quantity" :label="$t('数量')">
+            </el-table-column> -->
+            <el-table-column align="center" prop="buyName" :label="$t('姓名')" />
+            <el-table-column
+              align="center"
+              prop="phone"
+              width="150"
+              :label="$t('手机号')"
+            />
+            <el-table-column
+              align="center"
+              prop="idCard"
+              width="150"
+              :label="$t('身份证号')"
+            />
+            <el-table-column align="center" prop="sexVal" :label="$t('性别')" />
+            <el-table-column
+              align="center"
+              prop="clothSize"
+              :label="$t('尺码')"
+            />
+            <el-table-column
+              align="center"
+              prop="cohabitant"
+              :label="$t('同住人')"
+            />
+            <el-table-column
+              align="center"
+              prop="emergencyPhone"
+              width="150"
+              :label="$t('紧急联系人')"
+            />
+            <el-table-column align="center" prop="vertexName" label="隶属体系" />
+            <el-table-column align="center" prop="teamName" label="隶属团队" />
+            <el-table-column
+              align="center"
+              prop="creationTime"
+              label="支付时间"
+            />
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script>
+import topBar from '@/components/topBar'
+import * as api from '@/api/ticket.js'
+export default {
+  name: 'Bzpz',
+  components: {
+    topBar
+  },
+
+  data() {
+    return {
+      creationTime: [],
+      creationTime1: [],
+      creationTime2: [],
+      select: {},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50
+      },
+      addOrEdit: '',
+      total: 0,
+      dialogVisible: false,
+      tableData: [],
+      loading: false,
+      moren: 'ticketQueryList',
+      topList: [
+        {
+          name: '自助购票',
+          path: 'ticketQueryList'
+        }
+      ],
+      form: {
+        name: ''
+      },
+      actStatus: [],
+      teamNameList: [],
+      options: []
+    }
+  },
+  mounted() {
+    // 获取下拉
+    this.getData()
+    // 获取列表
+    this.getDataList()
+  },
+  methods: {
+    // 重置
+    reset() {
+      this.select = {}
+      this.creationTime = []
+      this.creationTime1 = []
+      this.creationTime2 = []
+      this.getDataList()
+    },
+    getData() {
+      api.vertexFindAll().then((res) => {
+        this.options = res.data
+      })
+      api.listNoPage().then((res) => {
+        this.teamNameList = res.rows
+      })
+    },
+    changeTime(val) {
+      this.select.actStartDate = val ? val[0] : ''
+      this.select.actEndDate = val ? val[1] : ''
+    },
+    handleClose() {
+      this.dialogVisible = false
+      this.$refs['form'].clearValidate()
+      this.$refs['form'].resetFields()
+    },
+    // 获取列表
+    getDataList() {
+      this.loading = true
+      api
+        .ticketQuery(Object.assign({}, this.queryParams, this.select))
+        .then((res) => {
+          this.tableData = res.rows
+          this.total = res.total
+          this.loading = false
+        })
+    },
+    handleSelectionChange(val) {},
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$confirm(this.$t('MN_F_T_407'), this.$t('MN_F_T_304'), {
+        confirmButtonText: this.$t('w_0035'),
+        cancelButtonText: this.$t('ENU_P_TYPE0'),
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          process.env.VUE_APP_BASE_API + '/sale/manage/ticket/export',
+          Object.assign(
+            {},
+            {
+              actType: 22
+            },
+            this.queryParams,
+            this.select
+          ),
+          `自助购票${new Date().getTime()}.xlsx`
+        )
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return 'warning-row'
+      } else if (rowIndex % 2 == 0) {
+        return 'success-row'
+      }
+      return ''
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+
+::v-deep .el-table .success-row {
+  background: #ffffff;
+}
+
+::v-deep .el-table thead {
+  color: #000000;
+}
+
+::v-deep .el-select {
+  width: 100%;
+}
+
+.page {
+  padding: 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+
+  .main {
+    // background: #ffffff;
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+
+    .main_a {
+      background: #fff;
+      border-radius: 8px;
+      justify-content: space-between;
+      align-items: center;
+      box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+    }
+
+    .mainbtn {
+      padding: 0;
+    }
+
+    .maintable {
+      flex: 1;
+    }
+  }
+}
+
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 100%;
+}
+
+.form_all {
+  padding: 0 20px;
+  margin-bottom: 10px;
+  background: #fff;
+}
+</style>

From 65d3fc1ebf1d353f867288650d69c338622397b9 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 27 May 2025 15:19:03 +0800
Subject: [PATCH 02/13] feat(route): update routes

---
 src/layout/components/Sidebar/index.vue | 1 +
 src/router/index.js                     | 3 ++-
 src/router/module/tickets.js            | 8 ++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 8a1ce5c..a6877ae 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -73,6 +73,7 @@ export default {
       return new Promise((resolve) => {
         getRouters().then((res) => {
           this.rolaMenu = this.getName(res.data)
+          console.log(this.rolaMenu, 'this.rolaMenu')
           resolve(res)
         })
       })
diff --git a/src/router/index.js b/src/router/index.js
index 3d99693..b258f9c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,7 +8,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import i18n from '@/assets/i18n/index'
 Vue.use(Router)
-
+import { tickets } from './module/tickets'
 /* Layout */
 import Layout from '@/layout'
 import ParentView from '@/components/ParentView'
@@ -1820,6 +1820,7 @@ export const constantRoutes = [
     name: 'Activity',
     meta: { title: '营销管理', icon: 'yx', icon1: 'yxSel' },
     children: [
+      ...tickets,
       {
         path: 'giftGoods',
         name: 'GiftGoods',
diff --git a/src/router/module/tickets.js b/src/router/module/tickets.js
index d978697..08f81a9 100644
--- a/src/router/module/tickets.js
+++ b/src/router/module/tickets.js
@@ -4,12 +4,14 @@ export const tickets = [
     path: 'ticket',
     name: 'Ticket',
     component: ParentView,
+    hidden: false,
     children: [
       {
         path: 'ticketList',
         name: 'TicketList',
         component: () => import('@/views/marketing/ticket/index'),
-        meta: { title: '门票活动' }
+        meta: { title: '门票活动' },
+        hidden: false
       },
       {
         path: 'addTicket',
@@ -24,12 +26,14 @@ export const tickets = [
     path: 'ticketQuery',
     name: 'TicketQuery',
     component: ParentView,
+    hidden: false,
     children: [
       {
         path: 'ticketQueryList',
         name: 'TickeQuerytList',
         component: () => import('@/views/marketing/ticketQueryList/index'),
-        meta: { title: '自助购票' }
+        meta: { title: '自助购票' },
+        hidden: false
       }
     ]
   }

From 7cc12d6faca63d876567d6fa1d0bed591e1b9f57 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 27 May 2025 15:32:42 +0800
Subject: [PATCH 03/13] =?UTF-8?q?feat(addTicket):=20=E8=B4=AD=E7=A5=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/ticket/addTicket.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/marketing/ticket/addTicket.vue b/src/views/marketing/ticket/addTicket.vue
index 8d04e83..ed8ad93 100644
--- a/src/views/marketing/ticket/addTicket.vue
+++ b/src/views/marketing/ticket/addTicket.vue
@@ -203,7 +203,6 @@ export default {
     }
   },
   mounted() {
-    this.getData()
     // （1=新增,2=修改,3=删除）4查看
     if (
       this.$route.query.controlType == 4 ||
@@ -213,6 +212,7 @@ export default {
     } else {
       this.lookOver = false
     }
+    console.log(this.$route.query.controlType, 'this.$route.query.controlType')
     this.controlType = this.$route.query.controlType
     this.pkId = this.$route.query.pkId || ''
     if (this.pkId) {
@@ -265,10 +265,12 @@ export default {
     },
 
     submit() {
+      console.log(this.controlType, 'obj')
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
           let obj = {}
           obj = this.ruleForm
+
           if (this.controlType == 1) {
             api.ticketSave(obj).then((res) => {
               if (res.code == 200) {

From b801d3296aa466eb1435d1f986e05879987be40f Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 27 May 2025 16:05:02 +0800
Subject: [PATCH 04/13] =?UTF-8?q?feat(ticket):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A9=E8=B4=AD=E7=A5=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/ticket/addTicket.vue | 39 ++++++++++++++++++++----
 src/views/marketing/ticket/index.vue     | 16 +++-------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/views/marketing/ticket/addTicket.vue b/src/views/marketing/ticket/addTicket.vue
index ed8ad93..f81451a 100644
--- a/src/views/marketing/ticket/addTicket.vue
+++ b/src/views/marketing/ticket/addTicket.vue
@@ -36,6 +36,21 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="隶属体系" prop="pkVertex">
+                <!-- <imageUpload v-model="ruleForm.pkVertex" /> -->
+                <el-select v-model="ruleForm.pkVertex" placeholder="全部" clearable multiple>
+                  <el-option
+                    v-for="item in vertexList"
+                    :key="item.pkId"
+                    :label="item.vertexName"
+                    :value="item.pkId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="16">
               <el-form-item :label="'活动说明'" prop="actExplain">
@@ -60,6 +75,7 @@
               </el-form-item>
             </el-col>
           </el-row>
+
           <el-row>
             <el-col :span="8">
               <el-form-item :label="$t('门票金额')" required>
@@ -149,6 +165,7 @@ import Editor from '@/components/Editor'
 
 import * as api from '@/api/ticket.js'
 import ImageUpload from '@/components/ImageUpload'
+import { vertexList } from '@/api/settle.js'
 // import directUpdata from '@/views/marketing/benefitsGift/directUpdata'
 export default {
   name: 'AddTicket',
@@ -164,10 +181,12 @@ export default {
       ruleForm: {
         payMoney: '',
         quantity: '',
+        pkVertex: '',
         limitQuantity: '',
         ruleFormTime: [],
         ruleFormTime1: []
       },
+      vertexList: [],
       rules: {
         actName: [
           { required: true, message: this.$t('请输入活动名称'), trigger: 'blur' }
@@ -212,14 +231,19 @@ export default {
     } else {
       this.lookOver = false
     }
-    console.log(this.$route.query.controlType, 'this.$route.query.controlType')
     this.controlType = this.$route.query.controlType
     this.pkId = this.$route.query.pkId || ''
+    this.getVertexList()
     if (this.pkId) {
       this.getDetails()
     }
   },
   methods: {
+    getVertexList() {
+      vertexList().then((res) => {
+        this.vertexList = res.data
+      })
+    },
     cancel() {
       this.$router.go(-1)
     },
@@ -237,6 +261,7 @@ export default {
         this.ruleForm.payMoney = res.data.payMoney
         this.ruleForm.quantity = res.data.quantity
         this.ruleForm.limitQuantity = res.data.limitQuantity
+        this.ruleForm.pkVertex = res.data.pkVertex ? res.data.pkVertex.split(',').map(item => Number(item)) : []
         this.$set(this.ruleForm, 'ruleFormTime', [
           res.data.actStartDate,
           res.data.actEndDate
@@ -265,14 +290,16 @@ export default {
     },
 
     submit() {
-      console.log(this.controlType, 'obj')
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
-          let obj = {}
-          obj = this.ruleForm
+          let params = {}
+          params = {
+            ...this.ruleForm,
+            pkVertex: this.ruleForm.pkVertex ? this.ruleForm.pkVertex.join(',') : ''
+          }
 
           if (this.controlType == 1) {
-            api.ticketSave(obj).then((res) => {
+            api.ticketSave(params).then((res) => {
               if (res.code == 200) {
                 this.$message({
                   message: res.msg,
@@ -284,7 +311,7 @@ export default {
               }
             })
           } else {
-            api.ticketUpdate(obj).then((res) => {
+            api.ticketUpdate(params).then((res) => {
               if (res.code == 200) {
                 this.$message({
                   message: res.msg,
diff --git a/src/views/marketing/ticket/index.vue b/src/views/marketing/ticket/index.vue
index d058261..e1dd1bf 100644
--- a/src/views/marketing/ticket/index.vue
+++ b/src/views/marketing/ticket/index.vue
@@ -1,9 +1,3 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-24 15:45:01
--->
 <template>
   <div class="page">
     <topBar
@@ -66,7 +60,7 @@
             <el-table-column
               align="center"
               prop="actName"
-              width="150"
+              width="160"
               :label="'活动名称'"
             />
             <el-table-column
@@ -96,25 +90,25 @@
             <el-table-column
               align="center"
               prop="actStartDate"
-              width="150"
+              width="160"
               :label="$t('活动开始时间')"
             />
             <el-table-column
               align="center"
               prop="actEndDate"
-              width="150"
+              width="160"
               :label="$t('活动结束时间')"
             />
             <el-table-column
               align="center"
               prop="disStartDate"
-              width="150"
+              width="160"
               :label="$t('活动显示开始时间')"
             />
             <el-table-column
               align="center"
               prop="disEndDate"
-              width="150"
+              width="160"
               :label="$t('活动显示结束时间')"
             />
             <el-table-column

From a7fa2f2fe75edb11efa34f3a598476d3410b011d Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 27 May 2025 16:15:39 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat(addTicket):=20=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=94=B9=E4=B8=BA=E6=96=87=E6=9C=AC=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/ticket/addTicket.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/marketing/ticket/addTicket.vue b/src/views/marketing/ticket/addTicket.vue
index f81451a..6b7411b 100644
--- a/src/views/marketing/ticket/addTicket.vue
+++ b/src/views/marketing/ticket/addTicket.vue
@@ -54,17 +54,20 @@
           <el-row>
             <el-col :span="16">
               <el-form-item :label="'活动说明'" prop="actExplain">
-                <!-- <el-input clearable
-                          type="textarea"
-                          v-model="ruleForm.actExplain"
-                          :disabled="lookOver"></el-input> -->
-                <editor
+                <el-input
+                  v-model="ruleForm.actExplain"
+                  type="textarea"
+                  :rows="6"
+                  placeholder="请输入活动说明"
+                  :disabled="lookOver"
+                />
+                <!-- <editor
                   ref="sptwEditor"
                   v-model="ruleForm.actExplain"
                   :read-only="lookOver"
                   :min-height="196"
                   :upload-url="uploadImgUrl"
-                />
+                /> -->
               </el-form-item>
             </el-col>
           </el-row>

From 68b31bae50281bbed024c1833f4063c41ff08cca Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 11:04:25 +0800
Subject: [PATCH 06/13] =?UTF-8?q?feat(ticketQuery):=20=E8=B4=AD=E7=A5=A8?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/remove-i18n.js                        | 14 +++++++-------
 src/api/ticket.js                             |  9 +++++++++
 src/views/marketing/ticket/index.vue          |  4 ++--
 src/views/marketing/ticketQueryList/index.vue |  6 +++---
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/scripts/remove-i18n.js b/scripts/remove-i18n.js
index c43c0b0..e659d86 100644
--- a/scripts/remove-i18n.js
+++ b/scripts/remove-i18n.js
@@ -25,13 +25,13 @@ function getNestedValue(obj, path) {
 // 替换文件内容
 function replaceContent(content) {
   // 替换模板中的 $t('key')
-  content = content.replace(
-    /(?<!this\.|that\.)\$t\(['"]([^'"]+)['"]\)/g,
-    (match, key) => {
-      const value = getNestedValue(zhCN, key)
-      return value ? `'${value}'` : match
-    }
-  )
+  // content = content.replace(
+  //   /(?<!this\.|that\.)\$t\(['"]([^'"]+)['"]\)/g,
+  //   (match, key) => {
+  //     const value = getNestedValue(zhCN, key)
+  //     return value ? `'${value}'` : match
+  //   }
+  // )
 
   // 替换 JavaScript 中的 this.$t('key')
   content = content.replace(/this\.\$t\(['"]([^'"]+)['"]\)/g, (match, key) => {
diff --git a/src/api/ticket.js b/src/api/ticket.js
index 8a85f1a..5b18eaa 100644
--- a/src/api/ticket.js
+++ b/src/api/ticket.js
@@ -47,3 +47,12 @@ export function memberConsumeRule(params) {
     params
   })
 }
+
+// 自助购票-列表
+export function ticketQuery(data) {
+  return request({
+    url: '/sale/manage/ticket/query?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/marketing/ticket/index.vue b/src/views/marketing/ticket/index.vue
index e1dd1bf..6dd5397 100644
--- a/src/views/marketing/ticket/index.vue
+++ b/src/views/marketing/ticket/index.vue
@@ -171,9 +171,9 @@ export default {
   filters: {
     isAgree(val) {
       if (!val) {
-        return this.$t('ENU_POPUP_TYPE_1')
+        return '允许'
       } else {
-        return this.$t('ENU_POPUP_TYPE_2')
+        return '禁止'
       }
     }
   },
diff --git a/src/views/marketing/ticketQueryList/index.vue b/src/views/marketing/ticketQueryList/index.vue
index 48ef5fa..3940c5e 100644
--- a/src/views/marketing/ticketQueryList/index.vue
+++ b/src/views/marketing/ticketQueryList/index.vue
@@ -279,9 +279,9 @@ export default {
     handleSelectionChange(val) {},
     /** 导出按钮操作 */
     handleExport() {
-      this.$confirm(this.$t('MN_F_T_407'), this.$t('MN_F_T_304'), {
-        confirmButtonText: this.$t('w_0035'),
-        cancelButtonText: this.$t('ENU_P_TYPE0'),
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
         type: 'warning'
       }).then((_) => {
         this.download(

From 024ef3c4cc2c87620efcb90a32dd36b0415230a7 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 12:00:03 +0800
Subject: [PATCH 07/13] =?UTF-8?q?feat(ticketQueryList):=20=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=8C=89=E9=92=AE=E6=8E=A5=E5=8F=A3404=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/ticketQueryList/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/marketing/ticketQueryList/index.vue b/src/views/marketing/ticketQueryList/index.vue
index 3940c5e..73e9e70 100644
--- a/src/views/marketing/ticketQueryList/index.vue
+++ b/src/views/marketing/ticketQueryList/index.vue
@@ -279,13 +279,13 @@ export default {
     handleSelectionChange(val) {},
     /** 导出按钮操作 */
     handleExport() {
-      this.$confirm('是否确认导出所有数据项?', '警告', {
+      this.$confirm('是否确认导出所有数据项321?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then((_) => {
         this.download(
-          process.env.VUE_APP_BASE_API + '/sale/manage/ticket/export',
+          '/sale/manage/ticket/export',
           Object.assign(
             {},
             {

From 72038ce5f0e983057f18c5f3e8d8c7d4283727f3 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 13:29:46 +0800
Subject: [PATCH 08/13] =?UTF-8?q?feat(ticketQueryList):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=BC=E5=87=BA=E6=96=87=E6=A1=88=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/ticketQueryList/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/marketing/ticketQueryList/index.vue b/src/views/marketing/ticketQueryList/index.vue
index 73e9e70..e1c66fd 100644
--- a/src/views/marketing/ticketQueryList/index.vue
+++ b/src/views/marketing/ticketQueryList/index.vue
@@ -279,7 +279,7 @@ export default {
     handleSelectionChange(val) {},
     /** 导出按钮操作 */
     handleExport() {
-      this.$confirm('是否确认导出所有数据项321?', '警告', {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

From 587f3e80d5581f94cf5b7f89e3cc5a19a86b9bc3 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 14:54:51 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix(ticketQueryList):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/index.vue       | 1 -
 src/views/marketing/ticketQueryList/index.vue | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index a6877ae..8a1ce5c 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -73,7 +73,6 @@ export default {
       return new Promise((resolve) => {
         getRouters().then((res) => {
           this.rolaMenu = this.getName(res.data)
-          console.log(this.rolaMenu, 'this.rolaMenu')
           resolve(res)
         })
       })
diff --git a/src/views/marketing/ticketQueryList/index.vue b/src/views/marketing/ticketQueryList/index.vue
index e1c66fd..a483316 100644
--- a/src/views/marketing/ticketQueryList/index.vue
+++ b/src/views/marketing/ticketQueryList/index.vue
@@ -196,12 +196,12 @@
 <script>
 import topBar from '@/components/topBar'
 import * as api from '@/api/ticket.js'
+import { vertexList, memberTeam } from '@/api/settle.js'
 export default {
   name: 'Bzpz',
   components: {
     topBar
   },
-
   data() {
     return {
       creationTime: [],
@@ -249,10 +249,10 @@ export default {
       this.getDataList()
     },
     getData() {
-      api.vertexFindAll().then((res) => {
+      vertexList().then((res) => {
         this.options = res.data
       })
-      api.listNoPage().then((res) => {
+      memberTeam().then((res) => {
         this.teamNameList = res.rows
       })
     },

From 4a5946c3c6637f256f62561cb8505065ca241a47 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 14:59:39 +0800
Subject: [PATCH 10/13] =?UTF-8?q?feat(ticketQueryList):=20=E5=88=97?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/ticketQueryList/index.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/marketing/ticketQueryList/index.vue b/src/views/marketing/ticketQueryList/index.vue
index a483316..2a5d79a 100644
--- a/src/views/marketing/ticketQueryList/index.vue
+++ b/src/views/marketing/ticketQueryList/index.vue
@@ -123,6 +123,7 @@
               align="center"
               prop="memberCode"
               :label="$t('会员编号')"
+              min-width="120"
             />
             <el-table-column
               align="center"
@@ -133,11 +134,13 @@
               align="center"
               prop="orderCode"
               :label="$t('订单编号')"
+              min-width="170"
             />
             <el-table-column
               align="center"
               prop="orderAmount"
               :label="$t('订单金额')"
+              min-width="150"
             />
             <el-table-column align="center" prop="price" :label="$t('单价')" />
             <!-- <el-table-column align="center" prop="quantity" :label="$t('数量')">
@@ -152,7 +155,7 @@
             <el-table-column
               align="center"
               prop="idCard"
-              width="150"
+              width="190"
               :label="$t('身份证号')"
             />
             <el-table-column align="center" prop="sexVal" :label="$t('性别')" />
@@ -165,6 +168,7 @@
               align="center"
               prop="cohabitant"
               :label="$t('同住人')"
+              min-width="150"
             />
             <el-table-column
               align="center"
@@ -172,12 +176,13 @@
               width="150"
               :label="$t('紧急联系人')"
             />
-            <el-table-column align="center" prop="vertexName" label="隶属体系" />
+            <el-table-column align="center" prop="vertexName" label="隶属体系" width="120" />
             <el-table-column align="center" prop="teamName" label="隶属团队" />
             <el-table-column
               align="center"
               prop="creationTime"
               label="支付时间"
+              width="160"
             />
           </el-table>
         </div>

From c8726e827964fdcf7e296d710d54c223c19dfeab Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 15:44:03 +0800
Subject: [PATCH 11/13] =?UTF-8?q?feat(addTicket):=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=8F=AA=E5=B1=95=E7=A4=BA=E5=88=B0=E6=97=A5=E6=9C=9F=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A5=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/ticket/addTicket.vue | 25 ++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/marketing/ticket/addTicket.vue b/src/views/marketing/ticket/addTicket.vue
index 6b7411b..115b922 100644
--- a/src/views/marketing/ticket/addTicket.vue
+++ b/src/views/marketing/ticket/addTicket.vue
@@ -1,4 +1,3 @@
-
 <template>
   <div class="page">
     <div class="topbox">
@@ -120,8 +119,8 @@
                 <el-date-picker
                   v-model="ruleForm.ruleFormTime"
                   :disabled="lookOver"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
@@ -136,8 +135,8 @@
                 <el-date-picker
                   v-model="ruleForm.ruleFormTime1"
                   :disabled="lookOver"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
@@ -296,9 +295,23 @@ export default {
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
           let params = {}
+
+          // 处理时间格式，补充时分秒
+          const formatDateTime = (date, isEndTime = false) => {
+            if (!date) return ''
+            const timeStr = isEndTime ? ' 23:59:59' : ' 00:00:00'
+            return date + timeStr
+          }
+
           params = {
             ...this.ruleForm,
-            pkVertex: this.ruleForm.pkVertex ? this.ruleForm.pkVertex.join(',') : ''
+            pkVertex: this.ruleForm.pkVertex ? this.ruleForm.pkVertex.join(',') : '',
+            // 处理活动时间，补充时分秒
+            actStartDate: formatDateTime(this.ruleForm.actStartDate, false),
+            actEndDate: formatDateTime(this.ruleForm.actEndDate, true),
+            // 处理展示时间，补充时分秒
+            disStartDate: formatDateTime(this.ruleForm.disStartDate, false),
+            disEndDate: formatDateTime(this.ruleForm.disEndDate, true)
           }
 
           if (this.controlType == 1) {

From 87d7ba9e0d91aa6e6072d9d4dc37a5255b8b12e5 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 16:00:33 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix(addTikcet):=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/ticket/addTicket.vue | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/marketing/ticket/addTicket.vue b/src/views/marketing/ticket/addTicket.vue
index 115b922..ab08726 100644
--- a/src/views/marketing/ticket/addTicket.vue
+++ b/src/views/marketing/ticket/addTicket.vue
@@ -256,21 +256,29 @@ export default {
         this.$set(this.ruleForm, 'actExplain', res.data.actExplain)
         this.$set(this.ruleForm, 'actCover', res.data.actCover)
         this.ruleForm.pkId = res.data.pkId
-        this.ruleForm.actStartDate = res.data.actStartDate
-        this.ruleForm.actEndDate = res.data.actEndDate
-        this.ruleForm.disStartDate = res.data.disStartDate
-        this.ruleForm.disEndDate = res.data.disEndDate
+
+        // 处理时间字段，去掉时分秒部分，只保留日期
+        const formatDateOnly = (datetime) => {
+          if (!datetime) return ''
+          return datetime.split(' ')[0] // 去掉时分秒，只保留日期部分
+        }
+
+        this.ruleForm.actStartDate = formatDateOnly(res.data.actStartDate)
+        this.ruleForm.actEndDate = formatDateOnly(res.data.actEndDate)
+        this.ruleForm.disStartDate = formatDateOnly(res.data.disStartDate)
+        this.ruleForm.disEndDate = formatDateOnly(res.data.disEndDate)
+
         this.ruleForm.payMoney = res.data.payMoney
         this.ruleForm.quantity = res.data.quantity
         this.ruleForm.limitQuantity = res.data.limitQuantity
         this.ruleForm.pkVertex = res.data.pkVertex ? res.data.pkVertex.split(',').map(item => Number(item)) : []
         this.$set(this.ruleForm, 'ruleFormTime', [
-          res.data.actStartDate,
-          res.data.actEndDate
+          this.ruleForm.actStartDate,
+          this.ruleForm.actEndDate
         ])
         this.$set(this.ruleForm, 'ruleFormTime1', [
-          res.data.disStartDate,
-          res.data.disEndDate
+          this.ruleForm.disStartDate,
+          this.ruleForm.disEndDate
         ])
         // let that = this;
         // setTimeout(() => {

From 86262cd54d6396dc8889f7e8641f6e62ab7a39f1 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 28 May 2025 16:45:28 +0800
Subject: [PATCH 13/13] =?UTF-8?q?fix(supplierSet):=20=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20bug-130?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/supply.js                      | 8 ++++++++
 src/views/system/supplierSet/index.vue | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/src/api/supply.js b/src/api/supply.js
index 7edf911..934bf6f 100644
--- a/src/api/supply.js
+++ b/src/api/supply.js
@@ -64,6 +64,14 @@ export function supplierProduct(params) {
   })
 }
 
+// 供应商类型
+export function getCustTypeList(params) {
+  return request({
+    url: '/system/pub/enums/supply-type',
+    method: 'get',
+    params
+  })
+}
 // 供应商管理列表
 export function getSupplierList(params) {
   return request({
diff --git a/src/views/system/supplierSet/index.vue b/src/views/system/supplierSet/index.vue
index 98f4e84..7c04726 100644
--- a/src/views/system/supplierSet/index.vue
+++ b/src/views/system/supplierSet/index.vue
@@ -351,6 +351,12 @@ export default {
       site.areaList().then((res) => {
         this.areaData = res.data
       })
+      this.getCustTypeList()
+    },
+    getCustTypeList() {
+      api.getCustTypeList().then((res) => {
+        this.custTypeList = res.data
+      })
     },
     reset() {
       this.select = {}