From 78685918a9ce667146edee5ca1b168dc10f1c44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 17:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/visit-plan/components/visitPlanForm.vue       | 4 ++--
 .../trials/trials-panel/setting/visit-plan/index.vue      | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
index 1e143e79..81b47015 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
@@ -120,8 +120,8 @@ export default {
         Description: '',
         IsBaseLine: false,
         // BlindName: '',
-        VisitWindowLeft: -3,
-        VisitWindowRight: 3,
+        VisitWindowLeft: -5,
+        VisitWindowRight: 5,
         IsConfirmed: false,
         IsDeleted: false,
         IsHaveFirstConfirmed: false
diff --git a/src/views/trials/trials-panel/setting/visit-plan/index.vue b/src/views/trials/trials-panel/setting/visit-plan/index.vue
index 19539b68..783c2bd4 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/index.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/index.vue
@@ -103,7 +103,7 @@
         >
           <template slot-scope="scope">
             <span v-show="scope.row.VisitWindowLeft!==0 || scope.row.VisitWindowRight!==0">
-              {{ `${scope.row.VisitWindowLeft}${$t('trials:visitPlan:table:day')} ~ ${scope.row.VisitWindowRight}${$t('trials:visitPlan:table:day')}` }}
+              {{ `${scope.row.VisitWindowLeft} ${$t('trials:visitPlan:table:day')} ~ ${scope.row.VisitWindowRight} ${$t('trials:visitPlan:table:day')}` }}
             </span>
           </template>
         </el-table-column>
@@ -286,7 +286,7 @@ export default {
         })
     },
     handleAdd() {
-      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -3, VisitWindowRight: 3, Description: '' }
+      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -5, VisitWindowRight: 5, Description: '' }
       this.timer = new Date().getTime()
       if (this.list.length === 0) {
         this.row.VisitName = 'Baseline'
@@ -300,6 +300,10 @@ export default {
         this.row.VisitName = this.list[this.list.length - 1].VisitName.split(' ')[0] + ' ' + (this.list[this.list.length - 1].VisitNum + 1)
         this.row.VisitNum = this.list[this.list.length - 1].VisitNum + 1
         this.row.VisitDay = this.list[this.list.length - 1].VisitDay - this.list[this.list.length - 2].VisitDay + this.list[this.list.length - 1].VisitDay
+        if (this.list[this.list.length - 1].VisitWindowLeft && this.list[this.list.length - 1].VisitWindowRight) {
+          this.row.VisitWindowLeft = this.list[this.list.length - 1].VisitWindowLeft
+          this.row.VisitWindowRight = this.list[this.list.length - 1].VisitWindowRight
+        }
       }
       this.visit_model.title = this.$t('common:button:add')
       this.visit_model.visible = true