Commit 7c1116b6 authored by chenwei's avatar chenwei

Merge branch 'cherry-pick-45d3e590' into 'dev'

礼品查看剩余数量添加按钮和兑换会员选择按钮禁止操作

See merge request !89
parents b934369d 6f1a5b44
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<el-button type="primary" :icon="index == '0' ? 'el-icon-plus' : 'el-icon-minus'" @click="handleOrderVRule(item, index)"></el-button> <el-button type="primary" :disabled="isDisable" :icon="index == '0' ? 'el-icon-plus' : 'el-icon-minus'" @click="handleOrderVRule(item, index)"></el-button>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<el-form-item :label="$t('礼品选择')" prop="rewardName" id="colorRedInput"> <el-form-item :label="$t('礼品选择')" prop="rewardName" id="colorRedInput">
<el-input :placeholder="$t('请选择礼品')" clearable :disabled="true" v-model="item.rewardName" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" /> <el-input :placeholder="$t('请选择礼品')" clearable :disabled="true" v-model="item.rewardName" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
</el-form-item> </el-form-item>
<el-button type="success" size="small" @click="handleSelectMember"> {{ $t("选择") }}</el-button> <el-button :disabled="rewardEdit || veriftyDisable" type="success" size="small" @click="handleSelectMember"> {{ $t("选择") }}</el-button>
<el-form-item :label="$t('礼品积分')" id="colorRedInput"> <el-form-item :label="$t('礼品积分')" id="colorRedInput">
<el-input :placeholder="$t('请输入礼品积分')" clearable :disabled="true" v-model="item.pointsRequire" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" /> <el-input :placeholder="$t('请输入礼品积分')" clearable :disabled="true" v-model="item.pointsRequire" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
</el-form-item> </el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment