提交一下

1

src/constant/index.js

@@ -47,8 +47,8 @@ export const courseType = {
 }
 
 export const boolOptions = {
-  false: '否',
   true: '是',
+  false: '否',
 }
 
 export const saleType = {

src/views/resetTeaming/api.js

@@ -114,12 +114,18 @@ export const getMemberFee = data => request2({
   requestType: 'form'
 })
 
-// 获取虽有得会员等级
+// 获取所有得会员等级
 export const getAllmemberRank = (data) => request2({
   url: '/api-web/memberRankSetting/findAll',
   method: 'get',
   params: data
 })
+// 获取会员是否自动生效
+export const getAutoActivationFlag = (data) => request2({
+  url: '/api-web/tenantConfig/autoActivationFlag',
+  method: 'get',
+  params: data
+})
 
 // 查询未激活团练宝用户
 export const queryInactive = (data) => request2({

src/views/resetTeaming/components/payInfoDetail.vue

@@ -162,6 +162,7 @@
                 @priceChange="priceChange"
                 :rulesForm="rulesForm"
                 :organId="organId"
+                :showAutoActivationFlag="showAutoActivationFlag"
                 :form="form"
                 v-if="member"
               />
@@ -329,6 +330,7 @@ import {
   getAllmemberRank,
   musicGroupcreateCalender,
   musicGroupresetCalender,
+  getAutoActivationFlag
 } from "../api";
 import {
   getMusicGroupPaymentCalenderDetail,
@@ -358,6 +360,7 @@ export default {
             actualAmount: "",
             memberRankSettingId: "",
             optionalFlag: null,
+            autoActivationFlag:false,
           },
         ],
         leBaoList: [{}],
@@ -401,6 +404,7 @@ export default {
       preViewData: {},
       tenantId: null,
       isField: false,
+      showAutoActivationFlag:false
     };
   },
   mounted() {
@@ -455,6 +459,7 @@ export default {
       await this.getCharges(); // 续费的选择缴费类型
       await this.formatCourse(); // 临时加课的类型选择以及价格
       await this.getMemberList(); // 获取会员(团练保信息)
+
       await this.getLeBao(); // 获取乐保
       await this.getActive(); // 获取活动
       await this.getMemberRules();
@@ -576,6 +581,9 @@ export default {
       try {
         const res = await getAllmemberRank({ isDefault: 0 });
         this.memberRankList = res.data;
+        // 获取是否展示会员是否自动生效
+        const memberRes = await getAutoActivationFlag()
+        this.showAutoActivationFlag = memberRes.data
       } catch (e) {
         console.log(e);
       }

src/views/resetTeaming/modals/payMember.vue

@@ -69,7 +69,38 @@
           </el-form-item>
         </template>
       </el-table-column>
-
+            <el-table-column
+        label="是否自动开启"
+        prop="autoActivationFlag"
+        key="autoActivationFlag"
+        width="170px"
+      >
+        <template slot-scope="scope">
+          <el-form-item
+            :prop="'memberList.' + scope.$index + '.autoActivationFlag'"
+            :rules="{
+              required: true,
+              message: '请选择是否自动开启',
+              trigger: 'change',
+            }"
+          >
+            <el-select
+              style="width: 90% !important"
+              v-model="form.memberList[scope.$index].autoActivationFlag"
+              placeholder="请选择是否自动开启"
+              :disabled="!form.memberList[scope.$index].memberRankSettingId"
+              clearable
+            >
+              <el-option
+                v-for="(item, index) in boolOptionsOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
       <el-table-column label="会员周期" prop="num" key="num" width="170px">
         <template slot-scope="scope">
           <el-form-item
@@ -233,7 +264,7 @@ import { objectToOptions } from "@/utils";
 import { memberEnumList } from "@/utils/searchArray";
 import { getMemberFee } from "../api";
 export default {
-  props: ["form", "memberRankList", "organId", "rulesForm"],
+  props: ["form", "memberRankList", "organId", "rulesForm",'showAutoActivationFlag'],
   data() {
     return {
       charges: [],

vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.251:8000' // 何国威
-// let target = 'http://192.168.3.20:8000' //邹璇
+let target = 'http://192.168.3.20:8000' //邹璇
 // let target = 'http://192.168.3.119:8000' //勇哥
 // let target = 'http://dev.dayaedu.com' // 开发环境
-let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'https://test.dayaedu.com' //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**