diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 284e7c076..78c8be684 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -27,6 +27,7 @@
- +
+ + +
+
+ {{$t('standard')}} +
+ +
+
+ +
+
+ {{$t('title')}} +
+ +
+
+ +
+
+ {{$t('status')}} +
+ +
+
+ + + {{$t('query')}} + {{$t('reset')}} + + +
+
{ - if (queryParamQuery[res] instanceof Array) { - queryParamQuery[res] = queryParamQuery[res].join(',') - } - }) - this.queryParam = queryParamQuery + searchQuery() { + this.pageNo = 1 this.replacePage() }, - searchReset(queryParam) { - this.queryParam = queryParam + searchReset() { + this.pageNo = 1 + this.queryParam = {} this.replacePage() }, onChange(page, pageSize) { @@ -138,7 +174,21 @@ this.replacePage() }, replacePage() { - + let query = { + pageNo: this.pageNo, + pageSize: this.pageSize, + ...this.queryParam + } + this.loading = true + postAction(this.url.addModelList, query).then((res) => { + if (res.success) { + this.dataList = res.result.records || [] + this.total = res.result.total + this.loading = false + } else { + this.loading = false + } + }) }, onSelectChange(value) { this.selectedRowKeys = value @@ -148,6 +198,20 @@ }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.confirmLoading = true + let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + postAction(this.url.addModel, { ids: selectedRowKeys.join(','),projectLibraryId: this.$route.query.id }).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.selectedRowKeys = [] + this.$emit('addModelList') + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + } + }) this.visible = false } else { this.$message.warning(this.$t('selectLeastOne')) @@ -174,4 +238,37 @@ background: #fff; border-radius: 0 0 2px 2px; } + + .box-title-text { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; + } + + .title-text { + width: 20%; + min-width: 110px; + color: #000F16; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .box-input { + display: inline-block; + width: 70%; + height: 38px; + margin-top: 2px; + } + + .box-button { + height: 38px; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 26e4fb4cf..dfe8c13ac 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -16,10 +16,10 @@
{{$t('standard')}}
- +
@@ -46,7 +46,7 @@ @@ -57,10 +57,10 @@
WVTA ID
- + @@ -74,12 +74,10 @@ :title="$t('correspondingStandard')">{{$t('correspondingStandard')}} - + @@ -89,13 +87,13 @@ {{$t('implementationCategory')}} - - + + :triggerChange="false" :dictCode="'implement_type'"/> @@ -107,13 +105,13 @@ {{$t('vehicleInProductionDate')}} - + @@ -123,13 +121,13 @@
{{$t('ImplementationDate')}}
- + @@ -142,13 +140,13 @@ {{$t('certificationType')}} - - + + :triggerChange="false" :dictCode="'attestation_type'"/> @@ -158,13 +156,13 @@ {{$t('certificationLevel')}} - - + + :triggerChange="false" :dictCode="'attestation_rank'"/> @@ -177,12 +175,11 @@ :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}} - + diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 69be435f1..cba13cb20 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -107,7 +107,7 @@
- + @@ -324,8 +324,9 @@ selectedRowKeys: [], queryParam: {}, url: { + addModelList: '/document/bussDocumentLibraryEO/queryPageInfoDummy', list: '/project/projectLawsInventoryEO/list', - add: 'project/projectLawsInventoryEO/add', + addModel: 'project/projectLawsInventoryEO/add', edit: '/project/projectLawsInventoryEO/edit', deleteBatch: '/project/projectLawsInventoryEO/deleteBatch', deleteOne: '/project/projectLawsInventoryEO/delete' @@ -404,6 +405,9 @@ this.queryParam = {} this.getList() }, + addModelList() { + this.getList() + }, getList() { let query = { ...this.queryParam,