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

src/permission.js

@@ -33,7 +33,7 @@ router.beforeEach(async (to, from, next) => {
   } else if (getToken(tokenIndex)) {
     // 强制修改密码
     if (localStorage.getItem('entUpdatePassword') === 'needChange') fullScreen('entUpdatePassword')
-    // 强制填写个人信息
+    // 强制填写个人信息 fddeaddc47868b/ready
     else if (localStorage.getItem('necessaryInfoReady') === 'fddeaddc47868b' && tokenIndex === 2) dialogExtend('necessaryInfoDialog')
     // 企业登录免费职位广告提示
     else if (localStorage.getItem('positionAd')) {

src/plugins/dialogExtend/components/infoForm.vue

@@ -389,18 +389,16 @@ const getQuery = async () => {
 
 // 填充
 const handleAnalyzeFill = (data) => {
-  // debugger
   const person = data?.person || null
   if (!person && !Object.keys(person).length) return Snackbar.warning('无可用内容！')
   if (data.lastEmployed) {
-    // debugger
     if (data.lastEmployed.enterpriseName) person.enterpriseId = person.enterpriseName = data.lastEmployed.enterpriseName
-    if (data.lastEmployed.positionName) person.positionId = person.positionName = data.lastEmployed.positionName
-    if (person.enterpriseName) getEnterpriseData(person.enterpriseName)
+    if (data.lastEmployed.positionName) person.positionId = person.positionName = positionName = data.lastEmployed.positionName
+    // console.log('person', person)
   }
   if (data.lastPositionId) person.interestedPositionList = [data.lastPositionId]
-  // debugger
   items.value.options.forEach((e) => {
+    console.log(e.key, person[e.key])
     if (person[e.key]) e.value = person[e.key]
   })
 }
@@ -422,7 +420,7 @@ const uploadFileSubmit = async () => {
   analyzeLoading.value = false
 }
 
-handleAnalyzeFill(JSON.parse(JSON.stringify(analyzeTestData)))
+// handleAnalyzeFill(JSON.parse(JSON.stringify(analyzeTestData)))
 
 const attachmentCount = ref(0)
 const getAttachmentList = async () => {