diff --git a/src/api/crm/plan/getPlan.js b/src/api/crm/plan/getPlan.js index 92f54e8..a1cf479 100644 --- a/src/api/crm/plan/getPlan.js +++ b/src/api/crm/plan/getPlan.js @@ -1,36 +1,29 @@ import request from "@/utils/request" - -export function getPersonalPlanList(params) { - return request.post({ - url: '/getPersonalPlanList', - params - }) -} - -export function getUserInfo(data) { +// 获取用户信息 +/*export function getUserInfo(data) { return request.get({ url: '/app/user/getUserInfo', data }, {isTransformResponse: false}) +}*/ +//获取个人周计划列表 +export function getWeeklyPlanList(data) { + return request.get({ + url: '/crm/app/appWeeklyPlan/getWeeklyListByUser', + data + }, {isTransformResponse: false}) } //获取所有人周计划列表 export function getAllWeekPlanList(params){ return request.get({ - url: '/app/appWeeklyPlan/list', + url: '/crm/app/appWeeklyPlan/list', data: params },{isTransformResponse: false}) } -//获取个人周计划列表 -export function getWeeklyPlanList(data) { - return request.get({ - url: '/app/appWeeklyPlan/getWeeklyListByUser', - data - }, {isTransformResponse: false}) -} // 组合查询计划列表 export function getWeekPlanListByDate(params){ return request.get({ - url: '/app/appWeeklyPlan/weeklyListByDate', + url: '/crm/app/appWeeklyPlan/weeklyListByDate', data: params },{isTransformResponse: false}) } diff --git a/src/api/crm/plan/updatePlan.js b/src/api/crm/plan/updatePlan.js index 10183d6..f132adc 100644 --- a/src/api/crm/plan/updatePlan.js +++ b/src/api/crm/plan/updatePlan.js @@ -2,7 +2,7 @@ import request from "@/utils/request" export function updateWeekPlanList(data){ return request.post({ - url: '/app/appWeeklyPlan/updateWeekly', + url: '/crm/app/appWeeklyPlan/updateWeekly', data: data, header: { 'Content-Type': 'application/json;charset=UTF-8' @@ -12,7 +12,7 @@ export function updateWeekPlanList(data){ // 判断本周是否写过计划 export function judgeThisWeek (data){ return request.post({ - url: '/app/appWeeklyPlan/Judgethisweek', + url: '/crm/app/appWeeklyPlan/Judgethisweek', data, header: {'Content-Type': 'application/json;charset=UTF-8'} }) @@ -21,7 +21,7 @@ export function judgeThisWeek (data){ // 新增周计划 export function addPlan(data){ return request.post({ - url: '/app/appWeeklyPlan/addComment', + url: '/crm/app/appWeeklyPlan/addComment', data, header:{'Content-Type': 'application/json;charset=UTF-8'} }) diff --git a/src/pages/business/CRM/plan/index.vue b/src/pages/business/CRM/plan/index.vue index 0b585c5..1117302 100644 --- a/src/pages/business/CRM/plan/index.vue +++ b/src/pages/business/CRM/plan/index.vue @@ -8,7 +8,7 @@ - + diff --git a/src/pages/business/CRM/plan/myPlan.vue b/src/pages/business/CRM/plan/myPlan.vue index e7a49e6..f9670ab 100644 --- a/src/pages/business/CRM/plan/myPlan.vue +++ b/src/pages/business/CRM/plan/myPlan.vue @@ -17,7 +17,7 @@ - 姓名：{{ userInfo.nickName || userInfo.userName }} + 姓名：{{ userInfo.nickName || userInfo.userName }} {{ yearMonth }} @@ -28,9 +28,9 @@ - {{ getTapLabel(item) }} @@ -54,10 +54,11 @@ + - + @@ -106,12 +107,12 @@ let getWorkEvent = (index) => { const refreshPlanList = () => { message.showLoading(); // 获取用户信息 - getUserInfo().then(res => { - userInfo.value = res.user; - console.log(route.path, "：用户信息获取成功"); - }).catch(err => { - console.warn(err, "用户信息获取失败") - }); + // getUserInfo().then(res => { + // userInfo.value = res.user; + // console.log(route.path, "：用户信息获取成功"); + // }).catch(err => { + // console.warn(err, "用户信息获取失败") + // }); // 获取周计划列表 getWeeklyPlanList(queryParams.value).then(res => { const {rows} = res; @@ -180,11 +181,11 @@ function handleCreate() { handlePlanEdit({itemList, selectIndex: result.tapIndex}, true); }).catch((err) => { console.warn(err, "已存在周计划") - uni.showToast({ - icon: 'error', - title: '已有本周或下周计划', - duration: 2000 - }) + // uni.showToast({ + // icon: 'error', + // title: '已有本周或下周计划', + // duration: 2000 + // }) }) // }else{ // 创建下周计划 // } @@ -234,7 +235,7 @@ function handleEdit(index) { // console.log(JSON.stringify(formData)) console.log(route.path, formData, "前往修改页面"); const editFields = [OrdinalDate[index], WorkType[index], WorkEvent[index]]; - let userName = userInfo.value.nickName || userInfo.value.userName; + let userName = null; // userInfo.value.userName || userInfo.value.nickName; handlePlanEdit({userName, formData, editFields}, false); } @@ -268,9 +269,14 @@ function handleEdit(index) { } .white-bg.white-bg-2 { - margin-bottom: 20rpx; + /* margin-bottom: 20rpx; */ +} +.bottom-spliter{ + height: 20rpx; +} +.bg-gray{ + background-color: #f0f0f0; } - .report-list .w-b-title .btn-edit { background-color: #5C96F7; } @@ -280,14 +286,14 @@ function handleEdit(index) { } .nav-list { -/* display: flex;*/ -/* width: 690rpx;*/ + /* display: flex;*/ + /* width: 690rpx;*/ overflow-x: auto; /* 允许横向滚动 */ /*overflow-y: hidden; 隐藏垂直滚动 */ /*-ms-overflow-style: none; IE 隐藏滚动条 */ - /* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */ + /* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */ /* 添加高度以确保有足够的空间 */ -/* height: 80rpx;*/ + /* height: 80rpx;*/ white-space: nowrap; /* 保持子元素在同一行显示 */ /* 添加这些属性确保滚动正常工作 */ scroll-behavior: smooth; @@ -304,7 +310,7 @@ function handleEdit(index) { } .nav-list .nav-item { /* flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */ -/* width: 200rpx;*/ + /* width: 200rpx;*/ display: inline-block; background-color: #05A3F4; border-radius: 10rpx; diff --git a/src/pages/business/CRM/plan/planEdit.vue b/src/pages/business/CRM/plan/planEdit.vue index c36e3e2..cf37728 100644 --- a/src/pages/business/CRM/plan/planEdit.vue +++ b/src/pages/business/CRM/plan/planEdit.vue @@ -4,7 +4,7 @@