From 7709c2206746c3025a9a5aaa3e5c671b2f95cec3 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 19 May 2022 12:00:07 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=88=86=E9=85=8D=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/AssignedBy/index.vue       | 14 +++++++-------
 .../components/ParameterItemCollectionList.vue     | 11 +++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue
index 63f596fdd..9e2bceb9f 100644
--- a/jero-web/src/components/AssignedBy/index.vue
+++ b/jero-web/src/components/AssignedBy/index.vue
@@ -112,9 +112,9 @@ export default {
     }
   },
   props: {
-    paramsManifest: {
-      type: Object,
-      default: {},
+    selectedRowKeysArray: {
+      type: String,
+      default: '',
       require: true
     }
   },
@@ -171,8 +171,7 @@ export default {
       } else if (this.selectedRowKeys.length > 1) {
         this.$message.warning(this.$t('OnlyOneSelected'))
       } else {
-        console.log(this.selectedRowKeysDate,'this.selectedRowKeysDate')
-        let param = {ids: this.paramsManifest.id, projectId: this.$route.query.id, dre:this.selectedRowKeysDate[0].username }
+        let param = {ids: this.selectedRowKeysArray, projectId: this.$route.query.id, dre:this.selectedRowKeysDate[0].username }
         axios({
           url: '/jero-boot/params/collectManifest/updateDreBatch',
           method: 'post',
@@ -191,10 +190,11 @@ export default {
         })
           .then( (res) =>{
             if (res.data.success) {
-              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.$message.success(res.data.result)
               _this.loadData()
+              this.$emit('areaVisibleAssignedbyflag', false)
             }else{
-              _this.$message.warning(_this.$t('operationFailed'))
+              _this.$message.warning(res.data.result)
             }
           })
           .catch( (error) =>{
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 657852d6a..17d6483c7 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -161,7 +161,7 @@
     </a-modal>
     <!--  分配填写人--->
     <a-modal v-model="areaVisibleAssignedby" :title="$t('Assignedby')" width='950px' :footer="null">
-      <assigned-by v-if='areaVisibleAssignedby' :paramsManifest='paramsManifest'/>
+      <assigned-by v-if='areaVisibleAssignedby' :selectedRowKeysArray='selectedRowKeysArray' @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag'/>
     </a-modal>
   </a-card>
 </template>
@@ -565,7 +565,9 @@ export default {
     // 分配填写人
     assignedBy() {
       this.areaVisibleAssignedby = true
-      console.log('分配填写人')
+    },
+    areaVisibleAssignedbyflag(val) {
+      this.areaVisibleAssignedby = val
     },
     handleModule() {
 
@@ -634,10 +636,7 @@ export default {
     SizeChange() {
 
     },
-  },
-  // watch: {
-  //
-  // }
+  }
 }
 </script>