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

Merge branch 'dev_20230424_TJ' into fix_20230508

Browse Source 
# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
This commit is contained in:
wangzhijiang
2023-05-09 11:28:57 +08:00
parent ed770c7e58 2e17c381bb
commit 35b39ed9f0
15 changed files with 431 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+50 -38
View File
@@ -388,22 +388,22 @@
:title="text">{{text}}</a>
</span>
</a-table>
<!-- <div class="page" v-if="dataSource.length > 0">-->
<!-- <a-pagination-->
<!-- :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
<!-- show-quick-jumper-->
<!-- show-size-changer-->
<!-- :page-size.sync="pageSize"-->
<!-- :total="total"-->
<!-- :pageSizeOptions="['50','100','200','300']"-->
<!-- :current="pageNo"-->
<!-- @change="onChangeSize"-->
<!-- @showSizeChange="SizeChange"-->
<!-- />-->
<!-- </div>-->
<div class="buttom-box" v-if="dataSource && dataSource.length > 0">
{{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
<div class="page" v-if="dataSource.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
:pageSizeOptions="['50','100','200','300']"
:current="pageNo"
@change="onChangeSize"
@showSizeChange="SizeChange"
/>
</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"/>
@@ -748,14 +748,16 @@
align: 'left',
ellipsis: true,
dataIndex: 'attestationType_dictText',
width: 180
width: 180,
sorter: true,
},
{
title: this.$t('certificationLevel'),
align: 'left',
ellipsis: true,
dataIndex: 'attestationRank_dictText',
width: 180
width: 180,
sorter: true,
},
{
title: this.$t('areaOfResponsibility'),
@@ -1176,7 +1178,7 @@
url: {
addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
list: '/project/projectLawsInventoryEO/list',
list: '/project/projectLawsInventoryEO/page',
addModel: 'project/projectLawsInventoryEO/add',
editModel: '/project/projectLawsInventoryEO/edit',
deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
@@ -1520,7 +1522,7 @@
}
},
modifyOperatorForm() {
this
this.pageNo = 1
this.getList()
},
//收起/展开
@@ -2156,6 +2158,7 @@
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.pageNo = 1
_this.getList()
} else {
_this.$message.warning(_this.$t('operationFailed'))
@@ -2188,6 +2191,7 @@
// this.confirmLoadingRoleSwitching = false
this.$emit('getRoleSwitch', roleSwitchingCode)
this.selectedRowKeys = []
this.pageNo = 1
this.getList()
} else {
this.confirmLoadingRoleSwitching = false
@@ -2306,6 +2310,7 @@
//搜索
searchQuery() {
this.selectedRowKeys = []
this.pageNo = 1
this.getList()
},
//重置
@@ -2319,6 +2324,7 @@
addModelList() {
this.selectedRowKeys = []
this.pageNo = 1
this.getList()
},
customizeListForm(val) {
@@ -2329,6 +2335,7 @@
},
transferListFormHomo() {
this.$refs.transferListRef.handleCancel()
this.pageNo = 1
this.getList()
},
handleSuperQuery(params, matchType) {
@@ -2342,6 +2349,7 @@
sqp['superQueryMatchType'] = matchType
}
this.queryParamQuery = sqp
this.pageNo = 1
this.getList()
},
@@ -2363,20 +2371,24 @@
this.orderByField = 'verifyFlowStatus'
} else if (sorter.columnKey == 'designFlowStatusName') {
this.orderByField = 'designFlowStatus'
} else if (sorter.columnKey == 'attestationType_dictText') {
this.orderByField = 'attestationType'
} else if (sorter.columnKey == 'attestationRank_dictText') {
this.orderByField = 'attestationRank'
} else {
this.orderByField = sorter.columnKey
}
this.getList()
},
// onChangeSize(page, pageSize) {
// this.pageNo = page
// this.getList()
// },
// SizeChange(page, pageSize) {
// this.pageNo = 1
// this.pageSize = pageSize
// this.getList()
// },
onChangeSize(page, pageSize) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let roleCode = this.roleSwitchingCode
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -2395,20 +2407,20 @@
projectLibraryId: this.$route.query.id,
orderBy: this.orderBy,
orderByField: this.orderByField,
roleCode: roleCode
// pageNo: this.pageNo,
// pageSize: this.pageSize
roleCode: roleCode,
pageNo: this.pageNo,
pageSize: this.pageSize
}
this.loading = true
getAction(this.url.list, query).then((res) => {
if (res.success) {
// if (res.result.current > 1 && res.result.records.length == 0) {
// this.pageNo = 1
// this.getList()
// return
// }
this.dataSource = res.result || []
// this.total = res.result.total
if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.getList()
return
}
this.dataSource = res.result.records || []
this.total = res.result.total
this.loading = false
this.JLoading = false
if (this.dataSource.length == 0) {