diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue index 9f8188ee..d558a435 100644 --- a/src/views/workCenter/NewProcess.vue +++ b/src/views/workCenter/NewProcess.vue @@ -97,10 +97,10 @@ export default { title: this.$t('workCenter.newProcess.auditExtensionApplicationProcess'), path: '/workCenter/InspectionExtensionRequestProcess' }, - // { // 企标稽查整改 - // title: this.$t('workCenter.newProcess.enterpriseStandardInspectionAndRectification'), - // path: '/workCenter/EnterpriseStandardInspectionRectification' - // }, + { // 企标稽查整改 + title: this.$t('workCenter.newProcess.enterpriseStandardInspectionAndRectification'), + path: '/workCenter/EnterpriseStandardInspectionRectification' + }, { // 权限申请流程 title: this.$t('workCenter.newProcess.permissionApplicationProcess'), path: '/workCenter/PermissionApplicationProcess' diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue index d614ce62..50ec300d 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue @@ -3,12 +3,12 @@ :title="title" :width="drawerWidth" :visible="visible" - :confirmLoading="confirmLoading" + :confirmLoading="loading" switchFullscreen @ok="handleOk" @cancel="handleCancel" :cancelText="$t('close')"> - +
{{ $t('newlyAdded') }} @@ -19,6 +19,7 @@ :dataSource="dataSource" :can-drag="true" rowKey="id" + :loading="loading" :row-selection="null" :pagination="false" :scroll="{x: '100%'}" @@ -96,7 +97,6 @@ export default { drawerWidth: 1000, visible: false, model: {}, - confirmLoading: false, url: { list: '/enterprise/InspectContent/queryClauseByEsInspectId', delete: '/enterprise/InspectContent/delete' diff --git a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue index 56c9f40d..feea87f5 100644 --- a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue +++ b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue @@ -177,11 +177,11 @@ export default { }, computed: { pageTitle () { - return this.$t('flowCenter') + this.$route.meta.title + '(' + this.nodeTitle + ')' + return this.$t('flowCenter') + this.$route.meta.title + (this.nodeTitle ? `(${this.nodeTitle})` : '') }, // 节点标题 nodeTitle () { - return this.$route.query.taskName || EsInspectionRectification.uploadRectificationResult.text + return this.$route.query.taskName || '' }, processDisabled () { return this.currentNode !== EsInspectionRectification.uploadRectificationResult.value @@ -189,9 +189,9 @@ export default { }, created () { const { projectId, nodeId, taskName } = this.$route.query - // 发起、草稿进来没有nodeId,就默认发起节点 - this.currentNode = nodeId || EsInspectionRectification.uploadRectificationResult.value - this.currentNodeName = taskName || EsInspectionRectification.uploadRectificationResult.text + // 自动发起流程: 没有默认节点 + this.currentNode = nodeId || '' + this.currentNodeName = taskName || '' this.projectId = projectId this.btn = EsInspectionRectification.propertyOfValue('btn', this.currentNode) || [] // 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点