@@ -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 @@
@@ -9,12 +9,15 @@
v-if="isDisplay"
:projectInformationList="projectInformationList"
:url="url"
+ :queryProject="queryProject"
:projectInformationId="this.queryBy.projectLibraryId"
/>
+
@@ -71,49 +73,14 @@
return {
projectInformationList: [
{
- title: this.$t('entryName'),
+ title: this.$t('RelatedItems'),
value: 'projectName'
},
{
title: this.$t('targetMarket'),
value: 'targetMarket_dictText'
},
- {
- title: this.$t('projectStatus'),
- value: 'projectStatus_dictText'
- },
- {
- title: this.$t('StudioEngineer'),
- value: 'studioEngineerName'
- },
- {
- title: this.$t('certifiedEngineer'),
- value: 'certificationEngineerName'
- },
{},
- {
- title: this.$t('DigitalPlatform'),
- value: 'digitalPlatform_dictText'
- },
- {
- title: this.$t('ModelPlatform'),
- value: 'vehiclePlatform_dictText'
- },
- {},
- {
- title: this.$t('IPDInformation'),
- value: 'ipdInfo'
- },
- {
- title: this.$t('certificationProgram'),
- value: 'attestationPlan'
- },
- {
- title: this.$t('dehicleDevelopmentPlan'),
- value: 'vehicleDevelopmentPlan'
- }
- ],
- standardContentList: [
{
title: this.$t('standard'),
value: 'serialNumber'
@@ -131,30 +98,11 @@
value: 'dutyTerritory_dictText'
},
{
- title: this.$t('implementationCategory'),
- value: 'implementType_dictText'
- },
- {
- title: this.$t('correspondingStandard'),
- value: 'correspondingStandard'
- },
- {
- title: this.$t('engineeringInterfacePerson'),
- value: 'engineeringInterfacePersonName'
- },
- {
- title: this.$t('regulatoryEngineer'),
- value: 'regulationOwnerName'
- },
- {
- title: this.$t('certifiedEngineer'),
- value: 'homologationEngineerName'
- },
- {
- title: this.$t('remarks'),
- value: 'remark'
+ title: this.$t('applicableSupplement'),
+ value: 'applicableSupplement'
}
],
+ standardContentList: [],
url: {
urlFrom: 'project/projectLibraryBase/queryById',
queryProjectLawsInventoryInfoById: 'project/projectLawsInventoryEO/queryProjectLawsInventoryInfoById',
@@ -164,19 +112,25 @@
isDisplay: false,
queryProject: {},
loading: false,
+ titleName: '',
textLoading: this.$t('dataLoading')
}
},
mounted() {
let _this = this
this.isDisplay = false
+ if (this.$route.query.taskDefinitionKey == 'dreqr') {
+ this.titleName = this.$t('engineerReply')
+ } else {
+ this.titleName = this.$t('confirmationEngineeringInterfacePerson')
+ }
this.queryTaskDetailByTask(function() {
_this.queryProjectLawsInventoryInfo()
})
},
computed: {
isSendBack() {
- if (this.$route.query.taskDefinitionKey == 'zrrjsrw') {
+ if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') {
return false
}
return true
@@ -190,11 +144,11 @@
},
methods: {
...mapGetters(['userInfo']),
- terminationProcess(handlingTime) {
- this.textLoading = this.$t('terminationProcessing')
- this.loading = true
- this.completeTask({ flag: 2 }, handlingTime)
- },
+ // terminationProcess(handlingTime) {
+ // this.textLoading = this.$t('terminationProcessing')
+ // this.loading = true
+ // this.completeTask({ flag: 2 }, handlingTime)
+ // },
submit(handlingTime) {
this.$refs.examineInformationRef.submit((res) => {
this.textLoading = this.$t('Submitting')
@@ -291,7 +245,7 @@
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
this.visible = false
- this.$message.success(this.$t('OperationSuccessful'))
+ // this.$message.success(this.$t('OperationSuccessful'))
this.$router.push({
path: '/ProcessCenter'
})
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 623e1bf9b..08c8a8f83 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -14,6 +14,7 @@
/>