diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue index 3f2bd496b..ac007c0e1 100644 --- a/jero-web/src/views/projectManagement/components/associatedplat.vue +++ b/jero-web/src/views/projectManagement/components/associatedplat.vue @@ -32,32 +32,32 @@ :triggerChange="false" :dictCode="'brand'"/> - + + + + + + + + + + + + + + + + + + + + - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + + + {{$t('reset')}} {{$t('query')}} @@ -119,21 +119,29 @@ dataIndex: 'projectNameId', align: 'left', ellipsis: true, - width: 235 + width: 120 }, { - title: this.$t('StudioEngineer'), - dataIndex: 'studioEngineerName', + title: this.$t('regulatoryEngineer'), + dataIndex: 'createBy', align: 'left', ellipsis: true, width: 235 }, + { + title: this.$t('brand'), + align: 'left', + width: 120, + sorter:true, + ellipsis: true, + dataIndex: 'brandText' + }, { title: this.$t('configurationItem'), dataIndex: 'ipdInfo', align: 'left', ellipsis: true, - width: 235 + width: 180 }, { title: this.$t('explain'), @@ -142,20 +150,6 @@ ellipsis: true, width: 235 }, - { - title: this.$t('ModelPlatform'), - dataIndex: 'vehiclePlatform', - align: 'left', - ellipsis: true, - width: 235 - }, - { - title: this.$t('DigitalPlatform'), - dataIndex: 'digitalPlatform', - align: 'left', - ellipsis: true, - width: 235 - }, ], dataList: [], content: [], @@ -165,16 +159,18 @@ total: 0, flag:'', type:'', + ids:'', } }, mounted() { }, methods: { - transferModel(flag,type) { + transferModel(flag,type,ids) { this.visible = true this.flag = flag this.type = type + this.ids = ids this.queryParam = {} this.selectedRowKeys = [] this.replacePage() @@ -204,7 +200,7 @@ ...this.queryParam } this.loading = true - postAction(this.url.transferUrl, query).then((res) => { + postAction('platform/projectLibraryBase/page', query).then((res) => { if (res.success) { this.dataList = res.result.records || [] this.total = res.result.total @@ -228,7 +224,7 @@ this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) this.confirmLoading = false - this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type) + this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type,this.ids) this.selectedRowKeys = [] // postAction(this.url.addModel, { // dummyInventoryBaseId: selectedRowKeys.join(','), diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue index 5a7158360..36eb3a79a 100644 --- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue +++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue @@ -161,16 +161,17 @@ total: 0, type:'', id:'', + ids:'', } }, mounted() { }, methods: { - transferModel(id,type) { - this.visible = true + transferModel(id,type,ids) { this.id = id this.type = type + this.ids = ids this.queryParam = {} this.selectedRowKeys = [] this.replacePage() @@ -195,17 +196,18 @@ }, replacePage() { let query = { - pageNo: this.pageNo, - pageSize: this.pageSize, + ids: this.ids, + projectLibraryIds: this.id, ...this.queryParam } this.loading = true - postAction(this.url.transferUrl, query).then((res) => { + postAction('project/projectLibraryBase/listPlatform', query).then((res) => { if (res.success) { this.dataList = res.result.records || [] this.selectedRowKeys = this.dataList.map(item => item.id) this.total = res.result.total this.loading = false + this.visible = true } else { this.loading = false } diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue index e5337f1bf..cdb39f4ce 100644 --- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue +++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue @@ -145,16 +145,18 @@ export default { total: 0, flag:'', type:'', + ids:'', } }, mounted() { }, methods: { - transferModel(flag,type) { + transferModel(flag,type,ids) { this.visible = true this.flag = flag this.type = type + this.ids = ids this.queryParam = {} this.selectedRowKeys = [] this.replacePage() @@ -208,7 +210,7 @@ export default { this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) this.confirmLoading = false - this.$emit('associatedplattwoForm',selectedRowKeys.join(','),this.type) + this.$emit('associatedplattwoForm',selectedRowKeys.join(','),this.type,this.ids) this.selectedRowKeys = [] // postAction(this.url.addModel, { // dummyInventoryBaseId: selectedRowKeys.join(','), diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 4f2dfcf86..265550aef 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1297,18 +1297,18 @@ } }else{ flag = '2' - this.$refs.associatedplatRef.transferModel(flag,type) + this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) } }, - associatedplatForm(id,flag,type){ + associatedplatForm(id,flag,type,ids){ if(flag == '1'){ - this.$refs.associatedplatthreeRef.transferModel(id,type) + this.$refs.associatedplatthreeRef.transferModel(id,type,ids) }else{ - this.$refs.associatedplattwoRef.transferModel(id,type) + this.$refs.associatedplattwoRef.transferModel(id,type,ids) } }, - associatedplattwoForm(id,type){ - this.$refs.associatedplatthreeRef.transferModel(id,type) + associatedplattwoForm(id,type,ids){ + this.$refs.associatedplatthreeRef.transferModel(id,type,ids) }, associatedplatthreeForm(id){ console.log(id) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index d39c57392..75c720c36 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1968,18 +1968,18 @@ } }else{ flag = '2' - this.$refs.associatedplatRef.transferModel(flag,type) + this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) } }, - associatedplatForm(id,flag,type){ + associatedplatForm(id,flag,type,ids){ if(flag == '1'){ - this.$refs.associatedplatthreeRef.transferModel(id,type) + this.$refs.associatedplatthreeRef.transferModel(id,type,ids) }else{ - this.$refs.associatedplattwoRef.transferModel(id,type) + this.$refs.associatedplattwoRef.transferModel(id,type,ids) } }, - associatedplattwoForm(id,type){ - this.$refs.associatedplatthreeRef.transferModel(id,type) + associatedplattwoForm(id,type,ids){ + this.$refs.associatedplatthreeRef.transferModel(id,type,ids) }, associatedplatthreeForm(id){ console.log(id)