Commit 4c6510d1 authored by xulili's avatar xulili

用户去掉空格

parent a1487c51
...@@ -38,12 +38,13 @@ export default { ...@@ -38,12 +38,13 @@ export default {
form: { form: {
status: "REFUSED", status: "REFUSED",
remarks: "", remarks: "",
type:"ACCOUNT", type: "ACCOUNT",
}, },
activeRow:{}, activeRow: {},
rules: { rules: {
remarks: [ remarks: [
{ required: true, message: "请填写驳回原因", trigger: "change" }, { required: true, message: "请填写驳回原因", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到100个字" },
], ],
}, },
}; };
...@@ -86,8 +87,8 @@ export default { ...@@ -86,8 +87,8 @@ export default {
url: "audit/update", url: "audit/update",
authType: this.backToken, authType: this.backToken,
}, },
// _this.$qs.stringify(params) // _this.$qs.stringify(params)
params params
) )
.then((res) => { .then((res) => {
this.handleReset(); this.handleReset();
......
<template> <template>
<el-dialog <el-dialog
custom-class="party-dialog" custom-class="party-dialog"
:title="`管理员${isEdit?'修改':'查看'}`" :title="`管理员${isEdit ? '修改' : '查看'}`"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="468px" width="468px"
:before-close="handleClose" :before-close="handleClose"
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<el-input <el-input
v-model="form.userName" v-model="form.userName"
placeholder="请填写管理员姓名" placeholder="请填写管理员姓名"
oninput="value = value.trim()"
:readonly="!isEdit" :readonly="!isEdit"
></el-input> ></el-input>
</el-form-item> </el-form-item>
...@@ -58,7 +59,9 @@ ...@@ -58,7 +59,9 @@
<el-button type="primary" @click="handleSubmit()">确 定</el-button> <el-button type="primary" @click="handleSubmit()">确 定</el-button>
</div> </div>
<div v-else> <div v-else>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button> <el-button type="primary" @click="dialogVisible = false"
>确 定</el-button
>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
...@@ -90,12 +93,13 @@ export default { ...@@ -90,12 +93,13 @@ export default {
phone: "", phone: "",
weChat: "", weChat: "",
email: "", email: "",
roleList:[], roleList: [],
type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号 type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号
}, },
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请选择系统用户名", trigger: "change" }, { required: true, message: "请选择系统用户名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字" },
], ],
phone: [ phone: [
{ required: true, validator: validateMobilePhone, trigger: "change" }, { required: true, validator: validateMobilePhone, trigger: "change" },
...@@ -156,9 +160,9 @@ export default { ...@@ -156,9 +160,9 @@ export default {
phone: "", phone: "",
weChat: "", weChat: "",
email: "", email: "",
roleList:[], roleList: [],
type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号 type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号
} };
}, },
// 提交 // 提交
handleSubmit() { handleSubmit() {
...@@ -174,7 +178,7 @@ export default { ...@@ -174,7 +178,7 @@ export default {
user.email = _this.form.email; user.email = _this.form.email;
user.id = _this.id; user.id = _this.id;
user.type = this.form.type; user.type = this.form.type;
user.roleList = this.form.roleList user.roleList = this.form.roleList;
this.$https( this.$https(
{ {
method: "put", method: "put",
...@@ -210,7 +214,7 @@ export default { ...@@ -210,7 +214,7 @@ export default {
} }
}); });
}, },
} },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
...@@ -19,19 +19,20 @@ ...@@ -19,19 +19,20 @@
<el-input <el-input
v-model="form.userName" v-model="form.userName"
placeholder="请输入用户名" placeholder="请输入用户名"
oninput="value = value.trim()"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所在机构" prop="orgId"> <el-form-item label="所在机构" prop="orgId">
<el-select v-model="form.orgId" filterable placeholder="请选择"> <el-select v-model="form.orgId" filterable placeholder="请选择">
<el-option <el-option
v-for="item in organList" v-for="item in organList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="账号有效期" prop="permanent"> <el-form-item label="账号有效期" prop="permanent">
<el-radio-group v-model="form.permanent"> <el-radio-group v-model="form.permanent">
<el-radio :label="true">永久有效</el-radio> <el-radio :label="true">永久有效</el-radio>
...@@ -66,7 +67,7 @@ export default { ...@@ -66,7 +67,7 @@ export default {
dialogVisible: false, dialogVisible: false,
organList: [], organList: [],
form: { form: {
userName: "", userName: "",
orgId: "", orgId: "",
permanent: true, permanent: true,
date: "", date: "",
...@@ -74,6 +75,7 @@ export default { ...@@ -74,6 +75,7 @@ export default {
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请填写管理员姓名", trigger: "change" }, { required: true, message: "请填写管理员姓名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字" },
], ],
orgId: [ orgId: [
{ required: true, message: "请输入所在机构", trigger: "change" }, { required: true, message: "请输入所在机构", trigger: "change" },
...@@ -106,7 +108,7 @@ export default { ...@@ -106,7 +108,7 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
this.$refs.form.resetFields(); this.$refs.form.resetFields();
this.form = { this.form = {
userName: "", userName: "",
orgId: "", orgId: "",
permanent: true, permanent: true,
date: "", date: "",
...@@ -129,14 +131,14 @@ export default { ...@@ -129,14 +131,14 @@ export default {
user.permanent = this.form.permanent; user.permanent = this.form.permanent;
user.userName = this.form.userName; user.userName = this.form.userName;
user.orgId = this.form.orgId; user.orgId = this.form.orgId;
let requetsparams = this.$qs.stringify(user) let requetsparams = this.$qs.stringify(user);
this.$https( this.$https(
{ {
method: "post", method: "post",
url: "tUser/statisticsAdd", url: "tUser/statisticsAdd",
authType: this.backToken, authType: this.backToken,
}, },
requetsparams requetsparams
) )
.then((res) => { .then((res) => {
if (res.status == 200) { if (res.status == 200) {
...@@ -167,5 +169,4 @@ export default { ...@@ -167,5 +169,4 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
</style> </style>
\ No newline at end of file
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<el-input <el-input
v-model="form.userName" v-model="form.userName"
placeholder="请输入用户名" placeholder="请输入用户名"
oninput="value = value.trim()"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所在机构" prop="orgId"> <el-form-item label="所在机构" prop="orgId">
...@@ -76,6 +77,7 @@ export default { ...@@ -76,6 +77,7 @@ export default {
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请填写管理员姓名", trigger: "change" }, { required: true, message: "请填写管理员姓名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字符" },
], ],
orgId: [ orgId: [
{ required: true, message: "请输入所在机构", trigger: "change" }, { required: true, message: "请输入所在机构", trigger: "change" },
......
...@@ -16,19 +16,23 @@ ...@@ -16,19 +16,23 @@
class="party-form" class="party-form"
> >
<el-form-item label="运维人员姓名" prop="userName"> <el-form-item label="运维人员姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请填写"></el-input> <el-input
</el-form-item> v-model="form.userName"
<el-form-item label="运维区域" prop="areaId"> placeholder="请填写"
<el-cascader oninput="value = value.trim()"
v-model="form.areaId" ></el-input>
change-on-select </el-form-item>
:props="cascaderProps" <el-form-item label="运维区域" prop="areaId">
:options="areaOptions" <el-cascader
placeholder="请选择区域" v-model="form.areaId"
clearable change-on-select
> :props="cascaderProps"
</el-cascader> :options="areaOptions"
</el-form-item> placeholder="请选择区域"
clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="账号有效期" prop="permanent"> <el-form-item label="账号有效期" prop="permanent">
<el-radio-group v-model="form.permanent"> <el-radio-group v-model="form.permanent">
<el-radio :label="true">永久有效</el-radio> <el-radio :label="true">永久有效</el-radio>
...@@ -71,7 +75,7 @@ export default { ...@@ -71,7 +75,7 @@ export default {
date: "", date: "",
type: 4, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 type: 4, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
}, },
cascaderProps: { cascaderProps: {
label: "name", label: "name",
value: "code", value: "code",
checkStrictly: true, checkStrictly: true,
...@@ -79,6 +83,7 @@ export default { ...@@ -79,6 +83,7 @@ export default {
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请运维人员姓名", trigger: "change" }, { required: true, message: "请运维人员姓名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字" }
], ],
areaId: [ areaId: [
{ {
...@@ -129,12 +134,12 @@ export default { ...@@ -129,12 +134,12 @@ export default {
permanent: true, permanent: true,
date: "", date: "",
type: 4, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 type: 4, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
} };
}, },
// 提交 // 提交
handleSubmit() { handleSubmit() {
// 校验用户输入值 // 校验用户输入值
let _this = this let _this = this;
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
let user = {}; let user = {};
...@@ -150,7 +155,7 @@ export default { ...@@ -150,7 +155,7 @@ export default {
user.areaId = [...this.form.areaId].pop(); user.areaId = [...this.form.areaId].pop();
user.permanent = this.form.permanent; user.permanent = this.form.permanent;
user.type = this.form.type; user.type = this.form.type;
let requetsparams = this.$qs.stringify(user) let requetsparams = this.$qs.stringify(user);
this.$https( this.$https(
{ {
method: "post", method: "post",
...@@ -160,7 +165,7 @@ export default { ...@@ -160,7 +165,7 @@ export default {
requetsparams requetsparams
) )
.then((res) => { .then((res) => {
this.handleReset(); this.handleReset();
if (res.status == 200) { if (res.status == 200) {
if (res.data.resultCode == 200) { if (res.data.resultCode == 200) {
this.$message({ this.$message({
...@@ -188,5 +193,4 @@ export default { ...@@ -188,5 +193,4 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
</style> </style>
\ No newline at end of file
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
class="party-form" class="party-form"
> >
<el-form-item label="运维人员姓名" prop="userName"> <el-form-item label="运维人员姓名" prop="userName">
<el-input v-model="form.userName" placeholder="请填写"></el-input> <el-input v-model="form.userName" placeholder="请填写" oninput="value = value.trim()"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="运维区域" prop="areaId"> <el-form-item label="运维区域" prop="areaId">
<el-cascader <el-cascader
...@@ -81,6 +81,7 @@ export default { ...@@ -81,6 +81,7 @@ export default {
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请运维人员姓名", trigger: "change" }, { required: true, message: "请运维人员姓名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字" }
], ],
areaId: [ areaId: [
{ {
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<el-input <el-input
v-model="form.userName" v-model="form.userName"
placeholder="请填写管理员姓名" placeholder="请填写管理员姓名"
oninput="value = value.trim()"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="固定电话" prop="telephone"> <el-form-item label="固定电话" prop="telephone">
...@@ -123,6 +124,7 @@ export default { ...@@ -123,6 +124,7 @@ export default {
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请填写管理员姓名", trigger: "change" }, { required: true, message: "请填写管理员姓名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字" }
], ],
orgId: [ orgId: [
{ required: true, message: "请输入所在机构", trigger: "change" }, { required: true, message: "请输入所在机构", trigger: "change" },
...@@ -169,7 +171,7 @@ export default { ...@@ -169,7 +171,7 @@ export default {
// 提交 // 提交
handleSubmit() { handleSubmit() {
// 校验用户输入值 // 校验用户输入值
let _this = this; let _this = this;
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
let user = {}; let user = {};
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<el-input <el-input
v-model="form.userName" v-model="form.userName"
placeholder="请填写管理员姓名" placeholder="请填写管理员姓名"
oninput="value = value.trim()"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="固定电话" prop="telephone"> <el-form-item label="固定电话" prop="telephone">
...@@ -126,6 +127,7 @@ export default { ...@@ -126,6 +127,7 @@ export default {
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请选择系统用户名", trigger: "change" }, { required: true, message: "请选择系统用户名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字" },
], ],
orgId: [ orgId: [
{ required: true, message: "请输入所在机构", trigger: "change" }, { required: true, message: "请输入所在机构", trigger: "change" },
......
...@@ -17,7 +17,11 @@ ...@@ -17,7 +17,11 @@
> >
<div class="form-row"> <div class="form-row">
<el-form-item label="系统用户名" prop="userName"> <el-form-item label="系统用户名" prop="userName">
<el-input v-model="form.userName" placeholder="请填写"></el-input> <el-input
v-model.trim="form.userName"
placeholder="请填写"
oninput="value = value.trim()"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所在机构" prop="orgId"> <el-form-item label="所在机构" prop="orgId">
<el-select v-model="form.orgId" filterable placeholder="请选择"> <el-select v-model="form.orgId" filterable placeholder="请选择">
...@@ -84,6 +88,7 @@ export default { ...@@ -84,6 +88,7 @@ export default {
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请选择系统用户名", trigger: "change" }, { required: true, message: "请选择系统用户名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字符" },
], ],
orgId: [ orgId: [
{ required: true, message: "请输入所在机构", trigger: "change" }, { required: true, message: "请输入所在机构", trigger: "change" },
......
...@@ -17,7 +17,11 @@ ...@@ -17,7 +17,11 @@
> >
<div class="form-row"> <div class="form-row">
<el-form-item label="系统用户名" prop="userName"> <el-form-item label="系统用户名" prop="userName">
<el-input v-model="form.userName" placeholder="请填写"></el-input> <el-input
v-model="form.userName"
placeholder="请填写"
oninput="value = value.trim()"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所在机构" prop="orgId"> <el-form-item label="所在机构" prop="orgId">
<el-select v-model="form.orgId" filterable placeholder="请选择"> <el-select v-model="form.orgId" filterable placeholder="请选择">
...@@ -41,17 +45,18 @@ ...@@ -41,17 +45,18 @@
class="mt16" class="mt16"
v-model="form.date" v-model="form.date"
type="daterange" type="daterange"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
>
</el-date-picker> </el-date-picker>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="账号类型" prop="roleList"> <el-form-item label="账号类型" prop="roleList">
<el-checkbox-group v-model="form.roleList" :min="1"> <el-checkbox-group v-model="form.roleList" :min="1">
<el-checkbox <el-checkbox
v-for="(item,index) in rolesList" v-for="(item, index) in rolesList"
:key="index" :key="index"
:label="item.id" :label="item.id"
> >
...@@ -72,19 +77,20 @@ export default { ...@@ -72,19 +77,20 @@ export default {
data() { data() {
return { return {
dialogVisible: false, dialogVisible: false,
id:'', id: "",
form: { form: {
id:'', id: "",
userName: "", userName: "",
orgId: "", orgId: "",
permanent: true, permanent: true,
date: "", date: "",
roleList: [], roleList: [],
type: 1 //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 type: 1, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
}, },
rules: { rules: {
userName: [ userName: [
{ required: true, message: "请选择系统用户名", trigger: "change" }, { required: true, message: "请选择系统用户名", trigger: "change" },
{ min: 1, max: 20, message: "请输入1到20个字符" },
], ],
orgId: [ orgId: [
{ required: true, message: "请输入所在机构", trigger: "change" }, { required: true, message: "请输入所在机构", trigger: "change" },
...@@ -92,13 +98,18 @@ export default { ...@@ -92,13 +98,18 @@ export default {
permanent: [ permanent: [
{ required: true, message: "请选择账号有效期", trigger: "change" }, { required: true, message: "请选择账号有效期", trigger: "change" },
], ],
roleList: [ roleList: [
{ type: 'array',required: true, message: "请选择账号类型", trigger: "change" }, {
] type: "array",
required: true,
message: "请选择账号类型",
trigger: "change",
},
],
}, },
}; };
}, },
props: { props: {
organList: { organList: {
type: Array, type: Array,
default: () => { default: () => {
...@@ -112,86 +123,81 @@ export default { ...@@ -112,86 +123,81 @@ export default {
}, },
}, },
}, },
mounted() { mounted() {},
},
methods: { methods: {
// 根据id获取获取详情内容 // 根据id获取获取详情内容
getDetailById(){ getDetailById() {
let _this = this let _this = this;
this.$https( this.$https(
{ {
method: "get", method: "get",
url: "tUser/getById", url: "tUser/getById",
authType: this.backToken, authType: this.backToken,
}, },
{id:_this.id} { id: _this.id }
) )
.then((res) => { .then((res) => {
if(res.status == 200 ){ if (res.status == 200) {
if (res.data.resultCode == 200 ) { if (res.data.resultCode == 200) {
let resData = res.data.data let resData = res.data.data;
for(let key in _this.form){ for (let key in _this.form) {
this.form[key] = resData[key] this.form[key] = resData[key];
} }
if(!this.form.permanent){ if (!this.form.permanent) {
this.form.date = [ this.form.date = [resData.effectiveDate, resData.exiredDate];
resData.effectiveDate, }
resData.exiredDate } else {
] _this.$message.error(res.data.message);
} }
} else { } else {
_this.$message.error(res.data.message); _this.$message.error(res.data);
} }
} else { })
_this.$message.error(res.data); .catch((err) => {
} console.log(err);
}) });
.catch((err) => {
console.log(err);
});
}, },
// 弹窗关闭 // 弹窗关闭
handleClose() { handleClose() {
this.$confirm("确认关闭?") this.$confirm("确认关闭?")
.then((_) => { .then((_) => {
this.handleReset() this.handleReset();
}) })
.catch((_) => {}); .catch((_) => {});
}, },
handleReset(){ handleReset() {
this.dialogVisible = false this.dialogVisible = false;
this.$refs.form.resetFields() this.$refs.form.resetFields();
this.form = { this.form = {
userName: "", userName: "",
orgId: "", orgId: "",
permanent: true, permanent: true,
date: "", date: "",
roleList: [], roleList: [],
type:1 type: 1,
} };
}, },
// 提交 // 提交
handleSubmit() { handleSubmit() {
// 校验用户输入值 // 校验用户输入值
let _this = this let _this = this;
_this.$refs.form.validate((valid) => { _this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
let user = {}; let user = {};
if(!_this.form.permanent && !_this.form.date){ if (!_this.form.permanent && !_this.form.date) {
_this.$message.error('请选择有效期') _this.$message.error("请选择有效期");
return false return false;
} }
if(!_this.form.permanent){ if (!_this.form.permanent) {
user.effectiveDate = _this.form.date[0]; user.effectiveDate = _this.form.date[0];
user.exiredDate = _this.form.date[1]; user.exiredDate = _this.form.date[1];
} }
user.userName = _this.form.userName; user.userName = _this.form.userName;
user.orgId = _this.form.orgId; user.orgId = _this.form.orgId;
user.roleList = _this.form.roleList user.roleList = _this.form.roleList;
user.permanent = _this.form.permanent; user.permanent = _this.form.permanent;
user.id = _this.id user.id = _this.id;
user.type = this.form.type user.type = this.form.type;
this.$https( this.$https(
{ {
method: "put", method: "put",
...@@ -201,22 +207,22 @@ export default { ...@@ -201,22 +207,22 @@ export default {
user user
) )
.then((res) => { .then((res) => {
if(res.status == 200 ){ if (res.status == 200) {
if (res.data.resultCode == 200 ) { if (res.data.resultCode == 200) {
this.$message({ this.$message({
type: "success", type: "success",
message: res.data.message, message: res.data.message,
}); });
_this.dialogVisible = false _this.dialogVisible = false;
this.$emit('success',true) this.$emit("success", true);
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
this.$emit('success',false) this.$emit("success", false);
} }
} else { } else {
this.$message.error(res.data); this.$message.error(res.data);
this.$emit('success',false) this.$emit("success", false);
} }
}) })
.catch((err) => { .catch((err) => {
console.log(res); console.log(res);
......
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