|
|
@@ -33,7 +33,8 @@
|
|
|
</el-form-item>
|
|
|
<div style="margin-left: 10px;">
|
|
|
<el-button @click="ComputeRoyalties" type="primary">查 询</el-button>
|
|
|
- <el-button @click="derivelist" type="primary">导出提成列表</el-button>
|
|
|
+ <!-- <el-button @click="derivelist" type="primary">导出提成列表</el-button> -->
|
|
|
+ <el-button @click="derivelist" type="primary">确认</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -45,10 +46,10 @@
|
|
|
border
|
|
|
@selection-change="handleSelectionChange"
|
|
|
style="width: 100%">
|
|
|
- <!-- <el-table-column
|
|
|
+ <el-table-column
|
|
|
type="selection"
|
|
|
width="55">
|
|
|
- </el-table-column> -->
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="date"
|
|
|
label="序号"
|
|
|
@@ -139,6 +140,14 @@ export default {
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
|
|
picker.$emit('pick', [start, end]);
|
|
|
}
|
|
|
+ },{
|
|
|
+ text: '最近一年',
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 365);
|
|
|
+ picker.$emit('pick', [start, end]);
|
|
|
+ }
|
|
|
}]
|
|
|
},
|
|
|
cost:0,
|
|
|
@@ -153,7 +162,6 @@ export default {
|
|
|
depOption:[],
|
|
|
userOption:[],
|
|
|
tableData: [],
|
|
|
- currentPage4: 4,
|
|
|
numpices:0,
|
|
|
multipleSelection: []
|
|
|
}
|
|
|
@@ -309,7 +317,7 @@ export default {
|
|
|
var d=date.getDate()<10?'0'+date.getDate():date.getDate();
|
|
|
return y+'-'+m+'-'+d
|
|
|
},
|
|
|
- //提成结算
|
|
|
+ //查询
|
|
|
ComputeRoyalties(){
|
|
|
if(this.uservalue==""||this.value2.length<=0){
|
|
|
this.$message({
|
|
|
@@ -319,7 +327,7 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
this.tableData=[];
|
|
|
- var url = "/api/Financial/ComputeRoyalties"
|
|
|
+ var url = "/api/Financial/QueryRoyaltyInfo"
|
|
|
var that = this
|
|
|
this.$axios({
|
|
|
method: 'post',
|
|
|
@@ -334,7 +342,7 @@ export default {
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
if(res.data.code==200){
|
|
|
- that.tableData=res.data.data.resultArr;
|
|
|
+ that.tableData=res.data.data;
|
|
|
that.numpices=res.data.data.totalPrice;
|
|
|
}else{
|
|
|
that.$message({
|
|
|
@@ -344,6 +352,38 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ //提成确认
|
|
|
+ RoyaltyConfirmByUser(){
|
|
|
+ var url = "/api/Financial/RoyaltyConfirmByUser"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer '
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ startData:that.getdate(this.value2[0]),
|
|
|
+ endData:that.getdate(this.value2[1]),
|
|
|
+ userId:that.uservalue,
|
|
|
+ deparId:that.depvalue,
|
|
|
+ companyId:that.value,
|
|
|
+ computeRoyaltiesList:that.multipleSelection,
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if(res.data.code==200){
|
|
|
+ that.$message({
|
|
|
+ message: res.data.msg,
|
|
|
+ type: 'success'
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ that.$message({
|
|
|
+ message: res.data.msg,
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
},
|
|
|
created(){
|
|
|
},
|
