yili/vue-apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

伊利项目【架构筛选】代码合并问题

Browse Source
This commit is contained in:
qinoy 2022-07-15 10:38:09 +08:00
parent 4e0a3f00b2
commit 9c30878c38
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue
View File

@ -74,7 +74,6 @@
</awsui-button> </awsui-button>
</el-popover> </el-popover>
</div> </div>
<div v-if="havingWritePerm || havingCreatePerm" style="width: 100%;border-bottom: 1px solid #F2F2F2;"></div>
<!-- 【伊利需求】左侧新增查询条件 --> <!-- 【伊利需求】左侧新增查询条件 -->
<div class="condition-box" style="margin-bottom: 10px;display: flex;justify-content: space-evenly;"> <div class="condition-box" style="margin-bottom: 10px;display: flex;justify-content: space-evenly;">
<!-- 创建人 --> <!-- 创建人 -->
@ -187,7 +186,7 @@
</div> </div>
</el-popover> </el-popover>
</div> </div>
<div v-if="havingWritePerm" style="width: 100%;border-bottom: 1px solid #F2F2F2;"></div> <div v-if="havingWritePerm || havingCreatePerm" style="width: 100%;border-bottom: 1px solid #F2F2F2;"></div>
</el-header> </el-header>
<el-main class="main-tree" :style="{'overflow': 'auto', 'height': treeHeight}"> <el-main class="main-tree" :style="{'overflow': 'auto', 'height': treeHeight}">
<el-tree <el-tree
@ -679,10 +678,8 @@
item.deptNameView = `${item.deptName.substring(0,4)}***${item.deptName.substring(item.deptName.length-4)}` item.deptNameView = `${item.deptName.substring(0,4)}***${item.deptName.substring(item.deptName.length-4)}`
} }
}) })
console.log('=========',that.conditionData.createUsers)
that.createUserOptions = that.conditionData.createUsers; that.createUserOptions = that.conditionData.createUsers;
that.createUserList = that.createUserOptions; that.createUserList = that.createUserOptions;
console.log('=========',that.createUserList)
let checkMethodIdCount = that.conditionData.historyCondition.methodIds.length let checkMethodIdCount = that.conditionData.historyCondition.methodIds.length
let checkCreateUsersCount = that.conditionData.historyCondition.createUsers.length let checkCreateUsersCount = that.conditionData.historyCondition.createUsers.length
@ -714,7 +711,9 @@
that.currentUserDeptCheck = false; that.currentUserDeptCheck = false;
} }
that.$nextTick(() => { that.$nextTick(() => {
that.$refs.orgTree.setCheckedKeys(that.checkOrgIds); if (that.$refs.orgTree) {
that.$refs.orgTree.setCheckedKeys(that.checkOrgIds);
}
}) })
}, },