Skip to content

S
SuperMan
Commit a1bbb49a authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

新增奖励页面，修改一键审批按钮权限

parent 9527865f
Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 6 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ a1bbb49a
......@@ -821,7 +821,6 @@ export default {
let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
this.userMenuCode = true;
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.ActionMenuCode=userInfo.ActionMenuCode;
this.DepartIDs = userInfo.RB_Department_Id;
......
src/components/administrative/Announcement.vue
View file @ a1bbb49a
......@@ -89,7 +89,12 @@
<el-dialog custom-class='w800' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<div v-if='layerType==1'>
<p style="text-align: right; padding: 5px 0;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
<pre style="letter-spacing: 1px; font-size: 14px; color: #333;">{{detailMessage.Content}}</pre>
<div v-html="detailMessage.Content">
</div>
<!-- <pre style="letter-spacing: 1px; font-size: 14px; color: #333;">
{{detailMessage.Content}}
</pre> -->
<p style="padding:0 10px; margin: 10px 0; background: #f1f1f1;">{{$t('adm.adm_fujian')}}：</p>
<p style="height: 28px; padding: 0 10px; line-height: 28px;" v-for="item in downLoadList" class="AnnFileListPMeta">
<i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>
......@@ -107,9 +112,11 @@
</tr>
<tr>
<td>
<el-form-item :label="$t('adm.adm_content')" prop="Content">
<quill-editor :options="editorOption" v-model="addMsg.Content"></quill-editor>
<!-- <el-form-item :label="$t('adm.adm_content')" prop="Content">
<el-input class='w600 ann_textarea' type="textarea" v-model="addMsg.Content" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-form-item> -->
</td>
</tr>
<tr>
......@@ -156,6 +163,19 @@
export default {
data() {
return {
editorOption: {
modules:{
toolbar:[
['bold', 'italic', 'underline', 'strike', 'image'], // toggled buttons
[{ 'header': [1, 2, 3, 4, 5, 6, false] }],
[{ 'color': [] }, {'background': [] }],
[{ 'font': [] }],
[{ 'align': [] }],
[{ 'size': ['small', false, 'large', 'huge'] }],
[{ 'list': 'ordered'}, { 'list': 'bullet' }]
]
}
},
uploadList:[],
layerType:'',
loading:true,
......
src/components/index.vue
View file @ a1bbb49a
......@@ -829,7 +829,10 @@
<el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie">
<div>
<p style="text-align: right; padding: 5px 0;font-size: 12px;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
<pre style="letter-spacing: 1px; font-size: 14px; color: #333;line-height: 30px;">{{detailMessage.Content}}</pre>
<div v-html="detailMessage.Content">
</div>
<!-- <pre style="letter-spacing: 1px; font-size: 14px; color: #333;line-height: 30px;">{{detailMessage.Content}}</pre> -->
<p style="padding:0 10px; margin: 10px 0; background: #f1f1f1;">{{$t('adm.adm_fujian')}}：</p>
<p style="height: 28px; padding: 0 10px; line-height: 28px; color: blue;" v-for="item in downLoadList" class="AnnFileListPMeta">
<i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>
......
src/components/systemManagement/RewardManagement.vue 0 → 100644
View file @ a1bbb49a
<style>
.LM_mainDiv {
overflow-y: auto;
}
.LP_table {
margin-top: 10px;
background-color: #fff;
border-top: 1px solid #d1d1d1;
/*border-left: 1px solid #d1d1d1;*/
/* border-right: 1px solid #d1d1d1; */
font-size: 14px;
width:100%;
min-width: 1200px;
padding-bottom: 5px;
}
.LP_table tr {
height: 40px;
}
.LP_table tr th {
border-left: 1px solid #d1d1d1;
border-bottom: 1px solid #d1d1d1;
/* border-right: 1px solid #d1d1d1; */
position: relative;
background-color: #E6E6E6;
}
.LP_table tr th:last-child{
border-right: 1px solid #d1d1d1;
}
.LP_table td {
border-left: 1px solid #d1d1d1;
border-bottom: 1px solid #d1d1d1;
/* border-right: 1px solid #d1d1d1; */
text-align: center;
padding: 5px 0;
}
.LP_table td:last-child{
border-right: 1px solid #d1d1d1;
}
.LP_table .el-button--primary {
padding: 5px;
}
.Lp_role {
position: absolute;
top: 15px;
left: 30px;
}
.Lp_company {
position: absolute;
right: 30px;
top: 5px;
}
.comLessDiv{
width:100%;
height:40px;
margin-top:5px;
padding-bottom:5px;
border-bottom:1px solid #d1d1d1;
}
.comLessDiv:last-child{
border:0;
padding-bottom:0;
}
.comLessDiv input{
padding: 0 5px;
}
.comLessDiv .el-input-group__append,.comLessDiv .el-input-group__append button{
padding: 0 8px;
cursor: pointer;
}
.addLessPrice{
margin-left:10px;
color:seagreen;
cursor: pointer;
}
.lessBtn{
margin-top:5px;
}
</style>
<template>
<div>
<el-row>
<el-col :offset="23">
<input type='button' class="normalBtn lessBtn" @click="SaveLessPrice(null)" value="保存"></input>
</el-col>
</el-row>
<div class="LM_mainDiv">
<!--保存-->
<table border="0" cellspacing="0" cellpadding="0" class="LP_table" v-loading="this.loading">
<tr>
<th width="150">公司名称</th>
<th width="40%">人数</th>
<th width="40%">奖励金额</th>
<th width="150">操作</th>
</tr>
<tr v-for="(item,index) in dataList">
<td>
{{item.BName}} <i class="iconfont icon-bumenguanli-tianjia addLessPrice" @click="addLessPrice(item)"></i>
</td>
<td>
<div v-for="subItem in item.AwardList" class="comLessDiv">
<el-input class="w200" placeholder="最少" v-model="subItem.MinPeopleNum" @keyup.native="">
<template slot="prepend">最少</template>
<el-button slot="append">人</el-button>
</el-input>
-
<el-input class="w200" placeholder="最多" v-model="subItem.MaxPeopleNum" @keyup.native="">
<template slot="prepend">最多</template>
<el-button slot="append">人</el-button>
</el-input>
</div>
</td>
<td>
<div v-for="subItem in item.AwardList" class="comLessDiv">
<el-input class="w80" placeholder="奖励金额" v-model="subItem.AwardMoney" @keyup.native=""> <el-button slot="append">元</el-button></el-input>
</div>
</td>
<td>
<div v-for="(subItem,subIndex) in item.AwardList" class="comLessDiv">
<input type='button' class="normalBtn lessBtn" @click="SaveLessPrice(subItem)" value="保存"></input>
<input type='button' class="normalBtn lessBtn" @click="RemoveItem(item, subItem, subIndex)" value="删除"></input>
</div>
</td>
</tr>
</table>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//分公司列表
dataList: [],
//角色列表
RoleList: [],
loading:false,
LineList: [],
commonSelect:0,
};
},
methods: {
//保存少价管理
SaveLessPrice(subItem) {
let List = [];
if (subItem) {
if (subItem.MaxPeopleNum>0) {
List = [subItem]
} else {
return this.Error('请填写人数');
}
} else{
this.dataList.forEach(x=>{
x.AwardList.forEach(y=>{
if (y.MinPeopleNum>0 && y.MaxPeopleNum>0)
List.push(y)
})
})
}
console.log(List)
this.apipost(
"award_get_SetService", List,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
}else{
this.Error(res.data.message);
}
},
err => {}
);
},
//获取列表
getList() {
this.loading = true;
var that=this;
that.apipost(
"award_get_GetAllListService", {},
res => {
that.loading = false;
if (res.data.resultCode == 1) {
var data = res.data.data;
that.dataList=data;
}else{
that.Error(res.data.message);
}
},
err => {}
);
},
//获取列表
RemoveItem(item, subItem, index) {
if(subItem.ID==0){
item.AwardList.splice(index,1);
return;
}
var that = this;
this.Confirm("是否删除此少价信息?", function () {
if (subItem.ID > 0) {
that.apipost(
"award_get_DelAward", [subItem.ID],
res => {
if (res.data.resultCode == 1) {
that.Success("操作成功!");
that.getList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
}
});
},
//点击添加
addLessPrice(item){
var obj = {
RB_Branch_id: item.Id,
MinPeopleNum: 0,
MaxPeopleNum: 1,
AwardMoney: 0,
ID: 0,
}
item.AwardList.push(obj);
this.$forceUpdate()
}
},
mounted() {
this.getList();
},
};
</script>
src/router/config.js
View file @ a1bbb49a
......@@ -2320,7 +2320,14 @@ export default {
meta: {
title: '少价管理'
}
}, , { // 财务往来单据 收入确认单
}, { //奖励管理
path: '/RewardManagement',
name: 'RewardManagement',
component: resolve => require(['@/components/systemManagement/RewardManagement'], resolve),
meta: {
title: '奖励管理'
}
} , { // 财务往来单据 收入确认单
path: '/priceIncomeConfirmList',
name: 'priceIncomeConfirmList',
component: resolve => require(['@/components/FinancialModule/priceIncomeConfirmList'], resolve),
......
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