From 950ead7f6d4156c4b2281b9dd49207c7dd2e91e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 13 Apr 2023 14:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/designCompliance.vue           | 12 ++++----
 .../components/referenceDeliverablesList.vue  | 30 ++++++++++++-------
 .../reviewedByThePersonInCharge.vue           |  3 ++
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index 551ce1598..d77146847 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -163,10 +163,10 @@
         this.visible = false
       },
       referenceDeliverablesClick() {
-        this.$refs.referenceDeliverablesListRef.transferModel()
+        this.$refs.referenceDeliverablesListRef.transferModel(this.queryData.flowType,JSON.parse(JSON.stringify(this.queryProject)))
       },
-      referenceDeliverablesListForm() {
-
+      referenceDeliverablesListForm(data) {
+         this.$refs.reviewedByThePersonInChargeRef.getData(JSON.parse(JSON.stringify(data)))
       },
       confirm(operatorTime) {
         this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
@@ -283,9 +283,9 @@
         getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
           if (res.success) {
             this.queryProject = res.result[0] || {}
-            if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') {
-              this.queryProject.endTime = this.queryData.endTime
-            }
+            // if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') {
+            //   this.queryProject.endTime = this.queryData.endTime
+            // }
             this.loading = false
             this.isDisplay = true
           } else {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue
index 0c0c53401..e7a1791af 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue
@@ -97,17 +97,21 @@
         pageSize: 10,
         total: 0,
         ids: '',
-        detailedWarningList: []
+        detailedWarningList: [],
+        queryProject:{},
+        type:'',
       }
     },
     mounted() {
 
     },
     methods: {
-      transferModel(ids) {
+      transferModel(type,queryProject) {
         this.visible = true
         this.queryParam = {}
         this.selectedRowKeys = []
+        this.type = type
+        this.queryProject = queryProject
         this.replacePage()
       },
       searchQuery() {
@@ -154,16 +158,20 @@
       handleSubmit() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          if (selectedRowKeys.join(',') == this.$route.query.id) {
-            this.$message.warning(this.$t('theDeliverablesCannotReferencedPleaseReselect'))
-            return
-          }
           this.confirmLoading = true
-          postAction('/project/projectCertificationInventoryEO/citeDeliverable', {
-            projectCertificationInventoryIds: this.ids,
-            projectLibraryId: this.$route.query.id,
-            citeProjectLibraryId: selectedRowKeys.join(',')
-          }).then((res) => {
+          let query = {
+            serialNumber:this.queryProject.serialNumber,
+            dutyTerritory:this.queryProject.dutyTerritory,
+            citeProjectLibraryId:selectedRowKeys.join(','),
+          }
+          if (this.type == '2'){
+            query.operateType = 'lawsInventoryDesignCiteDeliverable'
+            query.designDeliverableType = this.queryProject.designDeliverableType
+          }else if(this.type == '4'){
+            query.operateType = 'lawsInventoryVerifyCiteDeliverable'
+            query.verifyDeliverableType =this.queryProject.verifyDeliverableType
+          }
+          postAction('/project/projectLawsInventoryEO/citeDeliverable', query).then((res) => {
             if (res.success) {
               this.confirmLoading = false
               if (res.result) {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 9efc1ec45..a25a6cb9d 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -180,6 +180,9 @@
       }
     },
     methods: {
+      getData(data) {
+
+      },
       submit(callBack) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {