From 0e69863928fe3e98c8f7bac2653330991fe4a096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 27 Mar 2023 14:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E8=BF=9B=E5=85=A5=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E7=9C=8B=E4=B8=8D=E8=A7=81=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 95cfd3f19..8053df156 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -761,14 +761,14 @@
                 scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
               }
             ]
-          },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            fixed: 'right',
-            width: 260,
-            scopedSlots: { customRender: 'operation' }
           }
+          // {
+          //   title: this.$t('operation'),
+          //   align: 'left',
+          //   fixed: 'right',
+          //   width: 260,
+          //   scopedSlots: { customRender: 'operation' }
+          // }
         ],
         columnsAll: [],
         columnsFileAll: [
@@ -1998,39 +1998,43 @@
           moduleFlag: '法规清单'
         }).then((res) => {
           if (res.success) {
-            this.columnsAll = res.result
-            for (let j = 0; j < this.columnsAll.length; j++) {
-              for (let i = 0; i < this.column.length; i++) {
-                if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) {
-                  if (this.column[i].title == this.$t('confirmationOfDesignConformity')) {
-                    if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
-                      for (let k = 0; k < this.columnsAll[j].children.length; k++) {
-                        for (let l = 0; l < this.column[i].children.length; l++) {
-                          if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
-                            this.columnsAll[j].children[k] = this.column[i].children[l]
+            if (res.result && res.result.length > 0) {
+              this.columnsAll = res.result
+              for (let j = 0; j < this.columnsAll.length; j++) {
+                for (let i = 0; i < this.column.length; i++) {
+                  if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) {
+                    if (this.column[i].title == this.$t('confirmationOfDesignConformity')) {
+                      if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
+                        for (let k = 0; k < this.columnsAll[j].children.length; k++) {
+                          for (let l = 0; l < this.column[i].children.length; l++) {
+                            if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
+                              this.columnsAll[j].children[k] = this.column[i].children[l]
+                            }
                           }
                         }
                       }
                     }
-                  }
-                } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) {
-                  if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) {
-                    if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
-                      for (let k = 0; k < this.columnsAll[j].children.length; k++) {
-                        for (let l = 0; l < this.column[i].children.length; l++) {
-                          if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
-                            this.columnsAll[j].children[k] = this.column[i].children[l]
+                  } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) {
+                    if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) {
+                      if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
+                        for (let k = 0; k < this.columnsAll[j].children.length; k++) {
+                          for (let l = 0; l < this.column[i].children.length; l++) {
+                            if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
+                              this.columnsAll[j].children[k] = this.column[i].children[l]
+                            }
                           }
                         }
                       }
                     }
-                  }
-                } else {
-                  if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) {
-                    this.columnsAll[j] = this.column[i]
+                  } else {
+                    if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) {
+                      this.columnsAll[j] = this.column[i]
+                    }
                   }
                 }
               }
+            } else {
+              this.columnsAll = this.column
             }
             this.columnsAll.push({
               title: this.$t('operation'),