This commit is contained in:
邱贞招 2024-10-24 15:51:19 +08:00
parent ae9d341026
commit 932d08b7bc

View File

@ -186,23 +186,14 @@
<el-option v-for="item in agentList" :key="item.agentId" :label="item.name+' ' +item.contact" :value="item.agentId"> <el-option v-for="item in agentList" :key="item.agentId" :label="item.name+' ' +item.contact" :value="item.agentId">
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-select v-model="form.cityId" placeholder="请选择代理城市">
<el-option
v-for="item in cityOptions"
:key="item.cityId"
:label="item.name"
:value="item.cityId"
></el-option>
</el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="角色"> <el-form-item label="角色">
<<<<<<<<< Temporary merge branch 1
<el-select v-model="form.roleIds" placeholder="请选择角色"> <el-select v-model="form.roleIds" placeholder="请选择角色">
<el-option <el-option
v-for="item in roleOptions" v-for="item in filteredRoleOptions"
:key="item.roleId" :key="item.roleId"
:label="item.roleName" :label="item.roleName"
:value="item.roleId" :value="item.roleId"
@ -212,10 +203,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row v-if="form.roleIds == 4">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="分账比例(%)" label-width="100" prop="dividendProportion"> <el-form-item label="分账比例(%)" label-width="100" prop="inputDividendProportion">
<el-input style="width: 64%" v-model="form.dividendProportion" placeholder="请输入分账比例" maxlength="11" /> <el-input style="width: 64%" v-model="inputDividendProportion" placeholder="请输入分账比例" maxlength="11" @input="handleInput"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -440,15 +431,10 @@ export default {
let data = { let data = {
pageNum: 1, pageNum: 1,
pageSize: 30, pageSize: 30,
} }
listAgent(this.addDateRange(data)).then(response => { listAgent(this.addDateRange(data)).then(response => {
console.log(response,'responseresponseresponse'); console.log(response,'responseresponseresponse');
this.agentList=response.rows this.agentList=response.rows
// this.options = response.rows.map(item => ({
// value: item.userId,
// label: item.realName+' ' +item.phonenumber
// }));
console.log( this.options,' this.options this.options'); console.log( this.options,' this.options this.options');
}); });
@ -590,6 +576,8 @@ export default {
this.form.roleIds = response.roleIds[0]; // ID this.form.roleIds = response.roleIds[0]; // ID
console.log("回显-=====roleIds[0]",response.roleIds[0]) console.log("回显-=====roleIds[0]",response.roleIds[0])
this.inputDividendProportion = this.form.dividendProportion * 100; this.inputDividendProportion = this.form.dividendProportion * 100;
console.log("this.form.dividendProportion========",this.form.dividendProportion)
console.log("inputDividendProportion========",this.inputDividendProportion)
this.open = true; this.open = true;
this.title = "修改系统用户"; this.title = "修改系统用户";
this.form.password = ""; this.form.password = "";
@ -626,7 +614,7 @@ export default {
this.form.roleIds = [this.form.roleIds]; this.form.roleIds = [this.form.roleIds];
console.log("提交roleIds=========="+this.form.roleIds) console.log("提交roleIds=========="+this.form.roleIds)
this.form.dividendProportion = this.inputDividendProportion; // 0.3 this.form.dividendProportion = this.inputDividendProportion; // 0.3
// console.log(':', this.form.dividendProportion); console.log('保存的分账比例:', this.form.dividendProportion);
this.form.dividendStatus = this.form.dividendStatus === "1" ? 1:0; this.form.dividendStatus = this.form.dividendStatus === "1" ? 1:0;
if (valid) { if (valid) {
if (this.form.userId != undefined) { if (this.form.userId != undefined) {