修改已知bug1

This commit is contained in:
qq787203167
2022-06-02 15:35:10 +08:00
parent 361707bd61
commit 46fa579da7
4 changed files with 18 additions and 3 deletions
+1
View File
@@ -626,6 +626,7 @@ module.exports = {
ListOfRelevantPersonnel: 'List of relevant personnel', ListOfRelevantPersonnel: 'List of relevant personnel',
DeliverableStatus: 'Deliverable status', DeliverableStatus: 'Deliverable status',
CurrentStatusOfTheProject: 'Current status of the project', CurrentStatusOfTheProject: 'Current status of the project',
CurrentStatus:'Current status',
NonConformance: 'Non conformance', NonConformance: 'Non conformance',
listSubclauses: 'List Subclauses', listSubclauses: 'List Subclauses',
fileType: 'File Type', fileType: 'File Type',
+1
View File
@@ -635,6 +635,7 @@ module.exports = {
ListOfRelevantPersonnel: '相关人员名单', ListOfRelevantPersonnel: '相关人员名单',
DeliverableStatus: '交付物状态', DeliverableStatus: '交付物状态',
CurrentStatusOfTheProject: '项目当前状态', CurrentStatusOfTheProject: '项目当前状态',
CurrentStatus:'当前状态',
NonConformance: '未符合项', NonConformance: '未符合项',
listSubclauses: '清单条目', listSubclauses: '清单条目',
fileType: '文件类型', fileType: '文件类型',
@@ -87,6 +87,7 @@
v-if="isTrue" v-if="isTrue"
ref="table" ref="table"
size="middle" size="middle"
@change="tableOnChange"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%'}" :scroll="{x: '100%'}"
@@ -302,6 +303,7 @@
align: 'center', align: 'center',
ellipsis: true, ellipsis: true,
width: 170, width: 170,
sorter: true,
dataIndex: 'issue_time' dataIndex: 'issue_time'
}, },
{ {
@@ -309,12 +311,14 @@
align: 'center', align: 'center',
ellipsis: true, ellipsis: true,
width: 210, width: 210,
sorter: true,
dataIndex: 'implement_time' dataIndex: 'implement_time'
}, },
{ {
title: this.$t('ImplementationDate'), title: this.$t('ImplementationDate'),
align: 'center', align: 'center',
ellipsis: true, ellipsis: true,
sorter: true,
width: 210, width: 210,
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1' dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
}, },
@@ -342,7 +346,9 @@
mapTwo: {}, mapTwo: {},
selectModelName: '', selectModelName: '',
queryParamOne: {}, queryParamOne: {},
searchQueryOne: {} searchQueryOne: {},
orderBy: '1',
orderByField: ''
} }
}, },
watch: { watch: {
@@ -575,6 +581,11 @@
changeQuery(val, name) { changeQuery(val, name) {
this.queryParamOne[name + '_name'] = val this.queryParamOne[name + '_name'] = val
}, },
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
this.orderByField = sorter.columnKey
this.getInfoList()
},
getInfoList(num) { getInfoList(num) {
let queryParam = JSON.parse(JSON.stringify(this.queryParam)) let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => { Object.keys(queryParam).forEach(val => {
@@ -596,6 +607,8 @@
let query = { let query = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
orderBy: this.orderBy,
orderByField: this.orderByField,
mapOne: this.mapOne, mapOne: this.mapOne,
mapTwo: this.mapTwo mapTwo: this.mapTwo
} }
@@ -114,13 +114,13 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="title-text-text"
:title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span> :title="$t('CurrentStatus')">{{$t('CurrentStatus')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="conditionAssessment"> <a-form-model-item class="itemModel" prop="conditionAssessment">
<a-select <a-select
:disabled="disabled" :disabled="disabled"
v-model="item.conditionAssessment" v-model="item.conditionAssessment"
:placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')"> :placeholder="$t('PleaseSelect')+$t('CurrentStatus')">
<a-select-option :value="'1'"> <a-select-option :value="'1'">
<span style="display: inline-block;width: 100%"> <span style="display: inline-block;width: 100%">
{{ $t('red') }} {{ $t('red') }}