diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1eb58966e..b83382e4b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -468,7 +468,7 @@ module.exports = { processDone: 'Process done', sentProcess: 'Sent process', monitoringProcess: 'Monitoring process', - ConfirmDeployment:'Confirm deployment', + ConfirmDeployment:'Confirm deployment?', terminationProcess:'termination process', issue:'issue', projectInformation:'project information', @@ -487,5 +487,16 @@ module.exports = { role:'role', operationContent:'operation content', operationTime:'operation time', - + ConfirmReplication:'Confirm replication', + ProcessName:'Process name', + ProcessType:'Process type', + AddProcess:'Add process', + RelatedItems:'Related items', + Sponsor:'Sponsor', + CurrentProcessor:'Current processor', + LastProcessor:'Last processor', + ProcessingTime:'Processing time', + cutoffTime:'cut-off time', + ProcessStatus:'Process status', + CompletionTime:'Completion time' } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 7759453ee..ebfc6b24f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -486,11 +486,21 @@ module.exports = { role:'角色', operationContent:'操作内容', operationTime:'操作时间', - - away:'收起', toDoProcess: '待办流程', processDone: '已办流程', sentProcess: '已发流程', monitoringProcess: '监控流程', ConfirmDeployment:'确认部署?', + ConfirmReplication:'确认复制?', + ProcessName:'流程名称', + ProcessType:'流程类型', + AddProcess:'添加流程', + RelatedItems:'相关项目', + Sponsor:'发起人', + CurrentProcessor:'当前处理人', + LastProcessor:'上一处理人', + ProcessingTime:'办理时间', + cutoffTime:'截止时间', + ProcessStatus:'流程状态', + CompletionTime:'完成时间', } \ No newline at end of file diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index dc8e27b3c..0bbf300cc 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -17,7 +17,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || '/jero-boot' const service = axios.create({ //baseURL: '/jero-boot', baseURL: apiBaseUrl, // api base_url - timeout: 9000 // 请求超时时间 + timeout: 900000000000 // 请求超时时间 }) const err = (error) => { diff --git a/jero-web/src/views/processCenter/procedure/index.vue b/jero-web/src/views/processCenter/procedure/index.vue index 15bfe699d..a4fb2b4a3 100644 --- a/jero-web/src/views/processCenter/procedure/index.vue +++ b/jero-web/src/views/processCenter/procedure/index.vue @@ -110,35 +110,35 @@ total: 0, visible: false, formData: {}, - title: '添加流程', + title: this.$t('AddProcess'), columns: [ { - title: '序号', + title: this.$t('serialNumber'), dataIndex: 'index', align: 'center', ellipsis: true }, { - title: '流程名称', + title: this.$t('ProcessName'), dataIndex: 'name', align: 'center', ellipsis: true }, { - title: '流程类型', + title: this.$t('ProcessType'), dataIndex: 'categoryName', align: 'center', ellipsis: true }, { - title: '创建时间', + title: this.$t('createTime'), dataIndex: 'createTime', align: 'center', ellipsis: true }, { - title: '操作', - width: 100, + title: this.$t('operation'), + width: 140, align: 'center', fixed: 'right', scopedSlots: { customRender: 'operation' } @@ -226,7 +226,7 @@ deploy(modelId) { let _this = this this.$confirm({ - content: _this.$t('ConfirmBatchDeletion'), + content: _this.$t('ConfirmDeployment'), onOk() { getAction('/model/deploy', { modelId: modelId }).then((res) => { if (res.success) { @@ -240,55 +240,40 @@ }) }, copyModel(modelId) { - this.$confirm('确认复制该条数据?', '确认复制', { - confirmButtonText: '确定', - cancelButtonText: '取消', - confirmButtonClass: 'common-button-primary', - roundButton: true, - type: 'warning' - }).then(() => { - this.$http.get('/lawss/activiti/copyModel', { - modelId: modelId - }, { - _this: this - }, res => { - if (res.success) { - this.$router.push({ - path: '/ProcessMapping', - query: { id: res.result } - }) - } - }, e => { - }) - }).catch(() => { + let _this = this + this.$confirm({ + content: _this.$t('ConfirmReplication'), + onOk() { + getAction('model/copyModel', { modelId: modelId }).then((res) => { + if (res.success) { + this.$router.push({ + path: '/ProcessMapping', + query: { id: res.result } + }) + _this.$message.success(_this.$t('OperationSuccessful')) + this.queryTablePage() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } }) }, // 删除 deleteRow(row) { - this.$confirm('确认删除该条数据?', '确认删除', { - confirmButtonText: '确定', - cancelButtonText: '取消', - confirmButtonClass: 'common-button-primary', - roundButton: true, - type: 'warning' - }).then(() => { - const id = row.id - var oDate1 = new Date('2021-09-22 15:00:00') - var oDate2 = new Date(row.createTime) - if (oDate1.getTime() > oDate2.getTime()) { - this.$message.warning('原始流程不可以删除') - } else { - this.$http.get('/lawss/activiti/deleteModel', { - modelId: id - }, { - _this: this - }, res => { - this.$message.success(res.message) - this.queryTablePage() - }, e => { + let _this = this + this.$confirm({ + content: _this.$t('confirmDeletion'), + onOk() { + getAction('model/deleteModel', { modelId: row.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + this.queryTablePage() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } }) } - }).catch(() => { }) } }, diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue index b65a012b4..cd4c891aa 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue @@ -1,206 +1,190 @@ diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue index e8e8e01ce..2e1f5d980 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue @@ -1,11 +1,33 @@ diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index fb80a34cb..5699c26d9 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -1,381 +1,177 @@