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

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
liyawei
2022-08-23 09:49:57 +08:00
parent abd77b852e ef214e1ab2
commit ff5fdc60af
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
+1 -1
View File
@@ -217,7 +217,7 @@
}, },
{ {
title: this.$t('feedbackTime'), title: this.$t('feedbackTime'),
dataIndex: 'createTime', dataIndex: 'updateTime',
align: 'center', align: 'center',
ellipsis: true, ellipsis: true,
width: 160 width: 160
jero-web/src/views/projectManagement/components/TaskList.vue
+16 -9
View File
@@ -199,13 +199,13 @@
> >
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
<span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in NotSelectedNoEngineerValue'> <span style='font-size: 16px;margin-bottom: 20px;display: flex;justify-content: center'' v-for='(item,key) in NotSelectedNoEngineerValue'>
<span>{{ item.nioNumber }}</span> <span v-html='item'></span>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
<div class="imports-footer"> <div class="imports-footer">
<div class="imports-footer-wrap"> <div class="imports-footer-wrap" style='text-align: center'>
<a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button> <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
</div> </div>
</div> </div>
@@ -553,10 +553,13 @@
} }
postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
if (res.success) { if (res.success) {
this.$refs.batchModelRef.getData(this.selectedRowKeys) if(res.result == []){
this.$refs.batchModelRef.getData(this.selectedRowKeys)
}else{
this.NotSelectedNoEngineerValue = res.result
this.visibleoperationFailed = true
}
} else { } else {
this.NotSelectedNoEngineerValue = res.result
this.visibleoperationFailed = true
} }
}) })
@@ -584,10 +587,14 @@
} }
postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => { postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
if (res.success) { if (res.success) {
this.$refs.batchChangeModelRef.getData(this.selectionRowsArray) if(res.result == []){
this.$refs.batchChangeModelRef.getData(this.selectionRowsArray)
}else{
this.NotSelectedNoEngineerValue = res.result
this.visibleoperationFailed = true
}
} else { } else {
this.NotSelectedNoEngineerValue = res.result
this.visibleoperationFailed = true
} }
}) })