Merge remote-tracking branch 'origin/master'

ywj_dev
郑明梁 2 years ago
commit 74df2703b2

@ -95,31 +95,22 @@
width="60%"
center
>
<el-form :model="rowData" :rules="rowDataRules" ref="rowDataForm" style="margin: 0 20px;">
<el-form :model="rowData" :rules="rowDataRules" ref="rowDataForm" label-width="100px">
<el-row :gutter="20">
<el-col :span="3">
<div class="div-text">
<span>用户名称:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-row>
<el-col :span="11">
<el-form-item label="用户名称:" prop="nickName">
<el-input
size="small"
v-model="rowData.nickName"
:disabled="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="div-text">
<span>企业名称:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-col :span="11">
<el-form-item label="企业名称:" prop="companyName">
<el-select
v-model="rowData.companyName"
filterable
@ -130,7 +121,7 @@
placeholder="请输入企业名称"
:remote-method="findMethod"
size="small"
style="width: 100%"
style="width: 90%"
:loading="loading"
>
<el-option
@ -146,109 +137,82 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3">
<div class="div-text">
<span>联系人:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-row>
<el-col :span="11">
<el-form-item label="联系人:" prop="realName">
<el-input
size="small"
v-model="rowData.realName"
:disabled="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="div-text">
<span>企业类型:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-col :span="11">
<el-form-item label="企业类型:" prop="bussinessStatus">
<el-input
size="small"
v-model="bussinessFlag[rowData.bussinessStatus]"
:disabled="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3">
<div class="div-text">
<span>电话:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-row>
<el-col :span="11">
<el-form-item label="电话:" prop="tel">
<el-input
size="small"
v-model="rowData.tel"
:disabled="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="div-text">
<span>所属地区:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-col :span="11">
<el-form-item label="所属地区:" prop="area">
<el-input
size="small"
v-model="rowData.area"
:disabled="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3">
<div class="div-text">
<span>手机:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-row>
<el-col :span="11">
<el-form-item label="手机:" prop="mobile">
<el-input
size="small"
v-model="rowData.mobile"
:disabled="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="div-text">
<span>邮箱:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-col :span="11">
<el-form-item label="邮箱:" prop="email" >
<el-input
size="small"
v-model="rowData.email"
:disabled="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3">
<div class="div-text">
<span>所属供应商:&nbsp;</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item>
<el-row type="flex">
<el-col :span="11">
<el-form-item label="所属供应商:" prop="sValue">
<el-select
style="width: 100%"
style="width: 90%"
v-model="sValue"
:multiple="false"
filterable
@ -281,21 +245,11 @@
<!-- size="small" type="primary">查看文件-->
<!-- </el-button>-->
<!--</el-col>-->
</el-row>
<!-- <el-divider></el-divider>-->
<el-row :gutter="20">
<el-col :span="3">
<div class="div-text">
<span>分配角色:&nbsp;</span>
</div>
</el-col>
<el-col :span="10">
<el-form :model="checkQuery">
<el-form-item label="" style="margin-top: 5px">
<el-radio-group v-model="check" @change="handleCheckedChange">
<el-col :span="11" type="flex">
<el-form :model="checkQuery" >
<el-form-item label="分配角色:" property="check">
<el-radio-group v-model="check" @change="handleCheckedChange" >
<el-radio v-for="item in roles" :key="item.roleId" :label="item.roleId">{{
item.roleName
}}
@ -503,7 +457,9 @@ export default {
passRegister() {
this.checkQuery.roles = this.check;
if (this.$isBlank(this.checkQuery.roles)) {
return this.$message.warning("请分配角色");
}
if (this.$isBlank(this.rowData.companyName)) {
return this.$message.warning("请输入企业名称");
}
@ -571,4 +527,6 @@ export default {
<style lang="scss" scoped>
</style>

Loading…
Cancel
Save