From 9d38709b4d8808058f270f92672182aac2227474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Fri, 7 Apr 2023 16:44:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B-?=
 =?UTF-8?q?=E5=8A=9E=E7=90=86-=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/reviewedByThePersonInCharge.vue                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 3d1d5d251..5a9147b4c 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -70,7 +70,9 @@
           <a-form-model-item class="itemModel" prop="approvalOpinion">
             <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')"
                         v-model="formInline.approvalOpinion"
-                        :rows="4"/>
+                        :rows="2"
+                        style="min-height: 68px"
+            />
           </a-form-model-item>
         </a-col>
       </a-row>

From fe295140146458ebfb1efbf04c962558f93ff7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 7 Apr 2023 16:48:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=B4=A3=E4=BB=BB=E4=BA=BA?=
 =?UTF-8?q?=E3=80=81=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E3=80=81=E4=BA=A4?=
 =?UTF-8?q?=E4=BB=98=E7=89=A9=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          | 44 +++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index cc1edc48d..dea37cdb4 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -732,9 +732,16 @@
                 align: 'left',
                 ellipsis: true,
                 width: 140,
-                sorter: true,
                 scopedSlots: { customRender: 'designFlowStatusName' }
               },
+              {
+                title: this.$t('typeOfDeliverables'),
+                dataIndex: 'designDeliverableTypeName',
+                align: 'left',
+                width: 180,
+                sorter: true,
+                ellipsis: true,
+              },
               {
                 title: this.$t('deliverableTemplate'),
                 dataIndex: 'designDeliverableTemplate',
@@ -771,9 +778,16 @@
                 align: 'left',
                 ellipsis: true,
                 width: 180,
-                sorter: true,
                 scopedSlots: { customRender: 'verifyFlowStatusName' }
               },
+              {
+                title: this.$t('typeOfDeliverables'),
+                dataIndex: 'verifyDeliverableTypeName',
+                align: 'left',
+                width: 180,
+                sorter: true,
+                ellipsis: true,
+              },
               {
                 title: this.$t('deliverableTemplate'),
                 dataIndex: 'verifyDeliverableTemplate',
@@ -988,6 +1002,16 @@
             key: 24,
             moduleFlag: '法规清单'
           },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'),
+            headFieldCn: '交付物类型',
+            headFieldEn: 'Deliverable Type',
+            field: 'designDeliverableTypeName',
+            affirmFlag: '1',
+            key: 25,
+            moduleFlag: '法规清单'
+          },
           {
             sort: '',
             name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'),
@@ -995,7 +1019,7 @@
             headFieldEn: 'Deliverable Template',
             field: 'designDeliverableTemplate',
             affirmFlag: '1',
-            key: 25,
+            key: 26,
             moduleFlag: '法规清单'
           },
           {
@@ -1028,6 +1052,16 @@
             key: 34,
             moduleFlag: '法规清单'
           },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'),
+            headFieldCn: '交付物类型',
+            headFieldEn: 'Deliverable Type',
+            field: 'verifyDeliverableTypeName',
+            affirmFlag: '3',
+            key: 25,
+            moduleFlag: '法规清单'
+          },
           {
             sort: '',
             name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'),
@@ -2085,6 +2119,10 @@
           this.orderByField = 'attestationRank'
         } else if (sorter.columnKey == 'dutyTerritory_dictText') {
           this.orderByField = 'dutyTerritory'
+        } else if (sorter.columnKey == 'designDeliverableTypeName') {
+          this.orderByField = 'designDeliverableType'
+        } else if (sorter.columnKey == 'verifyDeliverableTypeName') {
+          this.orderByField = 'verifyDeliverableType'
         } else {
           this.orderByField = sorter.columnKey
         }