修改UAT提出的问题
This commit is contained in:
@@ -68,6 +68,28 @@
|
|||||||
</a-input-group>
|
</a-input-group>
|
||||||
</div>
|
</div>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<a-col :md="6" :sm="8">
|
||||||
|
<div class="box-title-text">
|
||||||
|
<div class="title-text" :title="$t('statisticalNodes')">
|
||||||
|
<span>{{ $t('statisticalNodes') }}</span>
|
||||||
|
</div>
|
||||||
|
<a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
|
||||||
|
allowClear
|
||||||
|
show-search
|
||||||
|
optionFilterProp="label"
|
||||||
|
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||||
|
v-model="queryParam.firstLevelDutyTerritory">
|
||||||
|
<a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
|
||||||
|
:key="key"
|
||||||
|
:label="item.key"
|
||||||
|
:value="item.key">
|
||||||
|
<span style="display: inline-block;width: 100%" :title=" item.key ">
|
||||||
|
{{ item.key }}
|
||||||
|
</span>
|
||||||
|
</a-select-option>
|
||||||
|
</a-select>
|
||||||
|
</div>
|
||||||
|
</a-col>
|
||||||
<!-- <template v-if="toggleSearchStatus">-->
|
<!-- <template v-if="toggleSearchStatus">-->
|
||||||
<!-- <a-col :md="6" :sm="8">-->
|
<!-- <a-col :md="6" :sm="8">-->
|
||||||
<!-- <div class="box-title-text">-->
|
<!-- <div class="box-title-text">-->
|
||||||
@@ -143,10 +165,10 @@
|
|||||||
{{ $t('copy') }}
|
{{ $t('copy') }}
|
||||||
</div>
|
</div>
|
||||||
<!-- 列表设置-->
|
<!-- 列表设置-->
|
||||||
<!-- v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
|
<!-- v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
|
||||||
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
|
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
|
||||||
placement="bottomRight"
|
placement="bottomRight"
|
||||||
>
|
>
|
||||||
<template slot="title" id="popconfirmmize">
|
<template slot="title" id="popconfirmmize">
|
||||||
<div style="max-height:360px;overflow:scroll;overflow-x: auto;">
|
<div style="max-height:360px;overflow:scroll;overflow-x: auto;">
|
||||||
<a-checkbox
|
<a-checkbox
|
||||||
@@ -401,9 +423,9 @@
|
|||||||
@showSizeChange="SizeChange"
|
@showSizeChange="SizeChange"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
|
<!-- <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
|
||||||
<!-- {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}-->
|
<!-- {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}-->
|
||||||
<!-- </div>-->
|
<!-- </div>-->
|
||||||
</div>
|
</div>
|
||||||
<listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
|
<listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
|
||||||
<listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
|
<listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
|
||||||
@@ -685,6 +707,7 @@
|
|||||||
confirmLoadingQuestion: false,
|
confirmLoadingQuestion: false,
|
||||||
isDesignCompliance: false,
|
isDesignCompliance: false,
|
||||||
isVerifyingCompliance: false,
|
isVerifyingCompliance: false,
|
||||||
|
firstLevelDutyTerritoryList: [],
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 50,
|
pageSize: 50,
|
||||||
total: 0,
|
total: 0,
|
||||||
@@ -749,7 +772,7 @@
|
|||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'attestationType_dictText',
|
dataIndex: 'attestationType_dictText',
|
||||||
width: 180,
|
width: 180,
|
||||||
sorter: true,
|
sorter: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('certificationLevel'),
|
title: this.$t('certificationLevel'),
|
||||||
@@ -757,7 +780,7 @@
|
|||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'attestationRank_dictText',
|
dataIndex: 'attestationRank_dictText',
|
||||||
width: 180,
|
width: 180,
|
||||||
sorter: true,
|
sorter: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('areaOfResponsibility'),
|
title: this.$t('areaOfResponsibility'),
|
||||||
@@ -1250,7 +1273,7 @@
|
|||||||
value: 'attestationRank',
|
value: 'attestationRank',
|
||||||
text: this.$t('certificationLevel'),
|
text: this.$t('certificationLevel'),
|
||||||
dictCode: 'attestation_rank'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框
|
dictCode: 'attestation_rank'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框
|
||||||
},
|
}
|
||||||
// {
|
// {
|
||||||
// type: 'deliverables',
|
// type: 'deliverables',
|
||||||
// value: 'designDeliverableType',
|
// value: 'designDeliverableType',
|
||||||
@@ -1433,8 +1456,9 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) {
|
this.getFirstLevelDutyTerritory()
|
||||||
this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory
|
if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) {
|
||||||
|
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName
|
||||||
this.queryParam = { ...this.queryParam }
|
this.queryParam = { ...this.queryParam }
|
||||||
}
|
}
|
||||||
this.JLoading = true
|
this.JLoading = true
|
||||||
@@ -1483,6 +1507,15 @@
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapGetters(['userInfo']),
|
...mapGetters(['userInfo']),
|
||||||
|
getFirstLevelDutyTerritory() {
|
||||||
|
getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
|
||||||
|
if (res.success) {
|
||||||
|
this.firstLevelDutyTerritoryList = res.result
|
||||||
|
} else {
|
||||||
|
this.firstLevelDutyTerritoryList = []
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
modifyOperatorClick(name) {
|
modifyOperatorClick(name) {
|
||||||
if (this.selectedRowKeys.length == 0) {
|
if (this.selectedRowKeys.length == 0) {
|
||||||
this.$message.warning(this.$t('selectLeastOne'))
|
this.$message.warning(this.$t('selectLeastOne'))
|
||||||
@@ -1800,7 +1833,7 @@
|
|||||||
content: _this.$t('ConfirmReplication'),
|
content: _this.$t('ConfirmReplication'),
|
||||||
onOk() {
|
onOk() {
|
||||||
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
|
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
|
||||||
getAction(_this.url.copyUrl, { ids: idList.join(','),operateType:operateType }).then((res) => {
|
getAction(_this.url.copyUrl, { ids: idList.join(','), operateType: operateType }).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
_this.$message.success(_this.$t('OperationSuccessful'))
|
_this.$message.success(_this.$t('OperationSuccessful'))
|
||||||
_this.selectedRowKeys = []
|
_this.selectedRowKeys = []
|
||||||
@@ -2367,9 +2400,9 @@
|
|||||||
this.orderByField = 'designDutyId'
|
this.orderByField = 'designDutyId'
|
||||||
} else if (sorter.columnKey == 'verifyDutyIdName') {
|
} else if (sorter.columnKey == 'verifyDutyIdName') {
|
||||||
this.orderByField = 'verifyDutyId'
|
this.orderByField = 'verifyDutyId'
|
||||||
} else if (sorter.columnKey == 'verifyFlowStatusName') {
|
} else if (sorter.columnKey == 'verifyFlowStatusName') {
|
||||||
this.orderByField = 'verifyFlowStatus'
|
this.orderByField = 'verifyFlowStatus'
|
||||||
} else if (sorter.columnKey == 'designFlowStatusName') {
|
} else if (sorter.columnKey == 'designFlowStatusName') {
|
||||||
this.orderByField = 'designFlowStatus'
|
this.orderByField = 'designFlowStatus'
|
||||||
} else if (sorter.columnKey == 'attestationType_dictText') {
|
} else if (sorter.columnKey == 'attestationType_dictText') {
|
||||||
this.orderByField = 'attestationType'
|
this.orderByField = 'attestationType'
|
||||||
|
|||||||
Reference in New Issue
Block a user