From 50b6ae1bc18f4ae8f923ad67d810d95eded56a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 10 Apr 2023 09:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E9=A2=86=E5=9F=9F=E9=9C=80=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/certificationList/index.vue  | 2 +-
 .../views/projectManagement/components/listOfRegulations.vue  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 1047d0d34..17576fc02 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -17,7 +17,7 @@
               <div class="title-text" :title="$t('areaOfResponsibility')">
                 <span>{{ $t('areaOfResponsibility') }}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+              <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index dea37cdb4..4b120259d 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2123,6 +2123,10 @@
           this.orderByField = 'designDeliverableType'
         } else if (sorter.columnKey == 'verifyDeliverableTypeName') {
           this.orderByField = 'verifyDeliverableType'
+        }else if (sorter.columnKey == 'designDutyIdName') {
+          this.orderByField = 'designDutyId'
+        }else if (sorter.columnKey == 'verifyDutyIdName') {
+          this.orderByField = 'verifyDutyId'
         } else {
           this.orderByField = sorter.columnKey
         }