|
@@ -151,10 +151,10 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
//新增修改框关闭后的回调
|
|
|
- closeDig(){
|
|
|
+ closeDig() {
|
|
|
//重置数据
|
|
|
- this.$refs['ruleForm'].resetFields();
|
|
|
- this.dialogVisible=false;
|
|
|
+ this.$refs["ruleForm"].resetFields();
|
|
|
+ this.dialogVisible = false;
|
|
|
},
|
|
|
//获取当前届数
|
|
|
getGradeFun() {
|
|
@@ -192,18 +192,16 @@ 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('格式化的结构')
|
|
|
- // 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]);
|
|
|
+
|
|
|
} else {
|
|
|
this.groupData = [];
|
|
|
}
|
|
@@ -322,9 +320,7 @@ export default {
|
|
|
|
|
|
// this.isShowGrade = true;
|
|
|
//判断是修改还是
|
|
|
- console.log(data);
|
|
|
- this.currentSelectObj = data.data;
|
|
|
- // console.log(this.currentSelectObj);
|
|
|
+ this.currentSelectObj = JSON.parse(JSON.stringify(data.data));
|
|
|
if (data.val) {
|
|
|
this.ruleForm.orgName = data.data.orgName;
|
|
|
this.ruleForm.grade = data.data.extend;
|
|
@@ -345,7 +341,6 @@ export default {
|
|
|
// 删除
|
|
|
deleteStock(data) {
|
|
|
this.currentSelectObj = data;
|
|
|
- console.log(this.currentSelectObj);
|
|
|
|
|
|
this.dialogVisible2 = true;
|
|
|
},
|
|
@@ -400,7 +395,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- // console.log("error submit!!");
|
|
|
// return false;
|
|
|
}
|
|
|
});
|