Skip to content

S
SuperMan
Commit 45302d65 authored by 黄奎's avatar 黄奎
Browse files
Options

新增权限验证方法

parent 8929ed0a
Show whitespace changes
Inline Side-by-side
Showing with 460 additions and 471 deletions
src/assets/utils/AuthCode.js
View file @ 45302d65
......@@ -3,6 +3,6 @@
*/
var AuthCode = {
EidtCoupon:"IsEidtCoupon",//优惠券修改权限
};
export default AuthCode;
\ No newline at end of file
src/components/Hotel/SupplierHandFee.vue
View file @ 45302d65
......@@ -33,6 +33,15 @@
</el-select>
</span>
</li>
<li>
<span>
<em>团状态</em>
<el-select v-model="msg.IsSetOut">
<el-option label="正常发团" :value="0"></el-option>
<el-option label="取消发团" :value="1"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getSearch()"> &nbsp;
<input type="button" class="normalBtn" value="下载" @click="DownLoadFile()">
......@@ -111,6 +120,7 @@
Supplier: 0,
PageIndex: 1,
PageSize: 15,
IsSetOut:0,//0-正常发团，1-取消发团
},
loading: false,
currentPage: 1,
......@@ -165,6 +175,7 @@
TCID: item.TCIDS,
Supplier: that.msg.Supplier,
QMonthStr: that.msg.QMonthStr,
IsSetOut:that.msg.IsSetOut,
},
res => {
that.loading = false;
......
src/components/activity/CouponList.vue
View file @ 45302d65
<style>
.user_time_picker .el-date-editor--date > .el-input__inner {
.user_time_picker .el-date-editor--date>.el-input__inner {
padding: 0 10px;
font-size: 13px;
}
.user_time_picker .el-date-editor--date > span.el-input__prefix {
}
.user_time_picker .el-date-editor--date>span.el-input__prefix {
display: none;
}
.user_time_picker .el-date-editor--date > span.el-input__suffix {
}
.user_time_picker .el-date-editor--date>span.el-input__suffix {
top: -4px;
right: 2px;
}
.zidingyiFz i {
}
.zidingyiFz i {
font-size: 14px !important;
}
._couponReceiveCount{
}
._couponReceiveCount {
text-decoration: underline;
cursor: pointer;
}
/* .page_CouponList .el-button.is-circle{
}
/* .page_CouponList .el-button.is-circle{
border-radius: 4px
} */
.text_al_left{
.text_al_left {
text-align: left;
padding: 0 10px;
}
}
</style>
<template>
<div class="flexOne page_CouponList">
......@@ -32,18 +38,9 @@
<li>
<span>
<em>{{$t('system.table_company')}}</em>
<el-select
filterable
:disabled="msg.IsParentCompany==2"
v-model="msg.branchId"
>
<el-select filterable :disabled="msg.IsParentCompany==2" v-model="msg.branchId">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option
v-for="item in companyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
<el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
......@@ -52,7 +49,8 @@
<em>{{$t('system.table_ssLine')}}</em>
<el-select filterable v-model="msg.lineId" @change="getLineTeamList(msg.lineId, 2)">
<el-option :label="$t('system.ph_buxian')" :value="0"></el-option>
<el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option>
<el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
</el-option>
</el-select>
</span>
</li>
......@@ -61,7 +59,8 @@
<em>{{$t('active.ad_ssxl')}}</em>
<el-select filterable v-model="msg.lineteamId">
<el-option :label="$t('system.ph_buxian')" :value="0"></el-option>
<el-option v-for="item in QLineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option>
<el-option v-for="item in QLineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID">
</el-option>
</el-select>
</span>
</li>
......@@ -99,18 +98,11 @@
</li>
<li>
<input
type="button"
class="hollowFixedBtn"
:value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()"
> &nbsp;
<input
type="button"
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()">
&nbsp;
<input type="button"
@click="outerVisible = true,isleaveBtn=false,dialogTitle=$t('active.cl_addCoupon'),getCompany()"
class="normalBtn"
:value="$t('pub.addBtn')"
>
class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
......@@ -143,9 +135,11 @@
<td>{{item.couponsName}}</td>
<td>{{item.couponCount}}</td>
<td>
<span class="_couponReceiveCount" @click="item.couponReceiveCount === 0 ? '' : goDetail('CouponDetail', item)">{{item.couponReceiveCount}}</span>
<span class="_couponReceiveCount"
@click="item.couponReceiveCount === 0 ? '' : goDetail('CouponDetail', item)">{{item.couponReceiveCount}}</span>
</td>
<td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}
</td>
<td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}</td>
<td>{{item.branchName}}</td>
<td>{{item.lineId <= 0 ? $t('pub.unlimitedSel') : item.lineName}}</td>
<td>{{item.lineteamId <= 0 ? $t('pub.unlimitedSel') : item.lineTeamName}}</td>
......@@ -186,57 +180,33 @@
</td>
<td>{{item.remark}}</td>
<td class="text_al_left">
<!-- <el-button-group> -->
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button
v-if="item.couponEffectStatus === 2 && item.couponStatus === 1"
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle=$t('pub.updateMsg'),updateData(item),getCompany()"
></el-button>
<el-button v-if="item.couponEffectStatus === 2 && item.couponStatus === 1" type="primary"
icon="el-icon-edit" circle
@click="outerVisible=true,dialogTitle=$t('pub.updateMsg'),updateData(item),getCompany()"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_jyCoupon')" placement="top">
<el-button
v-if="item.couponStatus !== 2"
type="danger"
icon="iconfont icon-jinyong"
circle
@click="deleteItem(item, 2)"
></el-button>
<el-button v-if="item.couponStatus !== 2" type="danger" icon="iconfont icon-jinyong" circle
@click="deleteItem(item, 2)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_hfCoupon')" placement="top">
<el-button
v-if="item.couponStatus === 2"
type="success"
icon="iconfont icon-huifu"
circle
@click="deleteItem(item, 3)"
></el-button>
<el-button v-if="item.couponStatus === 2" type="success" icon="iconfont icon-huifu" circle
@click="deleteItem(item, 3)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_deleteCoupon')" placement="top">
<el-button
v-if="item.couponStatus === 2"
type="danger"
icon="iconfont icon-img_delete_small"
circle
@click="deleteItem(item)"
></el-button>
<el-button v-if="item.couponStatus === 2" type="danger" icon="iconfont icon-img_delete_small" circle
@click="deleteItem(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改当日活动库存" placement="top">
<el-button type="primary" icon="el-icon-edit" circle style="padding:6px;"
@click="updateKucundialog=true"
></el-button>
<el-button type="primary" icon="el-icon-edit" circle style="padding:6px;" @click="updateKucundialog=true">
</el-button>
</el-tooltip>
{{EditBtn}}
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button v-if="EditBtn" type="danger" icon="iconfont icon-xiugai" circle style="padding:4px;"
@click="outerVisible=true,EditItem(item)"
></el-button>
@click="outerVisible=true,EditItem(item)"></el-button>
</el-tooltip>
<!-- </el-button-group> -->
</td>
</tr>
</table>
......@@ -244,60 +214,37 @@
<i class="iconfont icon-kong"></i>
<p>{{$t('active.ld_noData')}}</p>
</div>
<el-pagination
background
@current-change="handleCurrentChange"
v-if="DataList.length>0"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
></el-pagination>
<el-dialog
custom-class="w800"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-pagination background @current-change="handleCurrentChange" v-if="DataList.length>0"
:current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size="msg.pageSize"
:total="total"></el-pagination>
<el-dialog custom-class="w800" :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<table class="layerTable layerNoIcon">
<tr>
<td>
<el-form-item :label="$t('system.table_company')" prop="branchId">
<el-select
filterable
class="w217"
v-model="addMsg.branchId"
:placeholder="$t('system.ph_choice')"
>
<el-select filterable class="w217" v-model="addMsg.branchId" :placeholder="$t('system.ph_choice')">
<el-option :label="$t('system.ph_buxian')" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in layerCompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
<el-option v-for="item in layerCompanyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('active.cl_couponName')" prop="couponsName">
<el-input
maxlength="20"
class="w217"
type="text"
v-model="addMsg.couponsName"
:placeholder="$t('pub.pleaseImport')"
></el-input>
<el-input maxlength="20" class="w217" type="text" v-model="addMsg.couponsName"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('advmanager.v_line')" prop="lineId">
<el-select filterable v-model="addMsg.lineId" @change="getLineTeamList(addMsg.lineId)">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option>
<el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
</el-option>
</el-select>
</el-form-item>
</td>
......@@ -305,14 +252,15 @@
<el-form-item :label="$t('advmanager.v_xilie')" prop="lineteamId">
<el-select filterable v-model="addMsg.lineteamId">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option>
<el-option v-for="item in LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID">
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('active.cl_couponType')" prop="couponsType" >
<el-form-item :label="$t('active.cl_couponType')" prop="couponsType">
<el-select filterable v-model="addMsg.couponsType" @change="addMsg.denomination = ''">
<el-option :label="$t('active.cl_dyquan')" :value="1"></el-option>
<el-option :label="$t('active.cl_zkquan')" :value="2"></el-option>
......@@ -321,48 +269,34 @@
</td>
<td>
<el-form-item :label="$t('active.cl_yhqmiane')" prop="denomination">
<el-input
@input="maxValue"
maxlength="20"
class="w217"
type="number"
v-model="addMsg.denomination"
:placeholder="$t('active.cl_dkjezk')"
></el-input>
<el-input @input="maxValue" maxlength="20" class="w217" type="number" v-model="addMsg.denomination"
:placeholder="$t('active.cl_dkjezk')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('active.cl_couponNum')" prop="couponCount">
<el-input v-model="addMsg.couponCount" class="w217" type="number"/>
<el-input v-model="addMsg.couponCount" class="w217" type="number" />
</el-form-item>
</td>
<td>
<el-form-item :label="$t('active.cl_sytiaojian')" prop="useCondition">
<el-input v-model="addMsg.useCondition" class="w217" :placeholder="$t('active.cl_mdskeyong')"/>
<el-input v-model="addMsg.useCondition" class="w217" :placeholder="$t('active.cl_mdskeyong')" />
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('active.cl_sxriqi')" prop="effectDate">
<el-date-picker
value-format="yyyy-MM-dd HH:mm:ss"
class="w217"
v-model="addMsg.effectDate"
type="datetime"
></el-date-picker>
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.effectDate"
type="datetime"></el-date-picker>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('active.cl_yxjzhiri')" prop="expirationDate">
<el-date-picker
value-format="yyyy-MM-dd HH:mm:ss"
class="w217"
v-model="addMsg.expirationDate"
type="datetime"
></el-date-picker>
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.expirationDate"
type="datetime"></el-date-picker>
</el-form-item>
</td>
</tr>
......@@ -402,21 +336,22 @@
</td>
<td>
<el-form-item :label="$t('MarketingActi.huangoujia')">
<el-input v-model="addMsg.redemptionPrice" class="w217" :placeholder="$t('pub.pleaseImport')"/>
<el-input v-model="addMsg.redemptionPrice" class="w217" :placeholder="$t('pub.pleaseImport')" />
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('hotel.hotel_remark')">
<el-input v-model="addMsg.remark" class="w217" :placeholder="$t('pub.pleaseImport')"/>
<el-input v-model="addMsg.remark" class="w217" :placeholder="$t('pub.pleaseImport')" />
</el-form-item>
</td>
</tr>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="hollowFixedBtn"
@click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
......@@ -424,7 +359,8 @@
<el-dialog custom-class='w400' title="修改当日活动库存" :visible.sync="updateKucundialog" center>
<el-form label-width="150px">
<el-form-item label="修改当日活动库存">
<el-input class="w180" v-model="upDateKcMsg.number" @keyup.native="checkInteger(upDateKcMsg,'number',true)"></el-input>
<el-input class="w180" v-model="upDateKcMsg.number" @keyup.native="checkInteger(upDateKcMsg,'number',true)">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
......@@ -436,7 +372,7 @@
</div>
</template>
<script>
export default {
export default {
data() {
return {
leaveBtn: "",
......@@ -448,7 +384,7 @@ export default {
currentPage: 1,
outerVisible: false,
innerVisible: false,
updateKucundialog:false,
updateKucundialog: false,
isRight: true,
dialogTitle: "",
insideDialogTxt: "",
......@@ -464,16 +400,44 @@ export default {
couponStatus: -1,
groupId: '',
branchId: '',
couponsUseScope:"",
couponsUseScope: "",
},
rules: {
branchId: [{ required: true, message: this.$t('rule.company'), trigger: "change" }],
lineId: [{ required: true, message: this.$t('rule.qxzxuanlu'), trigger: "change" }],
couponsName: [{ required: true, message: this.$t('rule.qsryhqmingcheng'), trigger: "blur" }],
useCondition: [{ required: true, message: this.$t('rule.qsrsytiaojian'), trigger: "blur" }],
effectDate: [{ required: true, message: this.$t('rule.qxzsxriqi'), trigger: "change" }],
expirationDate: [{ required: true, message: this.$t('rule.qxzjzriqi'), trigger: "change" }],
couponCount: [{ required: true, message: this.$t('rule.qsryhqshuliang'), trigger: "blur" }],
branchId: [{
required: true,
message: this.$t('rule.company'),
trigger: "change"
}],
lineId: [{
required: true,
message: this.$t('rule.qxzxuanlu'),
trigger: "change"
}],
couponsName: [{
required: true,
message: this.$t('rule.qsryhqmingcheng'),
trigger: "blur"
}],
useCondition: [{
required: true,
message: this.$t('rule.qsrsytiaojian'),
trigger: "blur"
}],
effectDate: [{
required: true,
message: this.$t('rule.qxzsxriqi'),
trigger: "change"
}],
expirationDate: [{
required: true,
message: this.$t('rule.qxzjzriqi'),
trigger: "change"
}],
couponCount: [{
required: true,
message: this.$t('rule.qsryhqshuliang'),
trigger: "blur"
}],
},
addMsg: {
couponsName: "",
......@@ -491,8 +455,8 @@ export default {
lineteamId: 0,
couponsUseScope: 1,
couponStatus: 1,
redemptionPrice:'',
remark:"",
redemptionPrice: '',
remark: "",
},
pwdMsg: {
Id: "",
......@@ -514,38 +478,44 @@ export default {
groupId: '',
LineTeamList: [],
QLineTeamList: [],
upDateKcMsg:{
number:''
upDateKcMsg: {
number: ''
},
EditBtn:false,
EditBtn: false,
};
},
mounted() {
let userInfo = this.getLocalStorage();
this.groupId = this.msg.groupId = this.getCompanyMsg.RB_Group_Id = this.addMsg.groupId = userInfo.RB_Group_id; //集团
this.groupId = this.msg.groupId = this.getCompanyMsg.RB_Group_Id = this.addMsg.groupId = userInfo
.RB_Group_id; //集团
this.msg.branchId = userInfo.RB_Branch_id; //公司
if(userInfo.EmployeeId==615){
this.EditBtn=true;
}
this.GetAuth();
this.getList();
this.getCompany();
this.getLineList();
},
filters: {
},
filters: {},
methods: {
EditItem(item){
this.addMsg=Object.assign({},item);
GetAuth() {
var actionCode = this.$AuthCode.EidtCoupon;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.EditBtn = true;
}
});
},
EditItem(item) {
this.addMsg = Object.assign({}, item);
},
//点击确定修改库存
sureUpdatekucun(){
sureUpdatekucun() {
this.apiJavaPost("/api/appActivity/updateCouponStock", this.upDateKcMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.updateKucundialog=false;
this.updateKucundialog = false;
this.getList();
this.upDateKcMsg.number='';
this.upDateKcMsg.number = '';
} else {
this.Error(res.data.message)
}
......@@ -558,8 +528,7 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.layerCompanyList = res.data.data;
} else {
}
} else {}
},
err => {}
);
......@@ -626,7 +595,7 @@ export default {
})
},
//获取系列列表
getLineTeamList (LineID, type) {
getLineTeamList(LineID, type) {
let msg = {
lineID: LineID,
isTOOP: 1
......@@ -644,17 +613,17 @@ export default {
// 修改
updateData(item) {
this.getLineTeamList(item.lineId)
this.addMsg.couponsName= item.couponsName
this.addMsg.effectDate= item.effectDate
this.addMsg.expirationDate= item.expirationDate
this.addMsg.couponsType= item.couponsType
this.addMsg.groupId= item.groupId
this.addMsg.branchId= item.branchId
this.addMsg.lineId= item.lineId
this.addMsg.denomination= item.denomination
this.addMsg.overlapUse= item.overlapUse
this.addMsg.useCondition= item.useCondition
this.addMsg.id= item.id
this.addMsg.couponsName = item.couponsName
this.addMsg.effectDate = item.effectDate
this.addMsg.expirationDate = item.expirationDate
this.addMsg.couponsType = item.couponsType
this.addMsg.groupId = item.groupId
this.addMsg.branchId = item.branchId
this.addMsg.lineId = item.lineId
this.addMsg.denomination = item.denomination
this.addMsg.overlapUse = item.overlapUse
this.addMsg.useCondition = item.useCondition
this.addMsg.id = item.id
this.addMsg.couponCount = item.couponCount
this.addMsg.lineteamId = item.lineteamId
this.addMsg.couponsUseScope = item.couponsUseScope
......@@ -675,12 +644,15 @@ export default {
text = this.$t('tips.qrhuifu');
status = 1
}
this.$confirm(text+'“'+ item.couponsName +'”'+this.$t('active.ad_yhq'), this.$t('tips.tips'), {
this.$confirm(text + '“' + item.couponsName + '”' + this.$t('active.ad_yhq'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/sell/coupon/updateCouponStatus", {couponId: item.id, status: status,}, res => {
this.apiJavaPost("/api/sell/coupon/updateCouponStatus", {
couponId: item.id,
status: status,
}, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
......@@ -716,7 +688,12 @@ export default {
goUrl(name, id) {
this.$router.push({
name: name,
query: { id: id, type: 9, blank: "y", tab: "绑定账户信息" }
query: {
id: id,
type: 9,
blank: "y",
tab: "绑定账户信息"
}
});
},
closeChangeMachie(done) {
......@@ -743,9 +720,10 @@ export default {
lineteamId: 0,
couponsUseScope: 1,
couponStatus: 1,
redemptionPrice:'',
redemptionPrice: '',
}
}
}
};
};
</script>
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