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

src/plugins/necessaryInfo/components/infoForm.vue

@@ -23,7 +23,7 @@ const formPageRef = ref()
 let query = reactive({})
 
 // 企业名称下拉列表
-let enterpriseName = ''
+let enterpriseName = null
 // const enterpriseNameInput = ref('')
 const getEnterpriseData = async (name) => {
   const item = items.value.options.find(e => e.key === 'enterpriseId')
@@ -38,7 +38,7 @@ const getEnterpriseData = async (name) => {
   }
 }
 
-let positionName = ''
+let positionName = null
 const items = ref({
   options: [
     {
@@ -222,9 +222,9 @@ items.value.options.forEach((e) => {
 // }
 
 const dealQuery = () => {
-  query.positionName = positionName
+  query.positionName = positionName || null
   if (query.positionId === positionName) delete query.positionId  // 有选中id传id和name，否者只传name
-  query.enterpriseName = enterpriseName
+  query.enterpriseName = enterpriseName || null
   if (query.enterpriseId === enterpriseName) delete query.enterpriseId  // 有选中id传id和name，否者只传name
   //
   if (query.interestedPositionList?.length) {
@@ -232,9 +232,9 @@ const dealQuery = () => {
   }
   query.workExpList = [{
     enterpriseId: query.enterpriseId,
-    enterpriseName: query.enterpriseName,
+    enterpriseName: query.enterpriseName || null,
     positionId: query.positionId,
-    positionName: query.positionName,
+    positionName: query.positionName || null,
   }]
 }
 
@@ -244,7 +244,7 @@ const getQuery = async () => {
   const obj = {}
   items.value.options.forEach(e => {
     if (Object.prototype.hasOwnProperty.call(e, 'data')) return obj[e.key] = e.data
-    obj[e.key] = e.value
+    obj[e.key] = e.value === '' ? null : e.value
   })
   query = Object.assign(query, obj)
   dealQuery()