!520 【优化】el-checkbox的label属性修改为value以兼容下个版本
Merge pull request !520 from 半栈幼儿员/hotfix/el-checkboxpull/511/MERGE
commit
484826a5ad
|
@ -45,17 +45,20 @@
|
|||
<el-checkbox
|
||||
v-model="loopInstanceForm.asyncBefore"
|
||||
label="异步前"
|
||||
value="异步前"
|
||||
@change="updateLoopAsync('asyncBefore')"
|
||||
/>
|
||||
<el-checkbox
|
||||
v-model="loopInstanceForm.asyncAfter"
|
||||
label="异步后"
|
||||
value="异步后"
|
||||
@change="updateLoopAsync('asyncAfter')"
|
||||
/>
|
||||
<el-checkbox
|
||||
v-model="loopInstanceForm.exclusive"
|
||||
v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
|
||||
label="排除"
|
||||
value="排除"
|
||||
@change="updateLoopAsync('exclusive')"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
|
@ -6,13 +6,20 @@
|
|||
<el-checkbox
|
||||
v-model="taskConfigForm.asyncBefore"
|
||||
label="异步前"
|
||||
value="异步前"
|
||||
@change="changeTaskAsync"
|
||||
/>
|
||||
<el-checkbox
|
||||
v-model="taskConfigForm.asyncAfter"
|
||||
label="异步后"
|
||||
value="异步后"
|
||||
@change="changeTaskAsync"
|
||||
/>
|
||||
<el-checkbox v-model="taskConfigForm.asyncAfter" label="异步后" @change="changeTaskAsync" />
|
||||
<el-checkbox
|
||||
v-model="taskConfigForm.exclusive"
|
||||
v-if="taskConfigForm.asyncAfter || taskConfigForm.asyncBefore"
|
||||
label="排除"
|
||||
value="排除"
|
||||
@change="changeTaskAsync"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
<el-checkbox
|
||||
v-for="scope in queryParams.scopes"
|
||||
:key="scope"
|
||||
:label="scope"
|
||||
:value="scope"
|
||||
style="display: block; margin-bottom: -10px"
|
||||
>
|
||||
{{ formatScope(scope) }}
|
||||
|
|
|
@ -34,9 +34,9 @@
|
|||
label="同时添加至"
|
||||
>
|
||||
<el-checkbox-group v-model="formData.toBizTypes">
|
||||
<el-checkbox :label="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
|
||||
<el-checkbox :label="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
|
||||
<el-checkbox :label="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
|
||||
<el-checkbox :value="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
|
||||
<el-checkbox :value="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
|
||||
<el-checkbox :value="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
|
|
@ -38,9 +38,9 @@
|
|||
</el-form-item>
|
||||
<el-form-item v-if="bizType === BizTypeEnum.CRM_CUSTOMER" label="同时转移">
|
||||
<el-checkbox-group v-model="formData.toBizTypes">
|
||||
<el-checkbox :label="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
|
||||
<el-checkbox :label="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
|
||||
<el-checkbox :label="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
|
||||
<el-checkbox :value="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
|
||||
<el-checkbox :value="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
|
||||
<el-checkbox :value="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
|
|
@ -37,26 +37,26 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="插入" min-width="4%">
|
||||
<template #default="scope">
|
||||
<el-checkbox v-model="scope.row.createOperation" false-label="false" true-label="true" />
|
||||
<el-checkbox v-model="scope.row.createOperation" false-value="false" true-value="true" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="编辑" min-width="4%">
|
||||
<template #default="scope">
|
||||
<el-checkbox v-model="scope.row.updateOperation" false-label="false" true-label="true" />
|
||||
<el-checkbox v-model="scope.row.updateOperation" false-value="false" true-value="true" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="列表" min-width="4%">
|
||||
<template #default="scope">
|
||||
<el-checkbox
|
||||
v-model="scope.row.listOperationResult"
|
||||
false-label="false"
|
||||
true-label="true"
|
||||
false-value="false"
|
||||
true-value="true"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="查询" min-width="4%">
|
||||
<template #default="scope">
|
||||
<el-checkbox v-model="scope.row.listOperation" false-label="false" true-label="true" />
|
||||
<el-checkbox v-model="scope.row.listOperation" false-value="false" true-value="true" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="查询方式" min-width="10%">
|
||||
|
@ -75,7 +75,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="允许空" min-width="5%">
|
||||
<template #default="scope">
|
||||
<el-checkbox v-model="scope.row.nullable" false-label="false" true-label="true" />
|
||||
<el-checkbox v-model="scope.row.nullable" false-value="false" true-value="true" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="显示类型" min-width="12%">
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<el-checkbox
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.TRADE_DELIVERY_TYPE)"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
:value="dict.value"
|
||||
>
|
||||
{{ dict.label }}
|
||||
</el-checkbox>
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
<el-form-item label="优惠设置">
|
||||
<template v-for="(item, index) in formData.rules" :key="index">
|
||||
<el-row type="flex">
|
||||
<el-col :span="24" style="font-weight: bold; display: flex">
|
||||
<el-col :span="24" style="display: flex; font-weight: bold">
|
||||
活动层级{{ index + 1 }}
|
||||
<el-button
|
||||
link
|
||||
|
@ -45,7 +45,7 @@
|
|||
删除
|
||||
</el-button>
|
||||
</el-col>
|
||||
<e-form :ref="'formRef' + index" :model="item">
|
||||
<el-form :ref="'formRef' + index" :model="item">
|
||||
<el-form-item
|
||||
label="优惠门槛:"
|
||||
prop="limit"
|
||||
|
@ -64,7 +64,7 @@
|
|||
<el-form-item label="优惠内容:" label-width="100px" style="padding-left: 50px">
|
||||
<el-checkbox-group v-model="activityRules[index]" style="width: 100%">
|
||||
<el-col :span="24">
|
||||
<el-checkbox label="订单金额优惠" name="type" />
|
||||
<el-checkbox label="订单金额优惠" value="订单金额优惠" name="type" />
|
||||
<el-form-item v-if="activityRules[index].includes('订单金额优惠')">
|
||||
减
|
||||
<el-input
|
||||
|
@ -77,10 +77,15 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-checkbox v-model="item.freeDelivery" label="包邮" name="type" />
|
||||
<el-checkbox
|
||||
v-model="item.freeDelivery"
|
||||
label="包邮"
|
||||
value="包邮"
|
||||
name="type"
|
||||
/>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-checkbox label="送积分" name="type" />
|
||||
<el-checkbox label="送积分" value="送积分" name="type" />
|
||||
<el-form-item v-if="activityRules[index].includes('送积分')">
|
||||
送
|
||||
<el-input
|
||||
|
@ -95,11 +100,11 @@
|
|||
<!-- 优惠券待处理 也可以参考优惠劵的SpuShowcase-->
|
||||
<!-- TODO 待实现!-->
|
||||
<el-col :span="24">
|
||||
<el-checkbox label="送优惠券" name="type" />
|
||||
<el-checkbox label="送优惠券" value="送优惠券" name="type" />
|
||||
</el-col>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
</e-form>
|
||||
</el-form>
|
||||
</el-row>
|
||||
</template>
|
||||
<!-- TODO 实现:建议改成放在每一个【活动层级】的下面,有点类似主子表 -->
|
||||
|
|
|
@ -182,7 +182,7 @@
|
|||
<el-checkbox
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE)"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
:value="dict.value"
|
||||
>
|
||||
{{ dict.label }}
|
||||
</el-checkbox>
|
||||
|
|
Loading…
Reference in New Issue