From 92dc4fc0966a03524f3cb163bbd9dafaf9aabf95 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 20 Sep 2023 16:24:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=20=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=8B=BE=E9=80=89=E6=B3=95=E8=A7=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplatthree.vue        | 12 ++++++++++--
 .../components/associatedplattwo.vue          | 19 ++++++++++++-------
 .../components/listOfRegulations.vue          | 10 ++++++----
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index 00e41c0f6..a55cc93d2 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -149,6 +149,7 @@
         pageSize: 10,
         total: 0,
         type:'',
+        flag:'',
         id:'',
         ids:'',
       }
@@ -157,9 +158,11 @@
 
     },
     methods: {
-      transferModel(id,type,ids) {
+      transferModel(id,flag,type,ids) {
+        console.log(id,flag,type,ids)
         this.id = id
         this.type = type
+        this.flag = flag,
         this.ids = ids
         this.queryParam = {}
         this.selectQuery = {}
@@ -180,8 +183,13 @@
           projectLibraryIds: this.id,
           ...this.queryParam
         }
+        let val = {
+          projectLibraryIds: this.ids,
+          platformProjectLibraryIds: this.id,
+          ...this.queryParam
+        }
         this.loading = true
-        postAction('project/projectLibraryBase/listPlatform', query).then((res) => {
+        postAction(this.flag == '2' ? '/project/projectLibraryBase/listPlatformAll' : 'project/projectLibraryBase/listPlatform', this.flag == '2' ? val : query).then((res) => {
           if (res.success) {
             this.data = res.result || []
             this.data.forEach((item,index) => {
diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
index cdb39f4ce..3ff14e24c 100644
--- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -124,14 +124,14 @@ export default {
         },
         {
           title: this.$t('design') + '-' + this.$t('typeOfDeliverables'),
-          dataIndex: 'designdeliverableTypeName',
+          dataIndex: 'designDeliverableTypeName',
           align: 'left',
           ellipsis: true,
           width: 120
         },
         {
           title: this.$t('verify') + '-' + this.$t('typeOfDeliverables'),
-          dataIndex: 'deliverableTypeName',
+          dataIndex: 'verifyDeliverableTypeName',
           align: 'left',
           ellipsis: true,
           width: 120
@@ -143,8 +143,9 @@ export default {
       pageNo: 1,
       pageSize: 10,
       total: 0,
-      flag:'',
+      id:'',
       type:'',
+      flag:'',
       ids:'',
     }
   },
@@ -152,11 +153,12 @@ export default {
 
   },
   methods: {
-    transferModel(flag,type,ids) {
+    transferModel(id,flag,type,ids) {
       this.visible = true
-      this.flag = flag
+      this.id = id
       this.type = type
       this.ids = ids
+      this.flag = flag
       this.queryParam = {}
       this.selectedRowKeys = []
       this.replacePage()
@@ -180,13 +182,16 @@ export default {
       this.replacePage()
     },
     replacePage() {
+      console.log(this.id)
       let query = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
+        projectLibraryId: this.id,
+        roleCode: 0,
         ...this.queryParam
       }
       this.loading = true
-      postAction(this.url.transferUrl, query).then((res) => {
+      getAction('/platform/projectLawsInventoryEO/page', query).then((res) => {
         if (res.success) {
           this.dataList = res.result.records || []
           this.total = res.result.total
@@ -210,7 +215,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.ids)
+        this.$emit('associatedplattwoForm',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/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 5be71b891..3676fec0d 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1982,18 +1982,20 @@
           }
         }else{
           flag = '2'
+          this.selectedRowKeys = this.dataSource.map(val => val.id)
+          console.log(this.selectedRowKeys)
           this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
         }
       },
       associatedplatForm(id,flag,type,ids){
         if(flag == '1'){
-          this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
+          this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids)
         }else{
-          this.$refs.associatedplattwoRef.transferModel(id,type,ids)
+          this.$refs.associatedplattwoRef.transferModel(id,flag,type,ids)
         }
       },
-      associatedplattwoForm(id,type,ids){
-        this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
+      associatedplattwoForm(id,flag,type,ids){
+        this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids)
       },
       associatedplatthreeForm(id){
         this.getList()