diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
index e401ee005..ee2d51f50 100644
--- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue
@@ -109,7 +109,7 @@
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
- this.$emit('editModelList')
+ this.$emit('batSettingList')
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 428021648..35a4fd393 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -239,12 +239,12 @@
{
title: this.$t('certificationType'),
align: 'center',
- dataIndex: 'attestationType'
+ dataIndex: 'attestationType_dictText'
},
{
title: this.$t('certificationLevel'),
align: 'center',
- dataIndex: 'attestationRank'
+ dataIndex: 'attestationRank_dictText'
},
{
title: this.$t('technicalField'),
@@ -254,7 +254,7 @@
{
title: this.$t('areaOfResponsibility'),
align: 'center',
- dataIndex: 'dutyTerritory'
+ dataIndex: 'dutyTerritory_dictText'
},
{
title: this.$t('remarks'),
@@ -332,14 +332,12 @@
],
selectedRowKeys: [],
isTrue: false,
- total: 0,
- pageSize: 10,
- pageNo: 1
}
},
mounted() {
this.title = this.$route.query.title
this.isTrue = this.$route.query.title == '虚拟清单详情' ? false : true
+ this.getList()
},
computed: {
columns() {
@@ -360,12 +358,10 @@
this.$refs.UpdateLogRef.getList()
},
searchQuery() {
- this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
- this.pageNo = 1
this.getList()
},
//模板下载
@@ -408,17 +404,13 @@
}
},
addModelList() {
- this.pageNo = 1
this.getList()
},
editModelList() {
- this.pageNo = 1
this.getList()
},
getList() {
let query = {
- pageNo: this.pageNo,
- pageSize: this.pageSize,
...this.queryParam
}
this.loading = true
@@ -432,7 +424,6 @@
})
},
batSettingList() {
- this.pageNo = 1
this.getList()
},
batSettingClick() {
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index 393460874..7812da6d8 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -19,7 +19,7 @@
+ :triggerChange="false" :dictCode="'region'"/>
@@ -30,7 +30,7 @@
+ :triggerChange="false" :dictCode="'project_status'"/>
@@ -78,7 +78,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
-
+
{{text}}
@@ -121,7 +121,13 @@
visible: false,
dataSource: [],
confirmLoading: false,
- url: {},
+ url: {
+ list:'project/projectLibraryBase/list',
+ add:'project/projectLibraryBase/add',
+ edit:'project/projectLibraryBase/edit',
+ deleteBatch:'project/projectLibraryBase/delete',
+ deleteAll:'project/projectLibraryBase/deleteBatch',
+ },
total: 0,
pageSize: 10,
pageNo: 1,
@@ -130,8 +136,8 @@
{
title: this.$t('entryName'),
align: 'center',
- dataIndex: 'entryName',
- scopedSlots: { customRender: 'entryName' }
+ dataIndex: 'projectName',
+ scopedSlots: { customRender: 'projectName' }
},
{
title: this.$t('targetMarket'),
@@ -146,17 +152,17 @@
{
title: this.$t('StudioEngineer'),
align: 'center',
- dataIndex: 'StudioEngineer'
+ dataIndex: 'studioEngineer'
},
{
title: this.$t('certifiedEngineer'),
align: 'center',
- dataIndex: 'certifiedEngineer'
+ dataIndex: 'certificationEngineer'
},
{
title: this.$t('CertificationTime'),
align: 'center',
- dataIndex: 'CertificationTime'
+ dataIndex: 'createTime'
},
{
title: this.$t('NTplatform'),