diff --git a/apiRc/needs/person.js b/apiRc/needs/person.js index 2297a97..6255d80 100644 --- a/apiRc/needs/person.js +++ b/apiRc/needs/person.js @@ -1,7 +1,7 @@ /* * @Date: 2025-10-31 11:06:15 - * @LastEditors: lip - * @LastEditTime: 2025-11-03 12:48:30 + * @LastEditors: shirlwang + * @LastEditTime: 2025-11-05 15:33:21 */ // 人员接口 // import { post, get } from '@/utilsRc/request' @@ -27,7 +27,7 @@ export function getPersonList(params) { export function addInvestigate(data) { return request({ // url: '//process/processInterview', - url: '//timelime/timelime', + url: '/timelime/timelime', method: 'post', data: data }) diff --git a/apiRc/personinfo/index.js b/apiRc/personinfo/index.js index 29af896..2aa1a9b 100644 --- a/apiRc/personinfo/index.js +++ b/apiRc/personinfo/index.js @@ -2,7 +2,7 @@ * @Descripttion: * @Author: lip * @Date: 2025-11-03 12:35:56 - * @LastEditors: lip + * @LastEditors: shirlwang */ // import { post, get } from '../../utils/request.js' import request from '@/utilsRc/request' @@ -28,14 +28,14 @@ export function personAlertList(params) { export function getJbrInfo() { return request({ method: 'get', - url: `system/center/user/selectHxjbr`, + url: `/system/center/user/selectHxjbr`, method: 'get' }) } export function getPersonBase() { return request({ method: 'get', - url: `system/center/user/selectHxjbr`, + url: `/system/center/user/selectHxjbr`, method: 'get' }) } diff --git a/apiRc/timeLine/index.js b/apiRc/timeLine/index.js new file mode 100644 index 0000000..b3e4596 --- /dev/null +++ b/apiRc/timeLine/index.js @@ -0,0 +1,26 @@ +import request from '@/utilsRc/request' + +// 查询时间轴列表 +export function timelineList(params) { + return request({ + url: '/timelime/timelime/timeline', + method: 'get', + params + }) +} + +// 查询时间轴详情列表 +export function timeList(params) { + return request({ + url: '/timelime/timelime/list', + method: 'get', + params + }) +} +//获取时间轴详细信息 +export function timeDetails(id) { + return request({ + url: '/timelime/timelime/' + id, + method: 'get' + }) +} \ No newline at end of file diff --git a/packageRc/api/needs/person.js b/packageRc/api/needs/person.js index 2297a97..52b8504 100644 --- a/packageRc/api/needs/person.js +++ b/packageRc/api/needs/person.js @@ -1,7 +1,7 @@ /* * @Date: 2025-10-31 11:06:15 - * @LastEditors: lip - * @LastEditTime: 2025-11-03 12:48:30 + * @LastEditors: shirlwang + * @LastEditTime: 2025-11-05 15:33:17 */ // 人员接口 // import { post, get } from '@/utilsRc/request' @@ -27,7 +27,7 @@ export function getPersonList(params) { export function addInvestigate(data) { return request({ // url: '//process/processInterview', - url: '//timelime/timelime', + url: '/timelime/timelime', method: 'post', data: data }) diff --git a/packageRc/api/personinfo/index.js b/packageRc/api/personinfo/index.js index 29af896..2aa1a9b 100644 --- a/packageRc/api/personinfo/index.js +++ b/packageRc/api/personinfo/index.js @@ -2,7 +2,7 @@ * @Descripttion: * @Author: lip * @Date: 2025-11-03 12:35:56 - * @LastEditors: lip + * @LastEditors: shirlwang */ // import { post, get } from '../../utils/request.js' import request from '@/utilsRc/request' @@ -28,14 +28,14 @@ export function personAlertList(params) { export function getJbrInfo() { return request({ method: 'get', - url: `system/center/user/selectHxjbr`, + url: `/system/center/user/selectHxjbr`, method: 'get' }) } export function getPersonBase() { return request({ method: 'get', - url: `system/center/user/selectHxjbr`, + url: `/system/center/user/selectHxjbr`, method: 'get' }) } diff --git a/packageRc/pages/daiban/addbangfu.vue b/packageRc/pages/daiban/addbangfu.vue index 452fdfc..12ab9c9 100644 --- a/packageRc/pages/daiban/addbangfu.vue +++ b/packageRc/pages/daiban/addbangfu.vue @@ -1,177 +1,153 @@ + + diff --git a/packageRc/pages/daiban/daiban.vue b/packageRc/pages/daiban/daiban.vue index c6ee16a..c231941 100644 --- a/packageRc/pages/daiban/daiban.vue +++ b/packageRc/pages/daiban/daiban.vue @@ -1,7 +1,7 @@ @@ -428,15 +508,15 @@ import { getPersonInfo } from "../../api/company/index.js"; // import { listJobService, serviceTraceability } from "@/api/needs/jobService"; import { listPersonDemand, delPersonDemand } from "../../api/needs/personDemand"; - // import { requirementCompletion } from "@/api/company"; + import { requirementCompletion } from "@/apiRc/company/index"; // import { listEntrepreneurshipService } from "@/api/needs/entrepreneurshipService"; // import { listTrainService, delTrainService } from "@/api/needs/trainService"; import { listJobType } from "../../api/jobType/index"; - // import ImageUpload from "@/packageRc/components/ImageUpload"; + import ImageUpload from "@/packageRc/components/ImageUpload"; export default { name: "serviceDetails", components: { - //ImageUpload, + ImageUpload, }, data() { @@ -554,6 +634,9 @@ export default { }, methods: { + closeopenDeal() { + this.$refs.openDeal.close(); + }, // 返回上一页 goBack() { uni.navigateBack(); @@ -613,20 +696,11 @@ export default { try { const url = `/packageRc/pages/daiban/addbangfu?id=${this.form?.userId || ''}&name=${this.form.name}`; + // const url = `/packageRc/pages/service/serviceDetail?id=${this.form?.userId || ''}&name=${this.form.name}`; console.log("导航URL:", url); uni.navigateTo({ url: url, - success: () => { - console.log("导航成功"); - }, - fail: (err) => { - console.error("导航失败:", err); - uni.showToast({ - title: '导航失败: ' + JSON.stringify(err), - icon: 'none' - }); - } }); } catch (error) { console.error("执行出错:", error); @@ -637,6 +711,9 @@ export default { } }, goNeedsDetail(item, needsType) { + // uni.navigateTo({ + // url: `/packageRc/pages/demand/demandail?id=${item.id}&type=${needsType}&showTab=1`, + // }); uni.navigateTo({ url: `/packageRc/pages/needs/needDetail?id=${item.id}&type=${needsType}&showTab=1`, }); @@ -665,14 +742,17 @@ export default { } } }, - confirmDate(e) { - this.showTime = false; - // 获取选中的日期 - const date = e.value; - // 使用 uView 的 uTime 方法格式化日期，包含时分秒 - const formattedDateTime = uni.$u.timeFormat(date, "yyyy-mm-dd hh:MM:ss"); - // 设置表单数据 - this.formData.actualSolveDate = formattedDateTime; + // confirmDate(e) { + // this.showTime = false; + // // 获取选中的日期 + // const date = e.value; + // // 使用 uView 的 uTime 方法格式化日期，包含时分秒 + // const formattedDateTime = uni.$u.timeFormat(date, "yyyy-mm-dd hh:MM:ss"); + // // 设置表单数据 + // this.formData.actualSolveDate = formattedDateTime; + // }, + change(e) { + this.formData.actualSolveDate = e }, removeRowData(data) { //确实要删除的提示 @@ -702,7 +782,8 @@ export default { }, goAddNeeds() { uni.navigateTo({ - url: `/packageRc/pages/demand/demandail?activeType=${1}&id=${this.form.userId}&name=${this.form.name}`, + url: `/packageRc/pages/needs/needDetail?userId=${this.form.userId}&type=1&name=${this.form.name}`, + // url: `/packageRc/pages/demand/demandail?activeType=${1}&id=${this.form.userId}&name=${this.form.name}`, success: function() { console.log('导航成功') @@ -741,12 +822,12 @@ export default { }, // 办结按钮 async finishJobRecommend(needsType) { + uni.showLoading(); try { // 先进行表单校验 await this.$refs.uForm.validate(); // 校验通过后再走后续逻辑 - this.$showLoading(); const url = "/manage/personDemand/demandDone"; if (!url) { throw new Error("无效的需求类型"); @@ -754,8 +835,8 @@ export default { const { code, msg } = await requirementCompletion(url, this.formData); if (code === 200) { - this.$u.toast('办结成功'); - this.openDeal = false; + uni.showToast({title: '办结成功', icon: 'none'}); + this.$refs.openDeal.close(); this.getListPersonDemand(); this.serviceTraceability(); } @@ -770,9 +851,9 @@ export default { } else { msg = '请检查必填项填写'; } - this.$u.toast(msg); + uni.showToast({title: msg, icon: 'none'}); } finally { - this.$hideLoading(); + uni.hideLoading(); } }, // 需求推荐/培训 @@ -802,19 +883,20 @@ export default { }, // 需求办结 requirementHandling(item, needsType) { - this.openDeal = true; - this.needsType = needsType; - this.formData = { - id: item.id, - currentStatus: "3", - userId: item.userId, - personStatus: item.personStatus || (this.dict.personStatusList[0] && this.dict.personStatusList[0].dictValue), - }; - console.log("item",item) - this.$nextTick(() => { - this.$forceUpdate(); - }); -}, + // this.openDeal = true; + this.$refs.openDeal.open(); + this.needsType = needsType; + this.formData = { + id: item.id, + currentStatus: "3", + userId: item.userId, + personStatus: item.personStatus || (this.dict.personStatusList[0] && this.dict.personStatusList[0].dictValue), + }; + console.log("item",item) + this.$nextTick(() => { + this.$forceUpdate(); + }); + }, onPersonStatusConfirm(e) { const item = e.value[0]; this.formData.personStatus = item.dictValue; diff --git a/packageRc/pages/demand/components/entrepreneurshipService.vue b/packageRc/pages/demand/components/entrepreneurshipService.vue index 9a64200..ff3767e 100644 --- a/packageRc/pages/demand/components/entrepreneurshipService.vue +++ b/packageRc/pages/demand/components/entrepreneurshipService.vue @@ -1,11 +1,11 @@