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

src/components/Enterprise/components/positions.vue

@@ -83,7 +83,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { timesTampChange } from '@/utils/date'
 import { getDict } from '@/hooks/web/useDictionaries'
 import { dealDictObjData } from '@/utils/position'
-import { prologue } from '@/hooks/web/useIM'
+import { prologue, defaultText } from '@/hooks/web/useIM'
 import { getUserAvatar } from '@/utils/avatar'
 import { getJobAdvertisedPositionCount, getJobAreaByEnterpriseId, getJobAdvertisedSearch } from '@/api/position'
 import MPagination from '@/components/CtPagination'
@@ -211,8 +211,7 @@ const desc = [
 const toDetails = async (info) => {
   const userId = info.contact.userId
   const enterpriseId = info.contact.enterpriseId
-  const text = '您好，可以进一步了解一下这个职位的详情吗？'
-  await prologue({userId, enterpriseId, text})
+  await prologue({userId, enterpriseId, defaultText})
   let url = `/recruit/personal/message?id=${info.job.id}`
   if (info.contact.enterpriseId) {
     url += `&enterprise=${info.contact.enterpriseId}`

src/hooks/web/useIM.js

@@ -21,6 +21,9 @@ import {
   // Message, StreamItem, ChannelTypeGroup, MessageStatus, SyncOptions, MessageExtra, MessageContent
 } from "wukongimjssdk"
 
+// 默认招呼语
+export const defaultText = '您好，关注到您发布该职位信息，请问有机会与您进一步沟通吗？'
+
 
 const ObjType = [ 101, 102, 103, 104 ]
 
@@ -357,8 +360,8 @@ export async function getMoreMessages (pageSize, channel) {
 const contentType = {
   101: ObjectContent,
   102: ObjectContent2,
-  103: ObjectContent3,
-  104: ObjectContent4,
+  103: ObjectContent3, // 求职者拒绝面试邀请
+  104: ObjectContent4, // 求职者接受面试邀请
   105: ObjectContent5, // 发送简历
 }
 export function send (text, _channel, type) {

src/views/publicRecruitment/myRecommendation.vue

@@ -12,14 +12,14 @@
         </div>
         <div class="topTip">推荐好友入职得赏金</div>
         <!-- 数据 -->
-        <!-- <TablePage :items="items"></TablePage>
+        <TablePage :items="items"></TablePage>
         <CtPagination
           v-if="total > 0"
           :total="total"
           :page="query.pageNo"
           :limit="query.pageSize"
           @handleChange="handleChangePage"
-        ></CtPagination> -->
+        ></CtPagination>
       </div>
     </div>
     <!-- 滚动区域 -->
@@ -36,9 +36,9 @@ import { getDict } from '@/hooks/web/useDictionaries'
 import { useUserStore } from '@/store/user'
 import { 
   getHireJobCvRelCount, 
-  // getHireJobCvRelPage
+  getHireJobCvRelPage
 } from '@/api/publicRecruitment'
-// import TablePage from './components/table.vue'
+import TablePage from './components/table.vue'
 import bountyDisplay from './components/bountyDisplay.vue'
 
 const active = ref(0)
@@ -63,18 +63,18 @@ const getData = async () => {
 }
 
 // 列表
-// const items = ref([])
-// const total = ref(0)
-// const query = ref({
-//   pageSize: 10,
-//   pageNo: 1,
-//   status: null
-// })
-// const getTableList = async () => {
-//   const res = await getHireJobCvRelPage(query.value)
-//   items.value = res.list
-//   total.value = res.total
-// }
+const items = ref([])
+const total = ref(0)
+const query = ref({
+  pageSize: 10,
+  pageNo: 1,
+  status: null
+})
+const getTableList = async () => {
+  const res = await getHireJobCvRelPage(query.value)
+  items.value = res.list
+  total.value = res.total
+}
 
 // 状态
 const getStatusData = () => {
@@ -83,25 +83,25 @@ const getStatusData = () => {
     statisticsList.value = data.map(e => {
       return { ...e, count: 0 }
     })
-    // query.value.status = data[0].value
+    query.value.status = data[0].value
     getData()
-    // getTableList()
+    getTableList()
   })
 }
 getStatusData()
 
 // 分页
-// const handleChangePage = (e) => {
-//   query.value.pageNo = e
-//   getTableList()
-// }
+const handleChangePage = (e) => {
+  query.value.pageNo = e
+  getTableList()
+}
 
 // 钻取
 const handleStatisticsItem = (item, index) => {
   active.value = index
-  // query.value.pageNo = 1
-  // query.value.status = item.value
-  // getTableList()
+  query.value.pageNo = 1
+  query.value.status = item.value
+  getTableList()
 }
 </script>
 

src/views/recruit/components/message/components/chatting.vue

@@ -63,7 +63,7 @@
             <v-card
               color="teal"
               variant="tonal"
-              class="mx-auto"
+              class="mx-auto mb-5"
               width="400"
               min-height="150"
               :elevation="3"

src/views/recruit/enterprise/informationManagement/informationSettingsComponents/basicInfo.vue

@@ -134,8 +134,7 @@ const formItems = ref({
       value: null,
       col: 6,
       class: 'mb-3',
-      label: '上班时间(示例：上午09:00 - 下午17:00) *',
-      rules: [v => !!v || '请填写上班时间']
+      label: '上班时间(示例：上午09:00 - 下午17:00)'
     },
     {
       type: 'datePicker',

src/views/recruit/personal/position/components/details.vue

@@ -161,7 +161,7 @@ import Snackbar from '@/plugins/snackbar'
 import Dialog from '@/components/CtDialog'
 import selectResumeDialog from './jobDetails/selectResumeDialog'
 import { getToken } from '@/utils/auth'
-import { prologue } from '@/hooks/web/useIM'
+import { prologue, defaultText } from '@/hooks/web/useIM'
 import { getUserAvatar } from '@/utils/avatar'
 
 const { t } = useI18n()
@@ -317,9 +317,8 @@ const handleSubmit = async (val) =>{
 const toDetails = async (info) => {
   const userId = info.contact.userId
   const enterpriseId = info.contact.enterpriseId
-  const text = '您好，可以进一步了解一下这个职位的详情吗？'
   const textObj = {
-    text: text,
+    text: defaultText,
     positionInfo: positionInfo.value
   }
   await prologue({userId, enterpriseId, text: JSON.stringify(textObj)})