From 21ce2d47905ed8649c892c86b2fd436bca123b92 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 4 Aug 2022 09:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../managementdetails/commponts/conventionalmodle.vue        | 5 +++++
 .../components/ParameterItemCollectionList.vue               | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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