|
|
@@ -421,7 +421,7 @@ export default {
|
|
|
eqOrg(row) {
|
|
|
// console.log(row.planCreateOrgId,"row.planCreateOrgId");
|
|
|
// console.log(this.orgId,"this.orgId");
|
|
|
- if (row != null && row != undefined && row.planOfOrgId == this.orgId) {
|
|
|
+ if (row != null && row != undefined && row.planOfOrgId == this.orgId&& row.planOfOrgType==1) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|
|
|
@@ -529,10 +529,12 @@ export default {
|
|
|
this.$modal
|
|
|
.confirm('是否确认删除名称为"' + name + '"的数据项?')
|
|
|
.then(function () {
|
|
|
+ this.loading=true;
|
|
|
return api.delelte(id);
|
|
|
})
|
|
|
.then(() => {
|
|
|
this.getList();
|
|
|
+ this.loading=false;
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
})
|
|
|
.catch(() => {});
|