Commit 99da3cf5 authored by youjie's avatar youjie

no message

parent 6c67a71c
......@@ -32,8 +32,10 @@
</td>
<td v-if="childIndex==0" :rowspan="subItem.DetailList.length">
{{subItem.ClientName}}
<el-popover style="max-width: 900px;" trigger="click" popper-class="pro_tripDetails">
<el-tag v-for="(ds, din) in Details" :key="ds" size="small" v-if="Details">{{ds.ClientName}}</el-tag>
<el-popover v-if="subItem.HistoryClientList.length>0" style="width: 500px;overflow: hidden;" trigger="click" popper-class="pro_tripDetails">
<div v-if="Details.length>0" style="display: flex;flex-wrap: wrap;">
<el-tag v-for="(ds, din) in Details" :key="din" size="small">{{ds.ClientName}}</el-tag>
</div>
<span slot="reference" @click="getDetails(subIndex,1)" style="color: #409EFF;cursor: pointer;">历史付款对象</span>
</el-popover>
</td>
......@@ -75,12 +77,12 @@
<el-dialog title="手配费" :visible.sync="showVisible" width="970px">
<el-form ref="addMsg" :model="addMsg" :rules="rules" label-width="90px">
<el-row>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="名称" prop="Name">
<el-input type="text" v-model="addMsg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="付款对象" prop="ClientID">
<el-select filterable v-model="addMsg.ClientID" placeholder="选择付款对象" style="width: 100%;">
<el-option v-for="item in ClientAccountList"
......@@ -89,7 +91,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="历史对象" prop="ClientIdList">
<el-select filterable v-model="addMsg.ClientIdList" multiple collapse-tags placeholder="历史对象" style="width: 100%;">
<el-option v-for="(item,index) in ClientAccountList" :key="item.ID" :label="item.AccountAlias" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="适配公司" prop="BranchId">
<el-select v-model="addMsg.BranchId" placeholder="选择适配公司" style="width: 100%;">
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
......@@ -97,7 +107,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="币种" prop="CurrencyId">
<el-select placeholder="选择币种"
v-model="addMsg.CurrencyId" style="width: 100%;" @change="getCurrent(addMsg.CurrencyId)">
......@@ -178,6 +188,7 @@
Id: 0,
Name: '',
ClientID: null,
ClientIdList:[],
ClientIds:'',
DetailList: [{
Type: 1,
......@@ -239,6 +250,11 @@
message: '请选择币种',
trigger: 'change'
}],
ClientIdList: [{
required: true,
message: '请选择历史付款对象',
trigger: 'change'
}],
},
productGroupRules2:{
Id: [{
......@@ -312,6 +328,8 @@
},
//获取详情
getDetails(index,type) {
// console.log(this.DataList[index].HistoryClientList)
// return
this.Details = type==1?this.DataList[index].HistoryClientList:this.DataList[index].DetailList;
},
//获取当前下拉选中币种
......@@ -397,6 +415,8 @@
this.addMsg.DetailList.forEach(item=>{
item.Unit_Price = Number(item.Unit_Price)
})
this.addMsg.ClientIdList = data.ClientIds.split(',').map(Number)
this.addMsg = Object.assign({}, this.addMsg),
this.showVisible = true;
},
DeleteRules(ID) { //删除
......@@ -424,6 +444,7 @@
Id: 0,
Name: '',
ClientID: null,
ClientIdList:[],
ClientIds:'',
DetailList: [{
Type: 1,
......@@ -447,19 +468,13 @@
FlowZId: null,
FlowFId: null
}
console.log(obj,'=-----')
this.addMsg.DetailList.push(obj)
}
},
submit(formName) {
this.addMsg.ClientIds = this.addMsg.ClientIdList.join(',')
this.$refs[formName].validate((valid) => {
if (valid) {
let ClientIds
if(this.addMsg.HistoryClientList){
ClientIds = this.addMsg.HistoryClientList.map(item=>{ return item.ClientId})
}
this.addMsg.ClientIds = ClientIds?ClientIds.join(','):''
this.apipost(
'handfee_post_SetHandFeeInfo', this.addMsg,
res => {
......@@ -503,6 +518,10 @@
.p-5{
padding: 5px 0;
}
/deep/.el-tag--small{
margin: 0 2px 2px;
padding: 0 3px;
}
</style>
\ No newline at end of file
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