提交 4d596e95 编写于 作者: zhentian.jia's avatar zhentian.jia

fix bug 17:19

上级 243369d6
......@@ -134,7 +134,7 @@ const vueFilter = {
return '未上架'
}else if(value[0] == 3) {
if(value[1] == 1) {
return '待审'
return '待审'
} else {
return '审批中'
}
......
......@@ -790,7 +790,8 @@ export default {
this.changeValue(componentEdit);
if (editData.certificateData.length > 0) {
this.formComponent.configure = 1;
this.formComponent.certificate = editData.certificateData[0].relevanceId;
this.formComponent.certificate =
editData.certificateData[0].relevanceId;
}
},
//编辑管理
......@@ -939,7 +940,7 @@ export default {
});
if (res.code == "000000") {
//notify
if(type == 2) {
if (type == 2) {
this.$router.push("item-manager");
}
}
......@@ -1043,9 +1044,9 @@ export default {
//点击完成
complete() {
//type 1:暂存 2:完成
if(this.projectStatus == 4) {
if (this.projectStatus == 4) {
vm.$message.info("已上架状态只能编辑基础信息");
vm.$router.push({ path: 'item-manager' });
vm.$router.push({ path: "item-manager" });
return;
}
let formName = "formComponent";
......@@ -1468,7 +1469,7 @@ export default {
let req = {
id: data.id,
status: data.status,
disabled: data.disabled,
disabled: data.disabled
};
vm.GET("portal/scope/v1/administrative/children", req).then(res => {
if (res.code == "000000") {
......@@ -1788,6 +1789,17 @@ export default {
//console.log(scope);
return scope;
},
initOrganizationStatus() {
let tableStatus = this.tableOrganization;
tableStatus.forEach(row => {
//console.log("row", row);
if (row.status == 0) {
this.$nextTick(function() {
this.$refs.multipleOrganization.toggleRowSelection(row);
});
}
});
},
//查询机构列表
getOrganization() {
let req = {
......@@ -1816,6 +1828,8 @@ export default {
this.changedOrganization[this.formOrganization.pageNum] !=
undefined
) {
//table的status
//机构table 勾选被更新过
let rowCheck = this.changedOrganization[
this.formOrganization.pageNum
......@@ -1835,6 +1849,8 @@ export default {
});
} else {
this.$refs.multipleOrganization.toggleAllSelection();
//table的status
this.initOrganizationStatus();
}
} else {
//全不选
......@@ -1843,6 +1859,7 @@ export default {
this.changedOrganization[this.formOrganization.pageNum] !=
undefined
) {
let rowCheck = this.changedOrganization[
this.formOrganization.pageNum
][0];
......@@ -1859,6 +1876,8 @@ export default {
this.$refs.multipleOrganization.toggleRowSelection(rowItem);
});
});
} else {
this.initOrganizationStatus();
}
}
}
......@@ -2020,13 +2039,14 @@ export default {
}
});
},
//设定人员中科室列表
getDepartmentList() {
let list = [];
for(let i=0;i<this.tableDepartment.length;i++) {
if(this.tableDepartment[i].status == 1) {
for (let i = 0; i < this.tableDepartment.length; i++) {
if (this.tableDepartment[i].status == 1) {
let obj = {
id: this.tableDepartment[i].id,
label: this.tableDepartment[i].name,
label: this.tableDepartment[i].name
};
list.push(obj);
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册