Merge remote-tracking branch 'origin/develop-718' into develop-718

server/index.js

@@ -23,7 +23,7 @@ app.get('/api/captchaImage', (req,res,next) =>{
 // 获取验证码
 app.post('/api/sendSms', (req, res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             verifyCode:'123456'
         },
@@ -35,7 +35,7 @@ app.post('/api/sendSms', (req, res) => {
 app.post('/api/user/login',(req,res,next) => {
     const { loginType,phone,verifyCode,username, password } = req.body;
     let retObj = {
-        code: 200,
+        code: 0,
         message: '登录成功',
         data: {
           'id': '@id',
@@ -82,7 +82,7 @@ app.post('/api/getUserInfo', (req,res) => {
     // console.log("req=>",req)
     // reqBody = JSON.parse(req.body)
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             'id': '@id',
             'name': '小北',
@@ -99,7 +99,7 @@ app.post('/api/getUserInfo', (req,res) => {
 // 搜索功能
 app.post('/api/search', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             'id': '@id',
             'content': '@cname',
@@ -110,7 +110,7 @@ app.post('/api/search', (req,res) => {
 // 查询企业日常 Daily business
 app.post('/api/businessDaily', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             list:[
                 {id:1,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
@@ -177,7 +177,7 @@ app.post('/api/backBlogCount', (req,res) => {
 // 首页通知消息跑马灯
 app.post('/api/swiperList', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: ["祝贺“友晟夏季封装外壳发布会”圆满成功","祝贺“友晟科技发布会”圆满成功","祝贺“友晟夏季封装外壳发布会”圆满成功"]
     }))
 });
@@ -186,7 +186,7 @@ app.post('/api/swiperList', (req,res) => {
 // 首页日程提醒
 app.post('/api/stepData', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             date:new Date().getTime(),
             list:[
@@ -200,7 +200,7 @@ app.post('/api/stepData', (req,res) => {
 // 首页销售任务
 app.post('/api/salesTask', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             salesList:['2025-3季度', '2025-2季度', '2025-1季度'],
             percentNum:82,
@@ -213,7 +213,7 @@ app.post('/api/salesTask', (req,res) => {
 // 首页常用服务
 app.post('/api/commonServices', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             list:[
                 {id:1,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
@@ -229,7 +229,7 @@ app.post('/api/commonServices', (req,res) => {
 // 新闻列表
 app.post('/api/newsQueryList', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             list:[
                 {id:1,date:'2025-06-29',name:'友晟亮相2025慕尼黑上海电子展',imgSrc:'https://img2.baidu.com/it/u=363858033,1221485415&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1067'},
@@ -246,7 +246,7 @@ app.post('/api/noticeList', (req,res) => {
     let param = req.body;
     if(param.pageIndex==1){
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[
                     {id:1,date:'2025-06-30',isReady:true,title:'临时调整本周工作时间的通知',imgSrc:'static/images/notice/icon-TiXing@2x.png'},
@@ -269,7 +269,7 @@ app.post('/api/noticeList', (req,res) => {
         }))
     }else if(param.pageIndex==2){
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[
                     {id:11,date:'2025-09-09 15:36:00',isReady:true,title:'祝贺“友晟夏季封装外壳发布会”圆满成功',imgSrc:'static/images/notice/icon-TongZhi@2x.png'},
@@ -282,7 +282,7 @@ app.post('/api/noticeList', (req,res) => {
         }))
     }else{
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[],
                 totalCount:14
@@ -298,7 +298,7 @@ app.post('/api/visitorReportList', (req,res) => {
     // console.log(param)
     if(param.pageIndex==1){
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[
                     {
@@ -357,7 +357,7 @@ app.post('/api/visitorReportList', (req,res) => {
         }))
     }else if(param.pageIndex==2){
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[
                     {
@@ -386,7 +386,7 @@ app.post('/api/visitorReportList', (req,res) => {
         }))
     }else{
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[],
                 totalCount:14
@@ -399,7 +399,7 @@ app.post('/api/visitorReportList', (req,res) => {
 // 客户列表
 app.post('/api/guestList', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             list:[
                 {id:1,name:'西安微电子技术研究所'},
@@ -416,7 +416,7 @@ app.post('/api/visitorReportDetail', (req,res) => {
     let param = req.body;
     // console.log(111,param.id)
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             activeObj:{
                 id:1,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
@@ -437,7 +437,7 @@ app.post('/api/mattersList', (req,res) => {
     // console.log(param)
     if(param.pageIndex==1){
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[
                     { id:1,status:1,statusName:'待王彦琳审核',title:'西安微电子技术研究所',desc:'a该企业产品线技术改造延期，本月设备供应周期预 计延长7-15天。' },
@@ -456,7 +456,7 @@ app.post('/api/mattersList', (req,res) => {
         }))
     }else if(param.pageIndex==2){
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[
                     { id:11,status:1,statusName:'待王彦琳审核',title:'北京中科睿信科技有限公司',desc:'该企业产品线技术改造延期，本月设备供应周期预 计延长7-15天。' },
@@ -469,7 +469,7 @@ app.post('/api/mattersList', (req,res) => {
         }))
     }else{
         res.json(Mock.mock({
-            code: 200,
+            code: 0,
             data: {
                 list:[],
                 totalCount:14

src/api/crm/plan/getPlan.js

@@ -0,0 +1,36 @@
+import request from "@/utils/request"
+
+export function getPersonalPlanList(params) {
+    return request.post({
+        url: '/getPersonalPlanList',
+        params
+    })
+}
+
+export function getUserInfo(data) {
+    return request.get({
+        url: '/app/user/getUserInfo',
+        data
+    }, {isTransformResponse: false})
+}
+//获取所有人周计划列表
+export function getAllWeekPlanList(params){
+    return request.get({
+        url: '/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',
+        data: params
+    },{isTransformResponse: false})
+}

src/api/crm/plan/updatePlan.js

@@ -0,0 +1,28 @@
+import request from "@/utils/request"
+
+export function updateWeekPlanList(data){
+    return request.post({
+        url: '/app/appWeeklyPlan/updateWeekly',
+        data: data,
+        header: {
+            'Content-Type': 'application/json;charset=UTF-8'
+        }
+    })
+}
+// 判断本周是否写过计划
+export function judgeThisWeek (data){
+    return request.post({
+        url: '/app/appWeeklyPlan/Judgethisweek',
+        data,
+        header: {'Content-Type': 'application/json;charset=UTF-8'}
+    })
+}
+
+// 新增周计划
+export function addPlan(data){
+    return request.post({
+        url: '/app/appWeeklyPlan/addComment',
+        data,
+        header:{'Content-Type': 'application/json;charset=UTF-8'}
+    })
+}

src/pages.json

@@ -7,7 +7,6 @@
 		}
 	},
 	"pages": [
-
 		{
 			"path": "pages/loading/loading",
 			"style": {
@@ -167,6 +166,42 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/business/CRM/plan/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+        {
+			"path": "pages/business/CRM/plan/myPlan",//我的计划列表
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/plan/planEdit",//计划修改
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/plan/planView",//周计划查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/customerAdd",//客户人员新增
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/selectCustomer",//选择客户
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/business/CRM/vistorCheckin",//签到打卡
 			"style": {
@@ -200,108 +235,7 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		},
+		}
-		//===================================活动报告====================
-		{
-			"path": "pages/business/CRM/marketActivity/visitReport",//市场信息管理
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/visitorReportAdd",//走访报告添加
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/visitReportView",//走访报告查看
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/visitReportDetail",//走访报告查看具体明细
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/auditReport",//走访报告审批列表查看
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/detailForApproval",//走访报告明细审批
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/visitorReportEnter",//走访报告内容录入
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/auditReject",//走访报告驳回输入原因
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/customerUserList",//客户公司人员信息
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/myUserList",//我公司人员信息
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/activityTypeList",//活动类型
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketActivity/chooseCus",//选择客户单位
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//====================地图======
-		{
-			"path": "pages/business/CRM/map/vistorCheckin",//签到打卡
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/map/addRearkSignIn",//签到备注
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/map/checkInView",//打卡信息（考勤查看）
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/map/checkinStatistics",//打卡统计
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-
-
-		//===================================活动报告====================
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

src/pages/business/CRM/plan/dataMap.js

@@ -0,0 +1,59 @@
+const ordinals = [
+    "firstDayOfThe", // 第1天
+    "secondDayOfThis", // 第2天
+    "thirdDayOfThe", // 第3天
+    "fourthDayOfThe", // 第4天
+    "fifthDayOfThe", // 第5天
+    "sixthDayOfThe", // 第6天
+    "seventhDayOfThe", // 第7天
+]
+const week = [
+    "Monday", // 周一
+    "Tuesday", // 周二
+    "Wednesday", // 周三
+    "Thursday", // 周四
+    "Friday", // 周五
+    "Saturday", // 周六
+    "Sunday", // 周日
+]
+const weekCN = [
+    "一",
+    "二",
+    "三",
+    "四",
+    "五",
+    "六",
+    "日"
+]
+export const WORK_TYPE = [ // 工作类型
+    "外出",
+    "出差",
+    "公司",
+    "办事处",
+    "请假",
+    "法定假日"
+];
+export const COLOR_MAP = {
+    "外出": "#04C660",
+    "出差": "#41b883",
+    "公司": "#20A0F1",
+    "办事处": "#307af5",
+    "请假": "#f2c55c",
+    "法定假日": "#e88f89",/*#ED8A73*/
+    "null": "#e7e7e7"
+};
+// 地区/部门
+export const AreaList = [
+    "北京",
+    "市场二部",
+    "南区",
+    "北区",
+    "西区",
+    "市场三部"
+];
+
+export const OrdinalDate = ordinals.map(item => `${item}Week`);
+export const WeekCN = weekCN.map(item => `星期${item}`);
+export const WeekShortCN = weekCN.map(item => `周${item}`);
+export const WorkType = week.map(item => `typeOf${item}`);
+export const WorkEvent = week.map(item => `eventOf${item}`);

src/pages/business/CRM/plan/dateTimeUtils.js

@@ -0,0 +1,153 @@
+/**
+ * 获取当前是本月第几周
+ * @returns {number}
+ */
+export function getCurrentWeekNum() {
+    // 获取当前日期
+    var currentDate = new Date();
+
+    // 获取本月的第一天
+    var firstDayOfMonth = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1);
+
+    // 获取本月的第一天是星期几
+    var firstDayOfWeek = firstDayOfMonth.getDay();
+
+    // 计算当前日期是本月的第几周
+    var weekNumber = Math.ceil((currentDate.getDate() + firstDayOfWeek) / 7);
+
+    // console.log("当前时间是本月的第 " + weekNumber + " 周");
+    return weekNumber;
+}
+
+/**
+ * 获取一周日期
+ * @param weekType 本周/下周
+ * @returns {{year, month, firstDayOfTheWeek, secondDayOfThisWeek, thirdDayOfTheWeek, fourthDayOfTheWeek, fifthDayOfTheWeek, sixthDayOfTheWeek, seventhDayOfTheWeek}}
+ */
+export function getWeek2(weekType) {
+    console.log(weekType, 888888888);
+    var date = [];
+    let weekIndex = new Date().getDay();
+    //可得到当前日期以及之前的
+    for (let i = weekIndex - 1; i >= 0; i--) {
+        if (weekType === '本周') {
+            date.push(getNowWeek(-i))
+        } else {
+            date.push(getNextWeek(-i))
+        }
+    }
+    for (let i = 1; i <= 7 - weekIndex; i++) {
+        if (weekType === '本周') {
+            date.push(getNowWeek(i))
+        } else {
+            date.push(getNextWeek(i))
+        }
+    }
+    return {
+        year: date[0].year,
+        month: date[0].month,
+        day: date[0].day,
+        firstDayOfTheWeek: date[0].result,
+        secondDayOfThisWeek: date[1].result,
+        thirdDayOfTheWeek: date[2].result,
+        fourthDayOfTheWeek: date[3].result,
+        fifthDayOfTheWeek: date[4].result,
+        sixthDayOfTheWeek: date[5].result,
+        seventhDayOfTheWeek: date[6].result
+    }
+
+}
+
+//本周日期
+export function getNowWeek(day) {
+    var today = new Date();
+    var ts = today.getTime();//转化为时间戳毫秒数
+    var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
+    today.setTime(targetday_milliseconds);
+    var tYear = today.getFullYear();
+    var tMonth = today.getMonth();
+    var tDate = today.getDate();
+    tMonth = tMonth + 1;
+    tDate = tDate;
+    //ios的格式判断
+    if (uni.getSystemInfoSync().platform == 'ios') {
+        //周几
+        let time = tYear + "-" + tMonth + "-" + tDate
+        let weekIndex = new Date(time).getDay();
+        //改变今天的选中状态
+        var d = new Date()
+        var days = d.getDate()
+        let daylist = {
+            day: tDate, // 天
+            isToday: tDate == days ? true : false, // 是否选中
+            month: tMonth, // 月份
+            result: tYear + "-" + tMonth + "-" + tDate, // 日期整体值
+            week: weekIndex, //星期
+            year: tYear, // 年份
+        }
+        return daylist
+    } else {
+        //周几
+        let time = tYear + "-" + tMonth + "-" + tDate
+        let weekIndex = new Date(time).getDay();
+        //改变今天的选中状态
+        var d = new Date()
+        var days = d.getDate()
+        let daylist = {
+            day: tDate, // 天
+            isToday: tDate == days ? true : false, // 是否选中
+            month: tMonth, // 月份
+            result: tYear + "-" + tMonth + "-" + tDate, // 日期整体值
+            week: weekIndex, //星期
+            year: tYear, // 年份
+        }
+        return daylist
+    }
+}
+
+//下周日期
+export function getNextWeek(day) {
+    var today = new Date();
+    var ts = today.getTime();//转化为时间戳毫秒数
+    var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
+    today.setTime(targetday_milliseconds + 1000 * 60 * 60 * 24 * 7);
+    var tYear = today.getFullYear();
+    var tMonth = today.getMonth();
+    var tDate = today.getDate();
+    tMonth = tMonth + 1;
+    tDate = tDate;
+    //ios的格式判断
+    if (uni.getSystemInfoSync().platform == 'ios') {
+        //周几
+        let time = tYear + "-" + tMonth + "-" + tDate
+        let weekIndex = new Date(time).getDay();
+        //改变今天的选中状态
+        var d = new Date()
+        var days = d.getDate()
+        let daylist = {
+            day: tDate, // 天
+            isToday: tDate == days ? true : false, // 是否选中
+            month: tMonth, // 月份
+            result: tYear + "-" + tMonth + "-" + tDate, // 日期整体值
+            week: weekIndex, //星期
+            year: tYear, // 年份
+        }
+        return daylist
+    } else {
+        //周几
+        let time = tYear + "-" + tMonth + "-" + tDate
+        let weekIndex = new Date(time).getDay();
+        //改变今天的选中状态
+        var d = new Date()
+        var days = d.getDate()
+        let daylist = {
+            day: tDate, // 天
+            isToday: tDate == days ? true : false, // 是否选中
+            month: tMonth, // 月份
+            result: tYear + "-" + tMonth + "-" + tDate, // 日期整体值
+            week: weekIndex, //星期
+            year: tYear, // 年份
+        }
+        return daylist
+    }
+}

src/pages/business/CRM/plan/index.vue

@@ -0,0 +1,108 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <customHeader ref="customHeaderRef" :title="'计划表'" :leftFlag="true">
+      </customHeader>
+      <!-- #ifdef H5 -->
+      <view style="height:50rpx"></view>
+      <!-- #endif -->
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <view class="white-bg">
+        <navigator url="/pages/business/CRM/plan/myPlan">
+          <view class="list-item item-padding">
+            <img class="l-icon" :src="'static/images/business/icon-zfsp.png'"/>
+            <text>我的计划</text>
+            <view class="list-right">
+              <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+            </view>
+          </view>
+        </navigator>
+        <view class="item-border"></view>
+        <navigator url="/pages/business/CRM/plan/planView">
+          <view class="list-item item-padding">
+            <img class="l-icon" :src="'static/images/business/icon-jhck.png'"/>
+            <text>计划查看</text>
+            <view class="list-right">
+              <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+            </view>
+          </view>
+        </navigator>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref, onMounted} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import {getNavBarPaddingTop} from '@/utils/system.js'
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+</script>
+
+<style scoped>
+
+.head-pic .head-right img {
+  display: block;
+  width: 28rpx;
+  height: 25rpx;
+  margin-left: auto;
+  margin-top: 2px;
+}
+
+.backlog-b-item img {
+  width: 90rpx;
+  height: 90rpx;
+  margin: 0 auto 10rpx;
+  display: block;
+}
+
+.white-bg {
+  width: 590rpx; /*690*/
+  padding: 30rpx 50rpx;
+}
+
+.list-item {
+  display: flex;
+  align-items: center;
+  font-size: 32rpx;
+  border-radius: 8rpx;
+}
+
+.list-item.item-padding {
+  padding: 45rpx 0;
+}
+
+.list-item.item-padding:first-child {
+  padding-top: 20rpx;
+}
+
+.list-item.item-padding:last-child {
+  padding-bottom: 20rpx;
+}
+
+.item-border {
+  height: 1px;
+  background-color: #E7E7E7;
+  width: 640rpx;
+}
+
+.list-item .l-icon {
+  width: 90rpx;
+  height: 90rpx;
+  margin-right: 20rpx;
+}
+
+.list-item .list-right {
+  margin-left: auto;
+  display: flex;
+  align-items: center;
+}
+
+</style>

src/pages/business/CRM/plan/myPlan.vue

@@ -0,0 +1,330 @@
+<!--
+* @Description 我的计划列表
+ -->
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'周计划列表'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="handleCreate">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>
+            新增
+          </view>
+        </template>
+      </customHeader>
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height"></view>
+
+      <view class="week-plan-title">
+        <view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <view v-if="weekNum">
+          {{ yearMonth }}
+          <view v-if="isThisWeek" style=" display: inline-block;">
+            <strong>本周</strong>
+          </view>
+          <view v-else style="display: inline-block"> 第 <strong>{{ weekNum }}</strong> 周</view>
+        </view>
+      </view>
+
+      <view class="nav-list">
+          <view class="nav-item" :class="{active:index==activeTab}"
+                    v-for="(item,index) in allPlans" :key="index"
+                    @click="handleNav(index)"
+        >{{ getTapLabel(item) }}
+        </view>
+      </view>
+
+      <block v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="item">
+        <!-- 计划详情 -->
+        <view class="white-bg white-bg-2" :class="index == 0 ? 'white-bg-r' : ''">
+          <view class="report-list">
+            <view class="w-b-title">
+              <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
+              <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
+            </view>
+            <view class="r-list">
+              <view class="r-left">工作类型</view>
+              <view class="r-right">{{ getWorkType(index) || '' }}</view>
+            </view>
+            <view class="border-bottom b-width"></view>
+            <view class="r-list">
+              <view class="r-left">内容</view>
+              <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
+            </view>
+          </view>
+        </view>
+      </block>
+
+      <!-- 底部加高度来避免tabbar遮挡 -->
+      <view class="bottom-height"></view>
+    </view>
+
+
+  </view>
+</template>
+
+<script setup>
+
+import {onMounted, ref, reactive, computed} from "vue";
+import {useRoute} from "vue-router"
+import customHeader from '@/components/customHeader.vue'
+import {WeekCN, WorkType, WorkEvent, OrdinalDate} from "./dataMap";
+import {getCurrentWeekNum} from "./dateTimeUtils";
+import {getUserInfo, getWeeklyPlanList} from "@/api/plan/getPlan";
+import {useMessage} from "@/utils/message";
+import {judgeThisWeek} from "@/api/plan/updatePlan";
+
+const userInfo = ref(null)
+const route = useRoute();
+userInfo.value = {
+  nickName: '',
+  userName: ''
+}
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10
+});
+const date = new Date(); // 当前日期
+const activeTab = ref(0);
+const yearMonth = ref(null);
+const weekNum = ref(0);
+const allPlans = ref([]);
+const onShowPlan = ref(null);
+const message = useMessage();
+
+let getWorkDate = (index) => {
+  return onShowPlan.value ? onShowPlan.value[OrdinalDate[index]] : '';
+};
+let getWorkType = (index) => {
+  return onShowPlan.value ? onShowPlan.value[WorkType[index]] : '';
+};
+let getWorkEvent = (index) => {
+  return onShowPlan.value ? onShowPlan.value[WorkEvent[index]] : '';
+};
+// 刷新计划列表
+const refreshPlanList = () => {
+  message.showLoading();
+  // 获取用户信息
+  getUserInfo().then(res => {
+    userInfo.value = res.user;
+    console.log(route.path, "：用户信息获取成功");
+  }).catch(err => {
+    console.warn(err, "用户信息获取失败")
+  });
+  // 获取周计划列表
+  getWeeklyPlanList(queryParams.value).then(res => {
+    const {rows} = res;
+    if (rows.length > 0) {
+      allPlans.value = rows;
+      onShowPlan.value = rows[0];
+      weekNum.value = rows[0].date;
+      yearMonth.value = rows[0].firstDayOfTheWeek.substring(0, 7);
+    }
+    console.log(route.path, "：用户周计划列表获取成功");
+  }).catch(err => {
+    console.warn(err, "用户周计划列表获取失败");
+    message.error("周计划获取失败");
+  }).finally(() => {
+    message.hideLoading();
+  })
+}
+
+onMounted(() => {
+  refreshPlanList();
+})
+
+// 判断计划是否为本周
+let isThisWeek = computed(() => {
+  let theYear = onShowPlan.value.year || onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
+  weekNum.value = onShowPlan.value.date; // 当目前展示的计划列表变化时，更新weekNum.value
+  yearMonth.value = onShowPlan.value.firstDayOfTheWeek.substring(0, 7); // 获取年月
+  return date.getFullYear() === parseInt(theYear) &&
+      date.getMonth() + 1 === onShowPlan.value.month &&
+      getCurrentWeekNum() === onShowPlan.value.date;
+})
+
+// 跳转到计划编辑页
+function handlePlanEdit(param, isAdd) {
+  // 在起始页面跳转到planEdit.vue页面，并监听planEdit.vue发送过来的事件数据
+  uni.navigateTo({
+    url: '/pages/business/CRM/plan/planEdit',
+    events: {
+      // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
+      // 监听页面返回事件，用于刷新数据
+      refreshData: function () {
+        refreshPlanList(); // 页面返回时调用刷新函数
+      }
+    },
+    success: function (res) {
+      // 通过eventChannel向被打开页面传送数据
+      res.eventChannel.emit('editPlanData', {param, isAdd})
+    }
+  })
+}
+
+// 创建计划
+function handleCreate() {
+  console.log("handleCreate", "前往增加计划");
+  const itemList = ["本周", "下周"];
+  uni.showActionSheet({
+    itemList,
+    success(result) {
+      // console.log("选择"+itemList[res.tapIndex])
+      // if(res.tapIndex == 0){ // 创建本周计划
+      judgeThisWeek({
+        month: new Date().getMonth() + 1,
+        date: getCurrentWeekNum()
+      }).then((res) => {
+        console.log(res, "可以创建周计划")
+        handlePlanEdit({itemList, selectIndex: result.tapIndex}, true);
+      }).catch((err) => {
+        console.warn(err, "已存在周计划")
+        uni.showToast({
+          icon: 'error',
+          title: '已有本周或下周计划',
+          duration: 2000
+        })
+      })
+      // }else{ // 创建下周计划
+      // }
+    },
+    fail(err) {
+
+    }
+  })
+
+}
+
+// 获取计划时间段
+function getTapLabel(row) {
+  return row.firstDayOfTheWeek.substring(0, 4) + '年' + row.month + '月 第' + row.date + '周';
+}
+
+// 选中计划时间段
+function handleNav(index) {
+  console.log(index, "tab更换时间段");
+  activeTab.value = index;
+  onShowPlan.value = allPlans.value[index]; // 更新计划列表视图
+}
+
+// 修改计划
+function handleEdit(index) {
+  const {
+    planId, // 主键ID
+    year, // 年
+    month, // 月
+    date, // 周
+    planDateId, // 周计划ID
+  } = onShowPlan.value;
+
+  let formData = {
+    planId, year, month, date, planDateId
+  };
+
+  for (let i = 0; i < OrdinalDate.length; i++) {
+    // 周一到周日的日期
+    formData[OrdinalDate[i]] = getWorkDate(i);
+    // 周一到周日的工作类型
+    formData[WorkType[i]] = getWorkType(i);
+    // 周一到周日的工作内容
+    formData[WorkEvent[i]] = getWorkEvent(i);
+  }
+
+  // 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;
+  handlePlanEdit({userName, formData, editFields}, false);
+}
+
+
+</script>
+
+<style scoped>
+.week-plan-title {
+  color: #fff;
+  padding: 0 30rpx 30rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.white-bg {
+  width: 690rpx;
+  margin: 0;
+  border-radius: 0;
+}
+
+.white-bg-r {
+  width: 690rpx;
+  margin: 0;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.white-bg .w-b-title {
+  color: #3384DF;
+  font-size: 38rpx;
+}
+
+.white-bg.white-bg-2 {
+  margin-bottom: 20rpx;
+}
+
+.report-list .w-b-title .btn-edit {
+  background-color: #5C96F7;
+}
+
+.con-bg {
+  height: 445rpx;
+}
+
+.nav-list {
+/*  display: flex;*/
+/*  width: 690rpx;*/
+  overflow-x: auto;   /* 允许横向滚动 */
+  /*overflow-y: hidden;  隐藏垂直滚动 */
+  /*-ms-overflow-style: none;   IE 隐藏滚动条 */
+ /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
+  /* 添加高度以确保有足够的空间 */
+/*  height: 80rpx;*/
+  white-space: nowrap; /* 保持子元素在同一行显示 */
+  /* 添加这些属性确保滚动正常工作 */
+  scroll-behavior: smooth;
+  /* #ifdef APP-PLUS */
+  padding: 80rpx 30rpx 0;
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  padding: 20rpx 30rpx 0;
+  /* #endif */
+}
+/* 为 Webkit 浏览器隐藏滚动条 */
+.nav-list::-webkit-scrollbar {
+  background-color: transparent;
+}
+.nav-list .nav-item {
+  /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
+/*  width: 200rpx;*/
+  display: inline-block;
+  background-color: #05A3F4;
+  border-radius: 10rpx;
+  color: #FFFFFF;
+  font-size: 28rpx;
+  text-align: center;
+  padding: 10rpx 25rpx;
+  margin-right: 15rpx;
+  margin-bottom: 20rpx;
+  white-space: nowrap;
+}
+
+/*.nav-list .nav-item:nth-child(3n){
+  margin-right:0;
+}*/
+
+.nav-list .nav-item.active {
+  background-color: #fff;
+  color: #3384DF;
+  font-weight: bold;
+}
+
+</style>

src/pages/business/CRM/plan/planEdit.vue

@@ -0,0 +1,329 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="title" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="submitForm" v-if="userInfo.nickName || userInfo.userName">
+            <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+                       color="#B7D2FF"></uni-icons>
+            保存
+          </view>
+        </template>
+      </customHeader>
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height"></view>
+
+      <!-- 正文内容 -->
+      <view class="week-plan-title">
+        <view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
+      </view>
+      <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">
+        <block v-for="(item, index) in OrdinalDate">
+          <view class="white-bg" :class="index==0?'white-bg-2':'white-bg-3'">
+            <view class="w-b-title" @click="handleExpand(index)">
+              {{ weekPlanFormData[item] }} {{ WeekCN[index] }}
+              <text>{{ expandFlag[index] ? '收起' : '展开' }}
+                <i :class="{iconfont:true,'icon-up':expandFlag[index],'icon-down':!expandFlag[index]}"></i>
+              </text>
+            </view>
+
+            <view v-show="expandFlag[index]" class="form-con">
+              <uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays">
+                <view class="form-picker">
+                  <picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)">
+                    <view class="flex">
+                      {{ weekPlanFormData[getTypeField(index)] }}
+                      <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                    </view>
+                  </picker>
+                </view>
+              </uni-forms-item>
+              <uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays">
+                <uni-easyinput type="textarea" autoHeight v-model="weekPlanFormData[getEventField(index)]"
+                               placeholder="请输入" class="form-texarea"/>
+              </uni-forms-item>
+            </view>
+
+          </view>
+        </block>
+      </uni-forms>
+
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref, reactive, onMounted, getCurrentInstance, computed} from 'vue'
+import {OrdinalDate, WorkEvent, WorkType, WORK_TYPE, WeekCN} from "./dataMap";
+import customHeader from '@/components/customHeader.vue'
+import {useRoute} from "vue-router"
+import {useMessage} from "@/utils/message";
+import {onLoad} from "@dcloudio/uni-app";
+import {updateWeekPlanList, addPlan} from "@/api/plan/updatePlan";
+import {getUserInfo} from "@/api/plan/getPlan";
+import {getDate} from "@/utils/datetime";
+import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils";
+
+const message = useMessage();
+// 当前页面路由
+const route = useRoute();
+// 当前编辑周期
+const currentEditDate = ref({
+  yearMonth: '',
+  weekNum: 0
+});
+// 用户信息
+const userInfo = ref({nickName: null, userName: null});
+// 编辑模式
+const isAdd = ref(true);
+// 标题
+const title = ref("修改周计划");
+// 表单项展开状态
+const expandFlag = ref([true, true, true, true, true, true, true]);
+// 表单ref
+const formRef = ref(null);
+// 工作类型的index
+const workTypeIndex = ref({});
+// 表单数据
+const weekPlanFormData = ref({
+  // planId: 0, // 主键ID
+  // planDateId: 0, // 周计划ID
+
+  year: 0, // 年
+  month: 0, // 月
+  date: 0, // 周
+
+  firstDayOfTheWeek: null, // 周一日期
+  secondDayOfThisWeek: null, // 周二日期
+  thirdDayOfTheWeek: null, // 周三日期
+  fourthDayOfTheWeek: null, // 周四日期
+  fifthDayOfTheWeek: null, // 周五日期
+  sixthDayOfTheWeek: null, // 周六日期
+  seventhDayOfTheWeek: null, // 周日日期
+
+  typeOfMonday: null, // 周一工作类型
+  typeOfTuesday: null, // 周二工作类型
+  typeOfWednesday: null, //周三工作类型
+  typeOfThursday: null, // 周四工作类型
+  typeOfFriday: null, // 周五工作类型
+  typeOfSaturday: null, // 周六工作类型
+  typeOfSunday: null, // 周日工作类型
+
+  eventOfMonday: null, // 周一工作内容
+  eventOfTuesday: null, // 周二工作内容
+  eventOfWednesday: null, // 周三工作内容
+  eventOfThursday: null, // 周四工作内容
+  eventOfFriday: null, // 周五工作内容
+  eventOfSaturday: null, // 周六工作内容
+  eventOfSunday: null // 周日工作内容
+});
+
+// 校验规则
+const rules = reactive({});
+// 工作日数量
+const workDays = 5;
+// const instance = getCurrentInstance().proxy;
+let instance = null;
+// 初始化创建任务
+let initCreate = (params)=>{
+  const {itemList, selectIndex} = params;
+  // 获取用户信息
+  getUserInfo().then(res => {
+    userInfo.value = res.user;
+    console.log(route.path, "：用户信息获取成功");
+  }).catch(err => {
+    console.warn(err, "用户信息获取失败")
+  });
+  console.log(route.path,`：创建${itemList[selectIndex]}计划`);
+  title.value="创建周计划";
+  currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月
+  currentEditDate.value.weekNum = getCurrentWeekNum() + selectIndex; // 取巧做法，当期周则selectIndex为0，下周则selectIndex为1，用加法处理
+  const week = getWeek2(itemList[selectIndex]); // 获取本周/下周一周日期
+  // weekPlanFormData.value.year = getDate({format:true}).substring(0, 4); // 年份
+  // weekPlanFormData.value.month = parseInt(currentEditDate.value.yearMonth.substring(5, 7)); // 月份
+  weekPlanFormData.value.date = getCurrentWeekNum() + selectIndex; // 第几周
+  const {year, month} = week;
+  weekPlanFormData.value.year = year;
+  weekPlanFormData.value.month = month;
+  for(let index in OrdinalDate){
+    let dateField = getDateField(index);
+    weekPlanFormData.value[dateField] = week[dateField];
+    // console.log(week[dateField]);
+    if(index>=workDays){
+      let typeField = getTypeField(index);
+      weekPlanFormData.value[typeField] = "法定假日"; // TODO: 换成更规范代码
+      workTypeIndex.value[typeField] = WORK_TYPE.indexOf("法定假日");
+    }
+  }
+  console.log(weekPlanFormData.value);
+}
+onLoad((options) => {
+  // console.log(options); // 参数
+  // console.log(route.path, "：计划编辑页面");
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('editPlanData', (data) => {
+    isAdd.value = data.isAdd;
+    if (!data.isAdd) {
+      let {userName, formData, editFields} = data.param;
+      console.log(route.path, userName, formData, editFields, "计划编辑页读取到参数");
+      weekPlanFormData.value = formData;
+      userInfo.value.userName = userName;
+      currentEditDate.value.yearMonth = formData.firstDayOfTheWeek.substring(0, 7);
+      currentEditDate.value.weekNum = formData.date; // 周数
+      // for(let typeField of WorkType){
+      //   workTypeIndex.value[typeField] = WORK_TYPE.indexOf(formData[typeField]);
+      // }
+      for (let index in OrdinalDate) {
+        expandFlag.value[index] = editFields.includes(getTypeField(index)) || editFields.includes(getEventField(index));
+        // console.log(index, expandFlag.value[index], "展开状态");
+      }
+    }else{
+      initCreate(data.param);
+    }
+
+  })
+});
+
+// 工作日期的field
+function getDateField(index) {
+  return OrdinalDate[index]
+}
+
+// 工作类型的field
+function getTypeField(index) {
+  return WorkType[index]
+}
+
+// 工作内容的field
+function getEventField(index) {
+  return WorkEvent[index];
+}
+
+// 初始化校验规则
+(function bindRules(){
+  for (let i in WorkType) {
+    if (i < workDays) {
+      rules[getTypeField(i)] = {
+        rules: [{
+          required: true,
+          errorMessage: '请选择工作类型',
+          trigger: 'blur'
+        }]
+      }
+    }
+  }
+  for (let i in WorkEvent) {
+    if (i < workDays) {
+      rules[getEventField(i)] = {
+        rules: [{
+          required: true,
+          errorMessage: '请输入工作内容',
+          trigger: 'blur'
+        }]
+      }
+    }
+  }
+  // console.log(rules, '初始化校验规则完成');
+})();
+
+// 展开事件
+function handleExpand(index) {
+  expandFlag.value[index] = !expandFlag.value[index];
+}
+
+// 选择工作类型
+const handleTypeChange = (e) => {
+  const {field} = e.target.dataset;
+  console.log("选中工作类型: ", WORK_TYPE[e.detail.value], "，更新类型字段: ", field);
+  workTypeIndex.value[field] = e.detail.value;
+  weekPlanFormData.value[field] = WORK_TYPE[e.detail.value];
+};
+
+// 保存
+const submitForm = async () => {
+  try {
+    // 验证表单
+    await formRef.value.validate()
+
+    // 验证通过后的操作
+
+    // console.log('表单数据:', weekPlanFormData.value);
+
+    // 这里可以添加提交到服务器的代码
+    if(!isAdd.value){ // 请求修改
+      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err=>{
+        message.error('操作失败!');
+        console.warn(err, "更新周计划失败");
+      })
+      message.success('修改成功!');
+      setTimeout(()=>{
+        const eventChannel = instance.getOpenerEventChannel();
+        eventChannel.emit('refreshData');
+        uni.navigateBack()
+      }, 500);
+    }else{ // 请求新增
+      console.log(weekPlanFormData.value,"新增计划");
+      let res = await addPlan(weekPlanFormData.value).catch(err=>{
+        message.error('操作失败!');
+        console.error(err, "周计划新增失败");
+      })
+      message.success('保存成功!');
+      setTimeout(()=>{
+        const eventChannel = instance.getOpenerEventChannel();
+        eventChannel.emit('refreshData');
+        uni.navigateBack()
+      }, 500);
+    }
+  } catch (err) {
+    uni.showToast({
+      icon:'none',
+      title:"请完善内容",
+      duration: 1500
+    })
+    console.log('表单验证失败:', err);
+  }
+};
+
+
+</script>
+
+<style scoped>
+.week-plan-title {
+  color: #fff;
+  padding: 0 30rpx 30rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.white-bg {
+  width: 690rpx;
+  margin: 0;
+  border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+  /*margin-bottom: 20rpx;*/
+}
+
+.white-bg.white-bg-3 {
+  border-top:  1rpx solid #E5E5E5;
+  border-radius: 0
+}
+
+.white-bg .w-b-title {
+  color: #3384DF;
+  font-size: 38rpx;
+}
+
+.form-con {
+  padding: 30rpx 0 0;
+}
+
+:deep(.form-con .uni-forms-item) {
+  margin-bottom: 22px !important;
+}
+
+</style>

src/pages/business/CRM/plan/planView.vue

@@ -0,0 +1,393 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'周计划表'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <!--          <view class="head-right" @click="handleAdd">
+                      <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>新增
+                    </view>-->
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view>
+
+        <!-- 搜索 -->
+        <view class="search">
+          <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate"
+                  @change="bindDateChange" class="picker-bg">
+            <view class="picker">
+              <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong" size="18"></uni-icons>
+              <view>{{ defaultDate }}</view>
+              <uni-icons type="down" size="18"></uni-icons>
+            </view>
+          </picker>
+          <picker @change="bindPickerChange" :value="areaIndex" :range="AreaList" class="picker-bg">
+            <view class="picker">
+              <uni-icons type="person" size="18"></uni-icons>
+              <view>{{ AreaList[areaIndex] }}</view>
+              <uni-icons type="down" size="18"></uni-icons>
+            </view>
+          </picker>
+          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+        </view>
+
+        <!-- 分页部分  -->
+<!--        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
+<!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
+<!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
+          <view class="white-bg" v-if="list.length">
+            <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
+            <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
+              {{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
+              <span class="line"></span>
+              {{searchValue.selectDate.substring(0, 4) }}年
+            </view>
+            <uni-row class="demo-uni-row">
+              <uni-col :span="1">
+                <view class="demo-uni-col right-radius">序号</view>
+              </uni-col>
+              <uni-col :span="2">
+                <view class="demo-uni-col left-radius">姓名</view>
+              </uni-col>
+              <block v-for="(field, i) in OrdinalDate">
+                <uni-col :span="3">
+                  <view class="demo-uni-col mar-left">
+                    <text>{{ WeekShortCN[i] }}</text>
+                    <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
+                  </view>
+                </uni-col>
+              </block>
+            </uni-row>
+            <block v-for="(item, index) in list" :key="index">
+              <uni-row class="demo-uni-row">
+                <uni-col :span="1">
+                  <view class="demo-uni-col right-radius">
+                    <text>{{ index + 1 }}</text>
+                  </view>
+                </uni-col>
+                <uni-col :span="2">
+                  <view class="demo-uni-col left-radius">
+                    <text>{{ item.nickName || item.userName }}</text>
+                  </view>
+                </uni-col>
+                <block v-for="(field, i) in WorkType">
+                  <uni-col :span="3">
+                    <view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
+                          :style="{ backgroundColor: COLOR_MAP[item[field]] }"
+                    ><!--@click="handleView(index, i)"-->
+                      <text>{{ item[field] }}</text>
+                    </view>
+                  </uni-col>
+                </block>
+              </uni-row>
+            </block>
+          </view>
+          <view v-else style="text-align: center; margin-top: 50%; color: white">
+            暂无数据
+          </view>
+<!--        </mescroll-uni>-->
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref, onMounted} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import {getNavBarPaddingTop} from '@/utils/system.js'
+import {getAllWeekPlanList} from "@/api/plan/getPlan";
+import {AreaList, COLOR_MAP, OrdinalDate, WeekShortCN, WorkEvent, WorkType} from "./dataMap";
+import {getCurrentWeekNum} from "./dateTimeUtils";
+import {getDate} from "@/utils/datetime";
+import {getWeekPlanListByDate} from "../../../../api/crm/plan/getPlan";
+
+// const currentYear = new Date().getFullYear();
+const currentMonth = new Date().getMonth() + 1;
+const currentWeekNum = getCurrentWeekNum();
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+  uni.showLoading({})
+  getPlanList().then(res=>{
+    let {total, rows} = res;
+    console.log(rows, "周计划数据获取成功")
+    list.value = rows;
+    uni.hideLoading();
+  })
+})
+
+// 开始时间
+let startDate = getDate('start');
+// 结束时间，间隔10年
+let endDate = getDate('end');
+let defaultDate = getDate({format: true})
+// 区域索引
+let areaIndex = ref(0);
+// 搜索内容
+let searchValue = ref({
+  selectDate: defaultDate,
+  region: AreaList[areaIndex.value]
+});
+
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+const upOption = ref({
+  page: {num: 0, size: 10},
+  noMoreSize: 5,
+  empty: {tip: '~ 空空如也 ~'},
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+
+// 获取数据列表
+const getPlanList = (month, date, pageIndex, pageSize) => {
+  return new Promise(async (resolve) => {
+    // 查询参数
+    let queryParams = {
+      month: month ? month : currentMonth,
+      date: date ? date : currentWeekNum,
+      pageNum: pageIndex ? pageIndex : 1,
+      pageSize: pageSize ? pageSize : 10
+    }
+
+    let {rows, total} = await getAllWeekPlanList(queryParams);
+    resolve({
+      rows,
+      total
+    });
+  });
+}
+
+// 搜索日期变更
+let bindDateChange = (e) => {
+  defaultDate = e.detail.value
+  searchValue.value.selectDate = e.detail.value;
+  handleSearch();
+}
+
+// 查询搜索跳转
+let handleSearch = () => {
+  console.log(searchValue.value, '查询参数')
+  uni.showLoading();
+  getWeekPlanListByDate(searchValue.value).then(res=>{
+    const {total, rows } = res;
+    list.value = rows;
+    console.log(rows, '查询成功');
+  }).catch(err=>{
+    console.warn(err,'数据获取失败');
+  }).finally(()=>{
+    uni.hideLoading();
+  })
+}
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+// 搜索区域变更
+const bindPickerChange = (e) => {
+  // console.log('picker发送选择改变，携带值为', peopleIndex.value)
+  areaIndex.value = e.detail.value
+  searchValue.value.region = AreaList[e.detail.value]
+  // 查询
+  handleSearch();
+}
+
+// 跳转到详情
+let handleDetail = (rowIndex, colIndex) => {
+  let detail = list.value[rowIndex];
+  let workDate = detail[OrdinalDate[colIndex]];
+  let workType = detail[WorkType[colIndex]];
+  let workEvent = detail[WorkEvent[colIndex]];
+  if(workType && workEvent){
+    uni.showModal({
+      title: `${workDate}\n${workType}`,
+      content: `${workEvent}`,
+      confirmText: '关闭',
+      showCancel: false,
+      maskClosable: true, // 允许点击蒙层关闭弹窗
+      success: function (res) {
+        if (res.confirm) {
+
+        } else if (res.cancel) {
+
+        }
+      }
+    })
+  }
+  else{
+    uni.showToast({
+      title: "暂无内容",
+      icon: "none",
+      duration: 1500
+    })
+  }
+}
+
+</script>
+
+<style lang="scss" scoped>
+.demo-uni-row {
+  margin-bottom: 4rpx;
+  /* QQ、抖音小程序文档写有 :host，但实测不生效 */
+  /* 百度小程序没有 :host，需要设置block */
+  /* #ifdef MP-TOUTIAO || MP-QQ || MP-BAIDU */
+  display: block;
+  /* #endif */
+}
+
+/* 支付宝小程序没有 demo-uni-row 层级 */
+/* 微信小程序使用了虚拟化节点，没有 demo-uni-row 层级 */
+/* #ifdef MP-ALIPAY || MP-WEIXIN */
+/deep/ .uni-row {
+  margin-bottom: 4rpx;
+}
+
+/* #endif */
+
+.search {
+  display: flex;
+  padding: 0 30rpx;
+  height: 68rpx;
+  overflow: hidden;
+}
+
+.search .btn-search {
+  border: none;
+  background: none;
+  line-height: normal;
+  color: #fff;
+  /*line-height: 56rpx !important;*/
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search .btn-search::after {
+  display: none;
+}
+
+.search .picker-bg {
+  display: flex;
+  flex-wrap: nowrap;
+  background-color: #6FA2F8;
+  border-radius: 25px;
+  color: #fff;
+  font-size: 28rpx;
+  padding: 0rpx 20rpx;
+  /* #ifndef APP-PLUS */
+  padding: 10rpx 20rpx 0 20rpx;
+  /* #endif */
+  margin-right: 20rpx;
+}
+
+.search .picker-bg .picker {
+  display: flex;
+  align-items: center;
+  /* #ifndef APP-PLUS */
+  padding-top: 2rpx;
+  /* #endif */
+}
+
+.search .picker-bg .picker .uni-icons {
+  color: #fff !important;
+}
+
+.search .picker-bg .picker .uni-icons:first-child {
+  margin-right: 10rpx;
+}
+
+.search .picker-bg .picker .uniui-down {
+  margin-left: 20rpx;
+}
+
+.line {
+  display: inline-block;
+  width: 10rpx;
+  border-right: solid gray 1rpx;
+  height: 20rpx;
+  margin-right: 10rpx;
+}
+
+.demo-uni-col {
+  height: 36px;
+  border-radius: 4px;
+  background-color: #E7E7E7;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  font-size: 30rpx;
+  line-height: 32rpx;
+  padding-top: 10rpx;
+  padding-bottom: 13rpx;
+  min-height: 130rpx;
+  overflow: hidden;
+}
+
+.mar-left {
+  margin-left: 5rpx;
+}
+
+.right-radius {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.left-radius {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.color-white {
+  color: white;
+}
+
+.white-bg {
+  width: 690rpx;
+  margin: 20rpx 0 0 0;
+  border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+  margin-bottom: 20rpx;
+}
+
+.white-bg.white-bg-3 {
+  border-radius: 0
+}
+
+.white-bg .w-b-title {
+  color: #3384DF;
+  font-size: 38rpx;
+}
+
+.form-con {
+  padding: 30rpx 0 0;
+}
+
+:deep(.form-con .uni-forms-item) {
+  margin-bottom: 22px !important;
+}
+/*.con-bg {
+  height: 420rpx;
+}*/
+</style>