|
@@ -240,14 +240,41 @@
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="用户名" prop="userName">
|
|
<el-form-item label="用户名" prop="userName">
|
|
- <span>{{ form.userName }}</span>
|
|
|
|
|
|
+ <span v-if="!isHaveUser">{{ form.userName }}</span>
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="form.userName"
|
|
|
|
+ placeholder="请输入用户名"
|
|
|
|
+ v-if="isHaveUser"
|
|
|
|
+ ></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="省份" prop="provinceName">
|
|
<el-form-item label="省份" prop="provinceName">
|
|
- <span>{{ form.provinceName }}</span>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="地市" prop="cityName">
|
|
|
|
- <span>{{ form.cityName }}</span>
|
|
|
|
|
|
+ <span v-if="!isHaveUser">{{ form.provinceName }}</span>
|
|
|
|
+ <span v-if="isHaveUser">河北省</span>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <div v-if="!isHaveUser">
|
|
|
|
+ <el-form-item label="地市" prop="cityName">
|
|
|
|
+ <span >{{ form.cityName }}</span>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </div>
|
|
|
|
+ <div v-if="isHaveUser">
|
|
|
|
+ <el-form-item label="地市" prop="cityId">
|
|
|
|
+ <el-select
|
|
|
|
+ ref="selectCity"
|
|
|
|
+ v-model="form.cityId"
|
|
|
|
+ placeholder="请选择地市"
|
|
|
|
+ style="width: 100%"
|
|
|
|
+ @change="selectCityChange"
|
|
|
|
+ v-if="isHaveUser"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in formCityList.children"
|
|
|
|
+ :key="dict.value"
|
|
|
|
+ :label="dict.label"
|
|
|
|
+ :value="dict.value"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </div>
|
|
<el-form-item label="区县" prop="areaId">
|
|
<el-form-item label="区县" prop="areaId">
|
|
<!-- <span>{{ form.areaName }}</span> -->
|
|
<!-- <span>{{ form.areaName }}</span> -->
|
|
<el-select
|
|
<el-select
|
|
@@ -260,13 +287,26 @@
|
|
<el-option
|
|
<el-option
|
|
v-for="dict in form.areas"
|
|
v-for="dict in form.areas"
|
|
:key="dict.value"
|
|
:key="dict.value"
|
|
|
|
+ v-if="!isHaveUser"
|
|
:label="dict.label"
|
|
:label="dict.label"
|
|
:value="dict.value"
|
|
:value="dict.value"
|
|
/>
|
|
/>
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in areasList"
|
|
|
|
+ :key="dict.areaId"
|
|
|
|
+ v-if="isHaveUser"
|
|
|
|
+ :label="dict.areaName"
|
|
|
|
+ :value="dict.areaId"
|
|
|
|
+ />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="组织" prop="orgName">
|
|
<el-form-item label="组织" prop="orgName">
|
|
- <span>{{ form.orgName }}</span>
|
|
|
|
|
|
+ <span v-if="!isHaveUser">{{ form.orgName }}</span>
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="form.orgName"
|
|
|
|
+ placeholder="请输入组织"
|
|
|
|
+ v-if="isHaveUser"
|
|
|
|
+ ></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</div>
|
|
</div>
|
|
<div v-if="dialogTitle != '用户详情'">
|
|
<div v-if="dialogTitle != '用户详情'">
|
|
@@ -356,6 +396,7 @@ import {
|
|
getUserDel,
|
|
getUserDel,
|
|
getUserDetail,
|
|
getUserDetail,
|
|
getRoleCopy,
|
|
getRoleCopy,
|
|
|
|
+ getAreasByCityId
|
|
} from "../../../common/js/home";
|
|
} from "../../../common/js/home";
|
|
export default {
|
|
export default {
|
|
name: "Module",
|
|
name: "Module",
|
|
@@ -363,6 +404,7 @@ export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
loading: false,
|
|
loading: false,
|
|
|
|
+ isHaveUser: false,
|
|
cityList: [],
|
|
cityList: [],
|
|
queryParams: {
|
|
queryParams: {
|
|
current: 1,
|
|
current: 1,
|
|
@@ -397,10 +439,20 @@ export default {
|
|
loginName: [
|
|
loginName: [
|
|
{ required: true, message: "账号不能为空", trigger: "blur" },
|
|
{ required: true, message: "账号不能为空", trigger: "blur" },
|
|
],
|
|
],
|
|
|
|
+ phone: [
|
|
|
|
+ { required: true, message: "手机号不能为空", trigger: "blur" },
|
|
|
|
+ ],
|
|
|
|
+ userName: [
|
|
|
|
+ { required: true, message: "用户名不能为空", trigger: "blur" },
|
|
|
|
+ ],
|
|
|
|
+ cityId: [
|
|
|
|
+ { required: true, message: "请选择地市", trigger: "change" },
|
|
|
|
+ ],
|
|
},
|
|
},
|
|
checkBoxList: [],
|
|
checkBoxList: [],
|
|
modelList: [],
|
|
modelList: [],
|
|
formCityList: [],
|
|
formCityList: [],
|
|
|
|
+ areasList:[],
|
|
};
|
|
};
|
|
},
|
|
},
|
|
computed: {},
|
|
computed: {},
|
|
@@ -472,6 +524,7 @@ export default {
|
|
};
|
|
};
|
|
this.dialogTitle = "用户添加";
|
|
this.dialogTitle = "用户添加";
|
|
this.dialogFormVisible = true;
|
|
this.dialogFormVisible = true;
|
|
|
|
+ this.isHaveUser = false;
|
|
this.isDisabled = false;
|
|
this.isDisabled = false;
|
|
this.isDisabledEmail = false;
|
|
this.isDisabledEmail = false;
|
|
this.isDisabled2 = false;
|
|
this.isDisabled2 = false;
|
|
@@ -485,6 +538,7 @@ export default {
|
|
};
|
|
};
|
|
this.dialogTitle = "批量复制权限";
|
|
this.dialogTitle = "批量复制权限";
|
|
this.dialogFormVisible = true;
|
|
this.dialogFormVisible = true;
|
|
|
|
+ this.isHaveUser = false;
|
|
this.isDisabled2 = false;
|
|
this.isDisabled2 = false;
|
|
},
|
|
},
|
|
userInfo(params) {
|
|
userInfo(params) {
|
|
@@ -511,6 +565,7 @@ export default {
|
|
this.modelList = [];
|
|
this.modelList = [];
|
|
this.dialogTitle = "用户编辑";
|
|
this.dialogTitle = "用户编辑";
|
|
this.dialogFormVisible = true;
|
|
this.dialogFormVisible = true;
|
|
|
|
+ this.isHaveUser = false;
|
|
this.isDisabled = true;
|
|
this.isDisabled = true;
|
|
this.isDisabledEmail = false;
|
|
this.isDisabledEmail = false;
|
|
this.isDisabled2 = false;
|
|
this.isDisabled2 = false;
|
|
@@ -523,6 +578,7 @@ export default {
|
|
this.modelList = [];
|
|
this.modelList = [];
|
|
this.dialogTitle = "用户详情";
|
|
this.dialogTitle = "用户详情";
|
|
this.dialogFormVisible = true;
|
|
this.dialogFormVisible = true;
|
|
|
|
+ this.isHaveUser = false;
|
|
this.isDisabled = true;
|
|
this.isDisabled = true;
|
|
this.isDisabledEmail = true;
|
|
this.isDisabledEmail = true;
|
|
this.isDisabled2 = true;
|
|
this.isDisabled2 = true;
|
|
@@ -542,6 +598,10 @@ export default {
|
|
...this.form,
|
|
...this.form,
|
|
...res.data,
|
|
...res.data,
|
|
};
|
|
};
|
|
|
|
+ }else if(res.code == "-1") {
|
|
|
|
+ this.isHaveUser = true;
|
|
|
|
+ this.form.provinceId = -1;
|
|
|
|
+ this.form.provinceName = '河北省';
|
|
} else {
|
|
} else {
|
|
this.$message({
|
|
this.$message({
|
|
type: "error",
|
|
type: "error",
|
|
@@ -580,6 +640,20 @@ export default {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
|
|
+ // 表单选择地市change事件
|
|
|
|
+ selectCityChange(val){
|
|
|
|
+ console.log('val: ', val);
|
|
|
|
+ console.log('this.$refs: ', this.$refs);
|
|
|
|
+ setTimeout(()=>{
|
|
|
|
+ this.form.cityName = this.$refs.selectCity.selectedLabel
|
|
|
|
+ console.log('this.form.cityName: ', this.form.cityName);
|
|
|
|
+ getAreasByCityId({cityId: val}).then(res=>{
|
|
|
|
+ console.log('res: ', res);
|
|
|
|
+ this.areasList = res.data;
|
|
|
|
+ })
|
|
|
|
+ }, 500)
|
|
|
|
+
|
|
|
|
+ },
|
|
// 表单查询条件地区选择
|
|
// 表单查询条件地区选择
|
|
formareaIdChange(val, index) {
|
|
formareaIdChange(val, index) {
|
|
// console.log("index111: ", index);
|
|
// console.log("index111: ", index);
|