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-05-11 20:02:29 +08:00
parent 588281e483
commit 294cfe71e6
33 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+2
View File
@@ -806,4 +806,6 @@ module.exports = {
pleaseDesignConformityConfirmation:'Please complete the data of design conformity confirmation',
pleaseConfirmedByPrehomo:'Please complete the data confirmed by prehomo',
pleaseConformityVerification:'Please complete the data of Conformity verification',
virtualListDetails:'Virtual list details',
maintainVirtualList:'Maintain virtual list',
}
jero-web/src/common/lang/zh-cn.js
+3 -1
View File
@@ -810,5 +810,7 @@ module.exports = {
verificationComplianceReview: '验证符合性审查',
pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据',
pleaseConformityVerification: '请补全验证符合性确认的数据'
pleaseConformityVerification: '请补全验证符合性确认的数据',
virtualListDetails:'虚拟清单详情',
maintainVirtualList:'维护虚拟清单',
}
jero-web/src/components/PersonnelSelection/index.vue
+1
View File
@@ -220,6 +220,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/components/Standardselection/index.vue
+1
View File
@@ -223,6 +223,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/components/frameAssembly/index.vue
+1
View File
@@ -235,6 +235,7 @@
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index:100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/components/libraryPush/index.vue
+1
View File
@@ -188,6 +188,7 @@
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index:100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/views/ceshiList/modules/addForm.vue
+1
View File
@@ -62,6 +62,7 @@
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index:100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/views/documentManage/library/modules/addForm.vue
+1
View File
@@ -87,6 +87,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/documentTools/virtualList/components/addModel.vue
+1
View File
@@ -248,6 +248,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+1
View File
@@ -793,6 +793,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+1 -1
View File
@@ -6,7 +6,7 @@
<a-icon @click="iconClick" type="arrow-left" style="margin-right: 6px;font-size: 26px;"/>
</span>
<span>
{{this.title}}
{{isTrue ? $t('maintainVirtualList'):$t('virtualListDetails')}}
</span>
</div>
<div class="Virtual-detail-right">
jero-web/src/views/documentTools/virtualList/index.vue
+1
View File
@@ -514,6 +514,7 @@
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index:100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue
+1
View File
@@ -290,6 +290,7 @@ export default {
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/parameter/ParameterTemplate/index.vue
+1
View File
@@ -463,6 +463,7 @@ export default {
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index:100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/views/parameter/parameterlist/components/addModel.vue
+1
View File
@@ -605,6 +605,7 @@ export default {
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/parameter/parameterlist/index.vue
+1
View File
@@ -474,6 +474,7 @@ export default {
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/processCenter/procedure/index.vue
+1
View File
@@ -313,6 +313,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/projectManagement/components/addModel.vue
+1
View File
@@ -458,6 +458,7 @@
padding: 10px 16px;
text-align: right;
left: 0;
z-index:100;
background: #fff;
border-radius: 0 0 2px 2px;
}
jero-web/src/views/projectManagement/components/certificationDirectory.vue
+1
View File
@@ -172,6 +172,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/projectManagement/components/commentList.vue
+8 -1
View File
@@ -12,7 +12,7 @@
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('comment')"
v-model="commentContent"></j-input>
<a-button @click="submitQuery" style="margin-right: 8px;" type="primary">{{$t('query')}}</a-button>
<a-button @click="handleSubmit" type="primary">{{$t('publishComment')}}</a-button>
<a-button @click="handleSubmit" class="button-text" :title="$t('publishComment')" type="primary">{{$t('publishComment')}}</a-button>
</div>
<div class="comment-box" v-if="dataList && dataList.length > 0">
<div class="comment-box-top-box" v-for="(item,index) in dataList" :key="index">
@@ -315,6 +315,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
@@ -366,4 +367,10 @@
width: calc(100% - 168px);
margin-right: 8px;
}
.button-text{
width: 80px;
overflow: hidden;
padding:0 10px;
box-sizing: border-box;
}
</style>
jero-web/src/views/projectManagement/components/historicalVersionList.vue
+1 -1
View File
@@ -57,7 +57,7 @@
{
title: this.$t('operation'),
align: 'center',
width: 80,
width: 120,
scopedSlots: { customRender: 'operation' }
}
]
jero-web/src/views/projectManagement/components/listAddModel.vue
+1
View File
@@ -232,6 +232,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/projectManagement/components/listEditModel.vue
+4 -3
View File
@@ -326,7 +326,7 @@
</div>
<a-form-model-item class="itemModel" prop="designDeliverableTemplate">
<a-button type="primary" class="button-text"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableTemplate ? true : false"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false"
@click="clickButtonToUpload('designDeliverableTemplate')">
{{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -447,7 +447,7 @@
</div>
<a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">
<a-button type="primary" class="button-text"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableTemplate ? true : false"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"
@click="clickButtonToUpload('prehomoDeliverableTemplate')">
{{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
||
@@ -568,7 +568,7 @@
</div>
<a-form-model-item class="itemModel" prop="verifyDeliverableTemplate">
<a-button type="primary" class="button-text"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableTemplate ? true : false"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"
@click="clickButtonToUpload('verifyDeliverableTemplate')">
{{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -1219,6 +1219,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+8 -6
View File
@@ -878,17 +878,17 @@
(!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId
&& !this.dataSource[i].verifyInitiatorId && !this.dataSource[i].verifyDeliverableType)) {
isTrue = true
}else{
} else {
isTrue = false
this.$message.warning(this.$t('pleaseConformityVerification'))
return
}
if ((this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId
&& this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) ||
&& this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) ||
(!this.dataSource[i].prehomoDueDate && !this.dataSource[i].prehomoDutyId
&& !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)){
&& !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)) {
isTrue = true
}else{
} else {
isTrue = false
this.$message.warning(this.$t('pleaseConfirmedByPrehomo'))
return
@@ -896,9 +896,9 @@
if ((this.dataSource[i].designDueDate && this.dataSource[i].designDutyId
&& this.dataSource[i].designInitiatorId && this.dataSource[i].designDeliverableType) ||
(!this.dataSource[i].designDueDate && !this.dataSource[i].designDutyId
&& !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)){
&& !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)) {
isTrue = true
}else{
} else {
isTrue = false
this.$message.warning(this.$t('pleaseDesignConformityConfirmation'))
return
@@ -956,6 +956,7 @@
}
})
setTimeout(() => {
this.confirmLoading = true
this.startProcess(this.dataSource[i])
}, 500)
}
@@ -994,6 +995,7 @@
this.visible = false
this.selectedRowKeys = []
this.$message.success(this.$t('OperationSuccessful'))
this.confirmLoading = false
this.getList()
} else {
this.$message.warning(this.$t('operationFailed'))
jero-web/src/views/projectManagement/components/transferList.vue
+1
View File
@@ -210,6 +210,7 @@
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index:100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/views/projectManagement/dialog/configure.vue
+1
View File
@@ -340,6 +340,7 @@ export default {
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/projectManagement/projectLibrary/index.vue
+1
View File
@@ -435,6 +435,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/system/DepartList.vue
+1
View File
@@ -660,6 +660,7 @@
/*position: absolute;*/
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: left;
jero-web/src/views/system/modules/DeptRoleAuthModal.vue
+1
View File
@@ -201,6 +201,7 @@
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index:100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/views/system/modules/DeptRoleUserModal.vue
+1
View File
@@ -190,6 +190,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/system/modules/GateWayRouteModal.vue
+1
View File
@@ -293,6 +293,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/system/modules/UserModal.vue
+1
View File
@@ -716,6 +716,7 @@
.drawer-bootom-button {
position: absolute;
bottom: -8px;
z-index:100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/views/system/modules/UserRoleModal.vue
+1
View File
@@ -189,6 +189,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;