yangjun
/
sadjv3_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改物料包及会员积分表

This commit is contained in:
yangjun 2024-06-06 15:33:17 +08:00
parent f171ace301
commit 9cf7491e8c
3 changed files with 135 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/allocation/allocationList.vue
View File

@ -318,8 +318,7 @@
<div style="display: flex;justify-content: left;align-items: center;"> <div style="display: flex;justify-content: left;align-items: center;">
<div>请选择服务类型：</div> <div>请选择服务类型：</div>
<el-select v-model="serverValue" placeholder="请选择服务类型" @change="changeServerType"> <el-select v-model="serverValue" placeholder="请选择服务类型" @change="changeServerType">
<el-option v-for="item in serverList" :key="item.id" :label="item.value" :value="item.value"> <el-option v-for="item in serverList" :key="item.id" :label="item.value" :value="item.id"></el-option>
</el-option>
</el-select> </el-select>
</div> </div>
<el-table v-loading="tableDataLoading" :data="tableData"> <el-table v-loading="tableDataLoading" :data="tableData">
@ -628,7 +627,7 @@ export default {
latitude: '', //经度 latitude: '', //经度
address: '', address: '',
serverList: [], serverList: [],
serverValue: "中医推拿", serverValue: "",
ruleForm: { ruleForm: {
id: "", id: "",
grade: "", grade: "",
@ -666,9 +665,7 @@ export default {
'limit': 100, 'limit': 100,
'parentId': 22, 'parentId': 22,
}) })
}).then(({ }).then(({ data }) => {
data
}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.serverList = data.page.list; this.serverList = data.page.list;
} }
@ -760,10 +757,13 @@ export default {
this.tableDataLoading = true; this.tableDataLoading = true;
console.log(this.condition, "12312hhh"); console.log(this.condition, "12312hhh");
console.log(this.serverValue); console.log(this.serverValue);
// if(!this.serverValue){
// this.serverValue = '91'
// }
this.tableData = []; this.tableData = [];
this.$http({ this.$http({
// type服务类型 1精油2中医推拿 // type服务类型 1精油2中医推拿
url: this.$http.adornUrl(`common/fcmx/` + (this.serverValue == "中医推拿" ? 95 : 91)), url: this.$http.adornUrl(`common/fcmx/` + (this.serverValue?this.serverValue:'91')),
method: 'get', method: 'get',
}).then(({ }).then(({
data data

57
src/views/materialPackage/materialPackage.vue
View File

@ -22,11 +22,11 @@
>&nbsp;&nbsp; >&nbsp;&nbsp;
</div> </div>
<div style="position: relative; display: inline-block"> <div style="position: relative; display: inline-block">
<span>项目名称：</span> <span>物料包名称：</span>
<el-input <el-input
style="width: 150px" style="width: 150px"
@keydown.enter.native="phoneSelect1" @keydown.enter.native="phoneSelect1"
placeholder="请输入项目名称" placeholder="请输入物料包名称："
v-model="projectName" v-model="projectName"
> >
</el-input </el-input
@ -425,15 +425,7 @@ export default {
classTypeList: [], classTypeList: [],
// 加钟项目 // 加钟项目
dialogFormVisibleJz: false, dialogFormVisibleJz: false,
materialPackageType: [ materialPackageType: [
{
id: 1,
value: "中医推拿",
},
{
id: 2,
value: "精油SPA",
},
], ],
classifyId: "", classifyId: "",
classType: "", classType: "",
@ -475,7 +467,9 @@ export default {
id: row.id, id: row.id,
}), }),
}).then(({ data }) => { }).then(({ data }) => {
if (data.data.code == 0) { console.log(`🚀 ~ deleteMaterialPackage ~ data:`, data)
if (data.code == 0) {
this.$message({ this.$message({
message: "删除成功", message: "删除成功",
type: "success", type: "success",
@ -485,12 +479,29 @@ export default {
this.$notify({ this.$notify({
title: "提示", title: "提示",
duration: 1800, duration: 1800,
message: data.data.msg, message: data.msg,
type: "warning", type: "warning",
}); });
} }
}); });
}, },
getDictOptions() {
this.$http({
url: this.$http.adornUrl('sys/dict/list'),
method: 'get',
params: this.$http.adornParams({
'page': 1,
'limit': 100,
'parentId': 22,
})
}).then(({ data }) => {
console.log(`🚀 ~ getDictOptions ~ data:`, data)
if (data && data.code === 0) {
this.materialPackageType = data.page.list;
}
})
},
closeTag() { closeTag() {
this.addMaterialPackageTag.goodsName = ""; this.addMaterialPackageTag.goodsName = "";
this.addMaterialPackageTag.goodsId = ""; this.addMaterialPackageTag.goodsId = "";
@ -532,15 +543,15 @@ export default {
}); });
return; return;
} }
if (!this.addMaterialPackageTag.goodsId) { // if (!this.addMaterialPackageTag.goodsId) {
this.$notify({ // this.$notify({
title: "提示", // title: "提示",
duration: 1800, // duration: 1800,
message: "请选择商城商品", // message: "请选择商城商品",
type: "warning", // type: "warning",
}); // });
return; // return;
} // }
this.$http({ this.$http({
url: this.$http.adornUrl( url: this.$http.adornUrl(
this.submitStatus == 0 ? "material/insert" : "material/update" this.submitStatus == 0 ? "material/insert" : "material/update"
@ -613,6 +624,7 @@ export default {
resetSearch() { resetSearch() {
this.classifyId = null; this.classifyId = null;
this.projectName = ""; this.projectName = "";
this.searchDataList();
}, },
searchDataList() { searchDataList() {
this.getMaterialPackageDataList(); this.getMaterialPackageDataList();
@ -840,6 +852,7 @@ export default {
if (userId) this.userId = userId; if (userId) this.userId = userId;
this.getMaterialPackageDataList(); this.getMaterialPackageDataList();
this.getShopDataList(); this.getShopDataList();
this.getDictOptions();
}, },
}; };
</script> </script>

146
src/views/members/memberDetails.vue
View File

@ -9,19 +9,30 @@
<el-table v-loading="tableDataLoading" :data="configData.list"> <el-table v-loading="tableDataLoading" :data="configData.list">
<el-table-column prop="id" label="编号" width="80"> <el-table-column prop="id" label="编号" width="80">
</el-table-column> </el-table-column>
<el-table-column prop="vipType" label="会员类型">
<template slot-scope="scope">
<span v-if="scope.row.vipType == 0">会员</span>
<span v-if="scope.row.vipType == 1">技师</span>
</template>
</el-table-column>
<el-table-column prop="vipNameType" label="专属标识" width="150">
<template slot-scope="scope">
<span v-if="scope.row.vipNameType == 0">月</span>
<span v-if="scope.row.vipNameType == 1">季</span>
<span v-if="scope.row.vipNameType == 2">年</span>
<span v-if="scope.row.vipNameType == 3">新</span>
<span v-if="scope.row.vipNameType == 4">专</span>
<span v-if="scope.row.vipNameType == 5">资</span>
</template>
</el-table-column>
<el-table-column prop="vipName" label="会员名称"> <el-table-column prop="vipName" label="会员名称">
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="优惠力度" width="150">
</el-table-column>
<el-table-column prop="money" label="会员价格"> <el-table-column prop="money" label="会员价格">
</el-table-column> </el-table-column>
<el-table-column prop="award" label="邀请赏金" width="150"> <el-table-column prop="award" label="邀请赏金" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="vipNameType" label="会员等级" width="150">
<template slot-scope="scope">
<span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.vipNameType == 0">月</span>
<span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.vipNameType == 1">季</span>
<span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.vipNameType == 2">年</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed='right' width="200"> <el-table-column label="操作" fixed='right' width="200">
<template slot-scope="scope"> <template slot-scope="scope">
@ -38,12 +49,23 @@
</el-pagination> </el-pagination>
</div> </div>
<el-dialog title="添加会员" :visible.sync="dialogFormVisible" center> <el-dialog title="添加会员" :visible.sync="dialogFormVisible" center>
<div style="margin-bottom: 20px;"> <div style="margin-bottom: 20px;">
<span style="width: 200px;display: inline-block;text-align: right;">会员类型：</span> <span style="width: 200px;display: inline-block;text-align: right;">会员类型：</span>
<el-radio-group v-model="form.vipType" @change="handleHylx">
<el-radio :label="0">会员</el-radio>
<el-radio :label="1">技师</el-radio>
</el-radio-group>
</div>
<div style="margin-bottom: 20px;">
<span style="width: 200px;display: inline-block;text-align: right;">是否有专属标识：</span>
<el-radio-group v-model="vipNameType"> <el-radio-group v-model="vipNameType">
<el-radio :label="0">月会员</el-radio> <el-radio :label="0" :hidden="vipShow">月</el-radio>
<el-radio :label="1">季会员</el-radio> <el-radio :label="1" :hidden="vipShow">季</el-radio>
<el-radio :label="2">年会员</el-radio> <el-radio :label="2" :hidden="vipShow">年</el-radio>
<el-radio :label="3" :hidden="!vipShow">新</el-radio>
<el-radio :label="4" :hidden="!vipShow">专</el-radio>
<el-radio :label="5" :hidden="!vipShow">资</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<div style="margin-bottom: 20px;"> <div style="margin-bottom: 20px;">
@ -51,18 +73,18 @@
<el-input style="width:50%;" v-model="vipName" placeholder="请输入会员名称"></el-input> <el-input style="width:50%;" v-model="vipName" placeholder="请输入会员名称"></el-input>
</div> </div>
<div style="margin-bottom: 20px;"> <div style="margin-bottom: 20px;">
<span style="width: 200px;display: inline-block;text-align: right;">优惠力度：</span>
<el-input v-model="rate" type="number" style="width:65%;" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input>
</div>
<div style="margin-bottom: 20px;" :hidden="vipShow">
<span style="width: 200px;display: inline-block;text-align: right;">会员价格：</span> <span style="width: 200px;display: inline-block;text-align: right;">会员价格：</span>
<el-input style="width:50%;" v-model="money" type="number" placeholder="请输入会员价格" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input> <el-input style="width:50%;" v-model="money" type="number" placeholder="请输入会员价格" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input>
</div> </div>
<div style="margin-bottom: 20px;"> <div style="margin-bottom: 20px;" :hidden="vipShow">
<span style="width: 200px;display: inline-block;text-align: right;">邀请赏金：</span> <span style="width: 200px;display: inline-block;text-align: right;">邀请赏金：</span>
<el-input style="width:50%;" v-model="award" type="number" placeholder="请输入邀请赏金" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input> <el-input style="width:50%;" v-model="award" type="number" placeholder="请输入邀请赏金" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input>
<!-- <el-input-number v-model="award" style="width:50%;" :precision="2" :step="0.1" :min="0"
placeholder="请输入邀请赏金"></el-input-number> -->
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button> <el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="releasNoticeTo()">确 定</el-button> <el-button type="primary" @click="releasNoticeTo()">确 定</el-button>
@ -71,23 +93,35 @@
<!-- 修改配置弹框 --> <!-- 修改配置弹框 -->
<el-dialog title="编辑会员配置" :visible.sync="dialogFormVisible1" center> <el-dialog title="编辑会员配置" :visible.sync="dialogFormVisible1" center>
<el-form :model="form"> <el-form :model="form">
<el-form-item label="是否有专属标识：" :label-width="formLabelWidth"> <el-form-item label="会员类型：" :label-width="formLabelWidth" >
<el-radio-group v-model="form.vipNameType"> <el-radio-group v-model="form.vipType" @change="handleHylx">
<el-radio :label="0">月会员</el-radio> <el-radio :label="0">会员</el-radio>
<el-radio :label="1">季会员</el-radio> <el-radio :label="1">技师</el-radio>
<el-radio :label="2">年会员</el-radio> </el-radio-group>
</el-radio-group> </el-form-item>
</el-form-item> <el-form-item label="是否有专属标识：" :label-width="formLabelWidth">
<el-radio-group v-model="form.vipNameType">
<el-radio :label="0" :hidden="vipShow">月</el-radio>
<el-radio :label="1" :hidden="vipShow">季</el-radio>
<el-radio :label="2" :hidden="vipShow">年</el-radio>
<el-radio :label="3" :hidden="!vipShow">新</el-radio>
<el-radio :label="4" :hidden="!vipShow">专</el-radio>
<el-radio :label="5" :hidden="!vipShow">资</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="会员名称：" :label-width="formLabelWidth"> <el-form-item label="会员名称：" :label-width="formLabelWidth">
<el-input v-model="form.vipName" style="width:65%;"></el-input> <el-input v-model="form.vipName" style="width:65%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="会员价格：" :label-width="formLabelWidth"> <el-form-item label="优惠力度：" :label-width="formLabelWidth">
<el-input v-model="form.rate" type="number" style="width:65%;" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input>
</el-form-item>
<el-form-item label="会员价格：" :label-width="formLabelWidth" :hidden="vipShow">
<el-input v-model="form.money" type="number" style="width:65%;" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input> <el-input v-model="form.money" type="number" style="width:65%;" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="邀请赏金：" :label-width="formLabelWidth"> <el-form-item label="邀请赏金：" :label-width="formLabelWidth" :hidden="vipShow">
<el-input v-model="form.award" style="width:65%;" type="number" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" <el-input v-model="form.award" style="width:65%;" type="number" min="0" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
placeholder="请输入邀请赏金"></el-input> placeholder="请输入邀请赏金"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="邀请赏金：" :label-width="formLabelWidth"> <!-- <el-form-item label="邀请赏金：" :label-width="formLabelWidth">
<el-input-number v-model="form.award" style="width:65%;" :precision="2" :step="0.1" :min="0" <el-input-number v-model="form.award" style="width:65%;" :precision="2" :step="0.1" :min="0"
placeholder="请输入邀请赏金 例0.1"></el-input-number> placeholder="请输入邀请赏金 例0.1"></el-input-number>
@ -120,10 +154,13 @@
dialogFormVisible1: false, dialogFormVisible1: false,
dialogFormVisible2: false, dialogFormVisible2: false,
dialogFormVisible3: false, dialogFormVisible3: false,
vipShow: false ,
memberGrade: '', memberGrade: '',
vipName: '', vipName: '',
money: '', money: '',
award: '', award: '',
rate: '',
vipType: 0,
vipNameType: 0, vipNameType: 0,
formLabelWidth: '200px', formLabelWidth: '200px',
checkBoxData: [], //多选框选择的值 checkBoxData: [], //多选框选择的值
@ -134,6 +171,8 @@
vipName: '', vipName: '',
money: 0.00, money: 0.00,
award: 0.00, award: 0.00,
rate: 0.00,
vipType: 0,
vipNameType: 0, vipNameType: 0,
}, },
form2: { form2: {
@ -209,6 +248,14 @@
addNotice() { addNotice() {
this.dialogFormVisible = true this.dialogFormVisible = true
}, },
handleHylx(record){
console.log(`🚀 ~ handleHylx ~ record:`, record)
if(record==0){
this.vipShow = false
}else{
this.vipShow = true
}
},
//添加会员配置 //添加会员配置
releasNoticeTo() { releasNoticeTo() {
@ -221,21 +268,11 @@
}); });
return return
} }
if (this.rate == '') {
if (this.money == '') {
this.$notify({ this.$notify({
title: '提示', title: '提示',
duration: 1800, duration: 1800,
message: '请输入会员价格', message: '请输入优惠力度',
type: 'warning'
});
return
}
if (this.award == '') {
this.$notify({
title: '提示',
duration: 1800,
message: '请输入邀请赏金',
type: 'warning' type: 'warning'
}); });
return return
@ -247,6 +284,8 @@
'vipName': this.vipName, 'vipName': this.vipName,
'money': this.money, 'money': this.money,
'award': this.award, 'award': this.award,
'vipType': this.vipType,
'rate': this.rate,
'vipNameType': this.vipNameType, 'vipNameType': this.vipNameType,
}) })
}).then(({ }).then(({
@ -261,6 +300,8 @@
this.vipName = '' this.vipName = ''
this.money = '' this.money = ''
this.award = '' this.award = ''
this.rate = ''
this.vipType = ''
this.vipNameType = 0 this.vipNameType = 0
this.dataSelect() this.dataSelect()
} }
@ -275,7 +316,14 @@
this.form.money = rows.money this.form.money = rows.money
this.form.award = rows.award this.form.award = rows.award
this.form.vipNameType = rows.vipNameType this.form.vipNameType = rows.vipNameType
this.form.vipType = rows.vipType
this.form.rate = rows.rate
if(rows.vipType==0){
this.vipShow = false
}else{
this.vipShow = true
}
console.log(`🚀 ~ amendone ~ this.vipShow:`, this.vipShow)
}, },
// 修改配置 // 修改配置
amendoneNoticeTo() { amendoneNoticeTo() {
@ -289,21 +337,11 @@
}); });
return return
} }
if (this.form.money == '') { if (this.form.rate == '') {
this.$notify({ this.$notify({
title: '提示', title: '提示',
duration: 1800, duration: 1800,
message: '请输入会员价格', message: '请输入优惠力度',
type: 'warning'
});
return
}
if (this.form.award == '') {
this.$notify({
title: '提示',
duration: 1800,
message: '请输入邀请赏金',
type: 'warning' type: 'warning'
}); });
return return
@ -317,6 +355,8 @@
'vipName': this.form.vipName, 'vipName': this.form.vipName,
'money': this.form.money, 'money': this.form.money,
'award': this.form.award, 'award': this.form.award,
'vipType': this.form.vipType,
'rate': this.form.rate,
'vipNameType': this.form.vipNameType, 'vipNameType': this.form.vipNameType,
}) })
}).then(({ }).then(({