Skip to content

G
gxpt_web
Commit cd41bbd5 by 吕明尚
Options

修改优惠券字段

parent c5d5f8c8
Showing with 55 additions and 55 deletions
src/views/system/consumerCoupon/index.vue
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="时长" align="center" prop="duration"/> <el-table-column label="时长" align="center" prop="duration"/>
<el-table-column label="优惠金额" align="center" prop="subPrice"/> <el-table-column align="center" label="优惠金额" prop="originalPrice"/>
<el-table-column align="center" label="优惠售卖金额" prop="couponPayPrice" width="130px"/> <el-table-column align="center" label="优惠售卖金额" prop="couponPayPrice" width="130px"/>
<el-table-column align="center" label="优惠促销金额" prop="promotionPrice" width="130px"/> <el-table-column align="center" label="优惠促销金额" prop="salePrice" width="130px"/>
<el-table-column align="center" label="优惠券来源" prop="sourceType" width="120px"> <el-table-column align="center" label="优惠券来源" prop="sourceType" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.consumer_coupon_source_type" :value="scope.row.sourceType"/> <dict-tag :options="dict.type.consumer_coupon_source_type" :value="scope.row.sourceType"/>
...@@ -347,8 +347,8 @@ ...@@ -347,8 +347,8 @@
<el-form-item label="门槛金额" prop="minPrice"> <el-form-item label="门槛金额" prop="minPrice">
<el-input v-model="form.minPrice" placeholder="请输入门槛金额"/> <el-input v-model="form.minPrice" placeholder="请输入门槛金额"/>
</el-form-item> </el-form-item>
<el-form-item label="减去金额(满减券单位:元，折扣为系数)" prop="subPrice"> <el-form-item label="减去金额(满减券单位:元，折扣为系数)" prop="originalPrice">
<el-input v-model="form.subPrice" placeholder="请输入减去金额(满减券单位:元，折扣为系数)"/> <el-input v-model="form.originalPrice" placeholder="请输入减去金额(满减券单位:元，折扣为系数)"/>
</el-form-item> </el-form-item>
<el-form-item label="有效期开始" prop="startDate"> <el-form-item label="有效期开始" prop="startDate">
<el-date-picker clearable <el-date-picker clearable
...@@ -466,7 +466,7 @@ export default { ...@@ -466,7 +466,7 @@ export default {
maxDuration: null, maxDuration: null,
duration: null, duration: null,
minPrice: null, minPrice: null,
subPrice: null, originalPrice: null,
sourceType: null, sourceType: null,
platformType: null, platformType: null,
startDate: null, startDate: null,
...@@ -545,7 +545,7 @@ export default { ...@@ -545,7 +545,7 @@ export default {
maxDuration: null, maxDuration: null,
duration: null, duration: null,
minPrice: null, minPrice: null,
subPrice: null, originalPrice: null,
sourceType: null, sourceType: null,
platformType: null, platformType: null,
startDate: null, startDate: null,
......
src/views/system/coupon/durationIndex.vue
...@@ -116,9 +116,9 @@ ...@@ -116,9 +116,9 @@
<dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/> <dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="优惠券原始金额" prop="subPrice" width="120px"/> <el-table-column align="center" label="优惠券原始金额" prop="originalPrice" width="120px"/>
<el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice" width="120px"/> <!-- <el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice" width="120px"/>-->
<el-table-column align="center" label="优惠券促销金额" prop="promotionPrice" width="120px"/> <el-table-column align="center" label="优惠券促销金额" prop="salePrice" width="120px"/>
<el-table-column label="时长" align="center" prop="duration"/> <el-table-column label="时长" align="center" prop="duration"/>
<el-table-column label="门槛时长" align="center" prop="minDuration"/> <el-table-column label="门槛时长" align="center" prop="minDuration"/>
<el-table-column label="平台类型" align="center" prop="platformType"> <el-table-column label="平台类型" align="center" prop="platformType">
...@@ -219,14 +219,14 @@ ...@@ -219,14 +219,14 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="优惠券原始金额" prop="subPrice"> <el-form-item label="优惠券原始金额" prop="originalPrice">
<el-input v-model="form.subPrice" placeholder="请输入优惠券原始金额"/> <el-input v-model="form.originalPrice" placeholder="请输入优惠券原始金额"/>
</el-form-item> </el-form-item>
<el-form-item label="优惠券售卖金额" prop="couponPayPrice"> <!-- <el-form-item label="优惠券售卖金额" prop="couponPayPrice">-->
<el-input v-model="form.couponPayPrice" placeholder="请输入优惠券售卖金额"/> <!-- <el-input v-model="form.couponPayPrice" placeholder="请输入优惠券售卖金额"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="优惠券促销金额" prop="promotionPrice"> <el-form-item label="优惠券促销金额" prop="salePrice">
<el-input v-model="form.promotionPrice" placeholder="请输入优惠券促销金额"/> <el-input v-model="form.salePrice" placeholder="请输入优惠券促销金额"/>
</el-form-item> </el-form-item>
<el-form-item label="时长" prop="duration"> <el-form-item label="时长" prop="duration">
<el-input-number v-model="form.duration" :max="24" :min="0.5" :step="0.5" placeholder="请输入时长"/> <el-input-number v-model="form.duration" :max="24" :min="0.5" :step="0.5" placeholder="请输入时长"/>
...@@ -388,7 +388,7 @@ export default { ...@@ -388,7 +388,7 @@ export default {
couponType: null, couponType: null,
duration: null, duration: null,
minPrice: null, minPrice: null,
subPrice: null, originalPrice: null,
useStatus: null, useStatus: null,
platformType: null, platformType: null,
startDate: null, startDate: null,
...@@ -416,7 +416,7 @@ export default { ...@@ -416,7 +416,7 @@ export default {
endDate: [ endDate: [
{required: true, message: "有效期结束不能为空", trigger: "change"} {required: true, message: "有效期结束不能为空", trigger: "change"}
], ],
promotionPrice: [ salePrice: [
//限制为数字 //限制为数字
{pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: '请输入正确的金额格式', trigger: 'blur'}, {pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: '请输入正确的金额格式', trigger: 'blur'},
{required: true, message: "促销金额不能为空", trigger: "change"} {required: true, message: "促销金额不能为空", trigger: "change"}
...@@ -519,7 +519,7 @@ export default { ...@@ -519,7 +519,7 @@ export default {
couponType: null, couponType: null,
duration: null, duration: null,
minPrice: null, minPrice: null,
subPrice: null, originalPrice: null,
platform: null, platform: null,
platformType: null, platformType: null,
startDate: null, startDate: null,
......
src/views/system/coupon/index.vue
...@@ -116,9 +116,9 @@ ...@@ -116,9 +116,9 @@
<dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/> <dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="优惠券原始金额" prop="subPrice" width="120px"/> <el-table-column align="center" label="优惠券原始金额" prop="originalPrice" width="120px"/>
<el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice" width="120px"/> <el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice" width="120px"/>
<el-table-column align="center" label="优惠券促销金额" prop="promotionPrice" width="120px"/> <el-table-column align="center" label="优惠券促销金额" prop="salePrice" width="120px"/>
<el-table-column align="center" label="时长" prop="duration"/> <el-table-column align="center" label="时长" prop="duration"/>
<el-table-column label="平台类型" align="center" prop="platformType"> <el-table-column label="平台类型" align="center" prop="platformType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -214,8 +214,8 @@ ...@@ -214,8 +214,8 @@
<el-form-item label="时长" prop="duration"> <el-form-item label="时长" prop="duration">
<el-input-number v-model="form.duration" :max="24" :min="0" placeholder="请输入时长"/> <el-input-number v-model="form.duration" :max="24" :min="0" placeholder="请输入时长"/>
</el-form-item> </el-form-item>
<el-form-item label="优惠券促销金额" prop="promotionPrice"> <el-form-item label="优惠券促销金额" prop="salePrice">
<el-input-number v-model="form.promotionPrice" :max="500" :min="0" placeholder="请输入优惠券促销金额"/> <el-input-number v-model="form.salePrice" :max="500" :min="0" placeholder="请输入优惠券促销金额"/>
</el-form-item> </el-form-item>
<el-form-item label="平台类型" prop="platformType"> <el-form-item label="平台类型" prop="platformType">
<!--输入框 显示美团 值为2--> <!--输入框 显示美团 值为2-->
...@@ -370,7 +370,7 @@ export default { ...@@ -370,7 +370,7 @@ export default {
couponType: null, couponType: null,
duration: null, duration: null,
minPrice: null, minPrice: null,
subPrice: null, originalPrice: null,
validStartTime: null, validStartTime: null,
validEndTime: null, validEndTime: null,
useStatus: null, useStatus: null,
...@@ -382,7 +382,7 @@ export default { ...@@ -382,7 +382,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
subPrice: [ originalPrice: [
//只保留2位小数 //只保留2位小数
{pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/, message: "请输入正确的优惠金额", trigger: "blur"} {pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/, message: "请输入正确的优惠金额", trigger: "blur"}
], ],
...@@ -395,7 +395,7 @@ export default { ...@@ -395,7 +395,7 @@ export default {
duration: [ duration: [
{required: true, message: "时长不能为空", trigger: "blur"} {required: true, message: "时长不能为空", trigger: "blur"}
], ],
promotionPrice: [ salePrice: [
//限制为数字 //限制为数字
{pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: '请输入正确的金额格式', trigger: 'blur'}, {pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: '请输入正确的金额格式', trigger: 'blur'},
{required: true, message: "促销金额不能为空", trigger: "change"} {required: true, message: "促销金额不能为空", trigger: "change"}
...@@ -488,7 +488,7 @@ export default { ...@@ -488,7 +488,7 @@ export default {
couponType: null, couponType: null,
duration: null, duration: null,
minPrice: null, minPrice: null,
subPrice: null, originalPrice: null,
platform: null, platform: null,
platformType: null, platformType: null,
startDate: null, startDate: null,
...@@ -612,11 +612,11 @@ export default { ...@@ -612,11 +612,11 @@ export default {
openShopDeal() { openShopDeal() {
this.$refs.select.show(); this.$refs.select.show();
}, },
queryShopDeal(name, startDate, endDate, subPrice, dealgroupId, storeIds, couponPayPrice) { queryShopDeal(name, startDate, endDate, originalPrice, dealgroupId, storeIds, couponPayPrice) {
this.form.name = name; this.form.name = name;
this.form.startDate = startDate; this.form.startDate = startDate;
this.form.endDate = endDate; this.form.endDate = endDate;
this.form.subPrice = subPrice; this.form.originalPrice = originalPrice;
this.form.dealgroupId = dealgroupId; this.form.dealgroupId = dealgroupId;
this.form.storeIds = storeIds; this.form.storeIds = storeIds;
this.form.couponPayPrice = couponPayPrice; this.form.couponPayPrice = couponPayPrice;
......
src/views/system/coupon/queryShopDeal.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="套餐价格" align="center" prop="subPrice"/> <el-table-column align="center" label="套餐价格" prop="originalPrice"/>
<el-table-column align="center" label="售卖价格" prop="couponPayPrice"/> <el-table-column align="center" label="售卖价格" prop="couponPayPrice"/>
<el-table-column label="团购ID" align="center" prop="dealgroupId"/> <el-table-column label="团购ID" align="center" prop="dealgroupId"/>
<el-table-column label="适用门店id" align="center" prop="storeIds" width="350"> <el-table-column label="适用门店id" align="center" prop="storeIds" width="350">
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
this.visible = true; this.visible = true;
}, },
clickRow(row) { clickRow(row) {
this.$emit('select', row.name, row.startDate, row.endDate, row.subPrice, row.dealgroupId, row.storeIds, row.couponPayPrice); this.$emit('select', row.name, row.startDate, row.endDate, row.originalPrice, row.dealgroupId, row.storeIds, row.couponPayPrice);
this.visible = false; this.visible = false;
}, },
// 查询表数据 // 查询表数据
......
src/views/system/coupon/querySkuId.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="套餐价格" align="center" prop="subPrice"/> <el-table-column align="center" label="套餐价格" prop="originalPrice"/>
<el-table-column align="center" label="售卖价格" prop="couponPayPrice"/> <el-table-column align="center" label="售卖价格" prop="couponPayPrice"/>
<el-table-column label="团购ID" align="center" prop="tiktokSkuId"/> <el-table-column label="团购ID" align="center" prop="tiktokSkuId"/>
<el-table-column label="适用门店id" align="center" prop="storeIds" width="350"> <el-table-column label="适用门店id" align="center" prop="storeIds" width="350">
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
this.tiktokvisible = true; this.tiktokvisible = true;
}, },
clickRow(row) { clickRow(row) {
this.$emit('selectSku', row.tiktokSkuId, row.name, row.subPrice, row.startDate, row.endDate, row.storeIds, row.couponPayPrice); this.$emit('selectSku', row.tiktokSkuId, row.name, row.originalPrice, row.startDate, row.endDate, row.storeIds, row.couponPayPrice);
this.dataList = []; this.dataList = [];
this.tiktokvisible = false; this.tiktokvisible = false;
}, },
......
src/views/system/coupon/tiktokindex.vue
...@@ -116,9 +116,9 @@ ...@@ -116,9 +116,9 @@
<dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/> <dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="优惠券原始金额" prop="subPrice" width="120px"/> <el-table-column align="center" label="优惠券原始金额" prop="originalPrice" width="120px"/>
<el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice" width="120px"/> <el-table-column align="center" label="优惠券售卖金额" prop="couponPayPrice" width="120px"/>
<el-table-column align="center" label="优惠券促销金额" prop="promotionPrice" width="120px"/> <el-table-column align="center" label="优惠券促销金额" prop="salePrice" width="120px"/>
<el-table-column align="center" label="时长" prop="duration"/> <el-table-column align="center" label="时长" prop="duration"/>
<el-table-column label="平台类型" align="center" prop="platformType"> <el-table-column label="平台类型" align="center" prop="platformType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -214,8 +214,8 @@ ...@@ -214,8 +214,8 @@
<el-form-item label="时长" prop="duration"> <el-form-item label="时长" prop="duration">
<el-input-number v-model="form.duration" :max="24" :min="0" placeholder="请输入时长"/> <el-input-number v-model="form.duration" :max="24" :min="0" placeholder="请输入时长"/>
</el-form-item> </el-form-item>
<el-form-item label="优惠券促销金额" prop="promotionPrice"> <el-form-item label="优惠券促销金额" prop="salePrice">
<el-input-number v-model="form.promotionPrice" :max="500" :min="0" placeholder="请输入优惠券促销金额"/> <el-input-number v-model="form.salePrice" :max="500" :min="0" placeholder="请输入优惠券促销金额"/>
</el-form-item> </el-form-item>
<el-form-item label="平台类型" prop="platformType"> <el-form-item label="平台类型" prop="platformType">
<!--输入框 显示美团 值为2--> <!--输入框 显示美团 值为2-->
...@@ -370,7 +370,7 @@ export default { ...@@ -370,7 +370,7 @@ export default {
couponType: null, couponType: null,
duration: null, duration: null,
minPrice: null, minPrice: null,
subPrice: null, originalPrice: null,
validStartTime: null, validStartTime: null,
validEndTime: null, validEndTime: null,
useStatus: null, useStatus: null,
...@@ -382,7 +382,7 @@ export default { ...@@ -382,7 +382,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
subPrice: [ originalPrice: [
//只保留2位小数 //只保留2位小数
{pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/, message: "请输入正确的优惠金额", trigger: "blur"} {pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/, message: "请输入正确的优惠金额", trigger: "blur"}
], ],
...@@ -395,7 +395,7 @@ export default { ...@@ -395,7 +395,7 @@ export default {
duration: [ duration: [
{required: true, message: "时长不能为空", trigger: "blur"} {required: true, message: "时长不能为空", trigger: "blur"}
], ],
promotionPrice: [ salePrice: [
//限制为数字 //限制为数字
{pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: '请输入正确的金额格式', trigger: 'blur'}, {pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: '请输入正确的金额格式', trigger: 'blur'},
{required: true, message: "促销金额不能为空", trigger: "change"} {required: true, message: "促销金额不能为空", trigger: "change"}
...@@ -488,7 +488,7 @@ export default { ...@@ -488,7 +488,7 @@ export default {
couponType: null, couponType: null,
duration: null, duration: null,
minPrice: null, minPrice: null,
subPrice: null, originalPrice: null,
platform: null, platform: null,
platformType: null, platformType: null,
startDate: null, startDate: null,
...@@ -612,11 +612,11 @@ export default { ...@@ -612,11 +612,11 @@ export default {
openSku() { openSku() {
this.$refs.selectSkuList.show(); this.$refs.selectSkuList.show();
}, },
querySku(tiktokSkuId, name, subPrice, startDate, endDate, storeIds, couponPayPrice) { querySku(tiktokSkuId, name, originalPrice, startDate, endDate, storeIds, couponPayPrice) {
this.form.tiktokSkuId = tiktokSkuId; this.form.tiktokSkuId = tiktokSkuId;
this.form.startDate = startDate; this.form.startDate = startDate;
this.form.endDate = endDate; this.form.endDate = endDate;
this.form.subPrice = subPrice; this.form.originalPrice = originalPrice;
this.form.storeIds = storeIds; this.form.storeIds = storeIds;
this.form.name = name; this.form.name = name;
this.form.couponPayPrice = couponPayPrice; this.form.couponPayPrice = couponPayPrice;
......
src/views/system/roomLabel/index.vue
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" prop="remark"/> <el-table-column align="center" label="备注" prop="remark"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作"> <!-- <el-table-column align="center" class-name="small-padding fixed-width" label="操作">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
...@@ -140,16 +140,16 @@ ...@@ -140,16 +140,16 @@
<!-- @click="handleUpdate(scope.row)"--> <!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['system:roomLabel:edit']"--> <!-- v-hasPermi="['system:roomLabel:edit']"-->
<!-- >修改</el-button>--> <!-- >修改</el-button>-->
<el-button <!-- <el-button-->
v-hasPermi="['system:roomLabel:remove']" <!-- v-hasPermi="['system:roomLabel:remove']"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
......
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