diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue index d38b0cfe5..a40587ed4 100644 --- a/jero-web/src/views/projectManagement/components/associatedplat.vue +++ b/jero-web/src/views/projectManagement/components/associatedplat.vue @@ -226,7 +226,7 @@ this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) this.confirmLoading = false - this.$emit('associatedplatForm',selectedRowKeys.join(',')) + this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag) 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 c3376be21..3236488aa 100644 --- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue +++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue @@ -95,7 +95,7 @@ }, { title: this.$t('design') + '-' + this.$t('typeOfDeliverables'), - dataIndex: 'deliverableTypeName', + dataIndex: 'designdeliverableTypeName', align: 'left', ellipsis: true, width: 130 diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue index 96defae3f..40af5e357 100644 --- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue +++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue @@ -52,7 +52,7 @@ :scroll="{x: 1000}" :data-source="dataList" :pagination="false" - :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:flag !== '法规'?' ':'' }" + :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }" :loading="loading"> @@ -124,7 +124,7 @@ export default { }, { title: this.$t('design') + '-' + this.$t('typeOfDeliverables'), - dataIndex: 'deliverableTypeName', + dataIndex: 'designdeliverableTypeName', align: 'left', ellipsis: true, width: 120 @@ -194,9 +194,9 @@ export default { }, onSelectChange(value) { this.selectedRowKeys = value - if (this.selectedRowKeys.length > 1 && this.flag !== '法规') { - this.selectedRowKeys.shift() - } + // if (this.selectedRowKeys.length > 1 && this.flag !== '法规') { + // this.selectedRowKeys.shift() + // } }, handleCancel() { this.visible = false diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 74249e206..bfc34ed26 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1938,7 +1938,13 @@ }, // 关联平台件 associatedplatformClick(){ - this.$refs.associatedplatRef.transferModel('法规') + let flag = '' + if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ + flag = '法规' + }else{ + flag = '清单' + } + this.$refs.associatedplatRef.transferModel(flag) }, //批量设置 batSettingClick() { @@ -2546,8 +2552,13 @@ transferListForm(id) { this.$refs.transferListvirtalRef.transferModel(id) }, - associatedplatForm(id){ - this.$refs.associatedplattwoRef.transferModel(id) + associatedplatForm(id,flag){ + console.log(flag) + if(flag == '法规'){ + this.$refs.associatedplatthreeRef.transferModel(id) + }else{ + this.$refs.associatedplattwoRef.transferModel(id) + } }, associatedplattwoForm(id){ this.$refs.associatedplatthreeRef.transferModel(id) diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue index c0726d7fe..933380e46 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue @@ -128,9 +128,9 @@ add: 'platform/projectLibraryBase/add', edit: 'platform/projectLibraryBase/edit', queryByProjectId: 'platform/projectTaskPlanning/queryByProjectId', - addSettingUrl: 'platform/projectTaskPlanning/add', - editSettingUrl: 'platform/projectTaskPlanning/edit', - settingQueryForm: '/platform/projectTaskPlanning/list' + addSettingUrl: '/platform/platformTaskPlanningEO/addBatch', + editSettingUrl: '/platform/platformTaskPlanningEO/addBatch', + settingQueryForm: '/platform/platformTaskPlanningEO/list' }, selectedRowKeys: [], idList: [], diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue index f1413d6d5..ac730b4e1 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue @@ -21,7 +21,7 @@ @@ -37,7 +37,7 @@ @change="dateChange(item,index)" format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" - v-model="item.date" + v-model="item.nodeTime" :disabled="false" style="width: 100%"/> @@ -114,17 +114,22 @@ }) }, handleOk() { + if(this.formInline.list){ + this.formInline.list.forEach(item => { + item.projectId = this.$route.query.id + }) + } this.$refs.ruleForm.validate(valid => { if (valid) { let query = { ...this.formInline, - projectId: this.$route.query.id + // projectId: this.$route.query.id } let url = '' let Action if (this.formInline.id) { url = this.url.editSettingUrl - Action = putAction + Action = postAction } else { url = this.url.addSettingUrl Action = postAction @@ -136,9 +141,6 @@ this.visible = false this.confirmLoading = false this.$emit('settingListForm') - if(res.result.matchVdr == true){ - this.vdrClick() - } } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false