From 74e563da7fa6886449fd2be5933e2d4ca5c85f48 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 12 九月 2023 11:25:52 +0800
Subject: [PATCH] [UPDATE] 解決弱點Se: Incorrect definition of Serializable class [UPDATE] 解決弱點Information exposure to log file [UPDATE] 解決弱點Use of hard-coded password

---
 PAMapp/pages/agentInfo/edit/_agentNo.vue |   91 +++++++++++++++++++++++++++------------------
 1 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/PAMapp/pages/agentInfo/edit/_agentNo.vue b/PAMapp/pages/agentInfo/edit/_agentNo.vue
index 7d3ebe8..e4cb6f6 100644
--- a/PAMapp/pages/agentInfo/edit/_agentNo.vue
+++ b/PAMapp/pages/agentInfo/edit/_agentNo.vue
@@ -125,18 +125,14 @@
         <UiField :span="12" icon="time" label="��敺�����">
           {{ agentInfo.latestLoginTime | formatDate }}
         </UiField>
-        <UiField :span="12" icon="calender" label="����風">
-          <div class="mt-10" style="display: flex; align-items: center">
-            <el-input  v-model="editInfoValue.seniorityYear" class="seniority-input" ></el-input>撟�
-            <el-select  style="width:60px" v-model="editInfoValue.seniorityMonth" class="seniority-input">
-              <el-option
-                v-for="(month) in [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]"
-                :value="month"
-                :key="month">
-                {{ month }}
-              </el-option>
-            </el-select>���
-          </div>
+        <UiField :span="12" icon="calender" label="������" class="pam-editInfo-date-picker">
+          <UiDatePicker
+              :isFutureDateDisabled = true
+              id="el-date-picker"
+              class="mt-10"
+              :defaultValue ="agentInfo.entryDate"
+              @changeDate="onChangeDate($event)"
+          ></UiDatePicker>
         </UiField>
       </el-row>
 
@@ -280,6 +276,7 @@
 import { agentCommunicationStyleList } from '~/shared/const/agent-communication-style-list';
 import { taiwanCities } from '~/shared/const/taiwan-cities';
 
+
 const localStorageTest = namespace('localStorage');
 const loginStore = namespace('login.store');
 
@@ -308,8 +305,6 @@
     title             : '',
     serveArea         : [] as string[],
     companyAddress    : '',
-    seniorityYear     : 1,
-    seniorityMonth    : 0,
     concept           : '',
     experiences       : '',
     awards            : '',
@@ -317,6 +312,7 @@
     photoBase64       : '',
     phoneNumber       : '',
     email             : '',
+    entryDate         : '',
   };
 
   communicationStyleList: string[] = agentCommunicationStyleList;
@@ -377,37 +373,48 @@
 
   mounted(){
     this.setAgentInfo(this.agentInfo);
+
+    const bodyEl = document.querySelector('body');
+
+    bodyEl?.addEventListener('scroll', function() {
+      const elDatePickerEl = document.querySelector('#el-date-picker');
+      const elDatePickerPanelEl = document.querySelector('.el-picker-panel');
+      if (elDatePickerPanelEl) {
+        elDatePickerPanelEl['style']['z-index'] = 5;
+        const elDatePickerOffsetTop = elDatePickerEl!.getBoundingClientRect().top;
+        elDatePickerPanelEl!['style'].top = elDatePickerOffsetTop + 30 + 'px';
+      }
+    });
+
   }
 
   private setAgentInfo(agentInfo: AgentInfo): void {
-    const [agentYear, _yearUnit , agentMonth, _monthUnit] =  agentInfo.seniority.split(" ");
     this.defaultAgentInfoSetting = {
-      agentNo           : agentInfo.agentNo||'',
-      name              : agentInfo.name || '',
-      expertise         : agentInfo.expertise || [],
-      title             : agentInfo.title || '',
-      role              : agentInfo.role||'',
-      serveArea         : agentInfo?.serveArea.split('��'),
-      gender            : agentInfo.gender||'',
-      phoneNumber       : agentInfo.phoneNumber||'',
-      companyAddress    : agentInfo.companyAddress || '',
-      seniorityYear     : agentYear? +agentYear : 0,
-      seniorityMonth    : agentMonth ? +agentMonth : 0,
-      concept           : agentInfo.concept || '',
-      experiences       : agentInfo.experiences  || '',
-      awards            : agentInfo.awards || '',
-      communicationStyle: agentInfo.communicationStyle || '',
-      photoBase64       : '',
-      email             : agentInfo.email || ''
+      agentNo: agentInfo?.agentNo || '',
+      name: agentInfo?.name || '',
+      expertise: agentInfo?.expertise || [],
+      title: agentInfo?.title || '',
+      role: agentInfo?.role || '',
+      serveArea: agentInfo?.serveArea?.split('��') || [],
+      gender: agentInfo?.gender || '',
+      phoneNumber: agentInfo?.phoneNumber || '',
+      companyAddress: agentInfo?.companyAddress || '',
+      concept: agentInfo?.concept || '',
+      experiences: agentInfo?.experiences || '',
+      awards: agentInfo?.awards || '',
+      communicationStyle: agentInfo?.communicationStyle || '',
+      photoBase64: '',
+      email: agentInfo?.email || '',
+      entryDate: agentInfo?.entryDate || '',
     };
 
     this.editInfoValue = {
       ...this.defaultAgentInfoSetting,
-      expertise          : _.cloneDeep(this.defaultAgentInfoSetting.expertise),
-      // TODO: 蝣箄��垢甇斗���垢���隞�" , "���� [Tomas, 2021/12/28]
-      communicationStyle : this.defaultAgentInfoSetting.communicationStyle.split('��'),
-    }
+      expertise: _.cloneDeep(this.defaultAgentInfoSetting.expertise),
+      communicationStyle: this.defaultAgentInfoSetting.communicationStyle?.split('��') || [],
+    };
   }
+
 
 
   //////////////////////////////////////////////////////////////////////
@@ -423,6 +430,10 @@
       this.isInfoUpdate = true;
       this.updateConsultantDetail(editSettingInfo.agentNo);
     });
+  }
+
+  onChangeDate(date: any): void {
+    this.editInfoValue.entryDate = date;
   }
 
   backToInfo() {
@@ -475,7 +486,7 @@
                         && this.editInfoValue.concept
                         && this.editInfoValue.experiences
                         && this.editInfoValue.phoneNumber.length
-                        && this.editInfoValue.seniorityYear
+                        && this.editInfoValue.entryDate
                         && this.editInfoValue.expertise.length
                         && this.editInfoValue.communicationStyle.length
                         && this.editInfoValue.email.length;
@@ -548,4 +559,10 @@
   padding-right: 20px;
 }
 
+.pam-editInfo-date-picker{
+  .pam-date.el-input {
+      width: 100%;
+  }
+}
+
 </style>

--
Gitblit v1.8.0