|
|
@@ -12,9 +12,32 @@
|
|
|
:visible.sync="dialogVisible"
|
|
|
:close-on-click-modal="false"
|
|
|
width="500px"
|
|
|
+ :before-close="closeDig"
|
|
|
>
|
|
|
+ <!-- 当符合条件时需要暂时属于哪一届 -->
|
|
|
<div class="tips">
|
|
|
- <el-form :model="ruleForm" ref="ruleForm" class="demo-ruleForm">
|
|
|
+ <el-form :model="ruleForm" ref="ruleForm" :rules="rules" class="demo-ruleForm">
|
|
|
+ <el-form-item
|
|
|
+ label="所属届"
|
|
|
+ prop="grade"
|
|
|
+ class="imput_com"
|
|
|
+ v-show="isShowGrade"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ v-model="ruleForm.grade"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择所属届"
|
|
|
+ style="width: 100%"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in gradeOption"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="组织架构名称" prop="orgName" class="imput_com">
|
|
|
<el-input
|
|
|
placeholder="输入组织架构名称"
|
|
|
@@ -26,7 +49,7 @@
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<div class="tip-left">
|
|
|
- <el-button type="info" @click="dialogVisible = false">取消</el-button>
|
|
|
+ <el-button type="info" @click="closeDig">取消</el-button>
|
|
|
<el-button type="primary" @click="confirm">确定</el-button>
|
|
|
</div>
|
|
|
</span>
|
|
|
@@ -44,7 +67,7 @@
|
|
|
</div>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
- <div class="changeDirection" @click="changeDir">切换方向</div>
|
|
|
+ <!-- <div class="changeDirection" @click="changeDir">切换方向</div> -->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -73,7 +96,7 @@ export default {
|
|
|
// //公司编号
|
|
|
// orgNo: 1,
|
|
|
// },
|
|
|
- treeData: {
|
|
|
+ treeData: {
|
|
|
//公司名称
|
|
|
orgName: "大米科技公司",
|
|
|
proportionShares: "100",
|
|
|
@@ -91,6 +114,11 @@ export default {
|
|
|
//输入表单的对象
|
|
|
ruleForm: {
|
|
|
orgName: "",
|
|
|
+ grade: "",
|
|
|
+ },
|
|
|
+ rules: {
|
|
|
+ orgName: [{ required: true, message: "请输入组织名称", trigger: "blur" }],
|
|
|
+ grade: [{ required: true, message: "请选择届数", trigger: "change" }],
|
|
|
},
|
|
|
shareholderTypeOptions: [
|
|
|
{
|
|
|
@@ -112,13 +140,41 @@ export default {
|
|
|
lastId: 11, // 最后一级id
|
|
|
currentTreeData: {},
|
|
|
userInfo: {},
|
|
|
+ gradeOption: [],
|
|
|
+ isShowGrade: false,
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
|
|
|
this.getChannel();
|
|
|
+ this.getGradeFun();
|
|
|
},
|
|
|
methods: {
|
|
|
+ //新增修改框关闭后的回调
|
|
|
+ closeDig(){
|
|
|
+ //重置数据
|
|
|
+ this.$refs['ruleForm'].resetFields();
|
|
|
+ this.dialogVisible=false;
|
|
|
+ },
|
|
|
+ //获取当前届数
|
|
|
+ getGradeFun() {
|
|
|
+ this.gradeOption = [];
|
|
|
+ //获取当前届数
|
|
|
+ //获取当前年份
|
|
|
+ let date = new Date();
|
|
|
+ let currentYear = date.getFullYear();
|
|
|
+ let preYear = currentYear - 12;
|
|
|
+ let list = [];
|
|
|
+ for (let i = preYear; i < currentYear + 1; i++) {
|
|
|
+ //
|
|
|
+ let obj = {
|
|
|
+ value: i + "",
|
|
|
+ label: i + "届",
|
|
|
+ };
|
|
|
+ list.push(obj);
|
|
|
+ }
|
|
|
+ this.gradeOption = list.reverse();
|
|
|
+ },
|
|
|
changeDir() {
|
|
|
//改变方向
|
|
|
this.isVertical = !this.isVertical;
|
|
|
@@ -136,15 +192,15 @@ export default {
|
|
|
let resAdd = this.addPro(res.data);
|
|
|
this.ppData = JSON.parse(JSON.stringify(resAdd));
|
|
|
let forRes = this.arrToTree(resAdd);
|
|
|
- console.log("forRes")
|
|
|
- console.log(forRes)
|
|
|
+ console.log("forRes");
|
|
|
+ console.log(forRes);
|
|
|
// console.log('格式化的结构')
|
|
|
// console.log(forRes)
|
|
|
let resultRes = this.deleteChildren(forRes);
|
|
|
|
|
|
let levelList = this.markersFun(resultRes, 1);
|
|
|
console.log("格式化的结构且去掉children");
|
|
|
-
|
|
|
+
|
|
|
// console.log(JSON.stringify(levelList));
|
|
|
this.treeData = levelList[0];
|
|
|
console.log(levelList[0]);
|
|
|
@@ -173,7 +229,7 @@ export default {
|
|
|
item.children = arr.filter((e) => {
|
|
|
return item.orgNo === e.parentOrgNo;
|
|
|
});
|
|
|
- return item.orgNo==this.userInfo.orgNo;
|
|
|
+ return item.orgNo == this.userInfo.orgNo;
|
|
|
});
|
|
|
return data;
|
|
|
},
|
|
|
@@ -199,6 +255,30 @@ export default {
|
|
|
}
|
|
|
arr.forEach((item) => {
|
|
|
item.level = level;
|
|
|
+ //设置都可以编辑
|
|
|
+ item.isEdit = true;
|
|
|
+ //设置都可以增加
|
|
|
+ item.isAdd = true;
|
|
|
+ //设置都可以删除
|
|
|
+ item.isDelete = true;
|
|
|
+ // item.extend = true;
|
|
|
+ item.isExtend = true;
|
|
|
+
|
|
|
+ //当角色是超级管理员时
|
|
|
+ if (this.userInfo.roleType == "5") {
|
|
|
+ //则level 是三级时
|
|
|
+ if (level == "3") {
|
|
|
+ item.isAdd = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // //当角色是院管理员时
|
|
|
+ if (this.userInfo.roleType == "4") {
|
|
|
+ //则level 是三级时
|
|
|
+ if (level == "2") {
|
|
|
+ item.isAdd = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (item.children && item.children.length) {
|
|
|
//
|
|
|
this.markersFun(item.children, level + 1);
|
|
|
@@ -210,17 +290,51 @@ export default {
|
|
|
|
|
|
// 新增编辑股东,val: 0 新增, 1 编辑
|
|
|
addStock(data) {
|
|
|
+ this.isShowGrade = false;
|
|
|
+ //判断是新增还是编辑
|
|
|
+ //当等于0时是新增
|
|
|
+ //当等于1时是修改
|
|
|
+ if (data.val == "1") {
|
|
|
+ //管理员编辑
|
|
|
+ if (this.userInfo.roleType == "5" && data.data.level == "3") {
|
|
|
+ this.isShowGrade = true;
|
|
|
+ }
|
|
|
+ //院管理员编辑
|
|
|
+ if (this.userInfo.roleType == "4" && data.data.level == "2") {
|
|
|
+ this.isShowGrade = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (data.val == "0") {
|
|
|
+ //管理员新增 是否显示届数
|
|
|
+ if (this.userInfo.roleType == "5" && data.data.level == "2") {
|
|
|
+ this.isShowGrade = true;
|
|
|
+ }
|
|
|
+ //院管理员新增 是否显示届数
|
|
|
+ if (this.userInfo.roleType == "4" && data.data.level == "1") {
|
|
|
+ this.isShowGrade = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //当是管理员登录时
|
|
|
+ // if(this.userInfo.roleType=='5'&&data.data.level=='3'){
|
|
|
+
|
|
|
+ // }
|
|
|
+
|
|
|
+ // this.isShowGrade = true;
|
|
|
+ //判断是修改还是
|
|
|
console.log(data);
|
|
|
this.currentSelectObj = data.data;
|
|
|
// console.log(this.currentSelectObj);
|
|
|
if (data.val) {
|
|
|
this.ruleForm.orgName = data.data.orgName;
|
|
|
+ this.ruleForm.grade = data.data.extend;
|
|
|
// 不使用=赋值,内存相同,改变后,treeData数据也会改变
|
|
|
// this.ruleForm = data.data;
|
|
|
// this.ruleForm = Object.assign(this.ruleForm, data.data);
|
|
|
// this.ruleForm.type = data.data.level;
|
|
|
} else {
|
|
|
this.ruleForm.orgName = "";
|
|
|
+ this.ruleForm.grade = "";
|
|
|
}
|
|
|
this.isEdit = data.val;
|
|
|
// 使用=赋值,编辑时改变currentTreeData, 源数据treeData也会改变
|
|
|
@@ -257,11 +371,39 @@ export default {
|
|
|
confirm() {
|
|
|
// let loading = Loading.service();
|
|
|
//判断是否输入值了
|
|
|
- if (this.ruleForm.orgName != "" && this.ruleForm.orgName != null) {
|
|
|
- this.sendData();
|
|
|
+ // if (this.ruleForm.orgName != "" && this.ruleForm.orgName != null) {
|
|
|
+ // this.sendData();
|
|
|
+ // } else {
|
|
|
+ // this.$message.warning("请输入组织架构名称");
|
|
|
+ // }
|
|
|
+
|
|
|
+ //当届数显示时--需要校验届数字段
|
|
|
+
|
|
|
+ //
|
|
|
+ let validSp = [];
|
|
|
+ let aa = [];
|
|
|
+ if (this.isShowGrade) {
|
|
|
+ validSp = ["orgName", "grade"];
|
|
|
} else {
|
|
|
- this.$message.warning("请输入组织架构名称");
|
|
|
+ validSp = ["orgName"];
|
|
|
}
|
|
|
+ this.$refs["ruleForm"].validateField(validSp, (valid) => {
|
|
|
+ if (!valid) {
|
|
|
+ aa.push(valid);
|
|
|
+ if (this.isShowGrade) {
|
|
|
+ if (aa.length == 2) {
|
|
|
+ this.sendData();
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (aa.length == 1) {
|
|
|
+ this.sendData();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ // console.log("error submit!!");
|
|
|
+ // return false;
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
// 发送添加股东数据
|
|
|
@@ -273,6 +415,7 @@ export default {
|
|
|
// data.id = this.treeData.id;
|
|
|
//将参数调用接口
|
|
|
this.currentSelectObj.orgName = this.ruleForm.orgName;
|
|
|
+ this.currentSelectObj.extend = this.ruleForm.grade;
|
|
|
this.$http.post(`/org/addOrUpdateOrg`, this.currentSelectObj, (res) => {
|
|
|
// this.$toast.success({message:'成功'});
|
|
|
if (res && res.code == 200) {
|
|
|
@@ -294,6 +437,7 @@ export default {
|
|
|
let data = {
|
|
|
parentOrgNo: this.currentSelectObj.orgNo,
|
|
|
orgName: this.ruleForm.orgName,
|
|
|
+ extend: this.ruleForm.grade,
|
|
|
};
|
|
|
//将参数调用接口
|
|
|
this.$http.post(`/org/addOrUpdateOrg`, data, (res) => {
|
|
|
@@ -345,11 +489,11 @@ export default {
|
|
|
.imput_com >>> .el-input__inner {
|
|
|
width: 400px !important;
|
|
|
}
|
|
|
+.imput_com >>> .el-input {
|
|
|
+ width: 400px !important;
|
|
|
+}
|
|
|
</style>
|
|
|
<style lang="less" scoped>
|
|
|
-// :deep(.el-input__inner) {
|
|
|
-
|
|
|
-// }
|
|
|
.changeDirection {
|
|
|
position: fixed;
|
|
|
right: 50px;
|
