Skip to content

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

‘财务单据审核@@’

parent a1f24dd7
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 207 deletions
src/assets/css/cssReset.css
View file @ 08ce9b15
...@@ -523,13 +523,12 @@ vertical-align:middle ...@@ -523,13 +523,12 @@ vertical-align:middle
bottom: 0; bottom: 0;
left: 50px; left: 50px;
padding: 10px; padding: 10px;
overflow: hidden; overflow: auto;
font-family: 'PingFangSc-Fine'; font-family: 'PingFangSc-Fine';
z-index: 999; z-index: 999;
right: 0; right: 0;
background-color: #fff; background-color: #fff;
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
padding-bottom: 30px;
} }
.bottom-box .btm-title{ .bottom-box .btm-title{
padding-left: 10px; padding-left: 10px;
...@@ -550,46 +549,4 @@ vertical-align:middle ...@@ -550,46 +549,4 @@ vertical-align:middle
.page_ShoppingReimbursementDetails .avatar-uploader-icon { .page_ShoppingReimbursementDetails .avatar-uploader-icon {
height: auto !important; height: auto !important;
} }
\ No newline at end of file
/************************** luochao 重新定义表格样式 BEGIN *******************************/
.al-tab{
width: 100%;
border-collapse: collapse;
}
.al-tab .center.th,.al-tab .center.td{
text-align: center !important;
}
.al-tab,.al-tab th, .al-tab td{
border:1px solid #ddd;
}
.al-tab caption{
font-size: 18px;
color: #333;
height: 40px;
line-height: 40px;
text-align: left;
padding-left: 12px;
}
.al-tab th{
background: #E6E6E6;
height: 40px;
line-height: 40px;
color: #333;
font-size: 16px;
font-weight: 300;
text-align: left;
padding-left:5px;
}
.al-tab td{
height: 40px;
line-height: 40px;
color: #333;
font-size: 12px;
font-weight: 300;
text-align: left;
padding-left:5px;
}
/************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file
src/components/FinancialModule/BasicDocuments.vue
View file @ 08ce9b15
...@@ -725,7 +725,7 @@ ...@@ -725,7 +725,7 @@
<td height="50px"></td> <td height="50px"></td>
<td height="50px"></td> <td height="50px"></td>
<td height="50px"></td> <td height="50px"></td>
<td height="50px"></td> <td height="50px"></td>Content
<td height="50px"></td> <td height="50px"></td>
<td height="50px"></td> <td height="50px"></td>
<!-- <td height="50px"></td> --> <!-- <td height="50px"></td> -->
...@@ -1463,7 +1463,7 @@ export default { ...@@ -1463,7 +1463,7 @@ export default {
data.VorcherInos.forEach(x=>{ data.VorcherInos.forEach(x=>{
if(x.Type==3){ if(x.Type==3){
this.FuImgList.push(x.Content); this.FuImgList.push(x.Content);
this.images.push(Content) this.images.push(x.Content)
} }
}) })
} }
......
src/components/FinancialModule/sellCommissionRules.vue
View file @ 08ce9b15
<template> <template>
<div class="rule-box"> <div>
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
...@@ -40,115 +40,85 @@ ...@@ -40,115 +40,85 @@
:rules="rules" :rules="rules"
label-width="110px" label-width="110px"
> >
<el-row> <el-row>
<el-col :span="4" :gutter="20"> <el-col :span="4" :gutter="20">
<el-form-item label="账户别名："> <el-form-item label="账户别名：">
<el-input v-model="addMsg.RuleName"></el-input> <el-input v-model="addMsg.RuleName" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5" :gutter="20"> <el-col :span="4" :gutter="20">
<el-form-item label="提成类别："> <el-form-item label="提成类别：">
<el-select filterable v-model="addMsg.CommissionMethod" class> <el-select filterable v-model="addMsg.CommissionMethod" class>
<el-option label="交易额" value=1></el-option> <el-option label="交易额" value=1></el-option>
<el-option label="毛利" value=2></el-option> <el-option label="毛利" value=2></el-option>
<el-option label="人头数" value=3></el-option> <el-option label="人头数" value=3></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5" :gutter="20"> <el-col :span="4" :gutter="20">
<el-form-item label="提成方式："> <el-form-item label="提成方式：">
<el-select filterable v-model="addMsg.CommissionType" class> <el-select filterable v-model="addMsg.CommissionType" class>
<el-option label="固定百分比" value=1></el-option> <el-option label="百分比" value=1></el-option>
<el-option label="阶梯百分比" value=2></el-option> <el-option label="定额" value=2></el-option>
<el-option label="固定金额" value=3></el-option> </el-select>
<el-option label="阶梯金额" value=4></el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="4" :gutter="20">
</el-col> <el-form-item label="提成比例：">
<el-col :span="5" :gutter="20"> <el-input v-model="addMsg.CommissionVariable">
<el-form-item label="提成比例："> <template slot="append">{{addMsg.CommissionType==1?'%':'/人'}}</template>
<el-input v-model="addMsg.CommissionVariable" :disabled="addMsg.CommissionType%2!=1"> </el-input>
<template slot="append">{{addMsg.CommissionType==1?'%':'/人'}}</template> </el-form-item>
</el-input> </el-col>
</el-form-item> <el-col :span="4" :gutter="20">
</el-col> <el-form-item label="提成要求：">
<el-col :span="5" :gutter="20"> <el-select filterable v-model="addMsg.Require" class>
<el-form-item label="提成要求："> <el-option label="已收定金" value=1></el-option>
<el-select v-model="addMsg.Require" class> <el-option label="尾款收齐" value=2></el-option>
<el-option label="已收定金" value=1></el-option> </el-select>
<el-option label="尾款收齐" value=2></el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="4" :gutter="20">
</el-col> <el-form-item label="结算周期：">
</el-row> <el-select filterable v-model="addMsg.BalanceCyc" class>
<el-row> <el-option label="按单结算" value=1></el-option>
<el-col :span="4" :gutter="20"> <el-option label="按月结算" value=2></el-option>
<el-form-item label="结算周期："> </el-select>
<el-select v-model="addMsg.BalanceCyc" class> </el-form-item>
<el-option label="按单结算" value=1></el-option> </el-col>
<el-option label="按月结算" value=2></el-option> </el-row>
</el-select> <el-row>
</el-form-item> <el-col :span="4" :gutter="20">
</el-col> <el-form-item label="结算要求：">
<el-col :span="5" :gutter="20"> <el-select filterable v-model="addMsg.BalanceCyc" class>
<el-form-item label="结算要求："> <el-option label="强制完成周期内所有订单提成要求" value=1></el-option>
<el-select v-model="addMsg.IsFinishAll" class> <el-option label="不用强制完成" value=0></el-option>
<el-option label="强制完成周期内所有订单提成要求" value=1></el-option> </el-select>
<el-option label="不用强制完成" value=0></el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="4" :gutter="20">
</el-col> <el-form-item label="适用公司：">
<el-col :span="5" :gutter="20"> <el-select filterable v-model="addMsg.BalanceCyc" class>
<el-form-item label="适用公司："> <el-option label="强制完成周期内所有订单提成要求" value=1></el-option>
<el-select filterable multiple collapse-tags @change="changeData(1)" v-model="addMsg.UsingBranch" class> </el-select>
<el-option label="集团通用" value=-1></el-option> </el-form-item>
<el-option v-for="(item, index) in CompanyList" :label="item.BName" :value="item.Id" :key="index"></el-option> </el-col>
</el-select> <el-col :span="4" :gutter="20">
</el-form-item> <el-form-item label="适用线路：">
</el-col> <el-select filterable v-model="addMsg.BalanceCyc" class>
<el-col :span="5" :gutter="20"> <el-option label="强制完成周期内所有订单提成要求" value=1></el-option>
<el-form-item label="适用线路："> </el-select>
<el-select filterable multiple collapse-tags @change="changeData(2)" v-model="addMsg.UsingLine" class> </el-form-item>
<el-option label="所有线路" value=-1></el-option> </el-col>
<el-option v-for="(item, index) in lines" :label="item.lineName" :value="item.lineID" :key="index"></el-option> <el-col :span="4" :gutter="20">
</el-select> <el-form-item label="启用时间">
</el-form-item> <el-select filterable v-model="addMsg.BalanceCyc" class>
</el-col> <el-option label="强制完成周期内所有订单提成要求" value=1></el-option>
<el-col :span="5" :gutter="20"> </el-select>
<el-form-item label="启用时间："> </el-form-item>
<el-date-picker v-model="EffectDate" type="date" placeholder="选择启用时间"> </el-col>
</el-date-picker> </el-row>
</el-form-item>
</el-col>
</el-row>
<el-row>
<table class="al-tab" v-show='addMsg.CommissionType%2==0'>
<caption>阶梯提成比例设定</caption>
<thead>
<th>序号</th>
<th>人数范围</th>
<th>提成比列</th>
<th>操作</th>
</thead>
<tbody>
<tr v-for="(item, index) in addMsg.RangeCommission" :key="index">
<td>1</td>
<td>
前 <el-input-number size="small" style="margin:0 12px" :min="1" :max="item.EndPeople" v-model="item.StartPeople" class="w120"></el-input-number>
至 <el-input-number size="small" style="margin:0 15px" :min="item.StartPeople" v-model="item.EndPeople" class="w100"></el-input-number>
</td>
<td>
<el-input placeholder="请输入内容" size="small" v-model="Variable" class="w200">
<template slot="append">{{addMsg.CommissionType==2?'%':'/人'}}</template>
</el-input>
</td>
<td></td>
</tr>
</tbody>
</table>
</el-row>
</el-form> </el-form>
</div> </div>
<div class="btm-opera-btn"> <div class="btm-opera-btn">
<input <input
...@@ -187,22 +157,14 @@ export default { ...@@ -187,22 +157,14 @@ export default {
CommissionType:'1', CommissionType:'1',
Require:'1', Require:'1',
CommissionVariable:'0', CommissionVariable:'0',
UsingLine:[], UsingLine:'',
UsingBranch:[], UsingBranch:'',
EffectDate:null, EffectDate:null,
RB_Group_Id:0, RB_Group_Id:0,
BalanceCyc:'', BalanceCyc:'',
IsFinishAll:'0', IsFinishAll:'0',
IsDelete:1, IsDelete:1
RangeCommission:[
{
StartPeople:null,
EndPeople:null,
Variable:0
}
]
}, },
lines:[],
rules: {} rules: {}
}; };
}, },
...@@ -359,23 +321,6 @@ export default { ...@@ -359,23 +321,6 @@ export default {
this.columns.push(opera); this.columns.push(opera);
this.isReady = true; this.isReady = true;
}, },
changeData(type){
let temp=[]
if(type==1){
temp=this.addMsg.UsingBranch
}else if(type==2){
temp=this.addMsg.UsingLine
}
let len=temp.length
if(len>1){
if(temp[len-1]==-1){
temp.splice(0,len-1)
}else if(temp.indexOf("-1")!=-1){
temp.splice(temp.indexOf("-1"),1)
}
}
},
handleCurrentChanges(val) { handleCurrentChanges(val) {
this.pageIndex = val; this.pageIndex = val;
this.getList(); this.getList();
...@@ -420,34 +365,11 @@ export default { ...@@ -420,34 +365,11 @@ export default {
err => {} err => {}
); );
}, },
getline(){
let msg={'pageIndex':0,'pageSize':100}
this.apipost("line_post_GetPageList", msg, x => {
this.lines=x.data.data.pageData
// console.log(this.lines)
},err => {})
},
}, },
mounted () { mounted () {
this.getCompanyList() this.getCompanyList()
this.getline()
} }
}; };
</script> </script>
<style> <style>
/* .rule-box .el-select__tags{
top: 100%;
} */
.rule-box .el-input .el-input__inner,.rule-box .el-select .el-input{
height: auto;
}
.rule-box .el-select{
display: block;
}
.el-input-group__append, .el-input-group__prepend{
border-radius: 0;
}
.rule-box .el-date-editor.el-input,.rule-box .el-date-editor.el-input__inner{
width: 100%;
}
</style> </style>
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