修改
This commit is contained in:
parent
1330565bb2
commit
9568dfa399
@ -363,13 +363,13 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="使用积分数量" align="center" >
|
<el-table-column label="使用健康豆数量" align="center" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input
|
<el-input
|
||||||
:disabled="!scope.row.integralExchangeFlag?true:false"
|
:disabled="!scope.row.integralExchangeFlag?true:false"
|
||||||
v-model.number="scope.row.integralExchangeSill"
|
v-model.number="scope.row.integralExchangeSill"
|
||||||
oninput="value=value.replace(/[^\d]/g,'')"
|
oninput="value=value.replace(/[^\d]/g,'')"
|
||||||
placeholder="使用积分数量"
|
placeholder="使用健康豆数量"
|
||||||
maxLength="10"
|
maxLength="10"
|
||||||
></el-input>
|
></el-input>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -199,7 +199,7 @@
|
|||||||
<el-input v-model="orderList.integralExchangeCount" disabled style="width: 240px" />
|
<el-input v-model="orderList.integralExchangeCount" disabled style="width: 240px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="兑换积分数"
|
label="兑换健康豆数"
|
||||||
prop="integralExchangeSill"
|
prop="integralExchangeSill"
|
||||||
v-if="orderList.orderType=='INTEGRAL_EXCHANGE'"
|
v-if="orderList.orderType=='INTEGRAL_EXCHANGE'"
|
||||||
>
|
>
|
||||||
@ -444,7 +444,7 @@
|
|||||||
<el-input v-model="refundlist.godTotalPrice" placeholder clearable disabled />
|
<el-input v-model="refundlist.godTotalPrice" placeholder clearable disabled />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="退款积分"
|
label="退款健康豆"
|
||||||
prop="godTotalPrice"
|
prop="godTotalPrice"
|
||||||
v-if="refundlist.orderType =='INTEGRAL_EXCHANGE'"
|
v-if="refundlist.orderType =='INTEGRAL_EXCHANGE'"
|
||||||
>
|
>
|
||||||
|
|||||||
@ -199,7 +199,7 @@
|
|||||||
<el-input v-model="orderList.integralExchangeCount" disabled style="width: 240px" />
|
<el-input v-model="orderList.integralExchangeCount" disabled style="width: 240px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="兑换积分数"
|
label="兑换健康豆数"
|
||||||
prop="integralExchangeSill"
|
prop="integralExchangeSill"
|
||||||
v-if="orderList.orderType=='INTEGRAL_EXCHANGE'"
|
v-if="orderList.orderType=='INTEGRAL_EXCHANGE'"
|
||||||
>
|
>
|
||||||
@ -444,7 +444,7 @@
|
|||||||
<el-input v-model="refundlist.godTotalPrice" placeholder clearable disabled />
|
<el-input v-model="refundlist.godTotalPrice" placeholder clearable disabled />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="退款积分"
|
label="退款健康豆"
|
||||||
prop="godTotalPrice"
|
prop="godTotalPrice"
|
||||||
v-if="refundlist.orderType =='INTEGRAL_EXCHANGE'"
|
v-if="refundlist.orderType =='INTEGRAL_EXCHANGE'"
|
||||||
>
|
>
|
||||||
|
|||||||
@ -48,18 +48,18 @@
|
|||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<!-- <el-form-item label="积分数量,累计签到、邀请好友、积分抵扣等系统设置使用" prop="integralCount">
|
<!-- <el-form-item label="健康豆数量,累计签到、邀请好友、健康豆抵扣等系统设置使用" prop="integralCount">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.integralCount"
|
v-model="queryParams.integralCount"
|
||||||
placeholder="请输入积分数量,累计签到、邀请好友、积分抵扣等系统设置使用"
|
placeholder="请输入健康豆数量,累计签到、邀请好友、健康豆抵扣等系统设置使用"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<!-- <el-form-item label="积分抵扣金额,积分抵扣设置使用" prop="creditAmount">
|
<!-- <el-form-item label="健康豆抵扣金额,健康豆抵扣设置使用" prop="creditAmount">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.creditAmount"
|
v-model="queryParams.creditAmount"
|
||||||
placeholder="请输入积分抵扣金额,积分抵扣设置使用"
|
placeholder="请输入健康豆抵扣金额,健康豆抵扣设置使用"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
@ -165,7 +165,7 @@
|
|||||||
scope.row.settingsType == "INTEGRAL_EXCHANGE_RULE" ? "健康豆兑换" : ""
|
scope.row.settingsType == "INTEGRAL_EXCHANGE_RULE" ? "健康豆兑换" : ""
|
||||||
}} -->
|
}} -->
|
||||||
{{ scope.row.settingsType == "SIGN_IN_RULE" ? "签到" : "" }}
|
{{ scope.row.settingsType == "SIGN_IN_RULE" ? "签到" : "" }}
|
||||||
{{ scope.row.settingsType == "INTEGRAL_DEDUCTION" ? "积分抵扣" : "" }}
|
{{ scope.row.settingsType == "INTEGRAL_DEDUCTION" ? "健康豆抵扣" : "" }}
|
||||||
{{ scope.row.settingsType == "INVITE_FRIENDS" ? "邀请好友" : "" }}
|
{{ scope.row.settingsType == "INVITE_FRIENDS" ? "邀请好友" : "" }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@ -175,14 +175,14 @@
|
|||||||
prop="totalSignInDays"
|
prop="totalSignInDays"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<el-table-column label="积分数量" align="center" prop="integralCount" />
|
<el-table-column label="健康豆数量" align="center" prop="integralCount" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="积分抵扣金额"
|
label="健康豆抵扣金额"
|
||||||
align="center"
|
align="center"
|
||||||
prop="creditAmount"
|
prop="creditAmount"
|
||||||
/>
|
/>
|
||||||
<!-- <el-table-column
|
<!-- <el-table-column
|
||||||
label="积分有效期"
|
label="健康豆有效期"
|
||||||
align="center"
|
align="center"
|
||||||
prop="integralExpirationDate"
|
prop="integralExpirationDate"
|
||||||
/> -->
|
/> -->
|
||||||
@ -280,10 +280,10 @@
|
|||||||
prop="integralCount"
|
prop="integralCount"
|
||||||
:label="
|
:label="
|
||||||
form.settingsType == 'INVITE_FRIENDS'
|
form.settingsType == 'INVITE_FRIENDS'
|
||||||
? '赠送积分数量'
|
? '赠送健康豆数量'
|
||||||
: form.settingsType == 'SIGN_IN_RULE'
|
: form.settingsType == 'SIGN_IN_RULE'
|
||||||
? '赠送积分数量'
|
? '赠送健康豆数量'
|
||||||
: '积分数量'
|
: '健康豆数量'
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
@ -293,11 +293,11 @@
|
|||||||
onafterpaste="this.value=this.value.replace(/[^[0-9]/g,'').replace(/^0[0-9]*/g, '')"
|
onafterpaste="this.value=this.value.replace(/[^[0-9]/g,'').replace(/^0[0-9]*/g, '')"
|
||||||
oninput="value=value.replace(/[^\d]/g,'')"
|
oninput="value=value.replace(/[^\d]/g,'')"
|
||||||
v-model.number="form.integralCount"
|
v-model.number="form.integralCount"
|
||||||
placeholder="请输入积分数量"
|
placeholder="请输入健康豆数量"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="积分抵扣金额"
|
label="健康豆抵扣金额"
|
||||||
prop="creditAmount"
|
prop="creditAmount"
|
||||||
v-if="form.settingsType == 'INTEGRAL_DEDUCTION'"
|
v-if="form.settingsType == 'INTEGRAL_DEDUCTION'"
|
||||||
>
|
>
|
||||||
@ -308,11 +308,11 @@
|
|||||||
onkeyup="this.value=this.value.replace(/[^[0-9]/g,'').replace(/^0[0-9]*/g, '')"
|
onkeyup="this.value=this.value.replace(/[^[0-9]/g,'').replace(/^0[0-9]*/g, '')"
|
||||||
onafterpaste="this.value=this.value.replace(/[^[0-9]/g,'').replace(/^0[0-9]*/g, '')"
|
onafterpaste="this.value=this.value.replace(/[^[0-9]/g,'').replace(/^0[0-9]*/g, '')"
|
||||||
oninput="value=value.replace(/[^\d]/g,'')"
|
oninput="value=value.replace(/[^\d]/g,'')"
|
||||||
placeholder="请输入积分抵扣金额"
|
placeholder="请输入健康豆抵扣金额"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item
|
<!-- <el-form-item
|
||||||
label="积分有效期"
|
label="健康豆有效期"
|
||||||
prop="integralExpirationDate"
|
prop="integralExpirationDate"
|
||||||
v-if="form.settingsType == 'INTEGRAL_EXCHANGE_RULE'||form.settingsType == 'INTEGRAL_DEDUCTION'"
|
v-if="form.settingsType == 'INTEGRAL_EXCHANGE_RULE'||form.settingsType == 'INTEGRAL_DEDUCTION'"
|
||||||
>
|
>
|
||||||
@ -321,7 +321,7 @@
|
|||||||
maxlength="9"
|
maxlength="9"
|
||||||
oninput="value=value.replace(/[^\d]/g,'')"
|
oninput="value=value.replace(/[^\d]/g,'')"
|
||||||
v-model.number="form.integralExpirationDate"
|
v-model.number="form.integralExpirationDate"
|
||||||
placeholder="请输入积分有效期"
|
placeholder="请输入健康豆有效期"
|
||||||
/>
|
/>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item label="显示顺序" prop="sort">
|
<el-form-item label="显示顺序" prop="sort">
|
||||||
@ -377,7 +377,7 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: "INTEGRAL_DEDUCTION",
|
value: "INTEGRAL_DEDUCTION",
|
||||||
label: "积分抵扣",
|
label: "健康豆抵扣",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: "INVITE_FRIENDS",
|
value: "INVITE_FRIENDS",
|
||||||
@ -426,7 +426,7 @@ export default {
|
|||||||
integralExpirationDate: [
|
integralExpirationDate: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: "请输入积分有效期",
|
message: "请输入健康豆有效期",
|
||||||
trigger: "blur",
|
trigger: "blur",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
@ -462,14 +462,14 @@ export default {
|
|||||||
integralCount: [
|
integralCount: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: "请输入积分数量",
|
message: "请输入健康豆数量",
|
||||||
trigger: "blur",
|
trigger: "blur",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
creditAmount: [
|
creditAmount: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: "请输入积分抵扣金额",
|
message: "请输入健康豆抵扣金额",
|
||||||
trigger: "blur",
|
trigger: "blur",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user