From e631b10af4f3c6a52034227f3cff1bb5f4b38036 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 23 May 2022 11:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 9 +- jero-web/src/common/lang/zh-cn.js | 9 +- .../components/circulationHistory.vue | 127 ++----------- .../components/examineInformation.vue | 24 ++- .../components/footerProcess.vue | 4 +- .../components/standardContent.vue | 15 +- .../components/standardContentList.vue | 173 ++++++++---------- .../processForm/handshakeProcess/index.vue | 92 +++------- .../processForm/taskListProcess/index.vue | 1 + 9 files changed, 155 insertions(+), 299 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 35ab6bf06..eee985f3c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -761,7 +761,7 @@ module.exports = { opinion: 'opinion', operationNode: 'operation node', taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', - selectIssuer: 'Select issuer', + selectInquiry: 'Select Inquiry', sendBack: 'send back', taskConfirmationProcess: 'Task confirmation process', notFinished: 'not finished', @@ -869,5 +869,10 @@ module.exports = { modelName: 'Model Name', modelYear: 'Model year', NoteConfirmTheChange: 'Note: after the change, the list will be in the status of not being reviewed, which will start from the internal review, and the historical data will be discarded Confirm the change', - onlyDataChanged: 'Only data whose task confirmation status is accepted can be changed' + onlyDataChanged: 'Only data whose task confirmation status is accepted can be changed', + inquiry:'Inquiry', + ConfirmationDeadline:'Confirmation Deadline', + regulatoryCertificationTaskConfirmation:'Regulatory certification task confirmation', + confirmationEngineeringInterfacePerson:'Confirmation of engineering interface person', + engineerReply:'Engineer reply', } \ 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 f8101c2f2..53b26f8b1 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -765,12 +765,12 @@ module.exports = { circulationInformation: '流转信息', circulationHistory: '流转历史', agree: '同意', - disagree: '不同意', + disagree: '拒绝', feedbackMessage: '反馈意见', result: '结果', opinion: '意见', operationNode: '操作节点', - selectIssuer: '选择下发人', + selectInquiry: '选择询问人', sendBack: '退回', taskConfirmationProcess: '任务确认流程', notFinished: '未完成', @@ -875,4 +875,9 @@ module.exports = { modelYear:'年款', NoteConfirmTheChange:'注意：变更后该条清单变为未审查状态，将从内部审查工作开始从头进行，历史数据都将丢弃是否确认变更', onlyDataChanged:'只能变更任务确认状态为接受的数据', + inquiry:'询问', + ConfirmationDeadline:'确认截止时间', + regulatoryCertificationTaskConfirmation:'法规认证任务确认', + confirmationEngineeringInterfacePerson:'工程接口人确认', + engineerReply:'工程师回复', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index 2d5e7ef51..d14ddadc7 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -17,46 +17,8 @@ {{approvalResult[text]}} - - - {{$t('viewFile')}} - - -- - - - - - - - {{$t('See')}} - - - {{ $t('download') }} - - - - @@ -78,60 +40,41 @@ 3: this.$t('issue') }, columns: [ + { + title: this.$t('operationNode'), + dataIndex: 'name', + align: 'center', + width:'20%', + }, + { + title: this.$t('Operator'), + dataIndex: 'assignee', + align: 'center', + width:'20%', + }, { title: this.$t('result'), dataIndex: 'approvalResult', align: 'center', + width:'20%', scopedSlots: { customRender: 'approvalResult' } }, { title: this.$t('opinion'), dataIndex: 'approvalOpinion', - align: 'center' - }, - { - title: this.$t('enclosure'), - dataIndex: 'approvalFile', align: 'center', - scopedSlots: { customRender: 'approvalFile' } - }, - { - title: this.$t('operationNode'), - dataIndex: 'name', - align: 'center' - }, - { - title: this.$t('Operator'), - dataIndex: 'assignee', - align: 'center' + width:'20%', }, { title: this.$t('operationTime'), dataIndex: 'createTime', align: 'center', + width:'20%', customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } } ], - visibleFile: false, - downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', - dataSourceFile: [], - columnsFile: [ - { - title: this.$t('enclosure'), - dataIndex: 'fileName', - align: 'center', - width: 260, - ellipsis: true - }, - { - title: this.$t('operation'), - align: 'center', - width: 130, - scopedSlots: { customRender: 'fileOperation' } - } - ] } }, mounted() { @@ -147,46 +90,6 @@ this.dataSource = res }) }, - clickButtonToUpload(item) { - this.loading = true - this.visibleFile = true - getAction('sys/common/getFileInfos', { id: item }).then((res) => { - if (res.success) { - this.dataSourceFile = res.result - this.dataSourceFile.forEach((val) => { - let fileName = val.fileName - let index1 = fileName.lastIndexOf('.') - let index2 = fileName.length - let fileSuffix = fileName.substring(index1, index2) - val.fileSuffix = fileSuffix - }) - this.loading = false - } else { - this.dataSourceFile = [] - this.loading = false - } - }) - }, - pdfPreview(fileQuery) { - let fileName = fileQuery.fileName - let index1 = fileName.lastIndexOf('.') - let index2 = fileName.length - let fileSuffix = fileName.substring(index1, index2) - if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id)) - } else if (fileSuffix == '.docx') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else { - downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) - } - }, - download(item) { - downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id }) - } } } diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index bccb453b4..b890edfb6 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -2,18 +2,18 @@
- {{$t('circulationInformation')}} + {{title}}
-
- * - {{$t('reviewResults')}} -
- + + + + + {{$t('agree')}} @@ -22,7 +22,7 @@ {{$t('disagree')}} - {{$t('issue')}} + {{$t('inquiry')}} @@ -34,12 +34,12 @@
* - {{$t('selectIssuer')}} + {{$t('selectInquiry')}}
@@ -101,7 +101,11 @@ isApprovalOpinion: { type: Boolean, default: false - } + }, + title:{ + type: String, + default: '' + }, }, components: { uploadFile, diff --git a/jero-web/src/views/processCenter/components/footerProcess.vue b/jero-web/src/views/processCenter/components/footerProcess.vue index 3c01e42c5..090db92d7 100644 --- a/jero-web/src/views/processCenter/components/footerProcess.vue +++ b/jero-web/src/views/processCenter/components/footerProcess.vue @@ -10,11 +10,11 @@ {{$t('preservation')}} {{$t('issue')}} - - {{$t('submit')}} {{$t('sendBack')}} + + {{$t('submit')}} {{$t('Resubmit')}} {{$t('submit')}}
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index 897752db3..84a15c57f 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -2,7 +2,10 @@
- {{$t('standardContent')}} + {{title}} +
+
+ {{this.$t('ConfirmationDeadline')}} : {{this.queryForm.taskAffirmDueDate}}
@@ -54,7 +57,15 @@ standardContentQuery: { type: Object, default: {} - } + }, + title:{ + type:String, + default:'', + }, + isConfirmationDeadline:{ + type:Boolean, + default:false, + }, }, components: { viewFileModel diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue index c3867ae49..8a8466017 100644 --- a/jero-web/src/views/processCenter/components/standardContentList.vue +++ b/jero-web/src/views/processCenter/components/standardContentList.vue @@ -9,33 +9,12 @@ :columns="columns" > - {{ record.designDeliverableType_dictText }}
- - {{ record.designDeliverableTemplateName }} + + {{ record.DeliverableTemplateName }} - {{ $t('viewFile') }} - -- - - - {{ record.prehomoDeliverableType_dictText }}
- - {{ record.prehomoDeliverableTemplateName }} - - {{ $t('viewFile') }} - -- - - - {{ record.verifyDeliverableType_dictText }}
- - {{ record.verifyDeliverableTemplateName }} - - {{ $t('viewFile') }} + {{ $t('viewFile') }} -- @@ -55,7 +34,7 @@ class="table" :columns="columnsFile" :pagination="false" - :scroll="{x:500,y: 400}" + :scroll="{x:true,y: 400}" :data-source="dataSourceFile" :loading="loading" > @@ -92,82 +71,47 @@ downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', columns: [ { - title: this.$t('confirmationOfDesignConformity'), - children: [ - { - title: this.$t('Deliverables'), - dataIndex: 'designDeliverableTemplateName', - align: 'center', - scopedSlots: { customRender: 'designDeliverableTemplateName' } - }, - { - title: this.$t('Sponsor'), - dataIndex: 'designInitiatorName', - align: 'center' - }, - { - title: this.$t('personLiable'), - dataIndex: 'designDutyName', - align: 'center' - }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'designDueDate', - align: 'center' - } - ] + title: this.$t('ProcessType'), + dataIndex: 'ProcessType', + align: 'center', + width:200, }, { - title: this.$t('PrehomoConfirmation'), - children: [ - { - title: this.$t('Deliverables'), - dataIndex: 'prehomoDeliverableTemplateName', - align: 'center', - scopedSlots: { customRender: 'prehomoDeliverableTemplateName' } - }, - { - title: this.$t('Sponsor'), - dataIndex: 'prehomoInitiatorName', - align: 'center' - }, - { - title: this.$t('personLiable'), - dataIndex: 'prehomoDutyName', - align: 'center' - }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'prehomoDueDate', - align: 'center' - } - ] + title: this.$t('Sponsor'), + dataIndex: 'InitiatorName', + align: 'center', + width:160, }, { - title: this.$t('verificationAndConformityconfirmation'), - children: [ - { - title: this.$t('Deliverables'), - dataIndex: 'verifyDeliverableTemplateName', - align: 'center', - scopedSlots: { customRender: 'verifyDeliverableTemplateName' } - }, - { - title: this.$t('Sponsor'), - dataIndex: 'verifyInitiatorName', - align: 'center' - }, - { - title: this.$t('personLiable'), - dataIndex: 'verifyDutyName', - align: 'center' - }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'verifyDueDate', - align: 'center' - } - ] + title: this.$t('personLiable'), + dataIndex: 'DutyName', + align: 'center', + width:160, + }, + { + title: this.$t('TaskCutOffTime'), + dataIndex: 'DueDate', + align: 'center', + width:160, + }, + { + title: this.$t('typeOfDeliverables'), + dataIndex: 'DeliverableType', + align: 'center', + width:160, + }, + { + title: this.$t('deliverableTemplate'), + dataIndex: 'DeliverableTemplateName', + align: 'center', + width:260, + scopedSlots: { customRender: 'designDeliverableTemplateName' } + }, + { + title: this.$t('descriptionDeliverables'), + dataIndex: 'remark', + align: 'center', + width:300, } ], loading: false, @@ -192,7 +136,36 @@ }, mounted() { this.dataSource = [] - this.dataSource.push(this.standardContentListQuery) + this.dataSource.push({ + ProcessType: this.$t('designComplianceReview'), + InitiatorName: this.standardContentListQuery.designInitiatorName, + DutyName: this.standardContentListQuery.designDutyName, + DueDate: this.standardContentListQuery.designDueDate, + DeliverableType: this.standardContentListQuery.designDeliverableType_dictText, + DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName, + remark: this.standardContentListQuery.designRemark + }) + this.dataSource.push({ + ProcessType: this.$t('preHomeConfirmation'), + InitiatorName: this.standardContentListQuery.prehomoInitiatorName, + DutyName: this.standardContentListQuery.prehomoDutyName, + DueDate: this.standardContentListQuery.prehomoDueDate, + DeliverableType: this.standardContentListQuery.prehomoDeliverableType_dictText, + DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName, + remark: this.standardContentListQuery.prehomoRemark + }) + this.dataSource.push({ + ProcessType: this.$t('verificationComplianceReview'), + InitiatorName: this.standardContentListQuery.verifyInitiatorName, + DutyName: this.standardContentListQuery.verifyDutyName, + DueDate: this.standardContentListQuery.verifyDueDate, + DeliverableType: this.standardContentListQuery.verifyDeliverableType_dictText, + DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName, + remark: this.standardContentListQuery.verifyRemark + }) }, methods: { pdfPreview(fileQuery) { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 6a0c64697..547be4ed6 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -1,7 +1,7 @@