diff --git a/yanzhu-ui/src/components/ImageUpload/index.vue b/yanzhu-ui/src/components/ImageUpload/index.vue index 2e64c9b..d4e8bfa 100644 --- a/yanzhu-ui/src/components/ImageUpload/index.vue +++ b/yanzhu-ui/src/components/ImageUpload/index.vue @@ -32,7 +32,8 @@ :visible.sync="dialogVisible" title="预览" width="800" - append-to-body + append-to-body :close-on-click-modal="false" + :close-on-press-escape="false" > @@ -87,7 +88,8 @@ title="选择表达式" :visible.sync="expVisible" width="60%" - :close-on-press-escape="false" + :close-on-click-modal="false" + :close-on-press-escape="false" :show-close="false" > @@ -101,7 +103,8 @@ title="选择候选角色" :visible.sync="roleVisible" width="60%" - :close-on-press-escape="false" + :close-on-click-modal="false" + :close-on-press-escape="false" :show-close="false" > diff --git a/yanzhu-ui/src/components/RightToolbar/index.vue b/yanzhu-ui/src/components/RightToolbar/index.vue index 67da293..6ee223b 100644 --- a/yanzhu-ui/src/components/RightToolbar/index.vue +++ b/yanzhu-ui/src/components/RightToolbar/index.vue @@ -21,7 +21,8 @@ - + + return ` ${str}
取消 diff --git a/yanzhu-ui/src/views/base/assetsType/index.vue b/yanzhu-ui/src/views/base/assetsType/index.vue index 28eeb51..79081a3 100644 --- a/yanzhu-ui/src/views/base/assetsType/index.vue +++ b/yanzhu-ui/src/views/base/assetsType/index.vue @@ -82,7 +82,8 @@ @pagination="getList" /> - + diff --git a/yanzhu-ui/src/views/flowable/definition/index.vue b/yanzhu-ui/src/views/flowable/definition/index.vue index a93ab05..e28b477 100644 --- a/yanzhu-ui/src/views/flowable/definition/index.vue +++ b/yanzhu-ui/src/views/flowable/definition/index.vue @@ -138,7 +138,8 @@ /> - + @@ -151,7 +152,8 @@ - + - + - +
- + - + @@ -121,7 +122,8 @@ - +
diff --git a/yanzhu-ui/src/views/flowable/task/myProcess/index.vue b/yanzhu-ui/src/views/flowable/task/myProcess/index.vue index 85a4212..d3380f5 100644 --- a/yanzhu-ui/src/views/flowable/task/myProcess/index.vue +++ b/yanzhu-ui/src/views/flowable/task/myProcess/index.vue @@ -239,7 +239,8 @@ /> - + - + diff --git a/yanzhu-ui/src/views/flowable/task/record/index.vue b/yanzhu-ui/src/views/flowable/task/record/index.vue index 92e63f3..a32550f 100644 --- a/yanzhu-ui/src/views/flowable/task/record/index.vue +++ b/yanzhu-ui/src/views/flowable/task/record/index.vue @@ -92,7 +92,8 @@ - + @@ -157,7 +158,8 @@ - + @@ -179,7 +181,8 @@ - + diff --git a/yanzhu-ui/src/views/flowable/task/todo/detail/approveDrawer.vue b/yanzhu-ui/src/views/flowable/task/todo/detail/approveDrawer.vue index b2750d5..c15be82 100644 --- a/yanzhu-ui/src/views/flowable/task/todo/detail/approveDrawer.vue +++ b/yanzhu-ui/src/views/flowable/task/todo/detail/approveDrawer.vue @@ -270,7 +270,8 @@ title="选择人员" :visible.sync="userVisible" width="60%" - :close-on-press-escape="false" + :close-on-click-modal="false" + :close-on-press-escape="false" :show-close="false" z-index="999999" v-loading="delegateLoading" diff --git a/yanzhu-ui/src/views/flowable/task/todo/detail/index.vue b/yanzhu-ui/src/views/flowable/task/todo/detail/index.vue index 312ba2c..d0d05b3 100644 --- a/yanzhu-ui/src/views/flowable/task/todo/detail/index.vue +++ b/yanzhu-ui/src/views/flowable/task/todo/detail/index.vue @@ -81,7 +81,8 @@ - + @@ -98,7 +99,8 @@ - + @@ -121,7 +123,8 @@ - + diff --git a/yanzhu-ui/src/views/index.vue b/yanzhu-ui/src/views/index.vue index 0449ac4..f293ec8 100644 --- a/yanzhu-ui/src/views/index.vue +++ b/yanzhu-ui/src/views/index.vue @@ -1,88 +1,6 @@ diff --git a/yanzhu-ui/src/views/monitor/job/index.vue b/yanzhu-ui/src/views/monitor/job/index.vue index e7d4598..51519ef 100644 --- a/yanzhu-ui/src/views/monitor/job/index.vue +++ b/yanzhu-ui/src/views/monitor/job/index.vue @@ -152,7 +152,8 @@ /> - + @@ -236,12 +237,14 @@
- + - + diff --git a/yanzhu-ui/src/views/monitor/job/log.vue b/yanzhu-ui/src/views/monitor/job/log.vue index 60bee1d..13c9da0 100644 --- a/yanzhu-ui/src/views/monitor/job/log.vue +++ b/yanzhu-ui/src/views/monitor/job/log.vue @@ -144,7 +144,8 @@ /> - + diff --git a/yanzhu-ui/src/views/monitor/operlog/index.vue b/yanzhu-ui/src/views/monitor/operlog/index.vue index 4a1828f..8c80ed7 100644 --- a/yanzhu-ui/src/views/monitor/operlog/index.vue +++ b/yanzhu-ui/src/views/monitor/operlog/index.vue @@ -160,7 +160,8 @@ /> - + diff --git a/yanzhu-ui/src/views/project/company/index.vue b/yanzhu-ui/src/views/project/company/index.vue index cd9abf4..bf7675d 100644 --- a/yanzhu-ui/src/views/project/company/index.vue +++ b/yanzhu-ui/src/views/project/company/index.vue @@ -8,7 +8,7 @@ - + @@ -53,7 +53,8 @@ - + diff --git a/yanzhu-ui/src/views/project/project/index.vue b/yanzhu-ui/src/views/project/project/index.vue index 11ffa1a..1680cbb 100644 --- a/yanzhu-ui/src/views/project/project/index.vue +++ b/yanzhu-ui/src/views/project/project/index.vue @@ -61,7 +61,8 @@ - + diff --git a/yanzhu-ui/src/views/project/projectApply/index.vue b/yanzhu-ui/src/views/project/projectApply/index.vue index 4a186a8..c77dd7a 100644 --- a/yanzhu-ui/src/views/project/projectApply/index.vue +++ b/yanzhu-ui/src/views/project/projectApply/index.vue @@ -173,7 +173,8 @@ /> - + diff --git a/yanzhu-ui/src/views/project/projectInfo/index.vue b/yanzhu-ui/src/views/project/projectInfo/index.vue index 4b68402..4be33c4 100644 --- a/yanzhu-ui/src/views/project/projectInfo/index.vue +++ b/yanzhu-ui/src/views/project/projectInfo/index.vue @@ -2,45 +2,21 @@
- + - + - + - + - + @@ -51,46 +27,20 @@ - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - 导出 + 导出 @@ -106,48 +56,34 @@ - - + + - + @@ -168,19 +104,15 @@ - + - + @@ -297,7 +229,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) - this.single = selection.length!==1 + this.single = selection.length !== 1 this.multiple = !selection.length }, /** 新增按钮操作 */ @@ -339,12 +271,12 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('是否确认删除项目信息编号为"' + ids + '"的数据项?').then(function() { + this.$modal.confirm('是否确认删除项目信息编号为"' + ids + '"的数据项?').then(function () { return delProjectInfo(ids); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + }).catch(() => { }); }, /** 导出按钮操作 */ handleExport() { diff --git a/yanzhu-ui/src/views/system/config/index.vue b/yanzhu-ui/src/views/system/config/index.vue index 3ab81fc..b4df288 100644 --- a/yanzhu-ui/src/views/system/config/index.vue +++ b/yanzhu-ui/src/views/system/config/index.vue @@ -148,7 +148,8 @@ /> - + diff --git a/yanzhu-ui/src/views/system/dept/index.vue b/yanzhu-ui/src/views/system/dept/index.vue index e502b4e..f06b8f6 100644 --- a/yanzhu-ui/src/views/system/dept/index.vue +++ b/yanzhu-ui/src/views/system/dept/index.vue @@ -97,7 +97,8 @@ - + diff --git a/yanzhu-ui/src/views/system/dict/data.vue b/yanzhu-ui/src/views/system/dict/data.vue index 3befe4a..9bf4e77 100644 --- a/yanzhu-ui/src/views/system/dict/data.vue +++ b/yanzhu-ui/src/views/system/dict/data.vue @@ -141,7 +141,8 @@ /> - + diff --git a/yanzhu-ui/src/views/system/dict/index.vue b/yanzhu-ui/src/views/system/dict/index.vue index 6ca5457..98d5bc9 100644 --- a/yanzhu-ui/src/views/system/dict/index.vue +++ b/yanzhu-ui/src/views/system/dict/index.vue @@ -158,7 +158,8 @@ /> - + diff --git a/yanzhu-ui/src/views/system/expression/index.vue b/yanzhu-ui/src/views/system/expression/index.vue index e5b4ea4..315d41a 100644 --- a/yanzhu-ui/src/views/system/expression/index.vue +++ b/yanzhu-ui/src/views/system/expression/index.vue @@ -106,7 +106,8 @@ /> - + diff --git a/yanzhu-ui/src/views/system/listener/index.vue b/yanzhu-ui/src/views/system/listener/index.vue index a4e6f45..5fa52fa 100644 --- a/yanzhu-ui/src/views/system/listener/index.vue +++ b/yanzhu-ui/src/views/system/listener/index.vue @@ -115,7 +115,8 @@ /> - + diff --git a/yanzhu-ui/src/views/system/menu/index.vue b/yanzhu-ui/src/views/system/menu/index.vue index c703fa0..319ed76 100644 --- a/yanzhu-ui/src/views/system/menu/index.vue +++ b/yanzhu-ui/src/views/system/menu/index.vue @@ -103,7 +103,8 @@ - + diff --git a/yanzhu-ui/src/views/system/notice/index.vue b/yanzhu-ui/src/views/system/notice/index.vue index 7982b54..194ba40 100644 --- a/yanzhu-ui/src/views/system/notice/index.vue +++ b/yanzhu-ui/src/views/system/notice/index.vue @@ -123,7 +123,8 @@ /> - + diff --git a/yanzhu-ui/src/views/system/post/index.vue b/yanzhu-ui/src/views/system/post/index.vue index 444bf63..0f5ea6e 100644 --- a/yanzhu-ui/src/views/system/post/index.vue +++ b/yanzhu-ui/src/views/system/post/index.vue @@ -124,7 +124,8 @@ /> - + diff --git a/yanzhu-ui/src/views/system/role/index.vue b/yanzhu-ui/src/views/system/role/index.vue index fb3b5ef..34ed29f 100644 --- a/yanzhu-ui/src/views/system/role/index.vue +++ b/yanzhu-ui/src/views/system/role/index.vue @@ -156,7 +156,8 @@ /> - + @@ -208,7 +209,8 @@ - + diff --git a/yanzhu-ui/src/views/system/role/selectUser.vue b/yanzhu-ui/src/views/system/role/selectUser.vue index b2b072f..170da88 100644 --- a/yanzhu-ui/src/views/system/role/selectUser.vue +++ b/yanzhu-ui/src/views/system/role/selectUser.vue @@ -1,6 +1,7 @@