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

src/views/menduner/system/talentMap/details/components/info.vue

@@ -102,8 +102,8 @@ const formRef = ref()
 const formData = ref({})
 const formLoading = ref(false)
 const formRules = reactive({
-  name: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }]
+  // name: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
+  // phone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }]
 })
 
 watch(() => props.modelValue, (newVal) => {

src/views/menduner/system/talentMap/details/index.vue

@@ -110,13 +110,6 @@ import TagsRecommend from './components/tagsRecommend.vue'
 import Search from './components/search.vue'
 
 const { push } = useRouter()
-const addNewTag = ref(false)
-const newTagText = ref('')
-
-const saveTags = () => {
-  // addNewTag.value = false
-}
-
 const loading = ref(false)
 const saveLoading = ref(false)
 const result = ref(cloneDeep(DefaultData))
@@ -252,12 +245,12 @@ const handleSave = async () => {
   console.log(result.value, 'result-add')
 
   // 效验基本信息中必填项是否有填写
-  if (!result.value?.person.name || !result.value.person.phone) {
-    message.notifyWarning('请将必填项填写完整')
-    InfoRef.value.formRef.validate()
-    content.value.scrollTo({ top: 0, behavior: 'smooth' })
-    return
-  }
+  // if (!result.value?.person.name || !result.value.person.phone) {
+  //   message.notifyWarning('请将必填项填写完整')
+  //   InfoRef.value.formRef.validate()
+  //   content.value.scrollTo({ top: 0, behavior: 'smooth' })
+  //   return
+  // }
 
   saveLoading.value = true
   try {

src/views/menduner/system/talentMap/index.vue

@@ -57,7 +57,7 @@
       <el-table-column label="联系电话" align="center" prop="person.phone" />
       <el-table-column label="邮箱" align="center" prop="person.email" />
       <el-table-column label="性别" align="center" prop="person.sexStr" />
-      <el-table-column label="出生日期" align="center" prop="person.birthday" :formatter="dateFormatter2" width="180px" />
+      <el-table-column label="出生日期" align="center" prop="person.birthday" :formatter="dateFormatter2" />
       <el-table-column label="学历" align="center" prop="person.eduTypeStr" />
       <el-table-column label="工作经验" align="center" prop="person.expTypeStr" />
       <el-table-column label="所在城市" align="center" prop="person.areaStr" />
@@ -71,7 +71,7 @@
           {{ scope.row?.person?.jobInterestedList && scope.row?.person?.jobInterestedList.length ? scope.row?.person?.jobInterestedList.join('，') : '' }}
         </template>
       </el-table-column>
-      <el-table-column label="首次工作时间" align="center" prop="person.firstWorkTime" :formatter="dateFormatter2" width="180px" />
+      <el-table-column label="首次工作时间" align="center" prop="person.firstWorkTime" :formatter="dateFormatter2" />
       <el-table-column label="操作" align="center" fixed="right" min-width="110">
         <template #default="scope">
           <el-button link type="primary" @click="openDetail(scope.row.person.id)">详情</el-button>