Skip to content

S
SuperMan
Commit 540ae322 authored by youjie's avatar youjie
Browse files
Options

no message

parent fba81cf1
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 24 deletions
src/assets/common/lang/zhCN/fill.js
View file @ 540ae322
...@@ -4332,6 +4332,10 @@ export const obj = { ...@@ -4332,6 +4332,10 @@ export const obj = {
feiyongkm: '费用科目', feiyongkm: '费用科目',
yuanbizh: '原币种', yuanbizh: '原币种',
yonglecl: '永乐车辆', yonglecl: '永乐车辆',
chanyuxs: '参与销售',
chanyurq: '参与日期',
qingxzcyxs: '请选择参与销售',
qingxzcyrq: '请选择参与日期',
} }
} }
//#endregion //#endregion
......
src/assets/common/lang/zhTW/fill.js
View file @ 540ae322
...@@ -4332,6 +4332,10 @@ export const obj = { ...@@ -4332,6 +4332,10 @@ export const obj = {
feiyongkm: '费用科目', feiyongkm: '费用科目',
yuanbizh: '原币种', yuanbizh: '原币种',
yonglecl: '永乐车辆', yonglecl: '永乐车辆',
chanyuxs: '参与销售',
chanyurq: '参与日期',
qingxzcyxs: '请选择参与销售',
qingxzcyrq: '请选择参与日期',
} }
} }
//#endregion //#endregion
......
src/components/FinancialModule/TradeCommission/CommissionRule.vue
View file @ 540ae322
...@@ -274,6 +274,7 @@ ...@@ -274,6 +274,7 @@
<p class="ImpressionTicketing-title">成都销售推广欧洲路线补充(未达标最低人数需要募捐，年终也需满足此规则)</p> <p class="ImpressionTicketing-title">成都销售推广欧洲路线补充(未达标最低人数需要募捐，年终也需满足此规则)</p>
<div class="ImpressionTicketing-msgbox ImpressionTicketing-msgboxBC" <div class="ImpressionTicketing-msgbox ImpressionTicketing-msgboxBC"
v-for="(item,index) in form.EuropeExtendRuleList" :key="index"> v-for="(item,index) in form.EuropeExtendRuleList" :key="index">
<div style="flex: 0 0 100%;display: flex;flex-direction: row;">
<div> <div>
<el-form-item <el-form-item
:label="form.EuropeExtendRuleList.length>0?`规则名称 ${index+1} `:` ` " :label="form.EuropeExtendRuleList.length>0?`规则名称 ${index+1} `:` ` "
...@@ -307,29 +308,58 @@ ...@@ -307,29 +308,58 @@
v-model="item.Money"></el-input> v-model="item.Money"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div style="flex: 0 0 630px;"> <div class="ImpressionTicketing-msg-but">
<span @click="addRule(item,index,8)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteRule(item,index,8)" v-else class="el-icon-delete itc-delete"></span>
</div>
</div>
<el-form-item label-width="0" style="width: 100%;padding: 5px 0 0 0;background-color: #eee;">
<div class="EmpGroupListBox"
v-for="(child,i) in item.EmpGroupList">
<div>
<el-form-item <el-form-item
:label="form.EuropeExtendRuleList.length>0?`参与销售 ${index+1} `:` ` " :label="form.EuropeExtendRuleList.length>0&&form.EuropeExtendRuleList[index].EmpGroupList.length>0?`${$t('objFill.v101.FinancialModule.chanyuxs')} ${i+1} `:` ` "
:prop="`EuropeExtendRuleList.${index}.EmpIdList`" :prop="`EuropeExtendRuleList.${index}.EmpGroupList.${i}.EmpIdList`"
:rules="rules.EmpIdList" :rules="rules.EmpIdList"
label-width="100px" label-width=""
label-position="left"> label-position="left">
<!-- collapse-tags --> <el-select style="width: 200px;" v-model="child.EmpIdList" filterable multiple
<el-select style="width: 100%;" v-model="item.EmpIdList" filterable multiple :placeholder="$t('objFill.v101.FinancialModule.chanyuxs')" @change="getEmpIds(index,i)">
placeholder="参与销售" @change="getEmpIds(index)">
<el-option v-for="(x,i) in EmployeeList" :label="x.EmName" <el-option v-for="(x,i) in EmployeeList" :label="x.EmName"
:value="x.EmployeeId" :value="x.EmployeeId"
:key="i"></el-option> :key="i"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<div class="ImpressionTicketing-msg-but"> <div>
<span @click="addRule(item,index,8)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span> <el-form-item
<span @click="deleteRule(item,index,8)" v-else class="el-icon-delete itc-delete"></span> :label="form.EuropeExtendRuleList.length>0&&form.EuropeExtendRuleList[index].EmpGroupList.length>0?`${$t('objFill.v101.FinancialModule.chanyurq')} ${i+1} `:` ` "
:prop="`EuropeExtendRuleList.${index}.EmpGroupList.${i}.EnableDate`"
:rules="rules.EnableDate"
label-width=""
label-position="left">
<el-date-picker
style="width: 200px;"
class="h34"
v-model="child.EnableDate"
type="month"
value-format="yyyy-MM"
align="right" :placeholder="$t('objFill.v101.FinancialModule.chanyurq')"
></el-date-picker>
</el-form-item>
</div>
<div class="ImpressionTicketing-msg-but" style="flex: 0 0 36px;">
<span @click="addEmpDate(item,index,i,8)" v-if="i==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteEmpDate(item,index,i,8)" v-else class="el-icon-delete itc-delete"></span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
</div>
</el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">日本线人头奖励</p> <p class="ImpressionTicketing-title">日本线人头奖励</p>
<div class="ImpressionTicketing-msgbox" <div class="ImpressionTicketing-msgbox"
...@@ -658,7 +688,8 @@ ...@@ -658,7 +688,8 @@
Name: [{ required: true, message: "请输入规则名称", trigger: "blur"}], Name: [{ required: true, message: "请输入规则名称", trigger: "blur"}],
PeopleNum: [{ required: true, message: "请输入最低人数", trigger: "blur"}], PeopleNum: [{ required: true, message: "请输入最低人数", trigger: "blur"}],
Money: [{ required: true, message: "请输入募捐金额", trigger: "blur"}], Money: [{ required: true, message: "请输入募捐金额", trigger: "blur"}],
EmpIdList: [{ required: true, message: '请选择参与销售', trigger: 'change'}], EmpIdList: [{ required: true, message: this.$t('objFill.v101.FinancialModule.qingxzcyxs'), trigger: 'change'}],
EnableDate: [{ required: true, message: this.$t('objFill.v101.FinancialModule.qingxzcyrq'), trigger: 'change'}],
}, },
AwardRuleList:{ StartValue:0, EndValue:null, Rate:null}, AwardRuleList:{ StartValue:0, EndValue:null, Rate:null},
ProfitRuleList:{ StartValue:0, EndValue:null, Rate:null}, ProfitRuleList:{ StartValue:0, EndValue:null, Rate:null},
...@@ -667,7 +698,9 @@ ...@@ -667,7 +698,9 @@
OtherAwardRuleList:{ StartValue:0, EndValue:null, Rate:null}, OtherAwardRuleList:{ StartValue:0, EndValue:null, Rate:null},
OtherProfitRuleList:{ StartValue:0, EndValue:null, Rate:null}, OtherProfitRuleList:{ StartValue:0, EndValue:null, Rate:null},
BonusRuleList:{ StartValue:0, Rate:null}, BonusRuleList:{ StartValue:0, Rate:null},
EuropeExtendRuleList:{Name:'',PeopleNum:null,Money:null,EmpIds:'',EmpIdList:[]}, EuropeExtendRuleList:{Name:'',PeopleNum:null,Money:null,EmpIds:'',EmpIdList:[],
EmpGroupList:[{EmpIdList:[],EnableDate:''}]
},
form:{ form:{
Id:0, Id:0,
Name:'', Name:'',
...@@ -680,8 +713,13 @@ ...@@ -680,8 +713,13 @@
OtherAwardRuleList:[{ StartValue:0, EndValue:null, Rate:null}], OtherAwardRuleList:[{ StartValue:0, EndValue:null, Rate:null}],
OtherProfitRuleList:[{ StartValue:0, EndValue:null, Rate:null}], OtherProfitRuleList:[{ StartValue:0, EndValue:null, Rate:null}],
BonusRuleList:[ { StartValue:0, Rate:null }], BonusRuleList:[ { StartValue:0, Rate:null }],
EuropeExtendRuleList:[{Name:'',PeopleNum:null,Money:null,EmpIds:'',EmpIdList:[]}] EuropeExtendRuleList:[{
Name:'',PeopleNum:null,Money:null,EmpIds:'',EmpIdList:[],
EmpGroupList:[{EmpIdList:[],EnableDate:''}]
}
]
}, },
EmpGroupObj: {EmpIdList:[],EnableDate:''},
ruleLoading: false, ruleLoading: false,
ruleVisible:false, ruleVisible:false,
titleName:'提成规则', titleName:'提成规则',
...@@ -695,9 +733,9 @@ ...@@ -695,9 +733,9 @@
this.getEmployeeList() this.getEmployeeList()
}, },
methods: { methods: {
getEmpIds(index){ getEmpIds(index,i){
let list = this.form.EuropeExtendRuleList[index].EmpIdList let list = this.form.EuropeExtendRuleList[index].EmpGroupList[i].EmpIdList
this.form.EuropeExtendRuleList[index].EmpIds = list.join(',') this.form.EuropeExtendRuleList[index].EmpGroupList[i].EmpIds = list.join(',')
}, },
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList() {
...@@ -743,6 +781,9 @@ ...@@ -743,6 +781,9 @@
this.form.BonusRuleList.push(JSON.parse(JSON.stringify(this.BonusRuleList))) this.form.BonusRuleList.push(JSON.parse(JSON.stringify(this.BonusRuleList)))
} }
}, },
addEmpDate(row,index,i,type){
if(type==8)this.form.EuropeExtendRuleList[index].EmpGroupList.push(JSON.parse(JSON.stringify(this.EmpGroupObj)))
},
// 删除规则 // 删除规则
deleteRule(row,index,type){ deleteRule(row,index,type){
if(type==1){ if(type==1){
...@@ -763,6 +804,9 @@ ...@@ -763,6 +804,9 @@
this.form.BonusRuleList.splice(index,1) this.form.BonusRuleList.splice(index,1)
} }
}, },
deleteEmpDate(row,index,i,type){
if(type==8)this.form.EuropeExtendRuleList[index].EmpGroupList.splice(i,1)
},
AddMsg(){//新增 AddMsg(){//新增
this.ruleVisible = true this.ruleVisible = true
this.titleName = '提成规则' this.titleName = '提成规则'
...@@ -809,6 +853,8 @@ ...@@ -809,6 +853,8 @@
RulesOk(formName) { RulesOk(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
console.log(this.form,'-----')
return
this.ruleLoading = true this.ruleLoading = true
this.apipost( this.apipost(
'sellcommission_SetTYSaleCommissionRule', this.form, 'sellcommission_SetTYSaleCommissionRule', this.form,
...@@ -917,7 +963,7 @@ ...@@ -917,7 +963,7 @@
flex: 1; flex: 1;
} }
.ImpressionTicketing-msgbox div.ImpressionTicketing-msg-but{ .ImpressionTicketing-msgbox div.ImpressionTicketing-msg-but{
flex: 0 0 auto; flex: 0 0 36px !important;
} }
.itc-delete{ .itc-delete{
color: #E95252; color: #E95252;
...@@ -967,4 +1013,23 @@ ...@@ -967,4 +1013,23 @@
.ImpressionTicketing-msgbox.ImpressionTicketing-msgboxBC div:last-child{ .ImpressionTicketing-msgbox.ImpressionTicketing-msgboxBC div:last-child{
flex: 0 0 auto; flex: 0 0 auto;
} }
.EmpGroupListBox{
display: flex;flex-direction: row; flex-wrap: nowrap;
justify-content: space-between;
/* box-shadow: 0 1px 2px rgb(0 0 0 / 20%), 0 1px 4px rgb(0 0 0 / 14%), 0 1px 1px -1px rgb(0 0 0 / 12%); */
margin-bottom: 5px;
}
.EmpGroupListBox:last-child{
/* margin-bottom: 0; */
}
.EmpGroupListBox>div{
flex: 0 0 220px;
}
.EmpGroupListBox>div:nth-child(2){
/* margin-left: 50px; */
}
/deep/.EmpGroupListBox .el-form-item__content{
/* 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