|
@@ -1,6 +1,20 @@
|
|
|
<template>
|
|
|
<div>
|
|
|
<div class="royaltypg-all">
|
|
|
+ <el-dialog title="已确认列表" :visible.sync="affirmVisible">
|
|
|
+ <div style="margin-bottom: 5px;text-align: right;">
|
|
|
+ <el-button @click="RoyaltyFormPrice" size="mini" type="primary">提交到日付申请</el-button>
|
|
|
+ </div>
|
|
|
+ <el-table height="550" border ref="ConfirmationListTable" tooltip-effect="dark" @selection-change="ConfirmationListChange" :data="ConfirmationList">
|
|
|
+ <el-table-column type="selection" width="55"></el-table-column>
|
|
|
+ <el-table-column property="cnName" label="姓名" width="100"></el-table-column>
|
|
|
+ <el-table-column property="companyName" label="公司" ></el-table-column>
|
|
|
+ <el-table-column property="depName" label="部门" width="150"></el-table-column>
|
|
|
+ <el-table-column property="jobName" label="职位" width="150"></el-table-column>
|
|
|
+ <el-table-column property="sumPrice" label="提成总额" width="150"></el-table-column>
|
|
|
+ <el-table-column property="count" label="已确认条数" width="100"></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-dialog>
|
|
|
<div class="royaltypg-hand">
|
|
|
<el-form label-width="50px">
|
|
|
<div class="royaltypg-hand-search">
|
|
@@ -36,7 +50,7 @@
|
|
|
<el-button style="margin-left: 10px;" @click="ComputeRoyalties" type="primary">查 询</el-button>
|
|
|
<el-button @click="derivelist" type="primary">导出提成列表</el-button>
|
|
|
<el-button @click="RoyaltyConfirmByFin" type="primary">发送通知给国交同事进行提成确认</el-button>
|
|
|
- <el-button type="primary">查看已确定</el-button>
|
|
|
+ <el-button @click="RoyaltyConfirmInfo" type="primary">查看已确定</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form>
|
|
@@ -137,6 +151,7 @@ import {debounce} from '../../store/statice'
|
|
|
export default {
|
|
|
data () {
|
|
|
return {
|
|
|
+ UserId:'',
|
|
|
pickerOptions: {
|
|
|
shortcuts: [{
|
|
|
text: '最近一周',
|
|
@@ -175,7 +190,10 @@ export default {
|
|
|
tableData: [],
|
|
|
currentPage4: 4,
|
|
|
numpices:0,
|
|
|
- multipleSelection: []
|
|
|
+ multipleSelection: [],
|
|
|
+ affirmVisible:false,
|
|
|
+ ConfirmationList:[],
|
|
|
+ ConfirmationListTable:[],
|
|
|
}
|
|
|
},
|
|
|
methods:{
|
|
@@ -305,9 +323,12 @@ export default {
|
|
|
},
|
|
|
//table 多选
|
|
|
handleSelectionChange(val) {
|
|
|
- console.log(val);
|
|
|
this.multipleSelection = val;
|
|
|
},
|
|
|
+ //确认列表选择
|
|
|
+ ConfirmationListChange(val) {
|
|
|
+ this.ConfirmationListTable = val;
|
|
|
+ },
|
|
|
//处理时间
|
|
|
getdate(val){
|
|
|
var date=new Date(val);
|
|
@@ -353,6 +374,13 @@ export default {
|
|
|
},
|
|
|
//提成通知
|
|
|
RoyaltyConfirmByFin(){
|
|
|
+ if (this.multipleSelection==0) {
|
|
|
+ this.$message({
|
|
|
+ message: "未勾选列表!",
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ return
|
|
|
+ }
|
|
|
var url = "/api/Financial/RoyaltyConfirmByFin"
|
|
|
var that = this
|
|
|
this.$axios({
|
|
@@ -383,8 +411,80 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ //已确认
|
|
|
+ RoyaltyConfirmInfo(){
|
|
|
+ this.affirmVisible=true;
|
|
|
+ var url = "/api/Financial/RoyaltyConfirmInfo"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer '
|
|
|
+ },
|
|
|
+ }).then(function (res) {
|
|
|
+ if(res.data.code==200){
|
|
|
+ // that.$message({
|
|
|
+ // message: res.data.msg,
|
|
|
+ // type: 'success'
|
|
|
+ // });
|
|
|
+ that.ConfirmationList=res.data.data;
|
|
|
+ }else{
|
|
|
+ that.$message({
|
|
|
+ message: res.data.msg,
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //提交到日付
|
|
|
+ RoyaltyFormPrice(){
|
|
|
+ let items=[];
|
|
|
+ if (this.ConfirmationListTable.length>0) {
|
|
|
+ for (let b = 0; b < this.ConfirmationListTable.length; b++) {
|
|
|
+ items.push(
|
|
|
+ {
|
|
|
+ "userId":this.ConfirmationListTable[b].userId,
|
|
|
+ "chiArr":this.ConfirmationListTable[b].royaltyIdArr,
|
|
|
+ }
|
|
|
+ )
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ this.$message({
|
|
|
+ message: "未勾选列表!",
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ var url = "/api/Financial/RoyaltyFormPrice"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer '
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ items:items,
|
|
|
+ createId:that.UserId
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if(res.data.code==200){
|
|
|
+ that.$message({
|
|
|
+ message: res.data.msg,
|
|
|
+ type: 'success'
|
|
|
+ });
|
|
|
+ that.RoyaltyConfirmInfo();
|
|
|
+ }else{
|
|
|
+ that.$message({
|
|
|
+ message: res.data.msg,
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
},
|
|
|
mounted(){
|
|
|
+ this.UserId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
|
|
|
this.daraSource()
|
|
|
}
|
|
|
}
|
|
@@ -396,7 +496,6 @@ export default {
|
|
|
box-shadow: 0 0 5px #0005;
|
|
|
border-radius: 10px;
|
|
|
height: 100%;
|
|
|
-
|
|
|
min-height: 830px;
|
|
|
}
|
|
|
.royaltypg-hand-search{
|