Skip to content

O
office-web
Commit f19c80e2 by xiaohai
Options

新增部门

parent 19869c27
Showing with 217 additions and 78 deletions
src/components/common/vueSelectEmployee.vue
...@@ -74,10 +74,27 @@ ...@@ -74,10 +74,27 @@
type: Object, type: Object,
default() { default() {
return { return {
isSelectPerson: false, isSelectPerson: true,
dialogVisible: true dialogVisible: false,
isSingle: false // 是否单选
} }
} }
},
treeData: {
type: Object,
default() {
return {};
}
},
onlyGroup: {
type: Array,
default() {
return [];
}
},
onlyPerson: {
type: Boolean,
default: false
} }
}, },
data() { data() {
...@@ -97,56 +114,92 @@ ...@@ -97,56 +114,92 @@
/** /**
* 获取分组架构 * 获取分组架构
*/ */
getGroupData() { // getGroupData() {
let _this = this; // let _this = this;
let params = { // let params = {
isStoreGroup: 0 // isStoreGroup: 0
}; // };
getRequest("/haoban-manage-web/dept/deptListForCompany", params) // getRequest("/haoban-manage-web/dept/deptListForCompany", params)
.then(res => { // .then(res => {
let treeData = []; // let treeData = [];
let personData = []; // let personData = [];
if (res.data.errorCode == 1) { // if (res.data.errorCode == 1) {
treeData = res.data.result.departmentList || []; // treeData = res.data.result.departmentList || [];
personData = res.data.result.searchList || [] // personData = res.data.result.searchList || []
} // }
_this.formatGroupData(treeData, personData); // _this.formatGroupData(treeData, personData);
}) // })
.catch(e => { // .catch(e => {
console.log(e, "error"); // console.log(e, "error");
}); // });
}, // },
formatGroupData(data, employees = []) { formatGroupData(data, employees = []) {
let copyData = data.slice(0); let copyData = data.slice(0);
let _this = this; let _this = this;
let onlyGroup = _this.onlyGroup;
data.forEach(group => { data.forEach(group => {
group.label = group.name || ""; group.label = group.name || "";
group.id = group.groupId || ""; group.id = group.groupId || "";
group.disableOpen = group.hasPression == 1 ? false : true; let allClerks = [];
group.disabled = group.hasPression == 1 ? false : true;
let arr = []; let arr = [];
if (onlyGroup.length > 0) {
if (onlyGroup.indexOf(group.groupId) > -1) {
group.disableOpen = false;
group.disabled = true;
} else {
group.disabled = true;
group.disableOpen = true;
}
} else {
group.disabled = _this.onlyPerson ? true : group.hasPression == 1 ? false : true;
}
copyData.forEach(cG => { copyData.forEach(cG => {
cG.label = cG.name || ""; cG.label = cG.name || "";
cG.id = cG.groupId || ""; cG.id = cG.groupId || "";
cG.disableOpen = cG.hasPression == 1 ? false : true; cG.disableOpen = false;
cG.disabled = cG.hasPression == 1 ? false : true; if (onlyGroup.length > 0) {
if (cG.parentId == group.groupId) { if (onlyGroup.indexOf(cG.groupId) > -1) {
arr.push(cG); cG.disableOpen = false;
cG.disabled = true;
if (cG.parentId == group.groupId) {
arr.push(cG);
}
} else {
cG.disabled = true;
cG.disableOpen = true;
}
} else {
cG.disabled = _this.onlyPerson ? true : cG.hasPression == 1 ? false : true;
if (cG.parentId == group.groupId) {
arr.push(cG);
}
} }
}); });
if (_this.treeSet.isSelectPerson) employees.forEach(person => { if (_this.treeSet.isSelectPerson && group.hasPression == 1) employees.forEach(person => {
person.label = person.name; person.label = person.name;
person.id = person.employeeClerkId; person.id = person.employeeClerkId;
if (person.departmentId == group.groupId) { if (person.departmentId == group.groupId) {
arr.push(person); arr.push(person);
allClerks.push(person);
} }
}); });
if (arr.length > 0) group.childrens = arr; if (arr.length > 0) group.childrens = arr;
if (group.level == 0) { group.allClerks = allClerks;
group.disabled = true; if (onlyGroup.length > 0) {
group.hasLoad = true; if (onlyGroup.indexOf(group.groupId) > -1) {
_this.menuData = [group]; group.hasLoad = true;
_this.defaultOpen.push(group.id); _this.defaultOpen.push(group.id);
if (onlyGroup.indexOf(group.parentId) < 0) {
_this.menuData.push(group);
}
}
} else {
if (group.level == 0) {
group.disabled = true;
group.hasLoad = true;
_this.menuData = [group];
_this.defaultOpen.push(group.id);
}
} }
}); });
}, },
...@@ -162,6 +215,11 @@ ...@@ -162,6 +215,11 @@
getCurrentNode(data, ifChecked) { getCurrentNode(data, ifChecked) {
data.disableOpen = ifChecked; data.disableOpen = ifChecked;
this.selectedList = this.$refs.tree.getCheckedNodes(); this.selectedList = this.$refs.tree.getCheckedNodes();
if (this.treeSet.isSingle && this.selectedList.length > 1) {
let index = this.selectedList.indexOf(data);
this.selectedList.splice(1 - index, 1);
this.$refs.tree.setCheckedNodes(this.selectedList);
}
}, },
/** /**
* 节点展开时，禁用复选框 * 节点展开时，禁用复选框
...@@ -173,7 +231,7 @@ ...@@ -173,7 +231,7 @@
* 节点关闭时，取消复选框的禁用 * 节点关闭时，取消复选框的禁用
*/ */
nodeClose(data, node, self) { nodeClose(data, node, self) {
data.disabled = false; data.disabled = this.onlyPerson ? true : data.hasPression != 1;
}, },
/** /**
* 关键词搜索 * 关键词搜索
...@@ -199,15 +257,19 @@ ...@@ -199,15 +257,19 @@
* 外抛已选的数据 * 外抛已选的数据
*/ */
submitSelected() { submitSelected() {
this.$emit("handleSelectedList", this.selectedList); this.$emit("handleSelectedList", this.treeSet.isSingle ? this.selectedList[0] : this.selectedList);
this.treeSet.dialogVisible = false;
} }
}, },
beforeMount() { // beforeMount() {
this.getGroupData(); // this.getGroupData();
}, // },
watch: { watch: {
searchText(newK, old) { searchText(newK, old) {
this.$refs.tree.filter(newK); this.$refs.tree.filter(newK);
},
treeData(newData) {
this.formatGroupData(newData.treeData, newData.personData);
} }
} }
}; };
......
src/components/contacts/permissionSet/permissionSetting.vue
...@@ -9,34 +9,6 @@ ...@@ -9,34 +9,6 @@
inactive-color="#DCDFE6"> inactive-color="#DCDFE6">
</el-switch> </el-switch>
<div class="particular-setting" v-if="visibleThere"> <div class="particular-setting" v-if="visibleThere">
<!-- <div>
<div class="setting-name">
个别员工不设置该权限
<a class="J_add a-href"><i class="el-icon-plus"></i>添加</a>
<a class="a-href J_check-detail">查看详情</a>
</div>
<ul class="particular-list">
<li class="item person-item" v-for="(li, index) in visibleApartList" :key="index+'_'+li.employeeClerkId" v-if="index < 14">
<img :src="li.headPic">
<p class="name">{{li.name}}</p>
<i class="el-icon-circle-close" @click="delCurrent(li, 'vaList')"></i>
</li>
</ul>
<p class="check-more" v-if="vsList.length > 14">查看更多</p>
<div class="setting-name">
允许指定部门/人员可见
<a class="J_add a-href"><i class="el-icon-plus"></i>添加</a>
<a class="a-href J_check-detail">查看详情</a>
</div>
<ul class="particular-list">
<li class="item person-item" v-for="(li, index) in visibleSpecialLsit" :key="index+'_'+li.employeeClerkId" v-if="index < 14">
<img :src="li.headPic">
<p class="name">{{index}}{{li.name}}</p>
<i class="el-icon-circle-close" @click="delCurrent(li, 'vsList')"></i>
</li>
</ul>
<p class="check-more" v-if="vsList.length > 14">查看更多</p>
</div> -->
<select-area></select-area> <select-area></select-area>
</div> </div>
</div> </div>
...@@ -80,7 +52,7 @@ ...@@ -80,7 +52,7 @@
}, },
data() { data() {
return { return {
visibleThere: false, visibleThere: true,
visibleSelf: false visibleSelf: false
}; };
}, },
......
src/views/contacts/addDepartment.vue
...@@ -5,26 +5,35 @@ ...@@ -5,26 +5,35 @@
<el-form <el-form
class="department-info-form" class="department-info-form"
label-position="right" label-position="right"
label-width="100px"> :rules="rules"
<el-form-item label="部门名称" required> :model="departInfo"
ref="departForm"
label-width="120px">
<el-form-item label="部门名称" prop="name">
<el-input v-model="departInfo.name"></el-input> <el-input v-model="departInfo.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="部门排序调整"> <el-form-item label="部门排序调整" prop="parentId">
<el-input v-model="departInfo.name"></el-input> <el-input :disabled="disabled" v-model="departInfo.parentName" @focus="callGroupSelector" suffix-icon="el-icon-arrow-down"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="setting-cell"> <div class="setting-cell" v-if="$route.query.addnew != 1">
<p class="title">权限设置</p> <p class="title">权限设置</p>
<permission-setting :visibleApartList="testList" :visibleSpecialLsit="testList" :onlySelfApartList="testList"></permission-setting> <permission-setting :visibleApartList="testList" :visibleSpecialLsit="testList" :onlySelfApartList="testList"></permission-setting>
</div> </div>
<div class="setting-cell"></div> <div class="setting-cell">
<vue-select-employee></vue-select-employee> <div class="btn-area">
<el-button type="primary" @click="saveEdit">保存</el-button>
<!-- <el-button>取消</el-button> -->
</div>
</div>
<vue-select-employee :treeSet="treeSet" @handleSelectedList="handleSelectedList" :treeData="treeData"></vue-select-employee>
</div> </div>
</template> </template>
<script> <script>
import permissionSetting from "components/contacts/permissionSet/permissionSetting"; import permissionSetting from "components/contacts/permissionSet/permissionSetting";
import vueSelectEmployee from "components/common/vueSelectEmployee" import vueSelectEmployee from "components/common/vueSelectEmployee";
import { getRequest, postRequest, postJsonRequest } from '@/api/api';
export default { export default {
name: "addDepartment", name: "addDepartment",
components: { components: {
...@@ -34,10 +43,101 @@ ...@@ -34,10 +43,101 @@
data() { data() {
return { return {
departInfo: { departInfo: {
name: "" name: "",
parentName: "",
parentId: ""
},
testList: [],
treeSet: {
isSelectPerson: false,
dialogVisible: false,
isSingle: true // 是否单选
},
rules: {
name: [
{ required: true, message: '请输入部门名称', trigger: 'blur' },
{ min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }
],
parentId: [
{ required: true, message: '请选择父级部门', trigger: 'change' }
]
}, },
testList: [] treeData: {},
disabled: true
}; };
},
methods: {
/**
* 唤起部门选择器
*/
callGroupSelector() {
this.treeSet.dialogVisible = true;
},
/**
* 处理已选部门
*/
handleSelectedList(group) {
console.log(group);
this.departInfo.parentId = group ? group.id : "";
this.departInfo.parentName = group ? group.label : "";
},
saveEdit() {
this.$refs.departForm.validate(valid => {
if (!valid) {
return false;
}
let _this = this;
let params = {
parentId: _this.departInfo.parentId,
name: _this.departInfo.name
}
getRequest("/haoban-manage-web/dept/insert", params)
.then(res => {
console.log(res);
if (res.data.errorCode == 1) {
} else {
_this.$message.error({
duration: 1000,
message: res.data.message
});
}
})
.catch(e => {
_this.$message.error({
duration: 1000,
message: e.message
});
});
});
},
getGroupData() {
let _this = this;
let params = {
isStoreGroup: 0
};
getRequest("/haoban-manage-web/dept/deptListForCompany", params)
.then(res => {
let treeData = [];
let personData = [];
if (res.data.errorCode == 1) {
treeData = res.data.result.departmentList || [];
personData = res.data.result.searchList || []
}
// _this.formatGroupData(treeData, personData);
_this.treeData = {
treeData,
personData
};
_this.disabled = false;
})
.catch(e => {
console.log(e, "error");
});
}
},
beforeMount() {
this.getGroupData();
} }
}; };
</script> </script>
...@@ -61,6 +161,11 @@ ...@@ -61,6 +161,11 @@
width: 380px; width: 380px;
} }
} }
.btn-area{
width: 100%;
text-align: center;
padding: 12px;
}
} }
} }
</style> </style>
......
src/views/contacts/administrativeFrame.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<span class="title-span">{{groupInfo.groupName}}（{{total}}人）</span> <span class="title-span">{{groupInfo.groupName}}（{{total}}人）</span>
<span class="id-span">部门ID： {{groupInfo.departmentId}}</span> <span class="id-span">部门ID： {{groupInfo.departmentId}}</span>
<span class="handle-area"> <span class="handle-area">
<a :href="'#/addDepartment?departmentId='+groupInfo.departmentId" target="_blank" class="J_add-child a-href">添加子部门</a> <a :href="'#/addDepartment?addnew=1&departmentId='+groupInfo.departmentId" target="_blank" class="J_add-child a-href">添加子部门</a>
<span class="hurdle"></span> <span class="hurdle"></span>
<a class="J_edit a-href">编辑</a> <a class="J_edit a-href">编辑</a>
</span> </span>
......
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