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/App.vue
+15 -6
View File
@@ -180,18 +180,18 @@
}
.ant-table-column-title {
font-weight: bold!important;
font-weight: bold !important;
}
.ant-table-thead > tr > th {
background: #f3f6f6!important;
padding-top: 12px!important;
padding-bottom: 12px!important;
background: #f3f6f6 !important;
padding-top: 12px !important;
padding-bottom: 12px !important;
}
.ant-table-tbody > tr > td {
padding-top: 12px!important;
padding-bottom: 12px!important;
padding-top: 12px !important;
padding-bottom: 12px !important;
}
.ant-tooltip-inner {
@@ -206,4 +206,13 @@
.ant-menu-inline-collapsed-tooltip a {
color: #333 !important;
}
.page .ant-select-selection--single {
height: 32px !important;
line-height: 32px !important;
}
.page .ant-select-selection__rendered{
height: 32px !important;
line-height: 32px !important;
}
</style>
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1827,4 +1827,5 @@ module.exports = {
proportion:'Proportion',
projectProgressStatistics:'Project Progress Statistics',
GRPSystemProjectProgressStatistics:'GRP system project progress statistics',
statisticalNodes:'Statistical Nodes',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1928,4 +1928,5 @@ module.exports = {
proportion:'占比',
projectProgressStatistics:'项目进度统计',
GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
statisticalNodes:'统计节点',
}
jero-web/src/views/documentManage/tags/dialog/DicList.vue
+11
View File
@@ -75,6 +75,9 @@
<a-input-number v-model="form.sortOrder" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%"
:min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber"/>
</a-form-model-item>
<a-form-model-item :label="$t('statisticalNodes')" prop="statNode" v-if="record.id == '1513417672023441409'">
<a-input v-model.trim="form.statNode" :placeholder="$t('pleaseEnter')+$t('statisticalNodes')"/>
</a-form-model-item>
<a-form-model-item :label="$t('describe')" prop="description">
<a-input v-model.trim="form.description" :placeholder="$t('PleaseEnterDescription')"/>
</a-form-model-item>
@@ -139,6 +142,14 @@
{ min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
{ validator: this.test }
],
statNode:[
{ required: true, message: this.$t('statisticalNodes')+ this.$t('cannotEmpty'), trigger: 'blur' },
{
max: 100,
message: this.$t('statisticalNodes') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'blur'
}
],
valueType:[
{ required: true, message: this.$t('type') + this.$t('cannotEmpty'), trigger: 'change' },
],
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+44 -5
View File
@@ -314,9 +314,22 @@
<span v-else>--</span>
</span>
</a-table>
<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>
</a-card>
</div>
@@ -403,6 +416,9 @@
orderBy: '1',
istable: true,
orderByField: '',
pageNo: 1,
pageSize: 50,
total: 0,
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
dataSourceFile: [],
@@ -424,7 +440,7 @@
url: {
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy',
queryConditionInventory: '/dummy/dummyInventoryInfoEO/queryConditionInventory',
list: '/dummy/dummyInventoryInfoEO/list',
list: '/dummy/dummyInventoryInfoEO/page',
addModel: '/dummy/dummyInventoryInfoEO/add',
editModel: '/dummy/dummyInventoryInfoEO/edit',
deleteBatch: '/dummy/dummyInventoryInfoEO/deleteBatch',
@@ -1231,6 +1247,15 @@
}
})
},
onChangeSize(page, pageSize) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
if (this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array) {
this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String.join(',')
@@ -1243,12 +1268,21 @@
...this.queryParamQuery,
orderBy: this.orderBy,
orderByField: this.orderByField,
dummyInventoryBaseId: this.$route.query.id
dummyInventoryBaseId: this.$route.query.id,
pageNo: this.pageNo,
pageSize: this.pageSize
}
this.loading = true
getAction(this.url.list, query).then((res) => {
if (res.success) {
this.dataSource = res.result || []
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.dataSource = res.result || []
if (this.dataSource.length == 0) {
this.$nextTick(() => {
let anttablebody = document.getElementsByClassName('ant-table-body')
@@ -1727,6 +1761,11 @@
padding-left: 16px!important;
border-right: 1px solid #e8e8e8;
}
.page {
text-align: right;
margin-top: 20px;
margin-bottom: 20px;
}
</style>
<style lang="less">
.popconfirm {
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) {
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+47 -5
View File
@@ -237,9 +237,22 @@
</span>
</a-table>
<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>
</a-card>
</div>
@@ -288,8 +301,11 @@
isbutton: false,
toggleSearchStatus:false,
dataSource: [],
pageNo: 1,
pageSize: 50,
total: 0,
url: {
list: '/authDummy/authDummyInventoryInfoEO/list',
list: '/authDummy/authDummyInventoryInfoEO/page',
logList: '/authDummy/authDummyLog/page',//更新log
exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载
exportData: '/authDummy/authDummyInventoryInfoEO/exportData',//导出
@@ -535,17 +551,35 @@
getPersonnelList(){
this.getList()
},
onChangeSize(page, pageSize) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let query = {
...this.queryParam,
orderBy: this.orderBy,
orderByField: this.orderByField,
authDummyInventoryBaseId: this.$route.query.id
authDummyInventoryBaseId: this.$route.query.id,
pageNo: this.pageNo,
pageSize: this.pageSize
}
this.loading = true
getAction(this.url.list, query).then((res) => {
if (res.success) {
this.dataSource = res.result || []
if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.getList()
return
}
// this.dataSource = res.result || []
this.dataSource = res.result.records || []
this.total = res.result.total
this.loading = false
} else {
this.loading = false
@@ -723,4 +757,12 @@
color: #00B3BE;
cursor: pointer;
}
.page {
text-align: right;
margin-top: 20px;
margin-bottom: 20px;
}
::v-deep .ant-card-body {
padding: 14px 32px 0 32px;
}
</style>