Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/login/components/passwordPage.vue

@@ -69,6 +69,12 @@ const loginData = reactive({
   password: '' // 1111
 })
 
+// 设置默认账号密码便于开发快捷登录
+if (window.location.hostname === 'localhost' || window.location.hostname === '192.168.3.152') {
+  loginData.phone = '13229740091'
+  loginData.password = '1111'
+}
+
 const passwordForm = ref()
 
 const handleEnter = () => {

src/views/recruit/enterprise/resumeManagement/talentPool/components/details/educationExp.vue

@@ -9,9 +9,9 @@
           <div>
             <span style="font-size: 16px;">{{ item.schoolName }}</span>
             <span class="color6 font15 ml-5">
-              <span>{{ timesTampChange(item.startTime, 'Y-M-D') }}</span>
+              <span>{{ timesTampChange(item.startTime, 'Y-M') }}</span>
               <span class="mx-1">至</span>
-              <span>{{ timesTampChange(item.endTime, 'Y-M-D') }}</span>
+              <span>{{ timesTampChange(item.endTime, 'Y-M') }}</span>
             </span>
           </div>
           <div v-if="item.active">

src/views/recruit/enterprise/resumeManagement/talentPool/components/details/workExperience.vue

@@ -10,9 +10,9 @@
           <div>
             <span>{{ item.enterpriseName }}</span>
             <span class="color6 font15 ml-5">
-              <span>{{ timesTampChange(item.startTime, 'Y-M-D') }}</span>
+              <span>{{ timesTampChange(item.startTime, 'Y-M') }}</span>
               <span class="mx-1">至</span>
-              <span>{{ timesTampChange(item.endTime, 'Y-M-D') }}</span>
+              <span>{{ item.endTime ? timesTampChange(item.endTime, 'Y-M') : $t('sys.soFar') }}</span>
             </span>
             <span class="color6 font15 ml-5">{{ item.positionName }}</span>
           </div>