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

src/views/enterprise/talentPool/components/details.vue

@@ -1,7 +1,7 @@
 <!-- 人才库 - 人才详情 -->
 <template>
-  <div class="d-flex justify-center mb-10">
-    <div v-if="Object.keys(cvData).length" style="width: 940px;overflow-y: auto;background: #fff;" class="px-8 py-3 my-n3 mr-3">
+  <div class="d-flex justify-center mb-8">
+    <div v-if="Object.keys(cvData).length" style="width: 940px;overflow-y: auto;background: #fff;" class="px-8 pb-12 pt-3 my-n3 mr-3">
       <!-- 基本信息 -->
       <baseInfo class="mt-5" :data="cvData.person"></baseInfo>
       <!-- 个人优势 -->

src/views/resume/components/educationExp.vue

@@ -25,9 +25,9 @@
           <div>
             <span style="font-size: 18px; font-weight: bold;">{{ item.schoolName }}</span>
             <span class="color6 font15 ml-5">
-              <span>{{ timesTampChange(item.startTime).slice(0, 10) }}</span>
+              <span>{{ timesTampChange(item.startTime).slice(0, 7) }}</span>
               <span class="mx-1">至</span>
-              <span>{{ timesTampChange(item.endTime).slice(0, 10) }}</span>
+              <span>{{ timesTampChange(item.endTime).slice(0, 7) }}</span>
             </span>
           </div>
           <div v-if="item.active">
@@ -183,6 +183,8 @@ const formItems = ref({
       key: 'content',
       value: null,
       default: null,
+      rows: 5,
+      resize: true,
       counter: 1600,
       label: '在校经历 *',
       outlined: true,
@@ -216,7 +218,7 @@ const handle = (item) => {
         // if (item[e.key] && item[e.itemTextName]) { e.search(item[e.itemTextName], '触发下拉框内容'); e.value = item[e.key] }
         // else { e.value = item[e.itemTextName]; e[e.itemTextName] = item[e.itemTextName] }
       }
-      else if (e.type === 'datepicker') e.value = timesTampChange(item[e.key]).slice(0, 10)
+      else if (e.type === 'datepicker') e.value = timesTampChange(item[e.key]).slice(0, 7)
       else if (item[e.key]) e.value = item[e.key]
     })
   } else { // 新增

src/views/resume/components/projectExperience.vue

@@ -93,6 +93,8 @@ const items = ref({
       value: '',
       label: '项目描述 *',
       counter: '500',
+      rows: 5,
+      resize: true,
       rules: [
         value => {
           if (value) return true

src/views/resume/components/trainingExperience.vue

@@ -107,6 +107,9 @@ const items = ref({
       key: 'content',
       value: '',
       label: '培训描述 *',
+      rows: 5,
+      resize: true,
+      counter: 2000,
       rules: [
         value => {
           if (value) return true

src/views/resume/components/workExperience.vue

@@ -25,9 +25,9 @@
           <div>
             <span style="font-size: 18px; font-weight: bold;">{{ item.enterpriseName }}</span>
             <span class="color6 font15 ml-5">
-              <span>{{ timesTampChange(item.startTime).slice(0, 10) }}</span>
+              <span>{{ timesTampChange(item.startTime).slice(0, 7) }}</span>
               <span class="mx-1">至</span>
-              <span>{{ timesTampChange(item.endTime).slice(0, 10) }}</span>
+              <span>{{ timesTampChange(item.endTime).slice(0, 7) }}</span>
             </span>
           </div>
           <div v-if="item.active">
@@ -150,7 +150,9 @@ const formItems = ref({
       key: 'content',
       value: null,
       default: null,
-      counter: 1600,
+      rows: 10,
+      resize: true,
+      counter: 2000,
       label: '工作内容 *',
       outlined: true,
       rules: [v => !!v || '请输入工作内容']
@@ -182,7 +184,7 @@ const handle = (item) => {
       if (e.canBeInputted) { // 特殊处理可输入下拉框
         dealCanBeInputtedValueAndLabel(e, item)
       }
-      else if (e.type === 'datepicker') e.value = timesTampChange(item[e.key]).slice(0, 10)
+      else if (e.type === 'datepicker') e.value = timesTampChange(item[e.key]).slice(0, 7)
       else if (item[e.key]) e.value = item[e.key]
     })
   } else { // 新增