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

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-07-01 18:10:37 +08:00
parent 1cae6e9239
commit 1912f76fc2
7 changed files with 138 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+4
View File
@@ -1068,4 +1068,8 @@ module.exports = {
newNiONumber: 'Number', newNiONumber: 'Number',
English: 'English', English: 'English',
requiredParametersEmpty:'Required parameters cannot be empty', requiredParametersEmpty:'Required parameters cannot be empty',
PleaseTaskConfirmationRejected:'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected',
theProjectContactEmpty:'The project contact person of cannot be empty',
pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
} }
jero-web/src/common/lang/zh-cn.js
+4
View File
@@ -681,7 +681,11 @@ module.exports = {
listConfirmation: '清单确认', listConfirmation: '清单确认',
ListConfirmationDeadline: '清单确认截止时间', ListConfirmationDeadline: '清单确认截止时间',
dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
pleaseSelectinitiatedOrRejected:'请选择清单确认状态为未发起或拒绝的数据',
TheEngineerAndCertification:'的法规工程师、认证工程师不能为空',
taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空', taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
theProjectContactEmpty:'的工程接口人不能为空',
PleaseTaskConfirmationRejected:'请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据',
pleaseSelectPersonFirst: '请先选择人员', pleaseSelectPersonFirst: '请先选择人员',
onlyOnePersonCanBeSelected: '只能选择一个人员', onlyOnePersonCanBeSelected: '只能选择一个人员',
overrule: '驳回', overrule: '驳回',
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
-2
View File
@@ -509,7 +509,6 @@
distributionEngineerList: this.distributionEngineerList distributionEngineerList: this.distributionEngineerList
} }
postAction(this.url.DetailEOAdd, query).then((res) => { postAction(this.url.DetailEOAdd, query).then((res) => {
if (res.success) {
if (res.success) { if (res.success) {
this.confirmLoading = false this.confirmLoading = false
this.getList() this.getList()
@@ -519,7 +518,6 @@
this.confirmLoading = false this.confirmLoading = false
this.$message.warning(res.message) this.$message.warning(res.message)
} }
}
}) })
}, },
feedbackData(url, Action) { feedbackData(url, Action) {
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+6 -6
View File
@@ -158,7 +158,7 @@
this.textLoading = this.$t('Submitting') this.textLoading = this.$t('Submitting')
this.loading = true this.loading = true
if (!this.isFlag) { if (!this.isFlag) {
res.flag = '' res.flag = 0
} }
this.completeTask(res, handlingTime) this.completeTask(res, handlingTime)
}) })
@@ -195,17 +195,17 @@
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') { if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') {
if (value.flag == 0) { if (value.flag == 0) {
if (this.queryProject.verifyRemark) { if (this.queryProject.verifyDeliverableType) {
this.startProcessDesign(this.queryBy, 4) this.startProcessDesign(this.queryBy, 4)
} }
if (this.queryProject.prehomoRemark) { if (this.queryProject.prehomoDeliverableType) {
this.startProcessDesign(this.queryBy, 3) this.startProcessDesign(this.queryBy, 3)
} }
if (this.queryProject.designRemark) { if (this.queryProject.designDeliverableType) {
this.startProcessDesign(this.queryBy, 2) this.startProcessDesign(this.queryBy, 2)
} }
if (!this.queryProject.verifyRemark && !this.queryProject.prehomoRemark && if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType &&
!this.queryProject.designRemark) { !this.queryProject.designDeliverableType) {
setTimeout(() => { setTimeout(() => {
this.loading = false this.loading = false
window.close() window.close()
jero-web/src/views/projectManagement/components/TaskList.vue
+3
View File
@@ -321,6 +321,7 @@
DueDate: 'designDueDate', DueDate: 'designDueDate',
remarks: 'designRemark', remarks: 'designRemark',
projectName: this.$route.query.projectName, projectName: this.$route.query.projectName,
targetMarket:this.$route.query.targetMarket,
projectNameId: this.$route.query.projectNameId, projectNameId: this.$route.query.projectNameId,
primaryKeyId: val.designTaskDetailId, primaryKeyId: val.designTaskDetailId,
PersonChargeFeedback: val.designPersonChargeFeedback PersonChargeFeedback: val.designPersonChargeFeedback
@@ -345,6 +346,7 @@
DueDate: 'prehomoDueDate', DueDate: 'prehomoDueDate',
remarks: 'prehomoRemark', remarks: 'prehomoRemark',
projectName: this.$route.query.projectName, projectName: this.$route.query.projectName,
targetMarket:this.$route.query.targetMarket,
projectNameId: this.$route.query.projectNameId, projectNameId: this.$route.query.projectNameId,
primaryKeyId: val.prehomoTaskDetailId, primaryKeyId: val.prehomoTaskDetailId,
PersonChargeFeedback: val.prehomoPersonChargeFeedback PersonChargeFeedback: val.prehomoPersonChargeFeedback
@@ -369,6 +371,7 @@
DueDate: 'verifyDueDate', DueDate: 'verifyDueDate',
remarks: 'verifyRemark', remarks: 'verifyRemark',
projectName: this.$route.query.projectName, projectName: this.$route.query.projectName,
targetMarket:this.$route.query.targetMarket,
projectNameId: this.$route.query.projectNameId, projectNameId: this.$route.query.projectNameId,
primaryKeyId: val.verifyTaskDetailId, primaryKeyId: val.verifyTaskDetailId,
PersonChargeFeedback: val.verifyPersonChargeFeedback PersonChargeFeedback: val.verifyPersonChargeFeedback
jero-web/src/views/projectManagement/components/listEditModel.vue
+70 -36
View File
@@ -46,7 +46,7 @@
</div> </div>
<a-form-model-item class="itemModel" prop="subtitle"> <a-form-model-item class="itemModel" prop="subtitle">
<a-input class="box-input" <a-input class="box-input"
:disabled="formInline.roleCode == 0 ? false : true" :disabled="formInline.roleCodeIndex == 0 ? false : true"
v-model="formInline.subtitle" v-model="formInline.subtitle"
:placeholder="$t('PleaseEnter')+$t('subtitle')"/> :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
</a-form-model-item> </a-form-model-item>
@@ -60,7 +60,7 @@
</div> </div>
<a-form-model-item class="itemModel" prop="applicableSupplement"> <a-form-model-item class="itemModel" prop="applicableSupplement">
<a-input class="box-input" <a-input class="box-input"
:disabled="formInline.roleCode == 0 ? false : true" :disabled="formInline.roleCodeIndex == 0 ? false : true"
v-model="formInline.applicableSupplement" v-model="formInline.applicableSupplement"
:placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/> :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
</a-form-model-item> </a-form-model-item>
@@ -158,7 +158,8 @@
</div> </div>
<a-form-model-item class="itemModel-multi" prop="attestationType"> <a-form-model-item class="itemModel-multi" prop="attestationType">
<j-multi-select-tag class="box-input" v-model="formInline.attestationType" <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
:disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true" :disabled="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.homologationEngineerId == userInfoQuery.id) ? false : true"
:placeholder="$t('PleaseSelect')+$t('certificationType')" :placeholder="$t('PleaseSelect')+$t('certificationType')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'attestation_type'"/> :triggerChange="false" :dictCode="'attestation_type'"/>
@@ -168,13 +169,14 @@
<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="Required" v-if="formInline.roleCode == 0">*</span> <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('certificationLevel')">{{$t('certificationLevel')}}</span> :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi" prop="attestationRank"> <a-form-model-item class="itemModel-multi" prop="attestationRank">
<j-multi-select-tag class="box-input" v-model="formInline.attestationRank" <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
:disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true" :disabled="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.homologationEngineerId == userInfoQuery.id) ? false : true"
:placeholder="$t('PleaseSelect')+$t('certificationLevel')" :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'attestation_rank'"/> :triggerChange="false" :dictCode="'attestation_rank'"/>
@@ -186,24 +188,24 @@
<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="Required" v-if="formInline.roleCode == 0">*</span> <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span> :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
</div> </div>
<a-form-model-item class="itemModel-multi" prop="dutyTerritory"> <a-form-model-item class="itemModel-multi" prop="dutyTerritory">
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory" <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
@change="dutyTerritoryChange" @change="dutyTerritoryChange"
:disabled="formInline.roleCode == 0 ? false : true" :disabled="formInline.roleCodeIndex == 0 ? false : true"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/> :triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="12" v-if="formInline.roleCode == 0"> <a-col :span="12" v-if="formInline.roleCodeIndex == 0">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="formInline.roleCode == 0">*</span> <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
<span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span> <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="'regulationOwnerId'"> <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
@@ -211,7 +213,7 @@
class="box-input" class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear allowClear
:disabled="formInline.roleCode == 0 ? false : true" :disabled="formInline.roleCodeIndex == 0 ? false : true"
v-model="formInline.regulationOwnerId"> v-model="formInline.regulationOwnerId">
<a-select-option v-for="(item, key) in regulatoryEngineerList" <a-select-option v-for="(item, key) in regulatoryEngineerList"
:key="key" :key="key"
@@ -225,11 +227,11 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="formInline.roleCode == 0"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0">
<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="Required" v-if="formInline.roleCode == 0">*</span> <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
<span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span> <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="'homologationEngineerId'"> <a-form-model-item class="itemModel" :prop="'homologationEngineerId'">
@@ -237,7 +239,7 @@
class="box-input" class="box-input"
allowClear allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:disabled="formInline.roleCode == 0 ? false : true" :disabled="formInline.roleCodeIndex == 0 ? false : true"
v-model="formInline.homologationEngineerId"> v-model="formInline.homologationEngineerId">
<a-select-option v-for="(item, key) in certificationEngineerList" <a-select-option v-for="(item, key) in certificationEngineerList"
:key="key" :key="key"
@@ -253,7 +255,7 @@
<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="Required" v-if="formInline.roleCode == 0">*</span> <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
<span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span> <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'"> <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
@@ -261,7 +263,7 @@
class="box-input" class="box-input"
allowClear allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:disabled="formInline.roleCode == 0 ? false : true" :disabled="formInline.roleCodeIndex == 0 ? false : true"
v-model="formInline.engineeringInterfacePerson"> v-model="formInline.engineeringInterfacePerson">
<a-select-option v-for="(item, key) in engineeringInterfacePersonList" <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
:key="key" :key="key"
@@ -310,10 +312,14 @@
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<!-- </a-row>--> <!-- </a-row>-->
<div class="header-text"> <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
&nbsp;{{$t('confirmationOfDesignConformity')}} &nbsp;{{$t('confirmationOfDesignConformity')}}
</div> </div>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -325,7 +331,6 @@
tree-node-filter-prop="title" tree-node-filter-prop="title"
v-model="formInline.designDeliverableType" v-model="formInline.designDeliverableType"
:maxTagCount="1" :maxTagCount="1"
:disabled="formInline.taskAffirmStatus != 'Not started' ? true : false"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input" class="box-input"
style="width: 100%" style="width: 100%"
@@ -349,7 +354,6 @@
</div> </div>
<a-form-model-item class="itemModel" prop="designDeliverableTemplate"> <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
:disabled="formInline.taskAffirmStatus != 'Not started' ? true : false"
@click="clickButtonToUpload('designDeliverableTemplate')"> @click="clickButtonToUpload('designDeliverableTemplate')">
{{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' || {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -359,7 +363,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -368,7 +374,7 @@
</div> </div>
<a-form-model-item class="itemModel" prop="designInitiatorId"> <a-form-model-item class="itemModel" prop="designInitiatorId">
<a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')" <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
:disabled="designInitiatorDisabled" :disabled="formInline.roleCodeIndex == 0 ? false : true"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input" class="box-input"
allowClear allowClear
@@ -420,7 +426,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -439,7 +447,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -455,10 +465,14 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<div class="header-text"> <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
&nbsp;{{$t('PrehomoConfirmation')}} &nbsp;{{$t('PrehomoConfirmation')}}
</div> </div>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -504,7 +518,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -513,7 +529,7 @@
</div> </div>
<a-form-model-item class="itemModel" prop="prehomoInitiatorId"> <a-form-model-item class="itemModel" prop="prehomoInitiatorId">
<a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')" <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
:disabled="prehomoInitiatorIdDisabled" :disabled="formInline.roleCodeIndex == 0 ? false : true"
class="box-input" class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear allowClear
@@ -565,7 +581,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -584,7 +602,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -600,10 +620,14 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<div class="header-text"> <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId)">
&nbsp;{{$t('verificationAndConformityconfirmation')}} &nbsp;{{$t('verificationAndConformityconfirmation')}}
</div> </div>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -648,7 +672,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -660,7 +686,7 @@
class="box-input" class="box-input"
allowClear allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:disabled="verifyInitiatorIdDisabled" :disabled="formInline.roleCodeIndex == 0 ? false : true"
v-model="formInline.verifyInitiatorId"> v-model="formInline.verifyInitiatorId">
<a-select-option v-for="(item, key) in verifyInitiatorList" <a-select-option v-for="(item, key) in verifyInitiatorList"
:key="key" :key="key"
@@ -709,7 +735,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -728,7 +756,9 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId) ||
(formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId)">
<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">
@@ -760,6 +790,7 @@
import { getAction, postAction, putAction } from '@/api/manage' import { getAction, postAction, putAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file' import uploadFile from '@/components/uploadFile/file'
import moment from 'moment' import moment from 'moment'
import { mapGetters } from 'vuex'
export default { export default {
name: 'listEditModel', name: 'listEditModel',
@@ -842,13 +873,16 @@
prehomoDutyIdDisabled: false, prehomoDutyIdDisabled: false,
verifyDutyIdDisabled: false, verifyDutyIdDisabled: false,
verifyInitiatorIdDisabled: false, verifyInitiatorIdDisabled: false,
DeliverableTreeList: [] DeliverableTreeList: [],
userInfoQuery:{},
} }
}, },
mounted() { mounted() {
this.getDeliverableTree() this.getDeliverableTree()
this.userInfoQuery = this.userInfo()
}, },
methods: { methods: {
...mapGetters(['userInfo']),
getDeliverableTree() { getDeliverableTree() {
getAction('/sys/category/getDeliverableTree', {}).then((res) => { getAction('/sys/category/getDeliverableTree', {}).then((res) => {
if (res.success) { if (res.success) {
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+51 -35
View File
@@ -1197,6 +1197,16 @@
} }
}, },
edit(item) { edit(item) {
let roleCodeIndex
if (this.isDisplay) {
roleCodeIndex = 0
} else {
roleCodeIndex = 4
}
if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
roleCodeIndex = 0
}
item.roleCodeIndex = roleCodeIndex
this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item))) this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
}, },
deleteLib(val) { deleteLib(val) {
@@ -1290,13 +1300,19 @@
if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) { if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
this.detailedSuccessList.push(this.dataSource[i]) this.detailedSuccessList.push(this.dataSource[i])
} else { } else {
this.detailedWarningList.push(<div> {this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } </div>) this.detailedWarningList.push( < div > {
this
.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')
} < /div>)
// this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification'))
// isTrue = false // isTrue = false
// return // return
} }
} else { } else {
this.detailedWarningList.push(<div> {this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } </div>) this.detailedWarningList.push( < div > {
this
.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')
} < /div>)
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
// isTrue = false // isTrue = false
// return // return
@@ -1307,12 +1323,12 @@
if (this.detailedSuccessList && this.detailedSuccessList.length > 0) { if (this.detailedSuccessList && this.detailedSuccessList.length > 0) {
this.visible = true this.visible = true
this.formInline = {} this.formInline = {}
}else{ } else {
let that = this let that = this
this.$warning({ this.$warning({
content: ( content: (
< div > < div >
{that.detailedWarningList} { that.detailedWarningList }
< /div> < /div>
) )
}) })
@@ -1342,36 +1358,36 @@
if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') && if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') &&
dataList[i].inventoryAffirmStatus == 'Accepted') { dataList[i].inventoryAffirmStatus == 'Accepted') {
if (dataList[i].engineeringInterfacePerson) { if (dataList[i].engineeringInterfacePerson) {
if (dataList[i].verifyRemark) { if (dataList[i].verifyDeliverableType) {
if (dataList[i].verifyDueDate && dataList[i].verifyDutyId if (dataList[i].verifyDueDate && dataList[i].verifyDutyId
&& dataList[i].verifyInitiatorId) { && dataList[i].verifyInitiatorId) {
} else { } else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } </div>) this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>)
continue; continue
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification'))
// return // return
} }
} }
if (dataList[i].prehomoRemark) { if (dataList[i].prehomoDeliverableType) {
if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId
&& dataList[i].prehomoInitiatorId) { && dataList[i].prehomoInitiatorId) {
} else { } else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } </div>) this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>)
continue; continue
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo'))
// return // return
} }
} }
if (dataList[i].designRemark) { if (dataList[i].designDeliverableType) {
if (dataList[i].designDueDate && dataList[i].designDutyId if (dataList[i].designDueDate && dataList[i].designDutyId
&& dataList[i].designInitiatorId) { && dataList[i].designInitiatorId) {
} else { } else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } </div>) this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } < /div>)
continue; continue
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation'))
// return // return
@@ -1379,27 +1395,27 @@
} }
this.TaskSuccessList.push(dataList[i]) this.TaskSuccessList.push(dataList[i])
} else { } else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('theProjectContactEmpty') } </div>) this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('theProjectContactEmpty') } < /div>)
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty'))
// return // return
} }
} else { } else {
this.TaskWarningList.push(<div> {dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } </div>) this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } < /div>)
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected'))
// return // return
} }
} }
if (this.TaskWarningList && this.TaskWarningList.length > 0) { if (this.TaskSuccessList && this.TaskSuccessList.length > 0) {
this.visible = true this.visible = true
this.formInline = {} this.formInline = {}
}else{ } else {
let that = this let that = this
this.$warning({ this.$warning({
content: ( content: (
< div > < div >
{that.TaskWarningList} { that.TaskWarningList }
< /div> < /div>
) )
}) })
@@ -1436,11 +1452,11 @@
this.confirmLoading = false this.confirmLoading = false
} }
let that = this let that = this
if (this.detailedWarningList.length > 0){ if (this.detailedWarningList.length > 0) {
this.$warning({ this.$warning({
content: ( content: (
< div > < div >
{that.detailedWarningList} { that.detailedWarningList }
< /div> < /div>
) )
}) })
@@ -1449,20 +1465,20 @@
this.detailedWarningList = [] this.detailedWarningList = []
}) })
} else { } else {
let index = 0
for (let i = 0; i < this.TaskSuccessList.length; i++) { for (let i = 0; i < this.TaskSuccessList.length; i++) {
index++ ((i) => {
this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
Object.keys(this.TaskSuccessList[i]).forEach(res => { Object.keys(this.TaskSuccessList[i]).forEach(res => {
if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) {
this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“')
this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘')
} }
}) })
setTimeout(() => { setTimeout(() => {
this.confirmLoading = true this.confirmLoading = true
this.startProcess(this.TaskSuccessList[i], index) this.startProcess(this.TaskSuccessList[i], (i + 1))
}, 500) }, 500)
})(i)
} }
} }
} }
@@ -1502,11 +1518,11 @@
this.confirmLoading = false this.confirmLoading = false
this.getList() this.getList()
let that = this let that = this
if (this.TaskWarningList.length > 0){ if (this.TaskWarningList.length > 0) {
this.$warning({ this.$warning({
content: ( content: (
< div > < div >
{that.TaskWarningList} { that.TaskWarningList }
< /div> < /div>
) )
}) })