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:
zyx.net
2023-09-27 14:28:35 +08:00
parent 225f91be6f
commit 67e3908c2b
5 changed files with 76 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -1978,5 +1978,5 @@ module.exports = {
PlatformInformation:'Platform Information',
Processdetails:'Process Details',
matchempty:'The match is empty',
onlyDataProcessStatusDeleted:'Only data whose flow status is to be started can be deleted',
onlyDataProcessStatusDeleted:'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person',
}
jero-web/src/common/lang/zh-cn.js
+1 -1
View File
@@ -1551,7 +1551,7 @@ module.exports = {
type: '类型',
select: '选择',
onlyDataWithProcessStatusDeleted: '只能删除流程状态为清单待发布和审查通过的数据',
onlyDataProcessStatusDeleted: '只能删除流程状态为任务待发起的数据',
onlyDataProcessStatusDeleted: '只能删除流程状态为任务待发起、审查通过和责任人拒绝的数据',
complianceCertificationProgram: '合规认证计划',
listPublishing: '清单发布',
responsibilityConfirmation: '责任确认',
jero-web/src/views/projectManagement/components/flowstatusdetial.vue
+66 -64
View File
@@ -48,77 +48,79 @@
</a-col>
</a-row>
<div v-for='(item,index) in dataList' :key='index'>
<div class='title' :title="item.projectName">{{item.projectName}}</div>
<div style='height:100%'>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('ProcessStatus')">{{$t('ProcessStatus')}}</span>
<span class="title-text-text" :title="flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName">
<div style='margin-bottom: 30px'>
<div v-for='(item,index) in dataList' :key='index'>
<div class='title' :title="item.projectName">{{item.projectName}}</div>
<div style='height:100%'>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('ProcessStatus')">{{$t('ProcessStatus')}}</span>
<span class="title-text-text" :title="flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName">
{{flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName}}</span>
</div>
</a-col>
<a-col :span="12">
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
<span class="title-text-text" :title="item.createBy">
</div>
</a-col>
<a-col :span="12">
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
<span class="title-text-text" :title="item.createBy">
{{item.createBy}}</span>
</div>
</a-col>
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('personLiable')">{{$t('personLiable')}}</span>
<span class="title-text-text" :title="flag == 'design'?item.designDutyIdName : item.verifyDutyIdName">
</div>
</a-col>
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('personLiable')">{{$t('personLiable')}}</span>
<span class="title-text-text" :title="flag == 'design'?item.designDutyIdName : item.verifyDutyIdName">
{{flag == 'design'?item.designDutyIdName : item.verifyDutyIdName}}</span>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
<span class="title-text-text" :title="item.dutyDepart">
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
<span class="title-text-text" :title="item.dutyDepart">
{{item.dutyDepart}}</span>
</div>
</a-col>
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
<span class="title-text-text" :title="item.dutyTerritory_dictText">
</div>
</a-col>
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
<span class="title-text-text" :title="item.dutyTerritory_dictText">
{{item.dutyTerritory_dictText}}</span>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
<a style='color:#00B3BE' class="title-text-text text-operation" @click="down(flag == 'design'?item.designDeliverableTemplate : item.verifyDeliverableTemplate),flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName" :title="flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName">
{{flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName }}</a>
</div>
</a-col>
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
<span class="title-text-text" :title="flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName">
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
<a style='color:#00B3BE' class="title-text-text text-operation" @click="down(flag == 'design'?item.designDeliverableTemplate : item.verifyDeliverableTemplate),flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName" :title="flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName">
{{flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName }}</a>
</div>
</a-col>
<a-col :span="12">
<div class='detail-box'>
<span class='detail-text' :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
<span class="title-text-text" :title="flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName">
{{flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName}}</span>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class='detail-box' style='display:flex'>
<span class='detail-text' :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
<span class="title-text-description" :title="flag == 'design'?item.designRemark : item.verifyRemark">
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class='detail-box' style='display:flex'>
<span class='detail-text' :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
<span class="title-text-description" :title="flag == 'design'?item.designRemark : item.verifyRemark">
{{flag == 'design'?item.designRemark : item.verifyRemark}}</span>
</div>
</a-col>
</a-row>
</div>
</a-col>
</a-row>
</div>
</div>
</div>
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
+7
View File
@@ -21,6 +21,7 @@
</div>
<a-form-model-item class="itemModel" prop="title">
<a-input class="box-input"
:maxLength="200"
v-model='formInline.title'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('title')"/>
@@ -53,6 +54,7 @@
</div>
<a-form-model-item class="itemModel" prop="issue">
<a-input class="box-input"
:maxLength="200"
v-model='formInline.psIssue'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+'PS-issue'"/>
@@ -177,6 +179,7 @@
</div>
<a-form-model-item class="itemModel" prop="descriptions">
<a-input class="box-input"
:maxLength="200"
v-model='formInline.description'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('descriptions')"/>
@@ -195,6 +198,7 @@
<a-form-model-item class="itemModel" prop="fileLink">
<div v-for="(item,index) in formInline.fileLinkList" :key="index">
<a-input class="box-input"
:maxLength="200"
style='width: 88%'
v-model='item.fileLink'
:disabled="disabled"
@@ -228,6 +232,7 @@
<div v-for="(item,index) in formInline.progressTrackingList" :key="index">
<!-- <span>{{item}}</span>-->
<a-input class="box-input"
:maxLength="200"
style='width: 88%'
v-model='item.progressTracking'
:disabled="true"
@@ -250,6 +255,7 @@
</div>
<a-form-model-item class="itemModel" prop="conclusion">
<a-input class="box-input"
:maxLength="200"
v-model='formInline.conclusion'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('conculsion')"/>
@@ -269,6 +275,7 @@
<div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
<a-input class="box-input"
style='width: 88%'
:maxLength="200"
v-model='item.approvalEvidenceLink'
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+1 -1
View File
@@ -1500,7 +1500,7 @@
},
deleteLib(val) {
let _this = this
if (val.flowStatus == 'List to be checked') {
if (val.flowStatus == 'List to be checked' || val.flowStatus == 'Review and pass' || val.flowStatus == 'Duty Person Rejected') {
this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {