|
@@ -2,9 +2,12 @@
|
|
|
<div class="m-container">
|
|
|
<h2>
|
|
|
<div class="squrt"></div>
|
|
|
- 云教练收费标准
|
|
|
+ 云练习收费标准
|
|
|
</h2>
|
|
|
- <div class="m-core" v-if="(tableList.length>0 || rules.page>1)&&contextFlag">
|
|
|
+ <div
|
|
|
+ class="m-core"
|
|
|
+ v-if="(tableList.length > 0 || rules.page > 1) && contextFlag"
|
|
|
+ >
|
|
|
<save-form
|
|
|
:inline="true"
|
|
|
class="searchForm"
|
|
@@ -19,7 +22,7 @@
|
|
|
<el-input
|
|
|
v-model.trim="searchForm.search"
|
|
|
clearable
|
|
|
- placeholder="云教练名称"
|
|
|
+ placeholder="云练习名称"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="organId">
|
|
@@ -63,7 +66,7 @@
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
prop="rankName"
|
|
|
- label="云教练名称"
|
|
|
+ label="云练习名称"
|
|
|
width="90px"
|
|
|
></el-table-column>
|
|
|
<el-table-column align="left" prop="type" label="月收费">
|
|
@@ -83,7 +86,10 @@
|
|
|
}}
|
|
|
</p>
|
|
|
<div>经营报表</div>
|
|
|
- <div>确认收入: {{ scope.row.memberFeeSetting.incomeMonthFee | hasMoneyFormat }}</div>
|
|
|
+ <div>
|
|
|
+ 确认收入:
|
|
|
+ {{ scope.row.memberFeeSetting.incomeMonthFee | hasMoneyFormat }}
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -112,7 +118,12 @@
|
|
|
</p>
|
|
|
|
|
|
<div>经营报表</div>
|
|
|
- <div>确认收入: {{ scope.row.memberFeeSetting.incomeQuarterlyFee | hasMoneyFormat }}</div>
|
|
|
+ <div>
|
|
|
+ 确认收入:
|
|
|
+ {{
|
|
|
+ scope.row.memberFeeSetting.incomeQuarterlyFee | hasMoneyFormat
|
|
|
+ }}
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -140,7 +151,12 @@
|
|
|
}}
|
|
|
</p>
|
|
|
<div>经营报表</div>
|
|
|
- <div>确认收入: {{ scope.row.memberFeeSetting.incomeHalfYearFee | hasMoneyFormat }}</div>
|
|
|
+ <div>
|
|
|
+ 确认收入:
|
|
|
+ {{
|
|
|
+ scope.row.memberFeeSetting.incomeHalfYearFee | hasMoneyFormat
|
|
|
+ }}
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -165,7 +181,10 @@
|
|
|
}}
|
|
|
</p>
|
|
|
<div>经营报表</div>
|
|
|
- <div>确认收入: {{ scope.row.memberFeeSetting.incomeYearFee | hasMoneyFormat }}</div>
|
|
|
+ <div>
|
|
|
+ 确认收入:
|
|
|
+ {{ scope.row.memberFeeSetting.incomeYearFee | hasMoneyFormat }}
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -207,7 +226,13 @@
|
|
|
@pagination="getList"
|
|
|
/>
|
|
|
</div>
|
|
|
- <emptyPage @submit="addFee" title='云教练收费标准' btnTitle='新建云教练收费标准' :context='context' v-if="!(tableList.length>0 || rules.page>1)&&contextFlag" />
|
|
|
+ <emptyPage
|
|
|
+ @submit="addFee"
|
|
|
+ title="云练习收费标准"
|
|
|
+ btnTitle="新建云练习收费标准"
|
|
|
+ :context="context"
|
|
|
+ v-if="!(tableList.length > 0 || rules.page > 1) && contextFlag"
|
|
|
+ />
|
|
|
<el-dialog
|
|
|
class="dialog"
|
|
|
:title="title"
|
|
@@ -244,9 +269,9 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
- label="云教练名称"
|
|
|
+ label="云练习名称"
|
|
|
prop="memberRankSettingId"
|
|
|
- :rules="[{ required: true, message: '请选择云教练' }]"
|
|
|
+ :rules="[{ required: true, message: '请选择云练习' }]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
|
<el-select
|
|
@@ -255,7 +280,7 @@
|
|
|
filterable
|
|
|
v-model.trim="form.memberRankSettingId"
|
|
|
clearable
|
|
|
- placeholder="请选择云教练"
|
|
|
+ placeholder="请选择云练习"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in remberList"
|
|
@@ -277,9 +302,9 @@
|
|
|
{ required: true, message: '请输入月收费团购价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateMonth, trigger: 'blur' },
|
|
|
+ { validator: validateMonth, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
:placeholder="monthRule"
|
|
@@ -289,7 +314,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="monthRule"
|
|
|
>
|
|
|
- <template slot="append">元/月</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/月</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -299,18 +326,20 @@
|
|
|
{ required: true, message: '请输入月收费零售价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateMonth, trigger: 'blur' },
|
|
|
+ { validator: validateMonth, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
|
<el-input
|
|
|
v-model="form.currentMonthFee"
|
|
|
:disabled="addDisabled"
|
|
|
- :placeholder="monthRule"
|
|
|
+ :placeholder="monthRule"
|
|
|
>
|
|
|
- <template slot="append">元/月</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/月</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -320,9 +349,9 @@
|
|
|
{ required: true, message: '请输入月收费原价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateMonth, trigger: 'blur' },
|
|
|
+ { validator: validateMonth, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -331,7 +360,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="monthRule"
|
|
|
>
|
|
|
- <template slot="append">元/月</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/月</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -341,9 +372,9 @@
|
|
|
{ required: true, message: '请输入月度经营报表确认收入' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateMonthIncome, trigger: 'blur' },
|
|
|
+ { validator: validateMonthIncome, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -352,7 +383,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="monthRuleIncome"
|
|
|
>
|
|
|
- <template slot="append">元</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
@@ -367,9 +400,9 @@
|
|
|
{ required: true, message: '请输入季度收费团购价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateQuarterly, trigger: 'blur' },
|
|
|
+ { validator: validateQuarterly, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -378,7 +411,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="quarterlyRule"
|
|
|
>
|
|
|
- <template slot="append">元/季度</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/季度</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -388,19 +423,20 @@
|
|
|
{ required: true, message: '请输入季度收费零售价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateQuarterly, trigger: 'blur' },
|
|
|
+ { validator: validateQuarterly, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
-
|
|
|
>
|
|
|
<el-input
|
|
|
v-model="form.currentQuarterlyFee"
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="quarterlyRule"
|
|
|
>
|
|
|
- <template slot="append">元/季度</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/季度</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -410,9 +446,9 @@
|
|
|
{ required: true, message: '请输入季度收费原价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateQuarterly, trigger: 'blur' },
|
|
|
+ { validator: validateQuarterly, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -421,7 +457,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="quarterlyRule"
|
|
|
>
|
|
|
- <template slot="append">元/季度</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/季度</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -431,9 +469,9 @@
|
|
|
{ required: true, message: '请输入季度经营报表确认收入' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateQuarterlyIncome, trigger: 'blur' },
|
|
|
+ { validator: validateQuarterlyIncome, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -442,7 +480,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="quarterlyRuleIncome"
|
|
|
>
|
|
|
- <template slot="append">元</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
@@ -457,9 +497,9 @@
|
|
|
{ required: true, message: '请输入半年收费团购价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateHalfYear, trigger: 'blur' },
|
|
|
+ { validator: validateHalfYear, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -468,7 +508,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="halfYearRule"
|
|
|
>
|
|
|
- <template slot="append">元/半年</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/半年</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -478,9 +520,9 @@
|
|
|
{ required: true, message: '请输入半年收费零售价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateHalfYear, trigger: 'blur' },
|
|
|
+ { validator: validateHalfYear, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -489,7 +531,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="halfYearRule"
|
|
|
>
|
|
|
- <template slot="append">元/半年</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/半年</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -499,9 +543,9 @@
|
|
|
{ required: true, message: '请输入半年收费原价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateHalfYear, trigger: 'blur' },
|
|
|
+ { validator: validateHalfYear, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -510,7 +554,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="halfYearRule"
|
|
|
>
|
|
|
- <template slot="append">元/半年</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/半年</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -520,9 +566,9 @@
|
|
|
{ required: true, message: '请输入半年经营报表确认收入' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateHalfYearIncome, trigger: 'blur' },
|
|
|
+ { validator: validateHalfYearIncome, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -531,13 +577,15 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="halfYearRuleIncome"
|
|
|
>
|
|
|
- <template slot="append">元</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
|
|
|
<div class="lineTitle">年度收费</div>
|
|
|
-
|
|
|
+
|
|
|
<div class="wrap">
|
|
|
<el-form-item
|
|
|
prop="groupPurchaseYearFee"
|
|
@@ -546,9 +594,9 @@
|
|
|
{ required: true, message: '请输入年收费团购价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateYear, trigger: 'blur' },
|
|
|
+ { validator: validateYear, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -557,7 +605,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="yearRule"
|
|
|
>
|
|
|
- <template slot="append">元/年</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/年</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -567,9 +617,9 @@
|
|
|
{ required: true, message: '请输入年收费零售价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateYear, trigger: 'blur' },
|
|
|
+ { validator: validateYear, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -578,7 +628,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="yearRule"
|
|
|
>
|
|
|
- <template slot="append">元/年</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/年</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -588,9 +640,9 @@
|
|
|
{ required: true, message: '请输入年收费原价' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateYear, trigger: 'blur' },
|
|
|
+ { validator: validateYear, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -599,7 +651,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="yearRule"
|
|
|
>
|
|
|
- <template slot="append">元/年</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/年</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
@@ -609,9 +663,9 @@
|
|
|
{ required: true, message: '请输入年度经营报表确认收入' },
|
|
|
{
|
|
|
pattern: /^[1-9][0-9]*$/,
|
|
|
- message: '请输入大于0的正整数',
|
|
|
+ message: '请输入大于0的正整数'
|
|
|
},
|
|
|
- { validator: validateYearIncome, trigger: 'blur' },
|
|
|
+ { validator: validateYearIncome, trigger: 'blur' }
|
|
|
]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
@@ -620,7 +674,9 @@
|
|
|
:disabled="addDisabled"
|
|
|
:placeholder="yearRuleIncome"
|
|
|
>
|
|
|
- <template slot="append">元</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
@@ -641,32 +697,32 @@ import {
|
|
|
addMemberOrganizationFeeMapper,
|
|
|
getmemberRankOrganizationFeeMapper,
|
|
|
getmemberOrganizationFeeMapperkDetail,
|
|
|
- resetMemberOrganizationFeeMapper,
|
|
|
+ resetMemberOrganizationFeeMapper
|
|
|
} from "./api";
|
|
|
import { sysConfigList } from "@/api/generalSettings";
|
|
|
import pagination from "@/components/Pagination/index";
|
|
|
-import emptyPage from '@/components/emptyPage'
|
|
|
+import emptyPage from "@/components/emptyPage";
|
|
|
// numeral(this.list.form[index].courseTotalMinuties * this.list.form[index].unitPrice).format('0,0.00')
|
|
|
export default {
|
|
|
- components: { pagination,emptyPage },
|
|
|
+ components: { pagination, emptyPage },
|
|
|
name: "memberFeeSet",
|
|
|
data() {
|
|
|
return {
|
|
|
searchForm: {
|
|
|
search: null,
|
|
|
- organId: null,
|
|
|
+ organId: null
|
|
|
},
|
|
|
rules: {
|
|
|
// 分页规则
|
|
|
limit: 10, // 限制显示条数
|
|
|
page: 1, // 当前页
|
|
|
total: 0, // 总条数
|
|
|
- page_size: [10, 20, 40, 50], // 选择限制显示条数
|
|
|
+ page_size: [10, 20, 40, 50] // 选择限制显示条数
|
|
|
},
|
|
|
tableList: [],
|
|
|
addDisabled: false,
|
|
|
title: "新增收费标准",
|
|
|
- pageType: 'create',
|
|
|
+ pageType: "create",
|
|
|
formLabelWidth: "120px",
|
|
|
form: {
|
|
|
currentDayFee: "",
|
|
@@ -684,10 +740,10 @@ export default {
|
|
|
groupPurchaseYearFee: "",
|
|
|
organId: "",
|
|
|
memberRankSettingId: "",
|
|
|
- incomeMonthFee: '', // 月经营报表
|
|
|
+ incomeMonthFee: "", // 月经营报表
|
|
|
incomeQuarterlyFee: "", // 季度经营报表
|
|
|
incomeHalfYearFee: "", // 半年经营报表
|
|
|
- incomeYearFee: "", // 年经营报表
|
|
|
+ incomeYearFee: "" // 年经营报表
|
|
|
},
|
|
|
branchStatus: false,
|
|
|
remberList: [],
|
|
@@ -699,10 +755,11 @@ export default {
|
|
|
minHalfYearFee: null,
|
|
|
maxHalfYearFee: null,
|
|
|
minYearFee: null,
|
|
|
- maxYearFee: null,
|
|
|
+ maxYearFee: null
|
|
|
},
|
|
|
- context:'云教练收费标准,可根据各分部的实际情况为分部制定不同的售价标准,设置完成后,各分部为学员创建云教练缴费时默认以此处设置的价格向学员收费。',
|
|
|
- contextFlag:false
|
|
|
+ context:
|
|
|
+ "云练习收费标准,可根据各分部的实际情况为分部制定不同的售价标准,设置完成后,各分部为学员创建云练习缴费时默认以此处设置的价格向学员收费。",
|
|
|
+ contextFlag: false
|
|
|
};
|
|
|
},
|
|
|
async mounted() {
|
|
@@ -712,8 +769,8 @@ export default {
|
|
|
const res = await getAllmemberRank();
|
|
|
this.remberList = res.data;
|
|
|
// 默认选中第一个
|
|
|
- if(this.pageType == 'create' && this.remberList.length > 0) {
|
|
|
- this.form.memberRankSettingId = this.remberList[0].id
|
|
|
+ if (this.pageType == "create" && this.remberList.length > 0) {
|
|
|
+ this.form.memberRankSettingId = this.remberList[0].id;
|
|
|
}
|
|
|
} catch {}
|
|
|
|
|
@@ -725,7 +782,7 @@ export default {
|
|
|
try {
|
|
|
const res = await sysConfigList({ group: "DEFAULT" });
|
|
|
const paramName = "cloud_price_range";
|
|
|
- res.data.forEach((item) => {
|
|
|
+ res.data.forEach(item => {
|
|
|
if (item.paramName == paramName) {
|
|
|
const itemValue = item.paranValue
|
|
|
? JSON.parse(item.paranValue)
|
|
@@ -757,7 +814,7 @@ export default {
|
|
|
const res = await getmemberRankOrganizationFeeMapper({
|
|
|
...this.searchForm,
|
|
|
rows: this.rules.limit,
|
|
|
- page: this.rules.page,
|
|
|
+ page: this.rules.page
|
|
|
});
|
|
|
this.contextFlag = true;
|
|
|
this.tableList = res.data.rows;
|
|
@@ -774,12 +831,12 @@ export default {
|
|
|
originalHalfYearFee: "",
|
|
|
originalMonthFee: "",
|
|
|
originalYearFee: "",
|
|
|
- incomeMonthFee: '', // 月经营报表
|
|
|
+ incomeMonthFee: "", // 月经营报表
|
|
|
incomeQuarterlyFee: "", // 季度经营报表
|
|
|
incomeHalfYearFee: "", // 半年经营报表
|
|
|
incomeYearFee: "", // 年经营报表
|
|
|
organId: "",
|
|
|
- memberRankSettingId: "",
|
|
|
+ memberRankSettingId: ""
|
|
|
}),
|
|
|
this.$refs[ruleForm].resetFields();
|
|
|
},
|
|
@@ -810,7 +867,7 @@ export default {
|
|
|
...obj,
|
|
|
organId: row.organId,
|
|
|
memberRankSettingId: row.memberRankSettingId,
|
|
|
- outId: row.id,
|
|
|
+ outId: row.id
|
|
|
};
|
|
|
this.branchStatus = true;
|
|
|
},
|
|
@@ -820,7 +877,7 @@ export default {
|
|
|
this.branchStatus = false;
|
|
|
return;
|
|
|
}
|
|
|
- this.$refs.ruleForm.validate(async (flag) => {
|
|
|
+ this.$refs.ruleForm.validate(async flag => {
|
|
|
if (flag) {
|
|
|
if (this.pageType == "update") {
|
|
|
try {
|
|
@@ -828,7 +885,7 @@ export default {
|
|
|
memberFeeSetting: { ...this.form },
|
|
|
organId: this.form.organId,
|
|
|
memberRankSettingId: this.form.memberRankSettingId,
|
|
|
- id: this.form.outId,
|
|
|
+ id: this.form.outId
|
|
|
});
|
|
|
this.$message.success("修改成功");
|
|
|
this.branchStatus = false;
|
|
@@ -841,7 +898,7 @@ export default {
|
|
|
const res = await addMemberOrganizationFeeMapper({
|
|
|
memberFeeSetting: { ...this.form },
|
|
|
organId: this.form.organId,
|
|
|
- memberRankSettingId: this.form.memberRankSettingId,
|
|
|
+ memberRankSettingId: this.form.memberRankSettingId
|
|
|
});
|
|
|
this.$message.success("新建成功");
|
|
|
this.branchStatus = false;
|
|
@@ -851,10 +908,12 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- validateMonthIncome(rule, value, callback){
|
|
|
+ validateMonthIncome(rule, value, callback) {
|
|
|
const one = Number(value);
|
|
|
const min = Number(this.rulesForm.minMonthFee);
|
|
|
- const max = this.form.groupPurchaseMonthFee ? Number(this.form.groupPurchaseMonthFee) : Number(this.rulesForm.maxMonthFee)
|
|
|
+ const max = this.form.groupPurchaseMonthFee
|
|
|
+ ? Number(this.form.groupPurchaseMonthFee)
|
|
|
+ : Number(this.rulesForm.maxMonthFee);
|
|
|
if (one >= min && one <= max) {
|
|
|
return callback();
|
|
|
}
|
|
@@ -867,12 +926,14 @@ export default {
|
|
|
if (one >= min && one <= max) {
|
|
|
return callback();
|
|
|
}
|
|
|
- return callback(new Error(`月度云教练定价应在${min}-${max}之间`));
|
|
|
+ return callback(new Error(`月度云练习定价应在${min}-${max}之间`));
|
|
|
},
|
|
|
validateQuarterlyIncome(rule, value, callback) {
|
|
|
const one = Number(value);
|
|
|
const min = Number(this.rulesForm.minQuarterlyFee);
|
|
|
- const max = this.form.groupPurchaseQuarterlyFee ? Number(this.form.groupPurchaseQuarterlyFee) : Number(this.rulesForm.maxQuarterlyFee);
|
|
|
+ const max = this.form.groupPurchaseQuarterlyFee
|
|
|
+ ? Number(this.form.groupPurchaseQuarterlyFee)
|
|
|
+ : Number(this.rulesForm.maxQuarterlyFee);
|
|
|
if (one >= min && one <= max) {
|
|
|
return callback();
|
|
|
}
|
|
@@ -885,12 +946,14 @@ export default {
|
|
|
if (one >= min && one <= max) {
|
|
|
return callback();
|
|
|
}
|
|
|
- return callback(new Error(`季度云教练定价应在${min}-${max}之间`));
|
|
|
+ return callback(new Error(`季度云练习定价应在${min}-${max}之间`));
|
|
|
},
|
|
|
validateHalfYearIncome(rule, value, callback) {
|
|
|
const one = Number(value);
|
|
|
const min = Number(this.rulesForm.minHalfYearFee);
|
|
|
- const max = this.form.groupPurchaseHalfYearFee ? Number(this.form.groupPurchaseHalfYearFee) : Number(this.rulesForm.maxHalfYearFee);
|
|
|
+ const max = this.form.groupPurchaseHalfYearFee
|
|
|
+ ? Number(this.form.groupPurchaseHalfYearFee)
|
|
|
+ : Number(this.rulesForm.maxHalfYearFee);
|
|
|
if (one >= min && one <= max) {
|
|
|
return callback();
|
|
|
}
|
|
@@ -903,12 +966,14 @@ export default {
|
|
|
if (one >= min && one <= max) {
|
|
|
return callback();
|
|
|
}
|
|
|
- return callback(new Error(`半年云教练定价应在${min}-${max}之间`));
|
|
|
+ return callback(new Error(`半年云练习定价应在${min}-${max}之间`));
|
|
|
},
|
|
|
validateYearIncome(rule, value, callback) {
|
|
|
const one = Number(value);
|
|
|
const min = Number(this.rulesForm.minYearFee);
|
|
|
- const max = this.form.groupPurchaseYearFee ? Number(this.form.groupPurchaseYearFee) : Number(this.rulesForm.maxYearFee);
|
|
|
+ const max = this.form.groupPurchaseYearFee
|
|
|
+ ? Number(this.form.groupPurchaseYearFee)
|
|
|
+ : Number(this.rulesForm.maxYearFee);
|
|
|
if (one >= min && one <= max) {
|
|
|
return callback();
|
|
|
}
|
|
@@ -921,42 +986,62 @@ export default {
|
|
|
if (one >= min && one <= max) {
|
|
|
return callback();
|
|
|
}
|
|
|
- return callback(new Error(`年度云教练定价应在${min}-${max}之间`));
|
|
|
- },
|
|
|
+ return callback(new Error(`年度云练习定价应在${min}-${max}之间`));
|
|
|
+ }
|
|
|
},
|
|
|
watch: {
|
|
|
branchStatus(val) {
|
|
|
if (!val) {
|
|
|
this.onFormClose("ruleForm");
|
|
|
}
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
computed: {
|
|
|
monthRuleIncome() {
|
|
|
- return `${this.rulesForm.minMonthFee}-${this.form.groupPurchaseMonthFee ? this.form.groupPurchaseMonthFee : this.rulesForm.maxMonthFee}`;
|
|
|
+ return `${this.rulesForm.minMonthFee}-${
|
|
|
+ this.form.groupPurchaseMonthFee
|
|
|
+ ? this.form.groupPurchaseMonthFee
|
|
|
+ : this.rulesForm.maxMonthFee
|
|
|
+ }`;
|
|
|
},
|
|
|
monthRule() {
|
|
|
return `${this.rulesForm.minMonthFee}-${this.rulesForm.maxMonthFee}`;
|
|
|
},
|
|
|
quarterlyRuleIncome() {
|
|
|
- return `${this.rulesForm.minQuarterlyFee}-${this.form.groupPurchaseQuarterlyFee ? this.form.groupPurchaseQuarterlyFee : this.rulesForm.maxQuarterlyFee}`;
|
|
|
+ return `${this.rulesForm.minQuarterlyFee}-${
|
|
|
+ this.form.groupPurchaseQuarterlyFee
|
|
|
+ ? this.form.groupPurchaseQuarterlyFee
|
|
|
+ : this.rulesForm.maxQuarterlyFee
|
|
|
+ }`;
|
|
|
},
|
|
|
quarterlyRule() {
|
|
|
- return `${this.rulesForm.minQuarterlyFee}-${this.rulesForm.maxQuarterlyFee}`;
|
|
|
+ return `${this.rulesForm.minQuarterlyFee}-${
|
|
|
+ this.rulesForm.maxQuarterlyFee
|
|
|
+ }`;
|
|
|
},
|
|
|
halfYearRuleIncome() {
|
|
|
- return `${this.rulesForm.minHalfYearFee}-${this.form.groupPurchaseHalfYearFee ? this.form.groupPurchaseHalfYearFee : this.rulesForm.maxHalfYearFee}`;
|
|
|
+ return `${this.rulesForm.minHalfYearFee}-${
|
|
|
+ this.form.groupPurchaseHalfYearFee
|
|
|
+ ? this.form.groupPurchaseHalfYearFee
|
|
|
+ : this.rulesForm.maxHalfYearFee
|
|
|
+ }`;
|
|
|
},
|
|
|
halfYearRule() {
|
|
|
- return `${this.rulesForm.minHalfYearFee}-${this.rulesForm.maxHalfYearFee}`;
|
|
|
+ return `${this.rulesForm.minHalfYearFee}-${
|
|
|
+ this.rulesForm.maxHalfYearFee
|
|
|
+ }`;
|
|
|
},
|
|
|
yearRuleIncome() {
|
|
|
- return `${this.rulesForm.minYearFee}-${this.form.groupPurchaseYearFee ? this.form.groupPurchaseYearFee : this.rulesForm.maxYearFee}`;
|
|
|
+ return `${this.rulesForm.minYearFee}-${
|
|
|
+ this.form.groupPurchaseYearFee
|
|
|
+ ? this.form.groupPurchaseYearFee
|
|
|
+ : this.rulesForm.maxYearFee
|
|
|
+ }`;
|
|
|
},
|
|
|
yearRule() {
|
|
|
return `${this.rulesForm.minYearFee}-${this.rulesForm.maxYearFee}`;
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
@@ -965,13 +1050,13 @@ export default {
|
|
|
width: 120px !important;
|
|
|
}
|
|
|
}
|
|
|
-.dialog{
|
|
|
+.dialog {
|
|
|
::v-deep {
|
|
|
- .el-dialog{
|
|
|
+ .el-dialog {
|
|
|
border-radius: 4px;
|
|
|
overflow: hidden;
|
|
|
}
|
|
|
- .el-dialog__header{
|
|
|
+ .el-dialog__header {
|
|
|
display: flex;
|
|
|
flex-shrink: 0;
|
|
|
justify-content: space-between;
|
|
@@ -980,49 +1065,49 @@ export default {
|
|
|
width: 100%;
|
|
|
height: 48px;
|
|
|
padding: 0 20px;
|
|
|
- .el-dialog__title{
|
|
|
+ .el-dialog__title {
|
|
|
font-weight: 500;
|
|
|
font-size: 16px;
|
|
|
}
|
|
|
- .el-dialog__headerbtn{
|
|
|
+ .el-dialog__headerbtn {
|
|
|
position: relative;
|
|
|
top: 0;
|
|
|
right: 0;
|
|
|
- &::before{
|
|
|
+ &::before {
|
|
|
position: absolute;
|
|
|
display: block;
|
|
|
box-sizing: border-box;
|
|
|
background-color: transparent;
|
|
|
border-radius: 50%;
|
|
|
- transition: background-color .1s cubic-bezier(0,0,1,1);
|
|
|
+ transition: background-color 0.1s cubic-bezier(0, 0, 1, 1);
|
|
|
content: "";
|
|
|
top: 50%;
|
|
|
left: 50%;
|
|
|
width: 20px;
|
|
|
height: 20px;
|
|
|
- transform: translate(-50%,-50%);
|
|
|
+ transform: translate(-50%, -50%);
|
|
|
}
|
|
|
}
|
|
|
- .el-dialog__headerbtn:hover{
|
|
|
- &::before{
|
|
|
- background-color: rgba(0,0,0, .5);
|
|
|
+ .el-dialog__headerbtn:hover {
|
|
|
+ &::before {
|
|
|
+ background-color: rgba(0, 0, 0, 0.5);
|
|
|
}
|
|
|
}
|
|
|
- .el-dialog__close{
|
|
|
+ .el-dialog__close {
|
|
|
position: relative;
|
|
|
}
|
|
|
}
|
|
|
- .el-dialog__body{
|
|
|
+ .el-dialog__body {
|
|
|
padding: 10px 20px;
|
|
|
}
|
|
|
- .el-input-group__append{
|
|
|
+ .el-input-group__append {
|
|
|
padding: 0 10px;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-.elForm{
|
|
|
+.elForm {
|
|
|
::v-deep {
|
|
|
- .el-form-item__label{
|
|
|
+ .el-form-item__label {
|
|
|
max-width: 100%;
|
|
|
color: #4e5969;
|
|
|
font-size: 14px;
|
|
@@ -1033,21 +1118,20 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-.lineTitle{
|
|
|
- background-color: rgba(247,247,247,1);
|
|
|
+.lineTitle {
|
|
|
+ background-color: rgba(247, 247, 247, 1);
|
|
|
padding: 10px;
|
|
|
border-radius: 4px;
|
|
|
color: #333;
|
|
|
}
|
|
|
-.wrap{
|
|
|
+.wrap {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
- ::v-deep .el-form-item:not(:last-child){
|
|
|
+ ::v-deep .el-form-item:not(:last-child) {
|
|
|
margin-right: 20px;
|
|
|
-
|
|
|
}
|
|
|
- .el-form-item{
|
|
|
- width: 180px;
|
|
|
- }
|
|
|
+ .el-form-item {
|
|
|
+ width: 180px;
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|