Browse Source

1. 新增

MONSTER-ygh 11 months ago
parent
commit
693bee9a24

+ 7 - 7
src/views/tourism/marketingActivities/detailsBox/couponManagementDetails.vue

@@ -30,7 +30,7 @@
               <el-form-item label="券种说明:" prop="remark">
                 <span>{{ form.remark }}</span>
               </el-form-item>
-              <el-form-item  label="券种类型" prop="type">
+              <el-form-item  label="券种类型" prop="type">
                 <el-radio-group class="details-is-disabled" v-model="form.type">
                   <el-radio 
                     v-for="dict in dict.type.tourism_couponManagement_type"
@@ -38,7 +38,7 @@
                     >{{ dict.label }}</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="优惠金额" class="is-required">
+              <el-form-item label="优惠金额" class="is-required">
                 <div style="display: flex;">
                   <span>订单满</span>
                   <el-form-item label="" prop="buyAmount">
@@ -51,11 +51,11 @@
                   <span>{{ form.type == 1 ? '元':'折' }}</span>
                 </div>
               </el-form-item>
-              <el-form-item label="发放数量" prop="issuseNum">
+              <el-form-item label="发放数量" prop="issuseNum">
                 <el-input-number v-model="form.issuseNum" controls-position="right" step-strictly :step="1" :min="0" placeholder="请输入发放数量"></el-input-number>
                 <span>张</span>
               </el-form-item>
-              <el-form-item label="发放时间" prop="grantTime">
+              <el-form-item label="发放时间" prop="grantTime">
                 <span>{{ form.grantTime&&form.grantTime.join('——') }}</span>
               </el-form-item>
               <el-form-item label="使用有效期:" prop="useType">
@@ -86,7 +86,7 @@
                   </div>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="优惠券背景图" prop="imag">
+              <el-form-item label="优惠券背景图" prop="imag">
                 <div style="display: flex;">
                   <div 
                   v-for="(item,index) in form.imag" 
@@ -136,7 +136,7 @@
                     >{{ dict.label }}</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="会员等级" v-if="form.useUserType == 2" prop="useUserRelid_2" label-width="200px">
+              <el-form-item label="会员等级" v-if="form.useUserType == 2" prop="useUserRelid_2" label-width="200px">
                 <selectMembershipLevel 
                     v-model="form.useUserRelid_2"
                     title="新增会员等级" 
@@ -144,7 +144,7 @@
                     @submitForm="()=>$refs.form.validateField('useUserRelid_2')">
                 </selectMembershipLevel>
               </el-form-item>
-              <el-form-item label="会员号" v-if="form.useUserType == 3" prop="useUserRelid_3" label-width="200px">
+              <el-form-item label="会员号" v-if="form.useUserType == 3" prop="useUserRelid_3" label-width="200px">
                 <selectMemberInformation 
                     v-model="form.useUserRelid_3"
                     title="新增会员号" 

+ 12 - 35
src/views/tourism/marketingActivities/eventManagement.vue

@@ -4,19 +4,10 @@
         <!--用户数据-->
         <el-col :span="24" :xs="24">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="批次号" prop="realName">
+            <el-form-item label="活动名称" prop="activityName">
               <el-input
-                v-model="queryParams.realName"
-                placeholder="请输入批次号"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="优惠卷名称" prop="memberCode" label-width="88px">
-              <el-input
-                v-model="queryParams.memberCode"
-                placeholder="请输入优惠卷名称"
+                v-model="queryParams.activityName"
+                placeholder="请输入活动名称"
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
@@ -44,32 +35,18 @@
   
           <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
             <el-table-column type="index" label="序号" align="center"  />
-            <el-table-column label="优惠券名称" align="center" key="realName" prop="realName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="券种类型" align="center" key="type" prop="type" v-if="columns[1].visible" :show-overflow-tooltip="true">
+            <el-table-column label="活动名称" align="center" key="activityName" prop="activityName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="活动起止时间" align="center" key="type1" prop="type1" v-if="columns[1].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <dict-tag :options="dict.type.tourism_memberInformation_user_type" :value="scope.row.type"/>
+                {{ scope.row.startDate }} — {{ scope.row.endDate }}
               </template>
             </el-table-column>
-            <el-table-column label="券种说明" align="center" key="levelName" prop="levelName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="发放数量" align="center" key="mobile" prop="mobile" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="适用对象" align="center" key="cardId" prop="cardId" v-if="columns[4].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="领取限制" align="center" key="credit" prop="credit" v-if="columns[5].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="使用有效期" align="center" key="balance" prop="balance" v-if="columns[6].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="适用产品" align="center" key="buyCount" prop="buyCount" v-if="columns[7].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="已领取统计" align="center" key="consumeTotal" prop="consumeTotal" v-if="columns[8].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="创建时间" align="center" key="consumeTotal1" prop="consumeTotal1" v-if="columns[9].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="禁用/启用" align="center" key="status" v-if="columns[10].visible">
+            <el-table-column label="状态" align="center" key="status" prop="status" v-if="columns[2].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <switchBox 
-                :defaultChecked="true" 
-                v-model="scope.row.status" 
-                @changeFun="openAttraction(scope.row)" 
-                :disabled="false"
-                :active-value="1"
-                :inactive-value="0"
-                 />
+                <dict-tag :options="dict.type.tourism_eventManagement_status" :value="scope.row.status"/>
               </template>
             </el-table-column>
+            <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" :show-overflow-tooltip="true" />
             <el-table-column
               label="操作"
               align="center"
@@ -128,7 +105,7 @@
   import addAndEdit from "./formBox/eventManagementForm.vue"
   export default {
     name: "User",
-    dicts: ['tourism_memberInformation_user_type','tourism_memberInformation_status','tourism_memberInformation_sex'],
+    dicts: ['tourism_eventManagement_status'],
     components: {detailsBox,addAndEdit},
     data() {
       return {
@@ -142,8 +119,8 @@
           export: [''],// 导出权限
         },
         configUrl: {
-          list: '/member/memberInfo/list', // 列表地址
-          delect: '', // 删除地址
+          list: '/merchant/merchantActivityInfo/pageList', // 列表地址
+          delect: '/merchant/merchantActivityInfo/deleteById', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址

+ 9 - 9
src/views/tourism/marketingActivities/formBox/couponManagementForm.vue

@@ -24,13 +24,13 @@
           </el-tabs>
         <el-form :model="form" ref="form" :rules="rules" label-width="120px">
           <div v-show="activeName == 'first'">
-              <el-form-item label="优惠券名称" prop="couponName">
+              <el-form-item label="优惠券名称" prop="couponName">
                 <el-input style="width: 350px;" v-model="form.couponName" placeholder="请输入优惠券名称" maxlength="50" show-word-limit />
               </el-form-item>
-              <el-form-item label="券种说明" prop="remark">
+              <el-form-item label="券种说明" prop="remark">
                 <el-input style="width: 350px;" type="textarea" v-model="form.remark" placeholder="请输入券种说明" maxlength="200" show-word-limit />
               </el-form-item>
-              <el-form-item label="券种类型" prop="type">
+              <el-form-item label="券种类型" prop="type">
                 <el-radio-group v-model="form.type">
                   <el-radio 
                     v-for="dict in dict.type.tourism_couponManagement_type"
@@ -38,7 +38,7 @@
                     >{{ dict.label }}</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="优惠金额" class="is-required">
+              <el-form-item label="优惠金额" class="is-required">
                 <div style="display: flex;">
                   <span>订单满</span>
                   <el-form-item label="" prop="buyAmount">
@@ -51,11 +51,11 @@
                   <span>{{ form.type == 1 ? '元':'折' }}</span>
                 </div>
               </el-form-item>
-              <el-form-item label="发放数量" prop="issuseNum">
+              <el-form-item label="发放数量" prop="issuseNum">
                 <el-input-number v-model="form.issuseNum" controls-position="right" step-strictly :step="1" :min="0" placeholder="请输入发放数量"></el-input-number>
                 <span>张</span>
               </el-form-item>
-              <el-form-item label="发放时间" prop="grantTime">
+              <el-form-item label="发放时间" prop="grantTime">
                 <el-date-picker
                   v-model="form.grantTime"
                   type="datetimerange"
@@ -108,7 +108,7 @@
                   </div>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="优惠券背景图" prop="imag">
+              <el-form-item label="优惠券背景图" prop="imag">
                 <div style="display: flex;">
                   <div 
                   v-for="(item,index) in form.imag" 
@@ -161,14 +161,14 @@
                     >{{ dict.label }}</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="会员等级" v-if="form.useUserType == 2" prop="useUserRelid_2" label-width="200px">
+              <el-form-item label="会员等级" v-if="form.useUserType == 2" prop="useUserRelid_2" label-width="200px">
                 <selectMembershipLevel 
                     v-model="form.useUserRelid_2"
                     title="新增会员等级" 
                     @submitForm="()=>$refs.form.validateField('useUserRelid_2')">
                 </selectMembershipLevel>
               </el-form-item>
-              <el-form-item label="会员号" v-if="form.useUserType == 3" prop="useUserRelid_3" label-width="200px">
+              <el-form-item label="会员号" v-if="form.useUserType == 3" prop="useUserRelid_3" label-width="200px">
                 <selectMemberInformation 
                     v-model="form.useUserRelid_3"
                     title="新增会员号" 

+ 226 - 244
src/views/tourism/marketingActivities/formBox/eventManagementForm.vue

@@ -1,124 +1,123 @@
 <template>
-  <el-dialog :title="title" :visible.sync="open" width="95%" append-to-body :close-on-click-modal="false"
-    @close="cancel">
-    <div class="form-dialog-box" v-loading="loading" :element-loading-text="loadingText"
-      element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0)">
-      <div v-loading="loading" :element-loading-text="''" element-loading-spinner="''"
-        element-loading-background="rgba(0, 0, 0, 0.8)">
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="70%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    :element-loading-text="loadingText"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0)">
+      <div
+        v-loading="loading"
+        :element-loading-text="''"
+        element-loading-spinner="''"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        >
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="基本信息" name="first"></el-tab-pane>
-          <el-tab-pane label="使用规则" name="second"></el-tab-pane>
+          <el-tab-pane label="基本信息:" name="first"></el-tab-pane>
         </el-tabs>
         <el-form :model="form" ref="form" :rules="rules" label-width="120px">
           <div v-show="activeName == 'first'">
-            <el-form-item label="优惠券名称" prop="remark">
-              <el-input style="width: 350px;" v-model="form.remark" placeholder="请输入优惠券名称" maxlength="50"
-                show-word-limit />
-            </el-form-item>
-            <el-form-item label="券种说明" prop="remark">
-              <el-input style="width: 350px;" type="textarea" v-model="form.remark" placeholder="请输入券种说明"
-                maxlength="200" show-word-limit />
-            </el-form-item>
-            <el-form-item label="券种类型" prop="type">
-              <el-radio-group v-model="form.type">
-                <el-radio v-for="dict in dict.type.tourism_memberInformation_biangeng_type" :label="dict.value">{{
-                  dict.label }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="优惠金额" class="is-required">
-              <div style="display: flex;">
-                <span>订单满</span>
-                <el-form-item label="" prop="num">
-                  <el-input-number v-model="form.num" controls-position="right" :precision="0" :min="0"
-                    placeholder="请输入金额"></el-input-number>
-                </el-form-item>
-                <span>减</span>
-                <el-form-item label="" prop="num">
-                  <el-input-number v-model="form.num" controls-position="right" :precision="0" :min="0"
-                    placeholder="请输入金额"></el-input-number>
-                </el-form-item>
-              </div>
-            </el-form-item>
-            <el-form-item label="发放数量" prop="num">
-              <el-input-number v-model="form.num" controls-position="right" :precision="0" :min="0"
-                placeholder="请输入发放数量"></el-input-number>
-              <span>张</span>
-            </el-form-item>
-            <el-form-item label="发放时间" prop="useExpireDateTime">
-              <el-date-picker v-model="form.useExpireDateTime" type="daterange" range-separator="至"
-                start-placeholder="开始日期" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="使用有效期:" prop="useExpireDateRadio">
-              <el-radio-group v-model="form.useExpireDateRadio" @input="radioInputs">
-                <div style="display: flex;flex-direction: column;">
-                  <div style="display: flex;align-items: center;">
-                    <el-radio style="display: flex;align-items: center;" label="3">
-                      <div style="display: flex;align-items: center;">
-                        <el-form-item label="" label-width="0" :prop="'useExpireDateTime'">
-                          <span>指定时间</span>
-                          <el-date-picker :disabled="form.useExpireDateRadio != 3" v-model="form.useExpireDateTime"
-                            type="daterange" range-separator="至" start-placeholder="开始日期" value-format="yyyy-MM-dd"
-                            end-placeholder="结束日期">
-                          </el-date-picker>
-                        </el-form-item>
-                      </div>
-                    </el-radio>
+              <el-form-item label="活动名称:" prop="activityName">
+                <el-input style="width: 350px;" v-model="form.activityName" placeholder="请输入活动名称" maxlength="50" show-word-limit />
+              </el-form-item>
+              <el-form-item label="封面" prop="image">
+                <div style="display: flex;">
+                  <div 
+                  v-for="(item,index) in form.image" 
+                  :key="index"
+                  style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
+                    <el-image 
+                      style="width: 100%; height: 100%"
+                      :src="item" 
+                      :preview-src-list="form.image">
+                    </el-image>
+                    <span @click="handleRemove(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
+                      <i class="el-icon-error"></i>
+                    </span>
                   </div>
-                  <div style="display: flex;align-items: center;margin-top: 25px;">
-                    <el-radio style="display: flex;align-items: center;" label="2">
-                      <div style="display: flex;align-items: center;">
-                        <el-form-item label="" label-width="0" :prop="'useExpireDateDay'">
-                          <span>领取当日起</span>
-                          <el-input-number :disabled="form.useExpireDateRadio != 2" v-model="form.useExpireDateDay"
-                            placeholder="请输入天数" controls-position="right">
-                          </el-input-number>
-                          <span>天内使用</span>
-                        </el-form-item>
-                      </div>
-                    </el-radio>
+                  <div 
+                  style="width: 100px; height: 100px;" 
+                  v-if="!form.image||form.image.length<1"
+                  v-loading="actionUrlLoading"
+                  element-loading-text="上传中..."
+                  element-loading-spinner="el-icon-loading"
+                  element-loading-background="rgba(0, 0, 0, 0.8)"
+                  >
+                    <el-upload
+                      class="avatar-uploader"
+                      :action="actionUrl"
+                      :data="{
+                        bucket: 'tourism'
+                      }"
+                      :show-file-list="false"
+                      :before-upload="beforeAvatarUpload"
+                      :on-success="handleAvatarSuccess"
+                      :on-progress="handleAvatarProgress"
+                      :disabled="actionUrlLoading"
+                      :on-error="handleAvatarError"
+                      >
+                      <i class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
                   </div>
-
-                </div>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="优惠券背景图" prop="imgUrl">
-              <div style="display: flex;">
-                <div v-for="(item, index) in form.imgUrl" :key="index"
-                  style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
-                  <el-image style="width: 100%; height: 100%" :src="item" :preview-src-list="form.imgUrl">
-                  </el-image>
-                  <span @click="handleRemove(index)"
-                    style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
-                    <i class="el-icon-error"></i>
-                  </span>
+                  
                 </div>
-                <div style="width: 100px; height: 100px;" v-if="!form.imgUrl || form.imgUrl.length < 1"
-                  v-loading="actionUrlLoading" element-loading-text="上传中..." element-loading-spinner="el-icon-loading"
-                  element-loading-background="rgba(0, 0, 0, 0.8)">
-                  <el-upload class="avatar-uploader" :action="actionUrl" :data="{
-                    bucket: 'tourism'
-                  }" :show-file-list="false" :before-upload="beforeAvatarUpload" :on-success="handleAvatarSuccess"
-                    :on-progress="handleAvatarProgress" :disabled="actionUrlLoading" :on-error="handleAvatarError">
-                    <i class="el-icon-plus avatar-uploader-icon"></i>
-                  </el-upload>
-                </div>
-
-              </div>
-              <span>支持jpg、png,支持1MB大小以内的图片上传</span>
-            </el-form-item>
-          </div>
-
-          <div v-show="activeName == 'second'">
-            <asEditor />
+                <span>建议尺寸375px X 392px,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
+              </el-form-item>
+              <el-form-item label="活动起止时间:" prop="eventTime">
+                <el-date-picker
+                  v-model="form.eventTime"
+                  type="datetimerange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="选择模板:" prop="jsonObj">
+                <el-select style="width: 100%;" v-model="form.jsonObj" placeholder="请选择模板">
+                  <el-option
+                    v-for="item in jsonObjList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              
+              <el-form-item label="优惠券:" prop="useUserRelid_2">
+                <selectCouponManagement 
+                    v-model="form.useUserRelid_2"
+                    title="新增优惠券" 
+                    @submitForm="()=>$refs.form.validateField('useUserRelid_2')">
+                </selectCouponManagement>
+              </el-form-item>
+              <el-form-item label="景区门票:" prop="useUserRelid_3">
+                <selectTicketOrders 
+                    v-model="form.useUserRelid_3"
+                    title="新增景区门票" 
+                    @submitForm="()=>$refs.form.validateField('useUserRelid_3')">
+                </selectTicketOrders>
+              </el-form-item>
           </div>
         </el-form>
       </div>
     </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus == 1">
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="submitForm" :loading="loading" element-loading-text="提交中..."
-        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-button
+        type="primary"
+        @click="submitForm"
+        :loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
         {{ loading ? '提交中...' : '保存' }}
       </el-button>
     </span>
@@ -127,16 +126,18 @@
 </template>
 
 <script>
-import {
+import { 
   getTableDeatilsByIdApi,
   updateTableApi,
-  addTableApi
-} from '@/api/CURD'
-import asEditor from "@/myComponents/asEditor"
+  addTableApi,
+  listTableApi,
+ } from '@/api/CURD'
+import selectCouponManagement from '../model/selectCouponManagement.vue'
+import selectTicketOrders from "../model/selectTicketOrders.vue"
 export default {
   name: "addAndEdit",
-  dicts: ['tourism_memberInformation_biangeng_type'],
-  components: {asEditor},
+  components: {selectCouponManagement,selectTicketOrders},
+  dicts: ['tourism_couponManagement_type','tourism_couponManagement_useUserType','tourism_couponManagement_receiveType','tourism_couponManagement_useConfig','goods_type'],
   data() {
     return {
       title: "",
@@ -146,35 +147,33 @@ export default {
       loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/member/memberInfo/updateCredit', // 新增地址
-        details: '/member/memberInfo/detail', // 详情地址
-        edit: '/member/memberInfo/updateCredit', // 编辑地址
+        list: '/merchant/merchantTemplate/pageList', // 列表地址
+        add: '/merchant/merchantActivityInfo/insertOrUpdate', // 新增地址
+        details: '/merchant/merchantActivityInfo/selectById', // 详情地址
+        edit: '/merchant/merchantActivityInfo/insertOrUpdate', // 编辑地址
       },
       form: {
         id: undefined,
       },
       rules: {
-        type: [{ required: true, message: "请选择积分变动", trigger: ["change", "blur"] }],
-        num: [{ required: true, message: "请输入变动量", trigger: ["change", "blur"] }],
-        remark: [{ required: true, message: "请输入变动原因说明", trigger: ["change", "blur"] }],
-
-        dayTypeRadio: [{ required: true, message: "请选择日期类型", trigger: ["change", "blur"] }],
-        dayType: [{ required: false, message: "请选择时间范围", trigger: ["change", "blur"] }],
-
-        useExpireDateRadio: [{ required: true, message: "请输入变动原因说明", trigger: ["change", "blur"] }],
-        useExpireDateDay: [{ required: false, message: "请输入天数", trigger: ["change", "blur"] }],
-        useExpireDateTime: [{ required: false, message: "请选择时间", trigger: ["change", "blur"] }],
-
+        activityName: [{ required: true, message: "请输入活动名称", trigger: ["change","blur"] }],
+        image: [{ required: true, message: "请上传封面", trigger: ["change","blur"] }],
+        eventTime: [{ required: true, message: "请选择活动起止时间", trigger: ["change","blur"] }],
+        jsonObj: [{ required: true, message: "请选择模板", trigger: ["change","blur"] }],
+        useUserRelid_2: [{ required: true, message: "请选择优惠券", trigger: ["change","blur"] }],
+        useUserRelid_3: [{ required: true, message: "请选择景区门票", trigger: ["change","blur"] }],
       },
 
       activeName: 'first',
-      
+
       actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
       actionUrlLoading: false,
+
+      jsonObjList: []
     };
   },
   methods: {
-    async initData(title, model, row) {
+    async initData(title , model,row){
       this.title = title
       this.activeName = 'first'
       this.open = true
@@ -182,27 +181,33 @@ export default {
       this.loading = true
       this.model = model
       this.formStatus = 0
-      if (model == 'ADD') { // 新增
-        this.$set(this, 'form', {
+      this.getJsonObjList()
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',{
           ...row,
-          imgUrl: [],
+          eventTime: [], // 活动时间段
+          image: [],
+          useUserRelid_2: [],
+          useUserRelid_3: [],
         })
         this.formStatus = 1
-      } else if (model == 'EDIT') { // 新增
+      }else if(model=='EDIT') { // 新增
         let obj = {
           ...row,
-          imgUrl: row.imgUrl ? row.imgUrl.split(',') : [],
+          image: row.image?row.image.split(','):[],
         }
-        this.$set(this, 'form', {
+        this.$set(this,'form',{
           memberId: row.id
         })
         this.formStatus = 1
-      } else if (model == 'EDITInit') { // 新增
+      }else if(model=='EDITInit') { // 新增
         await this.getTableDeatilsFun(row)
       }
       this.loading = false
-      this.$nextTick(() => {
-        if (this.$refs["form"]) {
+      this.radioInputs(this.form.useType)
+      this.radioInput(this.form.receiveType)
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
           this.$refs["form"].clearValidate();
         }
       })
@@ -212,15 +217,18 @@ export default {
       const id = row.id
       this.loading = true
       try {
-        let res = await getTableDeatilsByIdApi(this.configUrl.details, { id })
-        if (res.code == 200) {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
+        if(res.code == 200) {
           let obj = {
             ...res.data,
-            imgUrl: res.data.imgUrl ? res.data.imgUrl.split(',') : [],
+            eventTime: [res.data.startDate,res.data.endDate], // 发放时间段
+            image: res.data.image?res.data.image.split(','):[],
+            useUserRelid_3: [],
+            useUserRelid_2: []
           }
-          this.$set(this, 'form', JSON.parse(JSON.stringify(obj)))
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
-        } else {
+        }else {
           this.$message.error('获取详情失败!!!');
           this.formStatus = 2
           this.loading = false
@@ -228,62 +236,84 @@ export default {
         }
         this.loading = false
       } catch (error) {
-        console.error('获取详情失败!!!!', error)
+        console.error('获取详情失败!!!!',error)
         this.formStatus = 2
         this.loading = false
         this.open = false;
       }
     },
+    /** 查询模板列表 */
+    async getJsonObjList() {
+      try {
+        let res = await listTableApi(this.configUrl.list,{
+          pageNum: 1,
+          pageSize: 999
+        })
+        if(res.code == 200) {
+          this.jsonObjList = res.data.rows;
+        }
+      } catch (error) {
+        this.loading = false
+        this.open = false;
+      }
+    },
     /**
      * 保存
      * @date 2023-11-22
      * @returns {any}
      */
     submitForm() {
-      this.$refs["form"].validate((valid, object) => {
+      this.$refs["form"].validate((valid ,object)=> {
         if (valid) {
           this.loadingText = "提交数据中..."
           this.loading = true
+          let param = JSON.parse(JSON.stringify(this.form))
+          param['startDate'] = param.eventTime[0]
+          param['endDate'] = param.eventTime[1]
+
+          delete param.eventTime
+          delete param.useUserRelid_2
+          delete param.useUserRelid_3
           if (this.model != 'ADD') {
             addTableApi(
-              this.configUrl.edit, {
-              ...this.form,
-              imgUrl: this.form.imgUrl ? this.form.imgUrl.join(',') : '',
-            }).then(response => {
+              this.configUrl.edit,{
+                ...param,
+                image: param.image ? param.image.join(','):'',
+              }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.loading = false
               this.open = false;
               this.$emit('refresh')
-            }).catch(() => {
+            }).catch(()=>{
               this.$message.error("修改失败!!!");
               this.loading = false
             })
           } else {
-            addTableApi(this.configUrl.edit, {
-              ...this.form,
-              imgUrl: this.form.imgUrl ? this.form.imgUrl.join(',') : '',
-            }).then(response => {
+            addTableApi(this.configUrl.edit,{
+                ...param,
+                image: param.image ? param.image.join(','):'',
+              }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.loading = false
               this.open = false;
               this.$emit('refresh')
-            }).catch(() => {
+            }).catch(()=>{
               this.$message.error("新增失败!!!");
               this.loading = false
             })
           }
-        } else {
-          console.log("fsdfsd===", valid, object)
-          if (object && JSON.stringify(object) != '{}') {
+        }else {
+          console.log("fsdfsd===",valid,object)
+          if(object&&JSON.stringify(object)!='{}') {
             let srt = ''
-            for (let key in object) {
-              if (object.hasOwnProperty(key)) {
+            for(let key in object) {
+              if(object.hasOwnProperty(key)) {
                 srt = srt + `[${object[key][0].message}],`
               }
             }
             this.$message.error(srt);
           }
-
+          
         }
       });
     },
@@ -293,7 +323,7 @@ export default {
      * @returns {any}
      */
     reset() {
-      if (this.$refs["form"]) {
+      if(this.$refs["form"]) {
         this.$refs["form"].clearValidate();
       }
     },
@@ -310,46 +340,18 @@ export default {
     handleClick() {
 
     },
-
-    /**    */
-    radioInput(key, value) {
-      console.log('key,value===', key, value)
-      if (value == -2) {
-        this.rules[key][0].required = true
-      } else {
-        this.rules[key][0].required = false
-      }
-    },
-    /**  使用有效期   */
-    radioInputs(value) {
-      if (value == 1) {
-        this.rules.useExpireDateDay[0].required = false
-        this.rules.useExpireDateTime[0].required = false
-        this.$refs.form.clearValidate('useExpireDateTime');
-        this.$refs.form.clearValidate('useExpireDateDay');
-      } else if (value == 2) {
-        this.rules.useExpireDateDay[0].required = true
-        this.rules.useExpireDateTime[0].required = false
-        this.$refs.form.clearValidate('useExpireDateTime');
-      } else if (value == 3) {
-        this.rules.useExpireDateDay[0].required = false
-        this.rules.useExpireDateTime[0].required = true
-        this.$refs.form.clearValidate('useExpireDateDay');
-      }
-    },
-
     /**  上传图片 单张  */
     handleAvatarSuccess(response, file, fileList) {
-      console.log("res, file", response, file, fileList)
+      console.log("res, file",response, file, fileList)
       this.actionUrlLoading = false
-      if (response.code == 200) {
-        this.form.imgUrl.push(response.data.url)
+      if(response.code == 200) {
+        this.form.imag.push(response.data.url)
       }
     },
     beforeAvatarUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      let testmsg = file.name.substring(file.name.lastIndexOf('.') + 1)
-      let typeList = ['png', 'jepg', 'jpg']
+      const isLt2M = file.size / 1024 / 1024 <= 1;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
         this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
@@ -359,14 +361,14 @@ export default {
       }
       return isJPG && isLt2M;
     },
-    handleAvatarProgress() {
+    handleAvatarProgress(){
       this.actionUrlLoading = true
     },
     handleAvatarError() {
       this.actionUrlLoading = false
     },
     handleRemove(index) {
-      this.form.imgUrl.splice(index, 1)
+      this.form.imag.splice(index,1)
     },
   },
 };
@@ -379,18 +381,15 @@ export default {
   min-height: 50vh;
   max-height: 65vh;
   overflow-y: auto;
-
   >div {
     width: 100%;
     min-height: 50vh;
   }
-
   .form-title {
     padding: 0 0 10px 0;
-
     span {
       display: flex;
-      color: rgba(65, 80, 88, 1);
+      color: rgba(65,80,88,1);
       font-size: 16px;
       font-family: SourceHanSansSC;
       font-weight: 700;
@@ -398,53 +397,44 @@ export default {
       border-left: 4px solid rgb(22, 132, 252);
       padding-left: 10px;
     }
-
+    
   }
-
   ::v-deep .ql-editor {
     height: 400px;
   }
-
   .upload-btn {
     width: 100px;
     height: 100px;
     background-color: #fbfdff;
     border: dashed 1px #c0ccda;
     border-radius: 5px;
-
     i {
       font-size: 30px;
       margin-top: 20px;
     }
-
     &-text {
       margin-top: -10px;
     }
   }
-
   .avatar {
     cursor: pointer;
   }
 }
-
-.el-table {
+.el-table{
   .upload-btn {
     width: 100px;
     height: 100px;
     background-color: #fbfdff;
     border: dashed 1px #c0ccda;
     border-radius: 5px;
-
     i {
       font-size: 30px;
       margin-top: 20px;
     }
-
     &-text {
       margin-top: -10px;
     }
   }
-
   .avatar {
     cursor: pointer;
   }
@@ -456,19 +446,15 @@ export default {
 
 ::v-deep .area-wrap-city.el-cascader {
   line-height: normal;
-
   .el-input {
     cursor: pointer;
     width: 100% !important;
     height: 28px !important;
-
     .el-input__inner {
       display: none !important;
     }
-
     span.el-input__suffix {
       position: inherit !important;
-
       i.el-input__icon {
         line-height: inherit;
         margin-left: 5px;
@@ -477,7 +463,6 @@ export default {
 
     .el-input__wrapper {
       box-shadow: none;
-
       input {
         display: none;
       }
@@ -500,31 +485,28 @@ export default {
 }
 
 ::v-deep .avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-::v-deep .avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
-::v-deep .avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-  text-align: center;
-}
-
-::v-deep .avatar {
-  width: 100px;
-  height: 100px;
-  display: block;
-}
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
 </style>
 <style>
 .custom-class-box {

+ 493 - 0
src/views/tourism/marketingActivities/model/selectCouponManagement.vue

@@ -0,0 +1,493 @@
+<template>
+    <div class="select-more-box">
+        
+        <div class="select-more-item">
+            <div class="c_left_tag" v-if="modalDetails.length>0">
+                <el-tag class="tag" size="closable" v-for="(item, index) in modalDetails" :key="index"
+                    @close="handleCloseCopy(item)" closable>
+                    {{ item.name }}
+                    </el-tag>
+            </div>
+            <span style="color: #c0c0c0;" v-else>请点击添加,选择会员号</span>
+            <div class="select-more-tool" v-if="isAdd">
+                <span>目前已选择:{{ modalDetails.length }}个</span>
+                <div class="select-more-but-add" @click="dialogVisible = true"><span>添加</span><span>+</span></div>
+                <div class="select-more-but-clear" @click="clearModalDetails"><span>清除已选</span></div>
+            </div>
+        </div>
+        <el-dialog 
+        append-to-body 
+        :title="title" 
+        :visible.sync="dialogVisible" 
+        @open="dialogOpen" 
+        @close="dialogClose"
+        :close-on-click-modal="false"
+        :destroy-on-close="true" 
+        width="900px" 
+        class="information-dialog"
+        custom-class="template-con-dialog" top="auto">
+            <div class="form-con" v-loading="loading">
+                <div class="form_content">
+                    <!-- left -->
+                    <div class="c_left">
+                        <div class="c_left_btn">
+                            <div>已选成员</div>
+                            <el-button type="text" @click="clearUser">清空</el-button>
+                        </div>
+                        <div class="c_left_tag">
+                            <el-tag class="tag" size="closable" v-for="(item, index) in nameList" :key="index"
+                                @close="handleClose(item)" closable>
+                                {{ item.name }}
+                            </el-tag>
+                        </div>
+                    </div>
+                    <!-- right -->
+                    <div class="c_right">
+                        <div class="c_input">
+                            <el-input size="mini" prefix-icon="el-icon-search" v-model="userValue" placeholder="输入搜索"></el-input>
+                            <el-button style="margin-left: 10px;" size="mini" @click="searchFun(false)">
+                                重置
+                            </el-button>
+                            <el-button size="mini" @click="searchFun(true)" type="primary">
+                                搜索
+                            </el-button>
+                        </div>
+                        <div class="c_checkbox" v-loading="listLoading">
+                            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+                                @change="handleCheckAllChange">全选当前页</el-checkbox>
+                           <div style="margin: 15px 0;"></div>
+                            <div class="c_checkbox_item" v-for="(item, index) in dataList" :key="index">
+                                <el-checkbox 
+                                class="checkBox_item" 
+                                v-model="item.checked"
+                                @change="(val)=>changeCheckbox(item,index,val)"
+                                    :key="index">{{
+                                        item.name
+                                    }}</el-checkbox>
+                            </div>
+                            
+                        </div>
+                        <div class="c_pagination">
+                            <el-pagination
+                            v-if="!listLoading"
+                            small
+                            background
+                            layout="total, prev, pager, next"
+                            :page-sizes="page.pageSizes"
+                            :page-size="page.pageSize"
+                            :total="page.total"
+                            :current-page="page.pageNum"
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            >
+                            </el-pagination>
+                        </div>
+                    </div>
+                </div>
+    
+                <div class="drawer-footer">
+                    <el-button @click="dialogVisible = false">
+                        取消
+                    </el-button>
+                    <el-button @click="submitForm()" type="primary">
+                        确定
+                    </el-button>
+                </div>
+            </div>
+        </el-dialog>
+    </div>
+    
+</template>
+  
+<script>
+import { 
+    listTableApi, 
+  } from "@/api/CURD";
+export default {
+    props: {
+        title: {
+            type: String,
+            default: '新增',
+        },
+        value: {
+            type: Array,
+            default: ()=>{
+                return []
+            },
+        },
+        idKey: {
+            type: String,
+            default: 'id',
+        },
+        nameKey: {
+            type: String,
+            default: 'couponName',
+        },
+        isAdd: {
+            type: Boolean,
+            default: true,
+        },
+        selectKey: {
+            type: String,
+            default: 'couponName',
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false, //弹窗选择
+            userValue: '', //人员搜索
+            dataList: [], //数据列表集合
+            nameList: [],//已选择人员
+            checkAll: false,
+            checkedUsers: [], // 选中的
+            isIndeterminate: false,
+            modalDetails: [],
+            loading: false,// 
+            page: {
+                pageSizes: [100, 200, 300, 400],
+                pageSize: 10,
+                pageNum: 1,
+                total: 0,
+            },
+            configUrl: {
+                list: '/merchant/merchantCouponInfo/pageList', // 列表地址
+            },
+            listLoading: false,
+        }
+    },
+    watch: {
+        value: {
+            handler(newValue){
+                console.log("dfsdsfsdf====",this.value)
+                if(this.value) {
+                    this.modalDetails = JSON.parse(JSON.stringify(this.value))
+                }else {
+                    this.modalDetails = []
+                }
+            },
+            immediate: true
+        }
+    },
+    methods: {
+        // 弹窗组件显示事件
+        async dialogOpen() {
+            this.loading = true
+            this.listLoading = false
+            this.userValue = ''
+            this.$set(this.page,'pageNum',1)
+            if (this.modalDetails.length) {
+                this.modalDetails.forEach((item) => {
+                    this.checkedUsers.push(item.id)
+                })
+                this.nameList = this.modalDetails//已选择人员
+                this.checkAll = false
+                this.isIndeterminate = false
+                this.userValue = '' //人员搜索
+            } else {
+                this.nameList = []//已选择人员
+                this.checkAll = false
+                this.checkedUsers = [] // 选中的
+                this.isIndeterminate = false
+                this.userValue = '' //人员搜索
+            }
+            await this.listUser()
+            this.loading = false
+        },
+        /**  搜索   */
+        searchFun(type) {
+            this.listLoading = true
+            if(!type) {
+                this.userValue = ''
+            }
+            this.listUser()
+        },
+        // 查询支部人员集合
+        async listUser() {
+            try {
+                this.dataList = []
+                let res = await listTableApi(this.configUrl.list,{
+                    [this.selectKey]: this.userValue,
+                    pageNum: this.page.pageNum,
+                    pageSize: this.page.pageSize
+                })
+                if (res.code == 200) {
+                    let list = []
+                    let listId = []
+                    this.nameList.forEach((item1,index1)=>{
+                        listId.push(item1.id)
+                    })
+                    res.data.rows.forEach((item,index)=>{
+                        list.push({
+                            ...item,
+                            id: item[this.idKey],
+                            name: item[this.nameKey],
+                            checked: listId.includes(item[this.idKey])
+                        })
+                    })
+                    this.dataList = list
+                    this.$set(this.page,'total',res.data.total)
+                } else {
+                    this.$message({
+                        type: 'error',
+                        message: res.msg
+                    });
+                }
+                this.checkedCurrentPageAll()
+                this.listLoading = false
+            } catch (error) {
+                this.checkedCurrentPageAll()
+                this.loading = false
+                this.listLoading = false
+                this.dialogVisible = false
+            }
+        },
+        // 清空按钮
+        clearUser() {
+            this.handleCheckAllChange(false)
+            this.isIndeterminate = false;
+            this.checkAll = false
+        },
+        // 清除全部
+        clearModalDetails() {
+            this.$emit('input', [])
+            this.$emit('submitForm')
+        },
+        // 单项删除已选按钮 (外部)
+        handleCloseCopy(item) {
+            let arr = this.modalDetails.filter((item1) => {
+                return item.id != item1.id
+            })
+            this.$emit('input', arr)
+            this.$emit('submitForm')
+        },
+        // 单项删除已选按钮 (备选)
+        handleClose(item) {
+            let arr = this.nameList.filter((item1) => {
+                return item.id != item1.id
+            })
+            let listId = []
+            arr.forEach((item,index) => {
+                listId.push(item.id)
+            })
+            let list = JSON.parse(JSON.stringify(this.dataList))
+            list.forEach((item,index) => {
+                list[index].checked = listId.includes(item.id)
+            })
+            this.nameList = arr
+            this.dataList = list
+            this.checkedCurrentPageAll()
+        },
+        // 全选当前页按钮
+        handleCheckAllChange(val) {
+            let list = JSON.parse(JSON.stringify(this.dataList))
+            let listId = []
+            list.forEach((item,index) => {
+                list[index].checked = val
+                listId.push(item.id)
+            })
+            let listExist = this.nameList.filter((item,index)=>{
+                return !listId.includes(item.id)
+            })
+            list.forEach((item,index) => {
+                if(item.checked) {
+                    listExist.push({
+                        ...item
+                    })
+                } 
+            })
+            this.dataList = list
+            this.nameList = listExist
+            this.isIndeterminate = false;
+        },
+        /** 检测当前页是否全选  */
+        checkedCurrentPageAll() {
+            let length = 0
+            let list = JSON.parse(JSON.stringify(this.dataList))
+            list.forEach((item,index) => {
+                if(item.checked) {
+                    length++
+                }
+            })
+            this.checkAll = (length == list.length)&& length != 0
+        },
+        // 弹窗组件关闭事件
+        dialogClose() {
+        },
+        // 提交表单事件
+        submitForm() {
+            this.$emit('input', JSON.parse(JSON.stringify(this.nameList)))
+            this.$emit('submitForm')
+            this.dialogVisible = false
+        },
+        /** 调整每页选择条数  */
+        handleSizeChange(val) {
+        },
+        /** 点击页码  */
+        handleCurrentChange(val) {
+            this.listLoading = true
+            this.listUser()
+        },
+        /** 选择列表  */
+        changeCheckbox(item,index,val) {
+            if(val){
+                this.nameList.push({
+                    ...item
+                })
+            }else {
+                let i = -1
+                this.nameList.forEach((item1,index)=>{
+                    if(item1.id == item.id) {
+                        i = index
+                    }
+                })
+                if(i!=-1) {
+                    this.nameList.splice(i,1)
+                }
+            }
+            this.checkedCurrentPageAll()
+        }
+ 
+    },
+}
+</script>
+  
+<style lang="scss" scoped>
+.is-error {
+    .select-more-item {
+        border-color: #f56c6c !important;
+    }
+}
+.select-more-tool {
+    position: absolute;
+    bottom: 5px;
+    right: 5px;
+    display: flex;
+    .select-more-but-add {
+        width: 80px;
+        height: 36px;
+        box-sizing: border-box;
+        color: #fff;
+        background-color: #409eff;
+        border-color: #409eff;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border-radius: 5px;
+        cursor: pointer;
+        margin-left: 10px;
+        
+    }
+    .select-more-but-clear {
+        width: 80px;
+        height: 36px;
+        box-sizing: border-box;
+        color: #fff;
+        background-color: #f56c6c;
+        border-color: #f56c6c;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border-radius: 5px;
+        cursor: pointer;
+        margin-left: 10px;
+    }
+}
+
+.select-more-item {
+    width: 100%;
+    height: 300px;
+    border: 1px solid #C0C4CC;
+    overflow: hidden;
+    overflow-y: auto;
+    border-radius: 5px;
+    margin-top: 5px;
+    position: relative;
+    padding: 10px;
+    .c_left_tag {
+        display: flex;
+        flex-wrap: wrap;
+    }
+ 
+            .tag {
+                margin-left: 0 !important;
+                margin-right: 10px;
+                margin-bottom: 10px;
+            }
+}
+.form-con {
+    padding-top: 10px;
+    margin: auto;
+ 
+    .form_content {
+        height: 500px;
+        display: flex;
+ 
+        .c_left {
+            width: 50%;
+            border-right: 1px solid #EBEEF5;
+            padding: 0 10px;
+ 
+            .c_left_btn {
+                height: 32px;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+            }
+ 
+            .c_left_tag {
+                margin-top: 10px;
+                display: flex;
+                flex-wrap: wrap;
+            }
+ 
+            .tag {
+                margin-left: 0 !important;
+                margin-right: 10px;
+                margin-bottom: 10px;
+            }
+ 
+        }
+ 
+        .c_right {
+            width: 50%;
+            height: 100%;
+            padding: 0 10px;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            box-sizing: border-box;
+            .c_input {
+                height: 32px;
+                flex-shrink: 0;
+                display: flex;
+                align-items: center;
+            }
+            .c_checkbox {
+                margin-top: 10px;
+                height: 100%;
+                .c_checkbox_item {
+                    width: 100%;
+                    margin-bottom: 5px;
+                }
+            }
+ 
+            .checkBox {
+                display: flex;
+                flex-direction: column;
+                
+                .checkBox_item {
+                    height: 30px;
+                    display: flex;
+                    align-items: center;
+                }
+            }
+            .c_pagination {
+                height: 32px;
+                flex-shrink: 0;
+                display: flex;
+                justify-content: center;
+            }
+        }
+    }
+}
+</style>

+ 1 - 1
src/views/tourism/marketingActivities/model/selectMembershipLevel.vue

@@ -202,7 +202,7 @@ export default {
             try {
                 this.dataList = []
                 let res = await listTableApi(this.configUrl.list,{
-                    realName: this.userValue,
+                    name: this.userValue,
                     pageNum: this.page.pageNum,
                     pageSize: this.page.pageSize
                 })

+ 1 - 1
src/views/tourism/marketingActivities/model/selectTicketOrders.vue

@@ -43,7 +43,7 @@
                     </div>
                     <!-- right -->
                     <div class="c_right">
-                        <div class="c_input">
+                        <div class="c_input" v-if="false">
                             <el-input size="mini" prefix-icon="el-icon-search" v-model="userValue" placeholder="输入搜索"></el-input>
                             <el-button style="margin-left: 10px;" size="mini" @click="searchFun(false)">
                                 重置