Merge remote-tracking branch 'origin/jihan_0223_个人中心和客服功能运营端开发分支' into jihan_0223_个人中心和客服功能运营端开发分支

This commit is contained in:
曹辉 2023-03-06 16:56:03 +08:00
commit 635dd46c1e
4 changed files with 183 additions and 154 deletions

View File

@ -362,30 +362,30 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="积分兑换数值" align="center" >
<template slot-scope="scope">
<el-input
:disabled="!scope.row.integralExchangeFlag?true:false"
v-model.number="scope.row.integralExchangeSill"
oninput="value=value.replace(/[^\d]/g,'')"
placeholder="积分兑换数值"
maxLength="10"
></el-input>
</template>
</el-table-column>
<el-table-column label="使用积分数量" align="center" >
<template slot-scope="scope">
<el-input
:disabled="!scope.row.integralExchangeFlag?true:false"
v-model.number="scope.row.integralExchangeCount"
v-model.number="scope.row.integralExchangeSill"
oninput="value=value.replace(/[^\d]/g,'')"
placeholder="使用积分数量"
maxLength="10"
></el-input>
</template>
</el-table-column>
<el-table-column label="积分兑换商品数量" align="center" >
<template slot-scope="scope">
<el-input
:disabled="!scope.row.integralExchangeFlag?true:false"
v-model.number="scope.row.integralExchangeCount"
oninput="value=value.replace(/[^\d]/g,'')"
placeholder="积分兑换商品数量"
maxLength="10"
></el-input>
</template>
</el-table-column>
<el-table-column label="商品属性图片" align="center" width="200">
<el-table-column label="商品属性图片" align="center" width="150">
<template slot-scope="scope">
<stationAcatar
@imgUrl="attributePitureUrl"

View File

@ -26,8 +26,16 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
@ -40,7 +48,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:coupon:add']"
>新增</el-button>
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -51,7 +60,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:coupon:edit']"
>修改</el-button>
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -62,7 +72,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:coupon:remove']"
>删除</el-button>
>删除</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@ -75,13 +86,25 @@
>导出</el-button
>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="couponList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column label="优惠券名称" align="center" prop="couponTitle" show-overflow-tooltip />
<el-table-column
label="优惠券名称"
align="center"
prop="couponTitle"
show-overflow-tooltip
/>
<el-table-column label="优惠券编码" align="center" prop="couponCode" />
<el-table-column label="优惠券类型" align="center" prop="couponType">
<template slot-scope="scope">
@ -92,9 +115,17 @@
</template>
</el-table-column>
<el-table-column label="优惠券有效期(天)" align="center" prop="couponReductionDays" />
<el-table-column
label="优惠券有效期(天)"
align="center"
prop="couponReductionDays"
/>
<el-table-column label="优惠券面额" align="center" prop="couponPrice" />
<el-table-column label="优惠券适用门槛" align="center" prop="couponConsumePrice" />
<el-table-column
label="优惠券适用门槛"
align="center"
prop="couponConsumePrice"
/>
<el-table-column label="领取方式" align="center" prop="receiveType">
<template slot-scope="scope">
{{ scope.row.receiveType == "NEW_PEOPLE_WELFARE" ? "新人福利" : "" }}
@ -113,8 +144,13 @@
</template>
</el-table-column>-->
<el-table-column label="显示顺序" align="center" prop="showSort" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
@ -122,14 +158,16 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:coupon:edit']"
>修改</el-button>
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:coupon:remove']"
>删除</el-button>
>删除</el-button
>
</template>
</el-table-column>
</el-table>
@ -150,7 +188,13 @@
append-to-body
:before-close="cancel"
>
<el-form ref="form" :model="form" :rules="rules" label-width="130px" :inline="true">
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="130px"
:inline="true"
>
<el-form-item label="优惠券名称" prop="couponTitle">
<el-input
v-model="form.couponTitle"
@ -164,15 +208,16 @@
<el-input
maxlength="5"
oninput="value=value.replace(/[^\d]/g,'')"
v-model="form.couponReductionDays"
v-model.number="form.couponReductionDays"
placeholder="请输入优惠券有效期,单位:天"
style="width: 220px"
/>
</el-form-item>
<el-form-item label="优惠券面额" prop="couponPrice">
<el-input
@keyup.native="form.couponPrice =oninput(form.couponPrice) "
@keyup.native="form.couponPrice = oninput(form.couponPrice)"
v-model="form.couponPrice"
maxlength="8"
placeholder="请输入优惠券面额,单位:元"
style="width: 220px"
@ -181,6 +226,7 @@
<el-form-item label="优惠券适用门槛" prop="couponConsumePrice">
<el-input
:change="checkPrice()"
maxlength="8"
v-model="form.couponConsumePrice"
placeholder="请输入优惠券适用门槛"
@ -236,28 +282,6 @@
placeholder="请输入优惠券概述,包括使用范围,使用注意事项等信息"
/>
</el-form-item>
<!-- <el-form-item label="发放数量" prop="receiveCount">
<el-input v-model="form.receiveCount" placeholder="请输入发放数量" />
</el-form-item>
<el-form-item label="发放数量上限" prop="receiveLimitCount">
<el-input v-model="form.receiveLimitCount" placeholder="请输入发放数量上限" />
</el-form-item>-->
<!-- <el-form-item label="全部商品" prop="useScope">
<el-select
style="width: 220px"
clearable
v-model="form.useScope"
placeholder="请选择全部商品"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>-->
<!-- </el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -273,7 +297,7 @@ import {
getCoupon,
delCoupon,
addCoupon,
updateCoupon
updateCoupon,
} from "@/api/system/coupon";
export default {
@ -299,8 +323,8 @@ export default {
couponTypeoption: [
{
value: "FULL_REDUCTION_COUPON",
label: "满减券"
}
label: "满减券",
},
// {
// value: "CASH_COUPON",
// label: "",
@ -327,8 +351,8 @@ export default {
option: [
{
value: "NEW_PEOPLE_WELFARE",
label: "新人福利"
}
label: "新人福利",
},
// {
// value: "EVENT_GIFT",
// label: "",
@ -356,7 +380,7 @@ export default {
receiveCount: null,
receiveLimitCount: null,
useScope: null,
showSort: null
showSort: null,
},
//
form: {},
@ -366,50 +390,51 @@ export default {
{
required: true,
message: "请输入优惠券名称",
trigger: "blur"
}
trigger: "blur",
},
],
couponType: [
{
required: true,
message: "请选择优惠券类型",
trigger: "blur"
}
trigger: "blur",
},
],
couponReductionDays: [
{
required: true,
message: "请输入优惠券有效期",
trigger: "blur"
}
trigger: "blur",
},
],
couponPrice: [
{
required: true,
message: "请输入优惠券面额",
trigger: "blur"
}
trigger: "blur",
},
],
couponConsumePrice: [
{
required: true,
message: "请输入优惠券适用门槛",
trigger: "blur"
}
trigger: "blur",
},
],
couponDescription: [
{
required: true,
message: "请输入优惠券概述",
trigger: "blur"
}
trigger: "blur",
},
],
receiveType: [
{
required: true,
message: "请选择领取方式",
trigger: "blur"
}
trigger: "blur",
},
],
// useScope: [
// {
@ -422,10 +447,10 @@ export default {
{
required: true,
message: "请输入显示顺序",
trigger: "blur"
}
]
}
trigger: "blur",
},
],
},
};
},
created() {
@ -472,10 +497,7 @@ export default {
}
//
str = str.replace(/[^\d^.\\ .]+/g, ""); //
str = str
.replace(".", "$#$")
.replace(/\./g, "")
.replace("$#$", "."); //
str = str.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); //
str = str.replace(/^(-)*(\d+)\.(\d\d).*$/, "$1$2.$3");
return str;
},
@ -483,7 +505,7 @@ export default {
/** 查询优惠券信息列表 */
getList() {
this.loading = true;
listCoupon(this.queryParams).then(response => {
listCoupon(this.queryParams).then((response) => {
this.couponList = response.rows;
this.total = response.total;
this.loading = false;
@ -522,7 +544,7 @@ export default {
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
updateTime: null,
};
this.resetForm("form");
},
@ -538,7 +560,7 @@ export default {
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id);
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@ -552,7 +574,7 @@ export default {
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getCoupon(id).then(response => {
getCoupon(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改优惠券信息";
@ -567,16 +589,16 @@ export default {
this.form.couponConsumePrice = Number(this.form.couponConsumePrice);
}
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateCoupon(this.form).then(response => {
updateCoupon(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addCoupon(this.form).then(response => {
addCoupon(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -587,10 +609,11 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const couponTitles = row.couponTitle || this.couponTitles;
const ids = row.id || this.ids;
this.$modal
.confirm('是否确认删除优惠券信息编号为"' + ids + '"的数据项?')
.then(function() {
.confirm('是否确认删除优惠券名称为"' + couponTitles + '"的数据项?')
.then(function () {
return delCoupon(ids);
})
.then(() => {
@ -604,11 +627,11 @@ export default {
this.download(
"system/coupon/export",
{
...this.queryParams
...this.queryParams,
},
`coupon_${new Date().getTime()}.xlsx`
);
}
}
},
},
};
</script>

View File

@ -729,9 +729,10 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
console.log(row);
const ids = row.groupName || this.groupName;
const ids = row.id || this.ids;
const groupNames = row.groupName || this.groupNames;
this.$modal
.confirm('确认删除群名称为"' + ids + '"的信息吗?')
.confirm('确认删除群名称为"' + groupNames + '"的信息吗?')
.then(function() {
return delGroupQrCodeInfo(ids);
})

View File

@ -8,38 +8,38 @@
v-show="showSearch"
label-width="100px"
>
<el-form-item label="系统设置名称" prop="settingsName">
<el-form-item label="规则名称" prop="settingsName">
<el-input
v-model="queryParams.settingsName"
placeholder="请输入系统设置名称"
placeholder="请输入规则名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="系统设置编码" prop="settingsCode">
<el-form-item label="规则编码" prop="settingsCode">
<el-input
v-model="queryParams.settingsCode"
placeholder="请输入系统设置编码"
placeholder="请输入规则编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="系统设置类型" prop="settingsType">
<el-select
style="width: 220px"
clearable
v-model="queryParams.settingsType"
placeholder="请选择"
<el-form-item label="规则类型" prop="settingsType">
<el-select
style="width: 220px"
clearable
v-model="queryParams.settingsType"
placeholder="请选择"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="累计签到天数,签到设置使用" prop="totalSignInDays">
<el-input
v-model="queryParams.totalSignInDays"
@ -147,23 +147,19 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column
label="系统设置名称"
label="规则名称"
align="center"
prop="settingsName"
show-overflow-tooltip
/>
<el-table-column
label="系统设置编码"
align="center"
prop="settingsCode"
/>
<el-table-column label="规则编码" align="center" prop="settingsCode" />
<!-- <el-table-column
label="系统设置内容"
align="center"
prop="settingsContent"
show-overflow-tooltip
/> -->
<el-table-column label="系统设置类型" align="center" prop="settingsType">
<el-table-column label="规则类型" align="center" prop="settingsType">
<template slot-scope="scope">
<!-- {{
scope.row.settingsType == "INTEGRAL_EXCHANGE_RULE" ? "积分兑换" : ""
@ -226,9 +222,16 @@
/>
<!-- 添加或修改泉医到家平台系统业务设置信息对话框 -->
<el-dialog
:title="!isEditFlag ? '添加泉医到家平台系统业务设置信息' : '修改泉医到家平台系统业务设置信息'"
:visible.sync="open" width="900px" append-to-body>
<el-dialog
:title="
!isEditFlag
? '添加系统规则信息'
: '修改系统规则信息'
"
:visible.sync="open"
width="900px"
append-to-body
>
<el-form
ref="form"
:model="form"
@ -236,21 +239,16 @@
label-width="110px"
:inline="true"
>
<el-form-item label="系统设置名称" prop="settingsName">
<el-form-item label="规则名称" prop="settingsName">
<el-input
maxlength="100"
v-model="form.settingsName"
placeholder="请输入系统设置名称"
placeholder="请输入规则名称"
style="width: 250px"
/>
</el-form-item>
<!-- <el-form-item label="系统设置编码" prop="settingsCode">
<el-input
v-model="form.settingsCode"
placeholder="请输入系统设置编码"
/>
</el-form-item> -->
<el-form-item label="系统设置类型" prop="settingsType">
<el-form-item label="规则类型" prop="settingsType">
<el-select
style="width: 250px"
v-model="form.settingsType"
@ -273,21 +271,30 @@
>
<el-input
style="width: 250px"
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, '')"
maxlength="9"
oninput="value=value.replace(/[^\d]/g,'')"
v-model.number="form.totalSignInDays"
placeholder="请输入累计签到天数"
/>
</el-form-item>
<el-form-item
prop="integralCount"
:label="
form.settingsType == 'INVITE_FRIENDS'?'赠送积分数量' :form.settingsType == 'SIGN_IN_RULE' ?'赠送积分数量' : '积分数量'"
form.settingsType == 'INVITE_FRIENDS'
? '赠送积分数量'
: form.settingsType == 'SIGN_IN_RULE'
? '赠送积分数量'
: '积分数量'
"
>
<el-input
style="width: 250px"
maxlength="9"
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, '')"
oninput="value=value.replace(/[^\d]/g,'')"
v-model.number="form.integralCount"
placeholder="请输入积分数量"
@ -302,6 +309,8 @@
maxlength="8"
style="width: 250px"
v-model="form.creditAmount"
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, '')"
oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入积分抵扣金额"
/>
@ -336,7 +345,6 @@
placeholder="请输入系统设置内容"
v-model="form.settingsContent"
></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -381,8 +389,8 @@ export default {
},
],
value: "",
//
isEditFlag: false,
//
isEditFlag: false,
//
loading: true,
//
@ -410,7 +418,7 @@ export default {
settingsContent: null,
settingsType: null,
totalSignInDays: null,
integralExpirationDate:null,
integralExpirationDate: null,
integralCount: null,
creditAmount: null,
sort: null,
@ -419,8 +427,8 @@ export default {
form: {},
//
rules: {
integralExpirationDate:[
{
integralExpirationDate: [
{
required: true,
message: "请输入积分有效期",
trigger: "blur",
@ -433,13 +441,13 @@ export default {
trigger: "blur",
},
],
settingsContent: [
{
required: true,
message: "请输入系统设置内容",
trigger: "blur",
},
],
// settingsContent: [
// {
// required: true,
// message: "",
// trigger: "blur",
// },
// ],
settingsType: [
{
required: true,
@ -454,7 +462,7 @@ export default {
trigger: "blur",
},
],
integralCount: [
{
required: true,
@ -519,7 +527,7 @@ export default {
settingsContent: null,
settingsType: null,
totalSignInDays: null,
integralExpirationDate:null,
integralExpirationDate: null,
integralCount: null,
creditAmount: null,
sort: null,
@ -587,12 +595,9 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
const settingsNames=row.settingsName||this.settingsNames
this.$modal
.confirm(
'是否确认删除泉医到家平台系统业务设置信息编号为"' +
ids +
'"的数据项?'
)
.confirm('是否确认删除规则名称为"' + settingsNames + '"的数据项?')
.then(function () {
return delSettings(ids);
})