diff --git a/index.html b/index.html index ca4c20c..3dcf359 100644 --- a/index.html +++ b/index.html @@ -18,21 +18,24 @@ - BladeX微服务开发平台 + 电镀智能化生产管理系统
- BladeX - 微 - 服 - 务 - 开 - 发 - 平 - 台 + 电 + 镀 + 智 + 能 + 化 + 生 + 产 + 管 + 理 + 系 + 统
系统加载中
diff --git a/src/config/website.js b/src/config/website.js index 6b83ab7..110e1ca 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -53,7 +53,7 @@ export default { //水印配置 watermark: { mode: false, - text: 'BladeX', + text: '电镀智能化生产管理系统', }, //oauth2配置 oauth2: { diff --git a/src/lang/en.js b/src/lang/en.js index 815a033..07ef7e0 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -1,5 +1,5 @@ export default { - title: 'BladeX Admin', + title: 'jonhon Admin', logoutTip: 'Exit the system, do you want to continue?', submitText: 'submit', cancelText: 'cancel', @@ -78,7 +78,7 @@ export default { }, login: { title: 'Login ', - info: 'BladeX Development Platform', + info: 'jonhon Development Platform', tenantId: 'Please input tenantId', name: 'Please input name', username: 'Please input account', diff --git a/src/lang/zh.js b/src/lang/zh.js index 0568160..c01a6cd 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1,5 +1,5 @@ export default { - title: 'BladeX微服务平台', + title: '电镀智能化生产管理系统', confirmTip: '提示', logoutTip: '退出系统, 是否继续?', submitText: '确定', @@ -79,7 +79,7 @@ export default { }, login: { title: '登录 ', - info: 'BladeX 微服务平台', + info: '电镀智能化生产管理系统', tenantId: '请输入租户ID', name: '请输入姓名', username: '请输入账号', diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 0832584..e56b36e 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -11,14 +11,14 @@
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index ce7f0ba..9d71a94 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -66,13 +66,13 @@ {{ $t('login.submit') }} - {{ $t('login.register') }} - + --> diff --git a/src/router/views/index.js b/src/router/views/index.js index d43470d..6689139 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -159,4 +159,5 @@ export default [ } ] }, + ]; diff --git a/src/views/plugin/workflow/mixins/draft.js b/src/views/plugin/workflow/mixins/draft.js index 9eff9fa..199ebc2 100644 --- a/src/views/plugin/workflow/mixins/draft.js +++ b/src/views/plugin/workflow/mixins/draft.js @@ -14,6 +14,7 @@ export default { }) }, handleDraft({ processDefId, taskId, formKey, variables }) { + if (!this.$refs.form) { this.$message.error("找不到可用的表单，请检查表单配置"); return; diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js index 403f66e..5af2946 100644 --- a/src/views/plugin/workflow/mixins/ex-form.js +++ b/src/views/plugin/workflow/mixins/ex-form.js @@ -60,6 +60,7 @@ export default { return new Promise(resolve => { if (formKey && formKey.startsWith('wf_ex_')) { + if (formUrl) { // 配置了自定义路由 this.$router.push(formUrl + `?p=${param}`); diff --git a/src/views/plugin/workflow/pages/demo/leave/index.vue b/src/views/plugin/workflow/pages/demo/leave/index.vue index ecd8439..25f534d 100644 --- a/src/views/plugin/workflow/pages/demo/leave/index.vue +++ b/src/views/plugin/workflow/pages/demo/leave/index.vue @@ -138,7 +138,7 @@ export default { menuWidth: 260, column: [ { - label: '创建人', + label: '创建人2', prop: 'creator', search: true, type: 'tree', diff --git a/src/views/plugin/workflow/pages/external/Leave/detail.vue b/src/views/plugin/workflow/pages/external/Leave/detail.vue index e40ed73..4f827ca 100644 --- a/src/views/plugin/workflow/pages/external/Leave/detail.vue +++ b/src/views/plugin/workflow/pages/external/Leave/detail.vue @@ -125,7 +125,7 @@ export default { column: [ { type: 'input', - label: '创建人', + label: '创建人6', span: 12, display: true, prop: 'creator', diff --git a/src/views/plugin/workflow/pages/external/Leave/start.vue b/src/views/plugin/workflow/pages/external/Leave/start.vue index d26594f..35d3047 100644 --- a/src/views/plugin/workflow/pages/external/Leave/start.vue +++ b/src/views/plugin/workflow/pages/external/Leave/start.vue @@ -102,7 +102,7 @@ export default { column: [ { type: 'input', - label: '创建人', + label: '创建人3', span: 12, display: true, prop: 'creator', diff --git a/src/views/plugin/workflow/pages/external/zdtest/start.vue b/src/views/plugin/workflow/pages/external/zdtest/start.vue new file mode 100644 index 0000000..543b049 --- /dev/null +++ b/src/views/plugin/workflow/pages/external/zdtest/start.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/views/plugin/workflow/pages/process/start.vue b/src/views/plugin/workflow/pages/process/start.vue index ab65485..b56aa4a 100644 --- a/src/views/plugin/workflow/pages/process/start.vue +++ b/src/views/plugin/workflow/pages/process/start.vue @@ -46,7 +46,16 @@ - + + +