lex-xin 4 роки тому
батько
коміт
c1a7bde414

+ 4 - 2
src/views/categroyManager/insideSetting/branchActive.vue

@@ -10,6 +10,8 @@
       <save-form :inline="true"
                ref="searchForm"
                @submit.native.prevent
+               @submit="onSearch"
+               @reset="onReset"
                :model.sync="searchForm">
         <el-form-item prop="search">
           <el-input type="text"
@@ -50,8 +52,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSearch" type="primary">搜索</el-button>
-          <el-button @click="onReset" type="danger">重置</el-button>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
         </el-form-item>
       </save-form>
       <!-- 列表 -->

+ 34 - 23
src/views/categroyManager/vipActiveList.vue

@@ -6,17 +6,13 @@
     </h2>
 
     <div class="m-core">
-      <div
-        class="newBand"
-        v-permission="'/vipNewActive'"
-        @click="gotoNewActive"
-      >
-        新建
-      </div>
-      <el-form
+      <el-button type="primary" style="margin-bottom: 20px" v-permission="'/vipNewActive'" @click="gotoNewActive">新建</el-button>
+      <save-form
         :inline="true"
         class="searchForm"
         ref="searchForm"
+        @submit="search"
+        @reset="onReset"
         :model="searchForm"
       >
         <el-form-item prop="search">
@@ -56,12 +52,12 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search" type="danger">搜索</el-button>
+          <el-button native-type="submit" type="danger">搜索</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onReset">重置</el-button>
+          <el-button type="primary" native-type="reset">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div class="tableWrap">
         <el-table
           :data="tableList"
@@ -178,8 +174,8 @@
       </div>
     </div>
     <el-dialog
-      title="活动详情"
-      width="60%"
+      title="修改VIP活动"
+      width="650px"
       :before-close="closeVipform"
       :visible.sync="dialogVisible"
     >
@@ -191,13 +187,13 @@
           :rules="resetFormRules"
           class="vipform"
         >
-          <el-form-item label="活动名称" prop="name">
+          <el-form-item label="活动名称" label-width="120px" prop="name">
             <el-input
               style="width: 400px"
               v-model.trim="resetForm.name"
             ></el-input>
           </el-form-item>
-          <el-form-item label="适用分部" prop="organ">
+          <el-form-item label="适用分部" label-width="120px" prop="organ">
             <el-select
               v-model.trim="resetForm.organ"
               filterable
@@ -214,7 +210,7 @@
             </el-select>
             <!-- <el-button @click="onCheckAllBranch">适用所有分部</el-button> -->
           </el-form-item>
-          <el-form-item label="课程形式" prop="stauts">
+          <el-form-item label="课程形式" label-width="120px" prop="stauts">
             <el-select
               v-model.trim="resetForm.stauts"
               filterable
@@ -230,7 +226,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="活动描述" prop="desc">
+          <el-form-item label="活动描述" label-width="120px" prop="desc">
             <el-input
               type="textarea"
               v-model.trim="resetForm.desc"
@@ -239,9 +235,10 @@
               placeholder="请输入活动说明"
             ></el-input>
           </el-form-item>
-          <el-form-item label="活动时间" prop="activeTime">
+          <el-form-item label="活动时间" label-width="120px" prop="activeTime">
             <el-date-picker
               v-model.trim="resetForm.activeTime"
+              style="width: 100%"
               type="datetimerange"
               range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
@@ -252,9 +249,10 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="课程时间" prop="courseTime">
+          <el-form-item label="课程时间" label-width="120px" prop="courseTime">
             <el-date-picker
               v-model.trim="resetForm.courseTime"
+              style="width: 100%"
               type="datetimerange"
               :picker-options="{
                 firstDayOfWeek: 1,
@@ -266,10 +264,16 @@
             ></el-date-picker>
           </el-form-item>
         </el-form>
+        <el-alert
+          title="活动适用范围&结算标准"
+          type="info"
+          :closable="false"
+          class="alert">
+        </el-alert>
         <div class="activeRange">
-          <div class="left">
+          <!-- <div class="left">
             <p>活动适用范围&结算标准:</p>
-          </div>
+          </div> -->
           <div class="right">
             <div class="chioseWrap">
               <el-checkbox label="线上课" v-model.trim="online"></el-checkbox>
@@ -362,10 +366,17 @@
             </div>
           </div>
         </div>
+        <el-alert
+          title="活动类型"
+          type="info"
+          :closable="false"
+          style="margin-bottom: 15px;"
+          class="alert">
+        </el-alert>
         <div class="activeType">
-          <div class="left">
+          <!-- <div class="left">
             <p style="width: 60px">活动类型</p>
-          </div>
+          </div> -->
           <div class="right">
             <div>
               <div

+ 2 - 1
src/views/categroyManager/vipChargeSeting.vue

@@ -7,6 +7,7 @@
       <save-form :inline="true"
                ref="searchForm"
                class="searchForm"
+               @submit="search"
                :model.sync="searchForm">
         <el-form-item prop='organId'>
           <el-select class='multiple'
@@ -21,7 +22,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search"
+          <el-button native-type="submit"
                      type="primary">搜索</el-button>
         </el-form-item>
       </save-form>