diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index f255960da..046a35993 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -166,6 +166,11 @@ export default { }, mounted() { this.getNameList() + if(this.formInline.combineFlag == '1'){ + this.required = false + }else{ + this.required = true + } }, methods: { uploadSuccess(data) { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index fc24c69e0..0ff67a9de 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1546,7 +1546,8 @@ }, handleDel() { let param = { - ids: this.selectedRowKeysArray + ids: this.selectedRowKeysArray, + paramsManifestId:this.$route.query.id } if (this.selectedRowKeys.length > 0) { let _this = this