WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改法规清单的列表设置

Browse Source
This commit is contained in:
范强强
2023-03-21 16:59:47 +08:00
parent d36ca72188
commit 1f8b89d341
9 changed files with 821 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+2 -1
View File
@@ -1681,5 +1681,6 @@ module.exports = {
last:'Last', last:'Last',
designComplianceReviewAdmin:'Design Compliance Review', designComplianceReviewAdmin:'Design Compliance Review',
missionAccomplished:'Mission Accomplished', missionAccomplished:'Mission Accomplished',
taskTypeMismatch:'Task Type Mismatch',
taskNodeMismatch:'Task Node Mismatch',
} }
jero-web/src/common/lang/zh-cn.js
+2
View File
@@ -1781,4 +1781,6 @@ module.exports = {
module:'模块', module:'模块',
designComplianceReviewAdmin:'设计符合性审查', designComplianceReviewAdmin:'设计符合性审查',
missionAccomplished:'任务完成', missionAccomplished:'任务完成',
taskTypeMismatch:'任务类型不匹配',
taskNodeMismatch:'任务节点不匹配',
} }
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+163 -256
View File
@@ -268,13 +268,15 @@
@click="edit(record)"> @click="edit(record)">
{{ $t('edit') }} {{ $t('edit') }}
</a> </a>
<!-- <a class="text-operation"-->
<!-- v-else-->
<!-- @click="viewClick(record)">-->
<!-- {{ $t('view') }}-->
<!-- </a>-->
<a class="text-operation" <a class="text-operation"
v-else v-if="(record.designFlowStatus == 'List to be released' ||
@click="viewClick(record)"> record.verifyFlowStatus == 'List to be released')
{{ $t('view') }} && roleSwitchingCode == 0"
</a>
<a class="text-operation"
v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'Rejected') && record.roleCode == 0"
@click="deleteLib(record)"> @click="deleteLib(record)">
{{ $t('deleteLib') }} {{ $t('deleteLib') }}
</a> </a>
@@ -284,12 +286,12 @@
</a> </a>
</span> </span>
<span slot="operationOne" slot-scope="text,record"> <!-- <span slot="operationOne" slot-scope="text,record">-->
<a class="text-operation" <!-- <a class="text-operation"-->
@click="viewClick(record)"> <!-- @click="viewClick(record)">-->
{{ $t('view') }} <!-- {{ $t('view') }}-->
</a> <!-- </a>-->
</span> <!-- </span>-->
<span slot="titleName" slot-scope="text,record" :title="text"> <span slot="titleName" slot-scope="text,record" :title="text">
<span class="textName"> <span class="textName">
{{ text }} {{ text }}
@@ -301,6 +303,23 @@
{{ text }} {{ text }}
</a> </a>
</span> </span>
<span slot="verifyDeliverableTemplateName" slot-scope="text,result">
<span class="viewFile"
@click="viewFileClick(result.verifyDeliverableTemplate)"
v-if="result.verifyDeliverableTemplate">
{{$t('viewFile')}}
</span>
<span v-else>--</span>
</span>
<span slot="designDeliverableTemplate" slot-scope="text,result">
<span class="viewFile"
@click="viewFileClick(result.designDeliverableTemplate)"
v-if="result.designDeliverableTemplate">
{{$t('viewFile')}}
</span>
<span v-else>--</span>
</span>
</a-table> </a-table>
<div class="buttom-box" v-if="dataSource && dataSource.length > 0"> <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
{{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }} {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
@@ -358,39 +377,6 @@
</a-form-model> </a-form-model>
</a-spin> </a-spin>
</a-modal> </a-modal>
<a-modal
:title="fileTitle"
:width="600"
:visible="visibleFile"
:maskClosable="false"
@cancel="visibleFile = false"
>
<template slot="footer">
<a-button key="back" @click="visibleFile = false">
{{ $t('cancel') }}
</a-button>
</template>
<a-table
class="table"
:columns="columnsFile"
:pagination="false"
:scroll="{x:500,y: 400}"
:data-source="dataSourceFile"
:loading="loading"
>
<span slot="fileOperation" slot-scope="record">
<a class="text" @click="pdfPreview(record)"
:disabled="record.fileSuffix == '.pdf' || record.fileSuffix == '.docx' || record.fileSuffix == '.doc'
|| record.fileSuffix == '.jpg' || record.fileSuffix == '.png' || record.fileSuffix == '.gif'|| record.fileSuffix == '.jpeg'
|| record.fileSuffix == '.xlsx' || record.fileSuffix == '.xls' ? false : true">
{{ $t('See') }}
</a>
<a class="text" @click="download(record)">
{{ $t('download') }}
</a>
</span>
</a-table>
</a-modal>
<a-modal <a-modal
:title="$t('reasonsForRejection')" :title="$t('reasonsForRejection')"
:width="500" :width="500"
@@ -459,6 +445,7 @@
<resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/> <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
<listOfRegulationsView ref="listOfRegulationsViewRef"/> <listOfRegulationsView ref="listOfRegulationsViewRef"/>
<batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/> <batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
<viewFileModel ref="viewFileModelRef"/>
</a-card> </a-card>
</template> </template>
@@ -473,6 +460,7 @@
import fixedPlate from './fixedPlateForm' import fixedPlate from './fixedPlateForm'
import resultReportedUpload from './resultReportedUpload' import resultReportedUpload from './resultReportedUpload'
import listOfRegulationsView from './listOfRegulationsView' import listOfRegulationsView from './listOfRegulationsView'
import viewFileModel from '@/components/viewFileModel/index'
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
import batchSettingPersonnel from './batchSettingPersonnel' import batchSettingPersonnel from './batchSettingPersonnel'
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
@@ -496,7 +484,8 @@
fixedPlate, fixedPlate,
resultReportedUpload, resultReportedUpload,
batchSettingPersonnel, batchSettingPersonnel,
listOfRegulationsView listOfRegulationsView,
viewFileModel
}, },
mixins: [ResizeColumnProvide, ResizeHeader], mixins: [ResizeColumnProvide, ResizeHeader],
data() { data() {
@@ -531,92 +520,27 @@
ellipsis: true, ellipsis: true,
width: 180 width: 180
}, },
// { {
// title: this.$t('listConfirmationStatus'), title: this.$t('applicableSupplement'),
// align: 'left', align: 'left',
// dataIndex: 'inventoryAffirmStatusName', ellipsis: true,
// width: 240, dataIndex: 'applicableSupplement',
// sorter: true, width: 180
// ellipsis: true },
// }, {
// { title: this.$t('certificationType'),
// title: this.$t('taskAffirmStatus'), align: 'left',
// align: 'left', ellipsis: true,
// sorter: true, dataIndex: 'attestationType_dictText',
// dataIndex: 'taskAffirmStatusName', width: 180
// width: 240, },
// ellipsis: true {
// }, title: this.$t('certificationLevel'),
// { align: 'left',
// title: this.$t('taskReleaseStatus'), ellipsis: true,
// align: 'center', dataIndex: 'attestationRank_dictText',
// dataIndex: 'taskReleaseStatus' width: 180
// }, },
// {
// title: this.$t('zoneOfApplication'),
// align: 'left',
// dataIndex: 'region_dictText',
// width: 180,
// ellipsis: true
// },
// {
// title: this.$t('correspondingStandard'),
// align: 'left',
// dataIndex: 'correspondingStandard',
// width: 180,
// ellipsis: true
// },
// {
// title: this.$t('implementationCategory'),
// align: 'left',
// dataIndex: 'implementType_dictText',
// width: 180,
// ellipsis: true
// },
// {
// title: this.$t('ImplementationDate'),
// align: 'left',
// width: 200,
// dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
// ellipsis: true
// },
// {
// title: this.$t('vehicleInProductionDate'),
// align: 'left',
// width: 220,
// dataIndex: 'implementTime',
// ellipsis: true
// },
// {
// title: this.$t('certificationType'),
// align: 'left',
// dataIndex: 'attestationType_dictText',
// width: 180,
// ellipsis: true
// },
// {
// title: this.$t('certificationLevel'),
// align: 'left',
// dataIndex: 'attestationRank_dictText',
// width: 180,
// sorter: true,
// ellipsis: true
// },
// {
// title: this.$t('applicableSupplement'),
// align: 'left',
// width: 220,
// dataIndex: 'applicableSupplement',
// ellipsis: true
// },
// {
// title: 'WVTA ID',
// align: 'left',
// dataIndex: 'wvtaId',
// width: 180,
// sorter: true,
// ellipsis: true
// },
{ {
title: this.$t('areaOfResponsibility'), title: this.$t('areaOfResponsibility'),
align: 'left', align: 'left',
@@ -649,31 +573,16 @@
dataIndex: 'engineeringInterfacePersonName', dataIndex: 'engineeringInterfacePersonName',
width: 180 width: 180
}, },
// { {
// title: this.$t('remarks'), title: this.$t('remarks'),
// align: 'left', align: 'left',
// dataIndex: 'remark', dataIndex: 'remark',
// width: 180, width: 180,
// ellipsis: true ellipsis: true
// }, },
{ {
title: this.$t('confirmationOfDesignConformity'), title: this.$t('confirmationOfDesignConformity'),
children: [ children: [
// {
// title: this.$t('Deliverables'),
// dataIndex: 'designDeliverableTemplateName',
// align: 'left',
// width: 180,
// ellipsis: true,
// scopedSlots: { customRender: 'designDeliverableTemplateName' }
// },
// {
// title: this.$t('Sponsor'),
// dataIndex: 'designInitiatorName',
// align: 'left',
// width: 180,
// ellipsis: true
// },
{ {
title: this.$t('personLiable'), title: this.$t('personLiable'),
dataIndex: 'designDutyName', dataIndex: 'designDutyName',
@@ -694,6 +603,14 @@
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 140 width: 140
},
{
title: this.$t('deliverableTemplate'),
dataIndex: 'designDeliverableTemplate',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'designDeliverableTemplate' }
} }
// { // {
// title: this.$t('descriptionDeliverables'), // title: this.$t('descriptionDeliverables'),
@@ -704,65 +621,9 @@
// } // }
] ]
}, },
// {
// title: this.$t('PrehomoConfirmation'),
// children: [
// {
// title: this.$t('Deliverables'),
// dataIndex: 'prehomoDeliverableTemplateName',
// align: 'left',
// width: 180,
// ellipsis: true,
// scopedSlots: { customRender: 'prehomoDeliverableTemplateName' }
// },
// // {
// // title: this.$t('Sponsor'),
// // dataIndex: 'prehomoInitiatorName',
// // align: 'left',
// // width: 180,
// // ellipsis: true
// // },
// {
// title: this.$t('personLiable'),
// dataIndex: 'prehomoDutyName',
// align: 'left',
// width: 180,
// ellipsis: true
// },
// {
// title: this.$t('TaskCutOffTime'),
// dataIndex: 'prehomoDueDate',
// align: 'left',
// width: 140,
// ellipsis: true
// },
// {
// title: this.$t('descriptionDeliverables'),
// dataIndex: 'prehomoRemark',
// align: 'left',
// width: 220,
// ellipsis: true
// }
// ]
// },
{ {
title: this.$t('verificationAndConformityconfirmation'), title: this.$t('verificationAndConformityconfirmation'),
children: [ children: [
// {
// title: this.$t('Deliverables'),
// dataIndex: 'verifyDeliverableTemplateName',
// align: 'left',
// width: 180,
// ellipsis: true,
// scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
// },
// {
// title: this.$t('Sponsor'),
// dataIndex: 'verifyInitiatorName',
// align: 'left',
// width: 180,
// ellipsis: true
// },
{ {
title: this.$t('personLiable'), title: this.$t('personLiable'),
dataIndex: 'verifyDutyName', dataIndex: 'verifyDutyName',
@@ -783,6 +644,14 @@
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 180 width: 180
},
{
title: this.$t('deliverableTemplate'),
dataIndex: 'verifyDeliverableTemplate',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
} }
// { // {
// title: this.$t('descriptionDeliverables'), // title: this.$t('descriptionDeliverables'),
@@ -799,13 +668,6 @@
fixed: 'right', fixed: 'right',
width: 200, width: 200,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 140,
scopedSlots: { customRender: 'operationOne' }
} }
], ],
columnsAll: [], columnsAll: [],
@@ -911,6 +773,33 @@
key: 3, key: 3,
moduleFlag: '法规清单' moduleFlag: '法规清单'
}, },
{
sort: '',
name: this.$t('applicableSupplement'),
headFieldCn: '适用增补件',
headFieldEn: 'Applicable Supplement',
field: 'applicableSupplement',
key: 4,
moduleFlag: '法规清单'
},
{
sort: '',
name: this.$t('certificationType'),
headFieldCn: '认证类型',
headFieldEn: 'Certification Type',
field: 'attestationType_dictText',
key: 5,
moduleFlag: '法规清单'
},
{
sort: '',
name: this.$t('certificationLevel'),
headFieldCn: '认证级别',
headFieldEn: 'Certification Level',
field: 'attestationRank_dictText',
key: 6,
moduleFlag: '法规清单'
},
{ {
sort: '', sort: '',
name: this.$t('areaOfResponsibility'), name: this.$t('areaOfResponsibility'),
@@ -938,6 +827,15 @@
key: 18, key: 18,
moduleFlag: '法规清单' moduleFlag: '法规清单'
}, },
{
sort: '',
name: this.$t('remarks'),
headFieldCn: '备注',
headFieldEn: 'Comments',
field: 'remark',
key: 18,
moduleFlag: '法规清单'
},
{ {
sort: '', sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'), name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
@@ -965,7 +863,17 @@
headFieldEn: 'Process Status', headFieldEn: 'Process Status',
field: 'designFlowStatusName', field: 'designFlowStatusName',
affirmFlag: '1', affirmFlag: '1',
key: 23, key: 24 ,
moduleFlag: '法规清单'
},
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'),
headFieldCn: '交付物模板',
headFieldEn: 'Deliverable Template',
field: 'designDeliverableTemplate',
affirmFlag: '3',
key: 25,
moduleFlag: '法规清单' moduleFlag: '法规清单'
}, },
{ {
@@ -998,6 +906,16 @@
key: 34, key: 34,
moduleFlag: '法规清单' moduleFlag: '法规清单'
}, },
{
sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'),
headFieldCn: '交付物模板',
headFieldEn: 'Deliverable Template',
field: 'verifyDeliverableTemplate',
affirmFlag: '3',
key: 36,
moduleFlag: '法规清单'
},
{ {
sort: '', sort: '',
disabled: true, disabled: true,
@@ -1216,23 +1134,15 @@
}, },
columns() { columns() {
let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
console.log(this.isRoleSwitching) if (this.roleSwitchingCode == 0 || this.roleSwitchingCode == 1) {
if (!this.isRoleSwitching) { } else {
for (var i = 0; i < columnResult.length; i++) { for (var i = 0; i < columnResult.length; i++) {
if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 200) { if (columnResult[i].title === this.$t('operation')) {
columnResult.splice(i, 1)
i--
}
}
} else if (this.isRoleSwitching) {
for (var i = 0; i < columnResult.length; i++) {
if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 140) {
columnResult.splice(i, 1) columnResult.splice(i, 1)
i-- i--
} }
} }
} }
return columnResult return columnResult
} }
}, },
@@ -1620,7 +1530,8 @@
for (let i = 0; i < this.dataSource.length; i++) { for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) { for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) { if (this.dataSource[i].id == selectedRowKeys[j]) {
if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') { if (this.dataSource[i].verifyFlowStatus == 'List to be released' ||
this.dataSource[i].designFlowStatus == 'List to be released') {
isTrue = true isTrue = true
} else { } else {
isTrue = false isTrue = false
@@ -1733,6 +1644,15 @@
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
this.columnsAll = this.column this.columnsAll = this.column
this.columnsAll.forEach((item) => {
if (item.children) {
item.children.forEach((val) => {
this.checkedList.push(item.dataIndex, val.dataIndex)
})
} else {
this.checkedList.push(item.dataIndex)
}
})
return return
if (res.result.length != 0) { if (res.result.length != 0) {
this.columnsAll = res.result this.columnsAll = res.result
@@ -2082,7 +2002,7 @@
}) })
}, },
startProcess(value, type,index) { startProcess(value, type, index) {
let query = { let query = {
type: type, type: type,
projectLawsInvnetoryList: value, projectLawsInvnetoryList: value,
@@ -2092,7 +2012,7 @@
} }
postAction('/workFlow/startProcess', query).then((res) => { postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) { if (res.success) {
this.completeTaskList.push(this.completeTask(value, res.result,index)) this.completeTaskList.push(this.completeTask(value, res.result, index))
Promise.all(this.completeTaskList).then((res) => { Promise.all(this.completeTaskList).then((res) => {
if (this.requestsNum == res.length) { if (this.requestsNum == res.length) {
this.visible = false this.visible = false
@@ -2269,7 +2189,7 @@
if (dataList[i].designFlowStatus == 'List to be checked') { if (dataList[i].designFlowStatus == 'List to be checked') {
if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) { if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
this.requestsNum++ this.requestsNum++
_this.startProcess(dataList[i], 2,this.requestsNum) _this.startProcess(dataList[i], 2, this.requestsNum)
} }
} else { } else {
_this.detailedWarningList.push( _this.detailedWarningList.push(
@@ -2278,7 +2198,7 @@
if (dataList[i].verifyFlowStatus == 'List to be checked') { if (dataList[i].verifyFlowStatus == 'List to be checked') {
if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) { if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
this.requestsNum++ this.requestsNum++
_this.startProcess(dataList[i], 2,this.requestsNum) _this.startProcess(dataList[i], 2, this.requestsNum)
} }
} else { } else {
_this.detailedWarningList.push( _this.detailedWarningList.push(
@@ -2384,27 +2304,6 @@
} }
}, },
pdfPreviewClick(name, id) {
let fileName = name
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=' + id + '&userName=' + this.userInfo().username))
} else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
window.open(url, '_blank')
} else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
window.open(url, '_blank')
} else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix)
window.open(url, '_blank')
} else {
downloadFile('/sys/common/downLoadFile', name, { id: id, userName: this.userInfo().username })
}
},
download(item) { download(item) {
downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
}, },
@@ -2465,7 +2364,7 @@
}, },
resultReportedClick(val) { resultReportedClick(val) {
if (val.regulationOwnerId == this.userInfo().id) { if (this.roleSwitchingCode == 1) {
this.$refs.resultReportedUploadRef.clickButtonToUploadFile(val) this.$refs.resultReportedUploadRef.clickButtonToUploadFile(val)
} else { } else {
if (val.fileId) { if (val.fileId) {
@@ -2483,6 +2382,9 @@
} }
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')
},
viewFileClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
} }
} }
} }
@@ -2772,6 +2674,11 @@
padding-bottom: 0 !important; padding-bottom: 0 !important;
overflow: scroll !important; overflow: scroll !important;
} }
.viewFile {
color: #00B3BE;
cursor: pointer;
}
</style> </style>
<style lang="less"> <style lang="less">
.box-input .ant-select-selection { .box-input .ant-select-selection {
jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
+137 -181
View File
@@ -92,7 +92,7 @@
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="12" v-if="formInline.roleCodeIndex == 0"> <a-col :span="12" v-if="formInline.roleCodeIndex == 0 || formInline.roleCodeIndex == 1">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span> <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
@@ -103,7 +103,7 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || formInline.roleCodeIndex == 1">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -125,29 +125,21 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<div class="header-text" v-if="formInline.roleCodeIndex == 0 || <div class="header-text">
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
formInline.homologationEngineerId == userInfoQuery.id) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
formInline.regulationOwnerId == userInfoQuery.id)">
&nbsp;{{$t('confirmationOfDesignConformity')}} &nbsp;{{$t('confirmationOfDesignConformity')}}
</div> </div>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <a-row :gutter="24">
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId && <!-- <a-col :span="12">-->
formInline.homologationEngineerId == userInfoQuery.id) || <!-- <div class="box-title-text">-->
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId && <!-- <div class="title-text">-->
formInline.regulationOwnerId == userInfoQuery.id)"> <!-- <span class="title-text-text"-->
<a-col :span="12"> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
<div class="box-title-text"> <!-- </div>-->
<div class="title-text"> <!-- <div class="itemModel">-->
<span class="title-text-text" <!-- {{formInline.designInitiatorName ? formInline.designInitiatorName : '&#45;&#45;'}}-->
:title="$t('Sponsor')">{{$t('Sponsor')}}</span> <!-- </div>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- </a-col>-->
{{formInline.designInitiatorName ? formInline.designInitiatorName : '--'}}
</div>
</div>
</a-col>
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -159,12 +151,6 @@
</div> </div>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
formInline.homologationEngineerId == userInfoQuery.id) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
formInline.regulationOwnerId == userInfoQuery.id)">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -177,11 +163,7 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <a-row :gutter="24">
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
formInline.homologationEngineerId == userInfoQuery.id) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
formInline.regulationOwnerId == userInfoQuery.id)">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -211,11 +193,7 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <a-row :gutter="24">
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
formInline.homologationEngineerId == userInfoQuery.id) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
formInline.regulationOwnerId == userInfoQuery.id)">
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -228,132 +206,124 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<div class="header-text" v-if="formInline.roleCodeIndex == 0 || <!-- <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
formInline.homologationEngineerId == userInfoQuery.id) || <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
formInline.regulationOwnerId == userInfoQuery.id)"> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
&nbsp;{{$t('PrehomoConfirmation')}} <!-- &nbsp;{{$t('PrehomoConfirmation')}}-->
</div> <!-- </div>-->
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
formInline.homologationEngineerId == userInfoQuery.id) || <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
formInline.regulationOwnerId == userInfoQuery.id)"> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('Sponsor')">{{$t('Sponsor')}}</span> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
{{formInline.prehomoInitiatorName ? formInline.prehomoInitiatorName : '--'}} <!-- {{formInline.prehomoInitiatorName ? formInline.prehomoInitiatorName : '&#45;&#45;'}}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('personLiable')">{{$t('personLiable')}}</span> <!-- :title="$t('personLiable')">{{$t('personLiable')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
{{formInline.prehomoDutyName ? formInline.prehomoDutyName : '--'}} <!-- {{formInline.prehomoDutyName ? formInline.prehomoDutyName : '&#45;&#45;'}}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
formInline.homologationEngineerId == userInfoQuery.id) || <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
formInline.regulationOwnerId == userInfoQuery.id)"> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('cutoffTime')">{{$t('cutoffTime')}}</span> <!-- :title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
{{formInline.prehomoDueDate ? formInline.prehomoDueDate : '--'}} <!-- {{formInline.prehomoDueDate ? formInline.prehomoDueDate : '&#45;&#45;'}}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
formInline.homologationEngineerId == userInfoQuery.id) || <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
formInline.regulationOwnerId == userInfoQuery.id)"> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> <!-- :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
{{formInline.prehomoDeliverableTypeName ? formInline.prehomoDeliverableTypeName : '--'}} <!-- {{formInline.prehomoDeliverableTypeName ? formInline.prehomoDeliverableTypeName : '&#45;&#45;'}}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span> <!-- :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
<span v-if="formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' || <!-- <span v-if="formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' ||-->
formInline.prehomoDeliverableTemplate == null"> <!-- formInline.prehomoDeliverableTemplate == null">-->
-- <!-- &#45;&#45;-->
</span> <!-- </span>-->
<a @click="clickButtonToUpload(formInline.prehomoDeliverableTemplate)" v-else> <!-- <a @click="clickButtonToUpload(formInline.prehomoDeliverableTemplate)" v-else>-->
{{ $t('viewFile') }} <!-- {{ $t('viewFile') }}-->
</a> <!-- </a>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <!-- <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId &&-->
formInline.homologationEngineerId == userInfoQuery.id) || <!-- formInline.homologationEngineerId == userInfoQuery.id) ||-->
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && <!-- (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId &&-->
formInline.regulationOwnerId == userInfoQuery.id)"> <!-- formInline.regulationOwnerId == userInfoQuery.id)">-->
<a-col :span="24"> <!-- <a-col :span="24">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span> <!-- :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
{{formInline.prehomoRemark ? formInline.prehomoRemark : '--'}} <!-- {{formInline.prehomoRemark ? formInline.prehomoRemark : '&#45;&#45;'}}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<div class="header-text" v-if="formInline.roleCodeIndex == 0 || <div class="header-text">
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
formInline.homologationEngineerId == userInfoQuery.id) ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
formInline.regulationOwnerId == userInfoQuery.id)">
&nbsp;{{$t('verificationAndConformityconfirmation')}} &nbsp;{{$t('verificationAndConformityconfirmation')}}
</div> </div>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <a-row :gutter="24">
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId && <!-- <a-col :span="12">-->
formInline.homologationEngineerId == userInfoQuery.id) || <!-- <div class="box-title-text">-->
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId && <!-- <div class="title-text">-->
formInline.regulationOwnerId == userInfoQuery.id)"> <!-- <span class="title-text-text"-->
<a-col :span="12"> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
<div class="box-title-text"> <!-- </div>-->
<div class="title-text"> <!-- <div class="itemModel">-->
<span class="title-text-text" <!-- {{formInline.verifyInitiatorName ? formInline.verifyInitiatorName : '&#45;&#45;'}}-->
:title="$t('Sponsor')">{{$t('Sponsor')}}</span> <!-- </div>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- </a-col>-->
{{formInline.verifyInitiatorName ? formInline.verifyInitiatorName : '--'}}
</div>
</div>
</a-col>
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -365,12 +335,6 @@
</div> </div>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
formInline.homologationEngineerId == userInfoQuery.id) ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
formInline.regulationOwnerId == userInfoQuery.id)">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -383,11 +347,7 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <a-row :gutter="24">
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
formInline.homologationEngineerId == userInfoQuery.id) ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
formInline.regulationOwnerId == userInfoQuery.id)">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -416,11 +376,7 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 || <a-row :gutter="24">
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
formInline.homologationEngineerId == userInfoQuery.id) ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
formInline.regulationOwnerId == userInfoQuery.id)">
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -550,8 +506,8 @@
formInline: {}, formInline: {},
disabled: false, disabled: false,
userInfoQuery: {}, userInfoQuery: {},
rejectCauseList:[], rejectCauseList: [],
rejectCauseListOne:[] rejectCauseListOne: []
} }
}, },
mounted() { mounted() {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+7 -1
View File
@@ -282,7 +282,7 @@
.process-content-content { .process-content-content {
background: #fff; background: #fff;
z-index: 1000; z-index: 1000;
padding: 0; padding: 0 10px;
.process-content-left { .process-content-left {
float: left; float: left;
@@ -329,7 +329,13 @@
} }
} }
} }
.process-content-content:first-child {
padding: 0 10px 0 0;
}
.process-content-content:last-child {
padding: 0 0 0 10px;
}
.process-content-right-xian { .process-content-right-xian {
height: 2px; height: 2px;
width: calc(100% - 27px); width: calc(100% - 27px);
jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
+447 -191
View File
@@ -1,212 +1,468 @@
<template> <template>
<a-drawer <div style="position: relative">
:title="titlename == 1 ? this.$t('Taskresponsibilityrecognition'): this.$t('complianceConfirmation')" <a-drawer
:maskClosable="false" :title="titleName"
:width="948" :maskClosable="false"
placement="right" :width="948"
:closable="true" placement="right"
@close="handleCancel" :closable="true"
:visible="visible" @close="handleCancel"
style="height: 100%;overflow: auto;padding-bottom: 53px;"> :visible="visible"
<div style="margin-bottom: 20px"> style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div class="header-text"> <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>
{{$t('Listoftreatableregulations')}} <div class="box">
</div> <div class="header-text">
<a-table {{$t('Listoftreatableregulations')}}
:pagination="false" </div>
:scroll="{x: '100%'}" <a-table
rowKey="id" :pagination="false"
:columns="columns"> class="table"
:scroll="{x: '100%',y:300}"
:data-source="processableList"
rowKey="id"
:columns="columns">
</a-table> </a-table>
</div>
<div style="margin-bottom: 20px">
<div class="header-text">
{{$t('Listofuntractableregulations')}}
</div> </div>
<a-table <div class="box box-two">
:pagination="false" <div class="header-text">
:scroll="{x: '100%'}" {{$t('Listofuntractableregulations')}}
rowKey="id" </div>
:columns="columns"> <a-table
:pagination="false"
class="table"
:scroll="{x: '100%',y:300}"
rowKey="id"
:data-source="noProcessableList"
:columns="noColumns">
<span slot="problemType" slot-scope="text">
<span class="problemTypeText">
{{text}}
</span>
</span>
</a-table>
</div>
<div class="drawer-review">
<div class="header-text">
{{titleName == $t('Taskresponsibilityrecognition') ? this.$t('Taskconfirmationresult'):
this.$t('Compliancetaskhandling')}}
</div>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('resultofhandling')">{{$t('resultofhandling')}}</span>
</div>
</div>
<a-form-model-item class="itemModel" :prop="'disposeResult'">
<a-radio-group class="box-input"
v-model="formInline.disposeResult">
<a-radio value="Accepted" v-if="titleName == $t('Taskresponsibilityrecognition')">
{{$t('accept')}}
</a-radio>
<a-radio value="Rejected" v-if="titleName == $t('Taskresponsibilityrecognition')">
{{$t('refuse')}}
</a-radio>
<a-radio value="Compliance" v-if="titleName == $t('complianceConfirmation')">
{{$t('accord')}}
</a-radio>
<a-radio value="Non-Compliance" v-if="titleName == $t('complianceConfirmation')">
{{$t('nonConformity')}}
</a-radio>
<a-radio value="To be tracked" v-if="titleName == $t('complianceConfirmation')">
{{$t('Tracked')}}
</a-radio>
<a-radio value="NA" v-if="titleName == $t('complianceConfirmation')">
{{$t('notInvolved')}}
</a-radio>
</a-radio-group>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
</div>
</div>
<a-form-model-item class="itemModel" prop="approvalOpinion">
<a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
v-model="formInline.approvalOpinion"
:rows="4"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24" v-if="titleName == $t('complianceConfirmation')">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
</div>
<a-form-model-item class="itemModel">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('approvalFile')">
{{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</div>
<div class="drawer-bootom-button">
<a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
<a-button @click="determineClick" type="primary">{{$t('determine')}}</a-button>
</div>
</a-drawer>
<uploadFile ref="uploadFile"
@uploadSuccess="uploadSuccess"/>
</div>
</a-table>
</div>
<div style="margin-bottom: 40px">
<div class="header-text">
{{titlename == 1 ? this.$t('Taskconfirmationresult'): this.$t('Compliancetaskhandling')}}
</div>
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('resultofhandling')">{{$t('resultofhandling')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-radio-group>
<a-radio value="1">
{{$t('accept')}}
</a-radio>
<a-radio value="2">
{{$t('refuse')}}
</a-radio>
</a-radio-group>
</a-form-model-item>
</div>
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
rows="4"/>
</a-form-model-item>
</div>
<div class="box-title-text" v-if="titlename == 1 ? false:true">
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-button type="primary">{{$t('uploadattachment')}}</a-button>
</a-form-model-item>
</div>
</div>
<div class="drawer-bootom-button">
<a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
<a-button type="primary">{{$t('determine')}}</a-button>
</div>
</a-drawer>
</template> </template>
<script> <script>
export default { import uploadFile from '@/components/uploadFile/file'
name:'confirmationDrawer', import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
props: { import { mapGetters } from 'vuex'
},
data() {
return {
titlename:'',
allTitle: '',
visible:false,
columns:[
{
title: this.$t('project'),
align: 'left',
dataIndex: '',
ellipsis: true,
width: 170
},
{
title: this.$t('standard'),
align: 'left',
dataIndex: '',
ellipsis: true,
width: 170
},
{
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: '',
ellipsis: true,
width: 120
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: '',
ellipsis: true,
width: 150
},
{
title: this.$t('Categoryofdeliverables'),
align: 'left',
dataIndex: '',
ellipsis: true,
width: 120
},
{
title: this.$t('closingDate'),
align: 'left',
dataIndex: '',
ellipsis: true,
width: 170
},
]
}
},
methods:{
confirmation(data){
this.visible = true
this.$nextTick(()=>{
this.titlename = data
})
export default {
name: 'confirmationDrawer',
components: {
uploadFile
}, },
handleCancel(){ props: {},
this.visible = false data() {
this.titlename = '' return {
titleName: '',
allTitle: '',
visible: false,
columns: [
{
title: this.$t('project'),
align: 'left',
dataIndex: 'projectName',
ellipsis: true,
width: 170
},
{
title: this.$t('standard'),
align: 'left',
dataIndex: 'serialNumber',
ellipsis: true,
width: 170
},
{
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: '',
ellipsis: true,
width: 120
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 150
},
{
title: this.$t('Categoryofdeliverables'),
align: 'left',
dataIndex: 'deliverableTypeName',
ellipsis: true,
width: 120
},
{
title: this.$t('closingDate'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 120
}
],
noColumns: [
{
title: this.$t('project'),
align: 'left',
dataIndex: 'projectName',
ellipsis: true,
width: 170
},
{
title: this.$t('standard'),
align: 'left',
dataIndex: 'serialNumber',
ellipsis: true,
width: 170
},
{
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: '',
ellipsis: true,
width: 120
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 150
},
{
title: this.$t('problemType'),
align: 'left',
dataIndex: 'problemType',
ellipsis: true,
width: 240,
scopedSlots: { customRender: 'problemType' }
}
],
processableList: [],
noProcessableList: [],
loading:false,
rules: {
disposeResult: [
{
required: true,
message: this.$t('reviewResults') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
approvalOpinion: [
{
required: true,
message: this.$t('feedbackMessage') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 300,
message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
]
},
formInline: {},
uploadName: ''
}
},
methods: {
...mapGetters(['userInfo']),
confirmation(data, name) {
this.visible = true
this.processableList = []
this.noProcessableList = []
this.formInline = {}
data.forEach(res => {
res = JSON.parse(res)
if (name == this.$t('Taskresponsibilityrecognition')) {
//任务责任确认
if (res.taskDefinitionKey == 'zrrqr' || res.taskDefinitionKey == 'dezrrqr') {
this.processableList.push(res)
} else {
if (res.flowType == '2' || res.flowType == '4') {
res.problemType = this.$t('taskNodeMismatch')
} else {
res.problemType = this.$t('taskTypeMismatch')
}
this.noProcessableList.push(res)
}
} else if (name == this.$t('complianceConfirmation')) {
//符合性确认
if (res.taskDefinitionKey == 'zrrtjjfw' || res.taskDefinitionKey == 'dezrrtjjfw') {
this.processableList.push(res)
} else {
if (res.flowType == '2' || res.flowType == '4') {
res.problemType = this.$t('taskNodeMismatch')
} else {
res.problemType = this.$t('taskTypeMismatch')
}
this.noProcessableList.push(res)
}
}
})
this.$nextTick(() => {
this.titleName = name
this.$refs.ruleForm.clearValidate()
})
},
handleCancel() {
this.visible = false
},
determineClick() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let query = {
userid: this.userInfo().id,
taskId: this.queryData.taskId || this.queryData.taskIds,
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.$emit('confirmationdrawerList')
} else {
this.loading = false
this.$message.warning(res.message)
}
})
}
})
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
/** 上传文件的回调 */
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
attIdList.push(item.id || data.name)
})
}
/** 赋值给当前对应的表单文件 */
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
this.$nextTick(() => {
this.$refs.ruleForm.validateField([this.uploadName])
})
}
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.header-text { .box {
font-size: 14px; margin-bottom: 20px;
font-weight: bold; }
height: 24px;
margin-bottom: 20px;
}
.box-title-text { .box-two {
line-height: 1.4; margin-bottom: 438px;
display: flex; }
/*align-items: center;*/
}
.title-text { .header-text {
width: 88px; font-size: 16px;
text-align: right; font-weight: bold;
display: inline-block; height: 24px;
font-weight: 500; }
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
color: #000F16;
}
.title-text-text { .table {
margin-top: 9px; margin-top: 20px;
} }
.itemModel { .drawer-review {
width: 100%; position: absolute;
display: inline-block; bottom: 40px;
margin-top: 2px; z-index: 1001;
margin-bottom: 12px; height: 404px;
} width: 100%;
padding: 24px;
border-top: 1px solid #e8e8e8;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
.drawer-bootom-button { .formAdd {
position: absolute; margin-top: 10px;
bottom: 0; }
z-index: 100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
/*.button-text {*/ .box-title-text {
/* height: 38px;*/ /*line-height: 1.4;*/
/* width: calc(100% - 250px);*/ display: flex;
/* line-height: 38px;*/ /*align-items: center;*/
/* background: #fff;*/ }
/* border: 1px #00B3BE solid;*/
/* color: #00B3BE;*/ .title-text {
/*}*/ /*width: 88px;*/
text-align: left;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 32px;
line-height: 36px;
color: #000F16;
}
.title-text-fq {
/*width: 130px;*/
text-align: left;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
color: #000F16;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: 100%;
display: inline-block;
margin-top: 2px;
margin-bottom: 0px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index: 1002;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
.button-text {
height: 38px;
width: calc(50% - 100px);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
color: #00B3BE;
}
.problemTypeText {
color: red;
}
</style> </style>
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+17 -3
View File
@@ -7,7 +7,7 @@
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}" :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id" :rowKey="(record)=>JSON.stringify(record)"
:data-source="dataSource" :data-source="dataSource"
:columns="columns" :columns="columns"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -46,6 +46,8 @@
/> />
</div> </div>
<designCompliance ref="designComplianceRef" @designComplianceList="designComplianceList"/> <designCompliance ref="designComplianceRef" @designComplianceList="designComplianceList"/>
<confirmation-drawer ref="confirmationdrawer"
@confirmationdrawerList="confirmationdrawerList"></confirmation-drawer>
</div> </div>
</template> </template>
@@ -194,13 +196,25 @@
this.getList() this.getList()
}, },
methods: { methods: {
getData(name) {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$refs.confirmationdrawer.confirmation(JSON.parse(JSON.stringify(this.selectedRowKeys)), name)
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
onSelectChange(value) { onSelectChange(value) {
this.selectedRowKeys = value this.selectedRowKeys = value
console.log(this.selectedRowKeys)
}, },
designComplianceList(){ designComplianceList() {
this.getList() this.getList()
}, },
confirmationdrawerList() {
this.selectedRowKeys = []
this.getList()
},
RelatedItemsClick(item) { RelatedItemsClick(item) {
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/ProjectDetails', path: '/ProjectDetails',
jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+16 -11
View File
@@ -26,13 +26,13 @@
:url="url" :url="url"
:standardContentQuery="queryProject" :standardContentQuery="queryProject"
/> />
<div :class="{'circulationHistory':this.queryData.isDisplay,'circulationHistoryOne':!this.queryData.isDisplay}"> <div :class="{'circulationHistory':this.queryData.isDisplay,'circulationHistoryOne':!this.queryData.isDisplay}">
<circulationHistory <circulationHistory
v-if="isDisplay" v-if="isDisplay"
:title="$t('Processhistory')" :title="$t('Processhistory')"
:queryProject="queryData" :queryProject="queryData"
/> />
</div> </div>
<div class="drawer-review" v-if="this.queryData.isDisplay"> <div class="drawer-review" v-if="this.queryData.isDisplay">
@@ -131,8 +131,8 @@
return true return true
}, },
isConfirm() { isConfirm() {
if (!this.queryData.isDisplay){ if (!this.queryData.isDisplay) {
return false return false
} }
return true return true
} }
@@ -150,6 +150,8 @@
}) })
}, },
completeTask(value) { completeTask(value) {
this.textLoading = this.$t('Submitting')
this.loading = true
let json = Object.assign(this.queryBy, value) let json = Object.assign(this.queryBy, value)
let data = JSON.stringify(json).replace(/\"/g, '\'') let data = JSON.stringify(json).replace(/\"/g, '\'')
Object.keys(value).forEach(res => { Object.keys(value).forEach(res => {
@@ -167,6 +169,7 @@
if (res.success) { if (res.success) {
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
this.visible = false this.visible = false
this.loading = false
this.$emit('designComplianceList') this.$emit('designComplianceList')
} else { } else {
this.loading = false this.loading = false
@@ -294,10 +297,12 @@
background: #fff; background: #fff;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
.circulationHistory{
.circulationHistory {
margin-bottom: 436px; margin-bottom: 436px;
} }
.circulationHistoryOne{
.circulationHistoryOne {
margin-bottom: 30px; margin-bottom: 30px;
} }
</style> </style>
jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+30 -35
View File
@@ -100,7 +100,6 @@
<SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/> <SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
<confirmation-drawer ref="confirmationdrawer"></confirmation-drawer>
</a-card> </a-card>
</template> </template>
@@ -109,78 +108,74 @@
import dealtWith from './components/dealtWith' import dealtWith from './components/dealtWith'
import doneList from './components/doneList' import doneList from './components/doneList'
import SentList from './components/SentList' import SentList from './components/SentList'
import confirmationDrawer from './components/confirmationDrawer'
export default { export default {
name: 'index', name: 'index',
components: { components: {
dealtWith, dealtWith,
doneList, doneList,
SentList, SentList
confirmationDrawer
}, },
data() { data() {
return { return {
title: '', title: '',
queryParam: { queryParam: {
projectName:this.$route.query.projectName?this.$route.query.projectName:'' projectName: this.$route.query.projectName ? this.$route.query.projectName : ''
}, },
toggleSearchStatus: false, toggleSearchStatus: false,
taskTypeList: [ taskTypeList: [
{ {
name:this.$t('confirmationOfRegulationsList'), name: this.$t('confirmationOfRegulationsList'),
value:'10', value: '10'
}, },
{ {
name:this.$t('listTaskConfirmation'), name: this.$t('listTaskConfirmation'),
value:'1', value: '1'
}, },
{ {
name:this.$t('designComplianceReview'), name: this.$t('designComplianceReview'),
value:'2', value: '2'
}, },
{ {
name:this.$t('preHomeConfirmation'), name: this.$t('preHomeConfirmation'),
value:'3', value: '3'
}, },
{ {
name:this.$t('verificationComplianceReview'), name: this.$t('verificationComplianceReview'),
value:'4', value: '4'
}, }
], ],
taskStatusList: [ taskStatusList: [
{ {
name:this.$t('listToConfirm'), name: this.$t('listToConfirm'),
value:'List to confirm', value: 'List to confirm'
}, },
{ {
name:this.$t('Finished'), name: this.$t('Finished'),
value:'Completed', value: 'Completed'
}, },
{ {
name:this.$t('inquiry'), name: this.$t('inquiry'),
value:'Inquiry', value: 'Inquiry'
}, },
{ {
name:this.$t('toSubmit'), name: this.$t('toSubmit'),
value:'To submit', value: 'To submit'
}, },
{ {
name:this.$t('toAudit'), name: this.$t('toAudit'),
value:'To audit', value: 'To audit'
}, }
], ],
tabActive: this.$t('toDoProcess') tabActive: this.$t('toDoProcess')
} }
}, },
methods: { methods: {
TaskresponsibilityrecognitionClick() { TaskresponsibilityrecognitionClick() {
this.$refs.confirmationdrawer.confirmation(1) this.$refs.dealtWithRef.getData(this.$t('Taskresponsibilityrecognition'))
// this.title = this.$t('Taskresponsibilityrecognition')
}, },
complianceConfirmationClick() { complianceConfirmationClick() {
this.$refs.confirmationdrawer.confirmation(2) this.$refs.dealtWithRef.getData(this.$t('complianceConfirmation'))
// this.title = this.$t('complianceConfirmation')
}, },
callback(value) { callback(value) {
this.tabActive = value this.tabActive = value
@@ -190,11 +185,11 @@
}, },
searchQuery() { searchQuery() {
if (this.tabActive == this.$t('toDoProcess')) { if (this.tabActive == this.$t('toDoProcess')) {
this.$refs.dealtWithRef.searchQuery(this.queryParam ) this.$refs.dealtWithRef.searchQuery(this.queryParam)
} else if (this.tabActive == this.$t('processDone')) { } else if (this.tabActive == this.$t('processDone')) {
this.$refs.doneListRef.searchQuery(this.queryParam ) this.$refs.doneListRef.searchQuery(this.queryParam)
} else if (this.tabActive == this.$t('sentProcess')) { } else if (this.tabActive == this.$t('sentProcess')) {
this.$refs.SentListRef.searchQuery(this.queryParam ) this.$refs.SentListRef.searchQuery(this.queryParam)
} }
}, },
searchReset() { searchReset() {
@@ -206,7 +201,7 @@
} else if (this.tabActive == this.$t('sentProcess')) { } else if (this.tabActive == this.$t('sentProcess')) {
this.$refs.SentListRef.searchReset() this.$refs.SentListRef.searchReset()
} }
}, }
// taskConfirmationHandlingClick() { // taskConfirmationHandlingClick() {
// this.$router.push({ // this.$router.push({
// path: '/toDoTaskConfirmation' // path: '/toDoTaskConfirmation'