diff --git a/src/style/fix.scss b/src/style/fix.scss
index 46b3a60..ac64987 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -68,7 +68,6 @@
.el-header .right-panel > * + * {margin-left:10px;}
.el-footer {background: #fff;border-top: 1px solid var(--el-border-color-light);padding:13px 15px;}
.el-main {padding:10px;width: 100%;height: 100%;box-sizing: border-box;background: var(--el-color-white);border-radius: 4px;}
-.noBorderRadius{border-radius: 0 !important;}
.el-main.nopadding {padding:0;background: #fff;display: flex;flex-direction: column;}
.el-main.nopadding .scTable{flex: 1;overflow: hidden;}
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index 882bfe2..c78332b 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -36,7 +36,7 @@
-
+
@@ -141,7 +141,7 @@ export default {
//删除
async table_del(row){
const reqData = {id: row.id};
- const res = await this.$API.demo.post.post(reqData);
+ const res = await this.$API.system.company.delete.post(reqData);
if(res.code == 200){
this.$refs.table.refresh()
this.$message.success("删除成功")
@@ -195,6 +195,7 @@ export default {
.logoCell{
display: flex;
align-items: center;
- height: 100%;
+ height: 20px;
+ margin: 0 auto;
}
diff --git a/src/views/setting/company/save.vue b/src/views/setting/company/save.vue
index 22f643b..95fb9bc 100644
--- a/src/views/setting/company/save.vue
+++ b/src/views/setting/company/save.vue
@@ -1,5 +1,5 @@
-
+
企业信息
@@ -32,13 +32,13 @@
企业管理员信息
-
+
-
+
@@ -110,13 +110,14 @@ export default {
}
},
mounted() {
-
+ this.getCompanyTypeSelect(true);
},
methods: {
//显示
open(mode='add'){
this.mode = mode;
this.visible = true;
+
return this
},
//加载树数据
@@ -149,13 +150,29 @@ export default {
})
},
//表单注入数据
- setData(data){
- this.form.id = data.id
- this.form.label = data.label
- this.form.status = data.status
- this.form.sort = data.sort
- this.form.parentId = data.parentId
- this.form.remark = data.remark
+ async setData(data) {
+ let params = {
+ id:data.id
+ }
+
+ const res = await this.$API.system.company.info.post(params);
+ if(res.code == 200){
+ this.form.id = res.data.id;
+ this.form.domain = res.data.domain;
+ this.form.company_type = res.data.company_type;
+ this.form.name = res.data.name;
+ this.form.full_name = res.data.full_name;
+ this.form.address = res.data.address;
+ this.form.email = res.data.platform_user && res.data.platform_user.email?res.data.platform_user.email:'';
+ this.form.logo = res.data.logo;
+ this.form.doc_url = [];
+ this.form.owner = res.data.owner;
+ this.form.mobile = res.data.mobile;
+ this.form.admin_access = res.data.admin_access;
+ this.form.password = res.data.password;
+ this.form.remark = res.data.remark;
+ this.form.accord = 1;
+ }
}
}
}
diff --git a/src/views/setting/user/save.vue b/src/views/setting/user/save.vue
index 531d961..b262891 100644
--- a/src/views/setting/user/save.vue
+++ b/src/views/setting/user/save.vue
@@ -2,34 +2,35 @@
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
取 消
- 保 存
+ 保 存
@@ -46,22 +47,25 @@
show: '查看'
},
visible: false,
- isSaveing: false,
+ isSave: false,
//表单数据
form: {
id:"",
- userName: "",
+ login_name: "",
+ name:"",
+ mobile:"",
+ email:"",
avatar: "",
- name: "",
- dept: "",
- group: []
+ password:"",
+ dept_id: "",
+ role_ids: []
},
//验证规则
rules: {
avatar:[
{required: true, message: '请上传头像'}
],
- userName: [
+ login_name: [
{required: true, message: '请输入登录账号'}
],
name: [
@@ -103,8 +107,10 @@
depts: [],
deptsProps: {
value: "id",
- checkStrictly: true
+ checkStrictly: false,
+ emitPath:false
}
+ // checkStrictly: false,
}
},
mounted() {
@@ -120,26 +126,27 @@
},
//加载树数据
async getGroup(){
- var res = await this.$API.system.role.list.get();
+ const res = await this.$API.system.role.list.get();
this.groups = res.data.rows;
},
async getDept(){
- var res = await this.$API.system.dept.list.get();
+ const res = await this.$API.system.dept.active.post();
this.depts = res.data;
},
+ parentParams(item){
+ this.form.avatar = item;
+ },
//表单提交方法
submit(){
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- this.isSaveing = true;
- var res = await this.$API.demo.post.post(this.form);
- this.isSaveing = false;
+ this.isSave = true;
+ const res = await this.$API.system.user.add.post(this.form);
+ this.isSave = false;
if(res.code == 200){
this.$emit('success', this.form, this.mode)
this.visible = false;
this.$message.success("操作成功")
- }else{
- this.$alert(res.message, "提示", {type: 'error'})
}
}else{
return false;
diff --git a/src/views/userCenter/index.vue b/src/views/userCenter/index.vue
index b123d0f..be32c0a 100644
--- a/src/views/userCenter/index.vue
+++ b/src/views/userCenter/index.vue
@@ -136,5 +136,5 @@
}