From 0719606312de0403f5231fa220db700faa0f5f9a 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 11:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=B8=8D=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/confirmationDrawer.vue         | 23 ++++++++++---------
 .../reviewedByThePersonInCharge.vue           |  8 +++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
index 8d89b4242..5803af6d8 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
@@ -366,7 +366,7 @@
   }
 
   .box-two {
-    margin-bottom: 438px;
+    /*margin-bottom: 438px;*/
   }
 
   .header-text {
@@ -380,16 +380,17 @@
   }
 
   .drawer-review {
-    position: absolute;
-    bottom: 40px;
-    z-index: 1001;
-    height: 404px;
-    width: 100%;
-    padding: 24px;
-    border-top: 1px solid #e8e8e8;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
+    /*position: absolute;*/
+    /*bottom: 40px;*/
+    /*z-index: 1001;*/
+    /*height: 404px;*/
+    /*width: 100%;*/
+    /*padding: 24px;*/
+    /*border-top: 1px solid #e8e8e8;*/
+    /*left: 0;*/
+    /*background: #fff;*/
+    /*border-radius: 0 0 2px 2px;*/
+    margin-bottom: 40px;
   }
 
   .formAdd {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 1cc79009c..9efc1ec45 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -30,10 +30,6 @@
               <a-radio value="Adopt" :disabled="isAdopt" v-if="query.TaskKey == 'fggcssh'">
                 {{$t('adopt')}}
               </a-radio>
-              <a-radio value="Returned" v-if="query.TaskKey == 'dezrrqr' || query.TaskKey == 'dezrrtjjfw' ||
-              query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'fggcssh'">
-                {{$t('sendBack')}}
-              </a-radio>
               <a-radio value="Compliance" v-if="query.TaskKey == 'dezrrtjjfw' || query.TaskKey == 'zrrtjjfw'">
                 {{$t('accord')}}
               </a-radio>
@@ -46,6 +42,10 @@
               <a-radio value="NA" v-if="query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw'">
                 {{$t('notInvolved')}}
               </a-radio>
+              <a-radio value="Returned" v-if="query.TaskKey == 'dezrrqr' || query.TaskKey == 'dezrrtjjfw' ||
+              query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'fggcssh'">
+                {{$t('sendBack')}}
+              </a-radio>
               <a-radio value="Transfer" v-if="query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'zrrqr'">
                 {{$t('turnToDo')}}
               </a-radio>