|
@@ -115,7 +115,6 @@
|
|
prop="autoActivationFlag"
|
|
prop="autoActivationFlag"
|
|
key="autoActivationFlag"
|
|
key="autoActivationFlag"
|
|
width="170px"
|
|
width="170px"
|
|
- v-if="showAutoActivationFlag"
|
|
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-form-item
|
|
<el-form-item
|
|
@@ -130,7 +129,7 @@
|
|
style="width: 90% !important"
|
|
style="width: 90% !important"
|
|
v-model="form.memberList[scope.$index].autoActivationFlag"
|
|
v-model="form.memberList[scope.$index].autoActivationFlag"
|
|
placeholder="请选择是否自动激活"
|
|
placeholder="请选择是否自动激活"
|
|
- :disabled="!(form.memberList[scope.$index].memberRankSettingId && form.memberList[scope.$index].memberRankSettingId.length > 0)"
|
|
|
|
|
|
+ :disabled="!(form.memberList[scope.$index].memberRankSettingId && form.memberList[scope.$index].memberRankSettingId.length > 0) || !(form.memberList[scope.$index].memberRankSettingId && showAutoActivationFlag[form.memberList[scope.$index].memberRankSettingId[form.memberList[scope.$index].memberRankSettingId.length - 1]])"
|
|
clearable
|
|
clearable
|
|
>
|
|
>
|
|
<el-option
|
|
<el-option
|