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