Merge branch 'develop' of http://123.57.20.168:4000/admin/ys-app into develop

fix: 修复页面高度适配问题

.env.development

@@ -1,2 +1,16 @@
-# VITE_APP_BASE_URL = "http://192.168.20.191:3000"
+
-VITE_APP_BASE_URL = "http://123.57.20.168:3000"
+#调用后台地址
+# 贝英斯公司
+VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
+# VITE_APP_BASE_URL = "http://192.168.236.71:31302"
+# VITE_APP_BASE_URL = "http://123.57.20.168:3000"
+
+# 友晟test外网
+# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
+# 友晟test内网
+# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
+
+# 友晟线上内网
+# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
+# 友晟线上外网网
+# VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

.env.production

@@ -1 +1,16 @@
-VITE_APP_BASE_URL = "http://192.168.20.191:5173"
+
+#调用后台地址
+# 贝英斯公司
+VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
+# VITE_APP_BASE_URL = "http://192.168.236.71:31302"
+# VITE_APP_BASE_URL = "http://123.57.20.168:3000"
+
+# 友晟test外网
+# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
+# 友晟test内网
+# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
+
+# 友晟线上内网
+# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
+# 友晟线上外网
+# VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

.gitignore

@@ -8,6 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
+.hbuilderx
 .DS_Store
 dist
 *.local

.hbuilderx/launch.json

@@ -2,12 +2,20 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "standard",
+            "customPlaygroundType" : "local",
+            "packageName" : "com.ys718.app",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         },
         {
-            "openVueDevtools" : true,
+            "app" : {
-            "type" : "uni-app:h5"
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "provider" : "aliyun",
+            "type" : "uniCloud"
         }
     ]
 }

nativeplugins/Tm-TmSafeSaveFileModule/package.json

@@ -0,0 +1,29 @@
+{
+	"name": "TmSafeSaveFileModule隐私数据保存",
+	"id": "Tm-TmSafeSaveFileModule",
+	"version": "1.0.0",
+	"description": "TmSafeSaveFileModule隐私数据保存",
+	"_dp_type": "nativeplugin",
+	"_dp_nativeplugin": {
+		"android": {
+			 "plugins": [
+			        {
+			          "type": "module",
+			          "name": "Tm-TmSafeSaveFileModule",
+			          "class": "io.dcloud.uniplugin.safesave.TmSafeSaveFileModule"
+			        }
+		  	],
+			"abis": [
+				"armeabi-v7a",
+				"x86"
+			],
+			"minSdkVersion": "26",
+			"integrateType": "aar",
+			"dependencies": [
+				"androidx.security:security-crypto:1.1.0-alpha06"
+			],
+			"permissions": [
+			]
+		}
+	}
+}

package.json

@@ -40,36 +40,42 @@
     "build:quickapp-webview-union": "uni build -p quickapp-webview-union"
   },
   "dependencies": {
-    "@dcloudio/uni-app": "3.0.0-4070520250711001",
+    "@dcloudio/uni-app": "3.0.0-4070620250821001",
-    "@dcloudio/uni-app-harmony": "3.0.0-4070520250711001",
+    "@dcloudio/uni-app-harmony": "3.0.0-4070620250821001",
-    "@dcloudio/uni-app-plus": "3.0.0-4070520250711001",
+    "@dcloudio/uni-app-plus": "3.0.0-4070620250821001",
-    "@dcloudio/uni-components": "3.0.0-4070520250711001",
+    "@dcloudio/uni-components": "3.0.0-4070620250821001",
-    "@dcloudio/uni-h5": "3.0.0-4070520250711001",
+    "@dcloudio/uni-h5": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-alipay": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-alipay": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-baidu": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-baidu": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-harmony": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-harmony": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-jd": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-jd": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-kuaishou": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-lark": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-lark": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-qq": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-qq": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-toutiao": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-toutiao": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-weixin": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-weixin": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-xhs": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-xhs": "3.0.0-4070620250821001",
-    "@dcloudio/uni-quickapp-webview": "3.0.0-4070520250711001",
+    "@dcloudio/uni-quickapp-webview": "3.0.0-4070620250821001",
-    "@dcloudio/uni-ui": "^1.5.7",
+    "@dcloudio/uni-ui": "^1.5.11",
+    "crypto-js": "^4.2.0",
     "mescroll-uni": "^1.3.7",
+    "minio": "^8.0.6",
+    "minio-js": "^1.0.7",
     "pinia": "2.0.20",
-    "vue": "^3.4.21"
+    "uuid": "^11.1.0",
+    "vue": "3.4.21",
+    "vue-i18n": "9.14.5"
   },
   "devDependencies": {
-    "@dcloudio/types": "^3.4.8",
+    "@dcloudio/types": "3.4.19",
-    "@dcloudio/uni-automator": "3.0.0-4070520250711001",
+    "@dcloudio/uni-automator": "3.0.0-4070620250821001",
-    "@dcloudio/uni-cli-shared": "3.0.0-4070520250711001",
+    "@dcloudio/uni-cli-shared": "3.0.0-4070620250821001",
-    "@dcloudio/uni-stacktracey": "3.0.0-4070520250711001",
+    "@dcloudio/uni-stacktracey": "3.0.0-4070620250821001",
-    "@dcloudio/vite-plugin-uni": "3.0.0-4070520250711001",
+    "@dcloudio/vite-plugin-uni": "3.0.0-4070620250821001",
-    "@vue/runtime-core": "^3.4.21",
+    "@vue/runtime-core": "3.5.20",
     "lodash-es": "^4.17.21",
-    "sass": "^1.79.3",
+    "sass": "^1.91.0",
+    "sass-loader": "^10.1.1",
     "vite": "5.2.8"
   }
 }

server/index.js

@@ -107,19 +107,60 @@ app.post('/api/search', (req,res) => {
     }))
 });
 
+// 查询业务列表
+app.post('/api/businessList', (req,res) => {
+    res.json(Mock.mock({
+        code: 0,
+        data: {
+            list:[
+                {bizId:1,bizName:'企业日常',children:[
+                    {bizId:11,bizName:'任务计划',icon:'static/images/business/icon-rwjh.png',status:1,isDaily:true},
+                    {bizId:12,bizName:'日报',icon:'static/images/business/icon-rb.png',status:1,isDaily:true},
+                    {bizId:13,bizName:'设备管理',icon:'static/images/business/icon-sbgl.png',status:1},
+                    {bizId:14,bizName:'绩效管理',icon:'static/images/business/icon-jxgl.png',status:1},
+                    {bizId:15,bizName:'公章申请',icon:'static/images/business/icon-gzsq.png',status:1,isDaily:true},
+                    {bizId:16,bizName:'会议室预约',icon:'static/images/business/icon-hysyy.png',status:1,isDaily:true},
+                    {bizId:17,bizName:'报修',icon:'static/images/business/icon-bx.png',status:1}
+                ]},
+                {bizId:2,bizName:'CRM系统',children:[
+                    {bizId:21,bizName:'走访报告',icon:'static/images/business/demo.png',bizUrl:'/pages/business/CRM/visitorReport',status:true},
+                    {bizId:101,bizName:'走访报告',icon:'static/images/business/icon-zfbg.png',status:1},
+                    {bizId:102,bizName:'走访查看',icon:'static/images/business/icon-zfck.png',status:1,isDaily:true},
+                    {bizId:103,bizName:'走访审批',icon:'static/images/business/icon-zfsp.png',status:1},
+                    {bizId:104,bizName:'计划查看',icon:'static/images/business/icon-jhck.png',status:1},
+                    {bizId:105,bizName:'签到打卡',icon:'static/images/business/icon-qddk.png',status:1},
+                    {bizId:106,bizName:'打卡信息',icon:'static/images/business/icon-dkxx.png',status:1},
+                    {bizId:107,bizName:'打卡统计',icon:'static/images/business/icon-dktj.png',status:1},
+                    {bizId:108,bizName:'人员新增',icon:'static/images/business/icon-ryxz.png',status:1},
+                    {bizId:109,bizName:'信息查看',icon:'static/images/business/icon-xxck.png',status:1,isDaily:true},
+                    {bizId:1010,bizName:'信息审核',icon:'static/images/business/xxsh.png',badgeCount:5,status:1,isDaily:true},
+                    {bizId:1011,bizName:'信息统计',icon:'static/images/business/icon-xxtj.png',status:1},
+                    {bizId:1012,bizName:'回款查看',icon:'static/images/business/icon-hkck.png',status:1},
+                    {bizId:1013,bizName:'客户人员审核',icon:'static/images/business/icon-khrysh.png',badgeCount:3,status:true},
+                    {bizId:1014,bizName:'客户人员所属',icon:'static/images/business/icon-khryss.png',status:1},
+                    {bizId:1015,bizName:'客户人员归属人变更',icon:'static/images/business/icon-khrybg.png',status:1},
+                    {bizId:1016,bizName:'市场活动',icon:'static/images/business/icon-schd.png',status:1}
+                ]},
+                {bizId:3,bizName:'供应链采纳',children:[]},
+                {bizId:4,bizName:'PLM系统',children:[]}
+            ]
+        }
+    }))
+});
+
 // 查询企业日常 Daily business
 app.post('/api/businessDaily', (req,res) => {
     res.json(Mock.mock({
         code: 0,
         data: {
             list:[
-                {id:1,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
+                {id:11,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
-                {id:2,name:'日报',imgSrc:'static/images/business/icon-rb.png'},
+                {id:12,name:'日报',imgSrc:'static/images/business/icon-rb.png'},
-                {id:3,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
+                {id:13,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
-                {id:4,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'},
+                {id:14,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'},
-                {id:5,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'},
+                {id:15,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'},
-                {id:6,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'},
+                {id:16,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'},
-                {id:7,name:'报修',imgSrc:'static/images/business/icon-bx.png'}
+                {id:17,name:'报修',imgSrc:'static/images/business/icon-bx.png'}
             ]
         }
     }))
@@ -128,18 +169,18 @@ app.post('/api/businessDaily', (req,res) => {
 // 查询CRM系统 Daily business
 app.post('/api/businessCRMList', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             list:[
-                {id:1,name:'走访报告',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReport'},
+                {id:21,name:'走访报告',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReport'},
-                {id:2,name:'走访报告添加',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportAdd'},
+                {id:22,name:'走访报告添加',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportAdd'},
-                {id:3,name:'走访报告详情',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportDetail'},
+                {id:23,name:'走访报告详情',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportDetail'},
-                {id:4,name:'走访报告内容录入',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportEnter'},
+                {id:24,name:'走访报告内容录入',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportEnter'},
-                {id:5,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation/marketInformation'},
+                {id:25,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation'},
-                {id:6,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'},
+                {id:26,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'},
-                {id:7,name:'签到打卡',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/vistorCheckin'},
+                {id:27,name:'签到打卡',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/vistorCheckin'},
-                {id:8,name:'打卡统计',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/checkinStatistics'},
+                {id:28,name:'打卡统计',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/checkinStatistics'},
-                {id:9,name:'回款查看',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/paymentCollection'},
+                {id:29,name:'回款查看',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/paymentCollection'},
                 {id:101,name:'走访报告',imgSrc:'static/images/business/icon-zfbg.png'},
                 {id:102,name:'走访查看',imgSrc:'static/images/business/icon-zfck.png'},
                 {id:103,name:'走访审批',imgSrc:'static/images/business/icon-zfsp.png'},
@@ -164,7 +205,7 @@ app.post('/api/businessCRMList', (req,res) => {
 // 首页待办数据
 app.post('/api/backBlogCount', (req,res) => {
     res.json(Mock.mock({
-        code: 200,
+        code: 0,
         data: {
             count1:3,
             count2:7,
@@ -190,7 +231,7 @@ app.post('/api/stepData', (req,res) => {
         data: {
             date:new Date().getTime(),
             list:[
-                { id:1,desc: '2025秋季产品发布前期准备会1s，在科研楼0317会议室召开。', title: '13:30 — 15:30',beginTime:'13:30',endTime:'15:30'}, 
+                { id:1,desc: '2025秋季产品发布前期准备会，在科研楼0317会议室召开。', title: '13:30 — 15:30',beginTime:'13:30',endTime:'15:30'}, 
                 { id:2,desc: '生产间安全巡检。', title: '16:30 — 18:00',beginTime:'16:30',endTime:'18:00'}, 
             ]
         }
@@ -478,6 +519,32 @@ app.post('/api/mattersList', (req,res) => {
     }
 })
 
+// 查询设备绑定状态 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
+app.post('/api/getBindStatus', (req,res) => {
+    res.json(Mock.mock({
+        code: 0,
+        data: {
+            bindStatus:4
+        }
+    }))
+})
+
+// 查询版本号
+app.post('/api/versionCheck', (req,res) => {
+    res.json(Mock.mock({
+        "code": 0,
+        "message": "Success.",
+        "data": {
+            "status": 0,//版本状态 0-最新版本  1-有新版本，但现有版本可用  2-现有版本不可用，需要下载新版本
+            "latestVersion": "1.0.1",
+            "downloadURL": "https://www.718ys.com/downloads/android/ys718_test_v1.0.0.apk",
+            "availableVersionsList": "1.0.0",
+            remark:'fdsfddf'
+        },
+        "ok": true
+    }))
+})
+
 
 
 //2.创建server

src/App.vue

@@ -4,14 +4,50 @@
 
 
 <script setup>
+import {showAlert} from '@/utils/message.js'
 import { onLaunch } from '@dcloudio/uni-app';
 onLaunch((opt) => {
-    console.log("onLaunch")
+	//     uni.preloadPage({ url: "/pages/login/login" });
+	//     uni.preloadPage({ url: "/pages/home/home" });
+	//     uni.preloadPage({ url: "/pages/business/business" });
+	//     uni.preloadPage({ url: "/pages/notice/notice" });
+	//     uni.preloadPage({ url: "/pages/userinfo/userinfo" });
+	console.log("APP onLaunch")
+	
+    // #ifdef APP-PLUS
+   //  uni.getPushClientId({
+   //      success: (res) => {
+   //          let push_clientid = res.cid
+			// showAlert(push_clientid)
+   //          console.log('客户端推送标识:', push_clientid);
+   //      },
+   //      fail(err) {
+   //          console.log(err)
+   //      }
+   //  })
+
+    uni.onPushMessage(res => {
+        console.log("收到推送消息：", res) //监听推送消息
+        // uni.createPushMessage({
+        //     title: res.data.title,
+        //     content: res.data.content,
+        //     payload: res.data.payload
+        // })
+    })
+    // #endif
 })
 
 
+
 </script>
 <style>
 @import '@/static/common.css';
-
+.uni-app--show{
+    opacity:1;
+    transition: opacity 0.3s;
+}
+.uni-app--hide {
+    opacity:0;
+    transition:opacity 0.3s;
+}
 </style>

src/api/auth.js

@@ -1,13 +1,38 @@
 import request from "@/utils/request"
 
-
+// 获取客户端版本
-// 获取图片
+export function versionCheck(data) {
-export function getCaptchaImage() {
+    return request.post({
-    return request.get({
+        url: '/acc/auth/version',
-        url: '/api/captchaImage',
+        data
     })
 }
 
+// 获取设备绑定状态
+export function getBindStatus(data) {
+    return request.post({
+        url: '/acc/auth/status',
+        data
+    })
+}
+
+// 申请设备授权
+export function authDeviceApply(data) {
+    return request.post({
+        url: '/acc/auth/apply',
+        data
+    })
+}
+
+// App绑定设备授权码
+export function authInputCode(data) {
+    return request.post({
+        url: '/acc/auth/inputCode',
+        data
+    })
+}
+
+
 // 获取验证码
 export function getVerifyCode(data) {
     return request.post({
@@ -19,19 +44,31 @@ export function getVerifyCode(data) {
 // 登录
 export function login(data) {
     return request.post({
-        url: '/api/user/login',
+        url: '/acc/auth/login',
         data
     })
 }
 
+// 登出
+export function logout(data) {
+    return request.post({
+        url: '/acc/auth/logout',
+        data
+    })
+}
  
 // 获取用户信息
 export function getUserInfo(data) {
-    return request.post({
+    return request.get({
-        url: '/api/getUserInfo',
+        url: '/acc/profile/userInfo',
         data
     })
 }
 
-
+// 查询当前用户常用功能
-
+export function getUserFavorite(data) {
+    return request.post({
+        url: '/acc/profile/favorite',
+        data
+    })
+}

src/api/business.js

@@ -8,15 +8,23 @@ export function search(data) {
     })
 }
 
-// 企业日常
+// 查询当前用户业务列表
-export function businessDaily(data) {
+export function businessList(data) {
     return request.post({
-        url: '/api/businessDaily',
+        url: '/acc/profile/bizList',
         data
     })
 }
 
-// crm 列表
+// 设置常用服务
+export function bizFavoriteSetting(data) {
+    return request.post({
+        url: '/acc/biz/favoriteSetting',
+        data
+    })
+}
+
+// CRM 列表
 export function businessCRMList(data) {
     return request.post({
         url: '/api/businessCRMList',
@@ -24,17 +32,15 @@ export function businessCRMList(data) {
     })
 }
 
-// crm 查询走访报告列表
+// CRM 查询走访报告列表
 export function visitorReportList(data) {
-    return request.get({
+    return request.post({
-        url: '/app/appVisistReport/list',
+        url: '/api/visitorReportList',
         data
-    },{
-        isTransformResponse:false
     })
 }
 
-// crm 客户列表
+// CRM 客户列表
 export function getGuestList(data) {
     return request.post({
         url: '/api/guestList',
@@ -42,7 +48,7 @@ export function getGuestList(data) {
     })
 }
 
-// crm 查询走访报告详情
+// CRM 查询走访报告详情
 export function visitorReportDetail(data) {
     return request.post({
         url: '/api/visitorReportDetail',
@@ -50,7 +56,7 @@ export function visitorReportDetail(data) {
     })
 }
 
-// crm 查询走访报告列表
+// CRM 查询走访报告列表
 export function mattersList(data) {
     return request.post({
         url: '/api/mattersList',

src/api/crm/activity/activity.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //获取客户单位用户人员信息
 export function crmCustomerUser(data) {
   return request.get({
-    url: "/app/appCrmCusUserNewController/crmCustomerUser",
+    url: "/crm/app/appCrmCusUserNewController/crmCustomerUser",
     data,
   },{
     isTransformResponse:false
@@ -13,7 +13,7 @@ export function crmCustomerUser(data) {
 //获取我公司人员信息
 export function myUserNameList(data) {
   return request.get({
-    url: "/app/appVisistDetail/getCompanyPersonnerlName",
+    url: "/crm/app/appVisistDetail/getCompanyPersonnerlName",
     data,
   },{
     isTransformResponse:false
@@ -23,7 +23,7 @@ export function myUserNameList(data) {
 //保存走访报告明细
 export function addVisistDetail(data) {
   return request.post({
-    url: "/app/appVisistDetail/addVisistDetail",
+    url: "/crm/app/appVisistDetail/addVisistDetail",
     data,
   },{
     isTransformResponse:false
@@ -33,7 +33,7 @@ export function addVisistDetail(data) {
 //删除走访报告中的某一项（日常走访，业务招待）
 export function deleVisistDetailItem(data) {
   return request.get({
-    url: "/app/appVisistDetail/deleVisistDetailItem",
+    url: "/crm/app/appVisistDetail/deleVisistDetailItem",
     data,
   },{
     isTransformResponse:false
@@ -43,7 +43,7 @@ export function deleVisistDetailItem(data) {
 //走访明细查询
 export function getVisistDetailItem(data) {
   return request.get({
-    url: "/app/appVisistDetail/queryList",
+    url: "/crm/app/appVisistDetail/queryList",
     data,
   },{
     isTransformResponse:false
@@ -53,7 +53,7 @@ export function getVisistDetailItem(data) {
 //删除整体的报告
 export function removeVisist(data) {
   return request.get({
-    url: "/app/appVisistReport/remove",
+    url: "/crm/app/appVisistReport/remove",
     data,
   },{
     isTransformResponse:false
@@ -63,7 +63,7 @@ export function removeVisist(data) {
 //走访报告列表查询
 export function getYsVisistList(data) {
   return request.get({
-    url: "/app/appVisistReport/list",
+    url: "/crm/app/appVisistReport/list",
     data
   },{
     isTransformResponse:false
@@ -73,7 +73,7 @@ export function getYsVisistList(data) {
 //更新一个报告的状态
 export function updateStatus(data) {
   return request.post({
-    url: "/app/appVisistReport/updateStatus",
+    url: "/crm/app/appVisistReport/updateStatus",
     data,
   },{
     isTransformResponse:false
@@ -83,7 +83,7 @@ export function updateStatus(data) {
 //获取客户信息列表
 export function getYsCustomerList(data) {
   return request.get({
-    url: "/app/appCustomerIfno/pageList",
+    url: "/crm/app/appCustomerIfno/pageList",
     data,
   },{
     isTransformResponse:false
@@ -93,7 +93,7 @@ export function getYsCustomerList(data) {
 //新增走访报告
 export function addVisist(data) {
   return request.post({
-    url: "/app/appVisistReport/add",
+    url: "/crm/app/appVisistReport/add",
     data,
   },{
     isTransformResponse:false
@@ -103,7 +103,7 @@ export function addVisist(data) {
 //走访报告查询
 export function getQueryVisistList(data) {
   return request.get({
-    url: "/app/appVisistReport/queryList",
+    url: "/crm/app/appVisistReport/queryList",
     data,
   },{
     isTransformResponse:false
@@ -113,7 +113,7 @@ export function getQueryVisistList(data) {
 //走访报告详细信息
 export function getYsVisistInfo(data) {
   return request.get({
-    url: "/app/appVisistReport/getDetail",
+    url: "/crm/app/appVisistReport/getDetail",
     data,
   },{
     isTransformResponse:false
@@ -123,7 +123,7 @@ export function getYsVisistInfo(data) {
 //一个走访报告下面关联的日常走访，业务招待等具体信息
 export function getVisistDetailList(data) {
   return request.get({
-    url: "/app/appVisistDetail/list",
+    url: "/crm/app/appVisistDetail/list",
     data,
   },{
     isTransformResponse:false
@@ -133,7 +133,7 @@ export function getVisistDetailList(data) {
 //新增点赞
 export function insertUserLike(data) {
   return request.post({
-    url: "/app/appUserLike/addVisistDetail",
+    url: "/crm/app/appUserLike/addVisistDetail",
     data,
   },{
     isTransformResponse:false
@@ -143,7 +143,7 @@ export function insertUserLike(data) {
 //查询是否已经点过赞
 export function getUserLike(data) {
   return request.get({
-    url: "/app/appUserLike/queryUserLikeStatus/" + data,
+    url: "/crm/app/appUserLike/queryUserLikeStatus/" + data,
   },{
     isTransformResponse:false
   });
@@ -152,7 +152,7 @@ export function getUserLike(data) {
 //获取当前人的信息
 export function getUserInfo(data) {
   return request.get({
-    url: "/app/user/getUserInfo",
+    url: "/crm/app/user/getUserInfo",
     data,
   },{
     isTransformResponse:false
@@ -162,7 +162,7 @@ export function getUserInfo(data) {
 //查询没有经过信息管理员审批的单子
 export function getApprovalList(data) {
   return request.get({
-    url: "/app/appVisistReport/approvalList",
+    url: "/crm/app/appVisistReport/approvalList",
     data,
   },{
     isTransformResponse:false
@@ -172,7 +172,7 @@ export function getApprovalList(data) {
 //打开详情页设置成为已读
 export function getUpdateApprovalForRead(data) {
   return request.post({
-    url: "/app/appVisistReport/updateApprovalForRead",
+    url: "/crm/app/appVisistReport/updateApprovalForRead",
     data,
   },{
     isTransformResponse:false
@@ -182,7 +182,7 @@ export function getUpdateApprovalForRead(data) {
 //提交通过活动报告
 export function auditActivityReport(data) {
   return request.post({
-    url: "/app/activity/auditActivityReport",
+    url: "/crm/app/activity/auditActivityReport",
     data,
     header: {
     'Content-Type': 'application/x-www-form-urlencoded' // 设置请求头，确保服务器正确解析 FormData
@@ -195,7 +195,7 @@ export function auditActivityReport(data) {
 //更新驳回原因
 export function getRejectReason(data) {
   return request.post({
-    url: "/app/appVisistReport/updaterejectReason",
+    url: "/crm/app/appVisistReport/updaterejectReason",
     data,
   },{
     isTransformResponse:false
@@ -205,9 +205,90 @@ export function getRejectReason(data) {
 //查询签到打卡信息集合为了报告
 export function addMapForReport(data) {
   return request.get({
-    url: "/app/appVisistReport/addMapList",
+    url: "/crm/app/appVisistReport/addMapList",
     data,
   },{
     isTransformResponse:false
   });
 }
+
+
+//新增请假申请
+export function addLeaveApply(data) {
+  return request.post({
+    url: "/crm/jys/app/appLeaveApply/add",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//我的表单
+export function getLeaveApplyList(data) {
+  return request.get({
+    url: "/crm/jys/app/appLeaveApply/list",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//可销假表单
+export function getBackList(data) {
+  return request.get({
+    url: "/crm/jys/app/appLeaveApply/getBackList",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//我的审批
+export function getMyReviewList(data) {
+  return request.get({
+    url: "/crm/jys/app/appLeaveApply/myReview",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//可销假表单
+export function getBackLeaveList(data) {
+  return request.get({
+    url: "/crm/jys/app/appLeaveApply/myBackLeave",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//提交审批
+export function addReviewLeave(data) {
+  return request.post({
+    url: "/crm/jys/app/appLeaveApply/addReview",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//新增销假申请
+export function addBackApply(data) {
+  return request.post({
+    url: "/crm/jys/app/appLeaveApply/addBackApply",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//可销假表单
+export function getDelLeaveApply(data) {
+  return request.get({
+    url: "/crm/jys/app/appLeaveApply/delLeaveApply",
+    data
+  },{
+    isTransformResponse:false
+  });
+}

src/api/crm/activity/map.js

@@ -3,27 +3,46 @@ import request from "@/utils/request";
 //新增地图开始签到接口
 export function addStartMap(data) {
   return request.post({
-    url: "/app/appVisistMap/Startadd",
+    url: "/crm/app/appVisistMap/Startadd",
     data,
   },{
     isTransformResponse:false
   });
 }
 
-//新增地图开始打卡接口
+// //出差打卡接口
-export function addStartMapForClockIn(data) {
+// export function businessTripClockIn(data) {
-  return request.post({
+//   return request.post({
-    url: "/app/appVisistMap/StartaddForClockIn",
+//     url: '/crm/app/appVisistMap/businessTripClockIn',
-    data,
+//     data
-  },{
+//   },{isTransformResponse:false});
-    isTransformResponse:false
+// }
-  });
+
-}
+// //新增地图开始打卡接口
+// export function addStartMapForClockIn(data) {
+//   return request.post({
+//     url: "/crm/app/appVisistMap/StartaddForClockIn",
+//     data,
+//   },{
+//     isTransformResponse:false
+//   });
+// }
+
+	//出差打卡接口
+	export function businessTripClockIn(data) {
+		return request('/app/appVisistMap/businessTripClockIn', data, 'POST', 'application/json;charset=UTF-8');
+	}
+  
+	//新增地图开始打卡接口
+	export function addStartMapForClockIn(data) {
+		return request('/app/appVisistMap/StartaddForClockIn', data, 'POST', 'application/json;charset=UTF-8');
+	}
+
 
 //打卡信息查看
 export function CheckInInformationViewing(data) {
   return request.get({
-    url: "/app/appVisistMap/DKList",
+    url: "/crm/app/appVisistMap/DKList",
     data
   },{
     isTransformResponse:false
@@ -33,7 +52,7 @@ export function CheckInInformationViewing(data) {
 //签到统计
 export function getSigninList(data) {
   return request.get({
-    url: "/app/appVisistMap/QueryBased",
+    url: "/crm/app/appVisistMap/QueryBased",
     data
   },{
     isTransformResponse:false
@@ -43,7 +62,7 @@ export function getSigninList(data) {
 //不签到统计
 export function getNoSigninList(data) {
   return request.get({
-    url: "/app/appVisistMap/QueryBasedIsNull",
+    url: "/crm/app/appVisistMap/QueryBasedIsNull",
     data
   },{
     isTransformResponse:false

src/api/crm/api_ys.js

@@ -1,138 +1,175 @@
 import request from "@/utils/request"
 
 
-	export function getYsVisistList(data) {
+export function getYsVisistList(data) {
-	    return request.get({
+	return request.get({
-	        url: '/app/appVisistReport/list',
+		url: '/crm/app/appVisistReport/list',
-			data: data
+		data: data
-	    })
+	},{
-	}
+		isTransformResponse:false
-	//市场信息列表接口
+	})
-	export function CrmMarketInformationList(data) {
+}
-	    return request.get({
+//市场信息列表接口
-	        url: '/app/informationMarketInformation/list',
+export function CrmMarketInformationList(data) {
-			data: data
+	return request.get({
-	    })
+		url: '/crm/app/informationMarketInformation/list',
-	}
+		data: data
-	//市场信息模块待审核改为提交
+	},{
-	export function handleCrmMarketInfo(data) {
+		isTransformResponse:false
-			return request.post({
+	})
-			    url: '/app/informationMarketInformation/handleCrmMarketInfo',
+}
-			    data
+//市场信息模块待审核改为提交
-			})
+export function handleCrmMarketInfo(data) {
-	}
+	return request.post({
-	//获取客户名称
+		url: '/crm/app/informationMarketInformation/handleCrmMarketInfo',
-	export function getYsCustomerList(data) {
+		data
-			return request.get({
+	},{
-			    url: '/app/appCustomerIfno/pageList',
+		isTransformResponse:false
-			    data
+	})
-			})
+}
-	}
+//获取客户名称
-	//市场信息模块提交
+export function getYsCustomerList(data) {
-	export function crmMarketInformationAdd(data) {
+	return request.get({
-			return request.post({
+		url: '/crm/app/appCustomerIfno/pageList',
-			    url: '/app/informationMarketInformation/add',
+		data
-			    data
+	},{
-			})
+		isTransformResponse:false
-	}
+	})
-	//市场信息模块查询
+}
-	export function crminformationItemForDetail(data) {
+//市场信息模块提交
-			return request.get({
+export function crmMarketInformationAdd(data) {
-			    url: '/app/informationMarketInformation/getDetail',
+	return request.post({
-			    data
+		url: '/crm/app/informationMarketInformation/add',
-			})
+		data
-	}
+	},{
-	//客户人员信息查询
+		isTransformResponse:false
-	export function crmCustomerUser(data) {
+	})
-			return request.get({
+}
-			    url: '/app/appCrmCusUserNewController/crmCustomerUser',
+//市场信息模块查询
-			    data
+export function crminformationItemForDetail(data) {
-			})
+	return request.get({
-	}
+		url: '/crm/app/informationMarketInformation/getDetail',
-	//市场信息根据ID删除
+		data
-	export function crmMarketInformationDelete(data) {
+	},{
-			return request.get({
+		isTransformResponse:false
-			    url: '/app/informationMarketInformation/delete',
+	})
-			    data
+}
-			})
+//客户人员信息查询
-	}
+export function crmCustomerUser(data) {
-	//市场信息查询接口
+	return request.get({
-	export function viewingMarketInfForAllMembers(data) {
+		url: '/crm/app/appCrmCusUserNewController/crmCustomerUser',
-			return request.get({
+		data
-			    url: '/app/informationMarketInformation/viewList',
+	},{
-			    data
+		isTransformResponse:false
-			})
+	})
-	}
+}
-	//市场信息详情查询接口
+//市场信息根据ID删除
-	export function viewingMarketInfgetDetail(data) {
+export function crmMarketInformationDelete(data) {
-			return request.get({
+	return request.get({
-			    url: '/app/informationMarketInformation/getDetail',
+		url: '/crm/app/informationMarketInformation/delete',
-			    data
+		data
-			})
+	},{
-	}
+		isTransformResponse:false
-	//市场信审核列表接口
+	})
-	export function approvalMarketInfget(data) {
+}
-			return request.get({
+//市场信息查询接口
-			    url: 'app/informationMarketInformation/Approval',
+export function viewingMarketInfForAllMembers(data) {
-			    data
+	return request.get({
-			})
+		url: '/crm/app/informationMarketInformation/viewList',
-	}
+		data
-	//回款模块列表查询
+	},{
-	export function getPaymentList(data) {
+		isTransformResponse:false
-			return request.get({
+	})
-			    url: '/app/InformationReviewController/getPaymentList',
+}
-			    data
+//市场信息详情查询接口
-			})
+export function viewingMarketInfgetDetail(data) {
-	}
+	return request.get({
-	//回款新增接口
+		url: '/crm/app/informationMarketInformation/getDetail',
-	export function addPaymentCollection(data) {
+		data
-			return request.post({
+	},{
-			    url: '/app/InformationReviewController/addPaymentCollection',
+		isTransformResponse:false
-			    data
+	})
-			})
+}
-	}
+//市场信审核列表接口
-	//回款更新接口
+export function approvalMarketInfget(data) {
-	export function updatePaymentDetail(data) {
+	return request.get({
-			return request.post({
+		url: '/crm/app/informationMarketInformation/Approval',
-			    url: '/app/InformationReviewController/updatePaymentDetail',
+		data
-			    data
+	},{
-			})
+		isTransformResponse:false
-	}
+	})
-	//回款删除接口
+}
-	export function deletePaymentDetail(data) {
+//回款模块列表查询
-			return request.post({
+export function getPaymentList(data) {
-			    url: '/app/InformationReviewController/deletePaymentDetail',
+	return request.get({
-			    data
+		url: '/crm/app/InformationReviewController/getPaymentList',
-			})
+		data
-	}
+	},{
+		isTransformResponse:false
+	})
+}
+//回款新增接口
+export function addPaymentCollection(data) {
+	return request.post({
+		url: '/crm/app/InformationReviewController/addPaymentCollection',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+//回款更新接口
+export function updatePaymentDetail(data) {
+	return request.post({
+		url: '/crm/app/InformationReviewController/updatePaymentDetail',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+//回款删除接口
+export function deletePaymentDetail(data) {
+	return request.post({
+		url: '/crm/app/InformationReviewController/deletePaymentDetail',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
 
-	//全员查询回款接口
+//全员查询回款接口
-	export function getFullStaffStatisticsViewingTable(data) {
+export function getFullStaffStatisticsViewingTable(data) {
-			return request.get({
+	return request.get({
-			    url: '/app/InformationReviewController/getFullStaffStatisticsViewingTable',
+		url: '/crm/app/InformationReviewController/getFullStaffStatisticsViewingTable',
-			    data
+		data
-			})
+	},{
-	}
+		isTransformResponse:false
-	//个人查询回款接口
+	})
-	export function getPersonalPaymentCollectionTable(data) {
+}
-			return request.get({
+//个人查询回款接口
-			    url: '/app/InformationReviewController/getPersonalPaymentCollectionTable',
+export function getPersonalPaymentCollectionTable(data) {
-			    data
+	return request.get({
-			})
+		url: '/crm/app/InformationReviewController/getPersonalPaymentCollectionTable',
-	}
+		data
-	
+	},{
-	//市场信息审核通过接口
+		isTransformResponse:false
-	export function crmMarketInformationApprovalSuccess(data) {
+	})
-			return request.get({
+}
-			    url: '/app/informationMarketInformation/ApprovalSuccess',
-			    data
-			})
-	}
-	//市场信息审核驳回接口
-	export function crmMarketInformationApprovalUnSuccess(data) {
-			return request.get({
-			    url: '/app/informationMarketInformation/ApprovalUnSuccess',
-			    data
-			})
-	}
 
+//市场信息审核通过接口
+export function crmMarketInformationApprovalSuccess(data) {
+	return request.get({
+		url: '/crm/app/informationMarketInformation/ApprovalSuccess',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+//市场信息审核驳回接口
+export function crmMarketInformationApprovalUnSuccess(data) {
+	return request.get({
+		url: '/crm/app/informationMarketInformation/ApprovalUnSuccess',
+		data
+	},{
+		isTransformResponse:false
+	})
+}

src/api/crm/customer/getCustomer.js

@@ -47,8 +47,8 @@ export function SearchForAllPerson(params){
 // 客户人员新增审核列表
 export　function　getCusUserApprovalList(params) {
     return request.get({
-            url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
+        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
-            data: params
+        data: params
         }, {isTransformResponse: false}
     )
 }

src/api/crm/plan/getPlan.js

@@ -1,15 +1,8 @@
 import request from "@/utils/request"
 // 获取用户信息
-/*export function getUserInfo(data) {
+export function getUserInfo(data) {
     return request.get({
-        url: '/app/user/getUserInfo',
+        url: '/crm/app/user/getUserInfo',
-        data
-    }, {isTransformResponse: false})
-}*/
-//获取个人周计划列表
-export function getWeeklyPlanList(data) {
-    return request.get({
-        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
         data
     }, {isTransformResponse: false})
 }
@@ -20,6 +13,13 @@ export function getAllWeekPlanList(params){
         data: params
     },{isTransformResponse: false})
 }
+//获取个人周计划列表
+export function getWeeklyPlanList(data) {
+    return request.get({
+        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
+        data
+    }, {isTransformResponse: false})
+}
 // 组合查询计划列表
 export function getWeekPlanListByDate(params){
     return request.get({

src/api/eqf/qualityFeedback.js

@@ -0,0 +1,151 @@
+import request from '@/utils/request'
+
+// 查询外部质量反馈列表
+export function listFeedback(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/list',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询电阻器类型
+export function listgetResistorTypeList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetResistorTypeList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询产品大类
+export function listgetProductCategoriesList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetProductCategoriesList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询产品分类
+export function listgetClassificationList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetClassificationList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询问题现象
+export function listgetProblemPhenomenonList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetProblemPhenomenonList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询问题发生阶段
+export function listgetProblemStageList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetProblemStageList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询用户诉求标签
+export function listgetCustomerAppealLabelList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetCustomerAppealLabelList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 新增外部质量反馈
+export function qualityFeedbackAdd(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackAdd',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+
+
+// 查询电阻器的批号
+export function getMockBatchData(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/getMockBatchData',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+
+
+// 新增外部质量反馈明细
+export function qualityFeedbackDetailAdd(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackDetailAdd',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+//根据合同号查询
+export function getCustomerOrderList(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/getCustomerOrderList',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+
+
+//根据管壳合同号查询
+export function getGkCustomerOrderList(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/getGkCustomerOrderList',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+
+// 新增外部质量反馈管壳明细
+export function qualityFeedbackGkDetailAdd(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackGkDetailAdd',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 删除外部质量反馈
+export function removeQualityFeedback(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/removeQualityFeedback',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 更新外部质量反馈状态
+export function updateStatus(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/updateStatus',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}

src/api/home.js

@@ -1,9 +1,24 @@
 import request from "@/utils/request"
 
-// 待办数据查询
+// 待办数据查询 获取用户消息的待阅和已阅数量
-export function backBlogCount(data) {
+export function messageNotifyCount(data) {
+    return request.get({
+        url: '/acc/message/notify/count',
+        data
+    })
+}
+// 获取用户审批的待办和已办数量
+export function messageFlowCount(data) {
+    return request.get({
+        url: '/acc/message/flow/count',
+        data
+    })
+}
+
+// 常用服务 
+export function getUserFavorite(data) {
     return request.post({
-        url: '/api/backBlogCount',
+        url: '/acc/profile/favorite',
         data
     })
 }
@@ -32,13 +47,7 @@ export function salesTask(data) {
     })
 }
 
-// 常用服务
+
-export function commonServices(data) {
-    return request.post({
-        url: '/api/commonServices',
-        data
-    })
-}
 
 // 新闻公告
 export function newsQueryList(data) {

src/api/notice.js

@@ -3,7 +3,15 @@ import request from "@/utils/request"
 // 查询通知列表
 export function noticeList(data) {
     return request.post({
-        url: '/api/noticeList',
+        url: '/acc/message/notify/detail',
+        data
+    })
+}
+
+// 获取用户审批的待办和已办详情
+export function flowList(data) {
+    return request.post({
+        url: '/acc/message/flow/detail',
         data
     })
 }

src/api/polling.js

@@ -0,0 +1,128 @@
+import request from "@/utils/request"
+
+// 按日查询任务表列表
+export function taskList(data) {
+    return request.post({
+        url: '/patrol/patroltask/list',
+        data
+    })
+}
+
+// 按月查询任务表列表
+export function taskListMonth(data) {
+    return request.post({
+        url: '/patrol/patroltask/listm',
+        data
+    })
+}
+
+// 按条件搜索任务列表
+export function taskLists(data) {
+    return request.post({
+        url: '/patrol/patroltask/lists',
+        data
+    })
+}
+
+// 查询任务详情
+export function taskDetail(data) {
+    return request.post({
+        url: '/patrol/patroltask/detail',
+        data
+    })
+}
+
+// 批量提交检查点的结果
+export function submitResult(data) {
+    return request.post({
+        url: '/patrol/patroltask/submitresult',
+        data
+    })
+}
+
+// 提交任务
+export function submitTask(data) {
+    return request.post({
+        url: '/patrol/patroltask/submittask',
+        data
+    })
+}
+
+// 查询任务检查项详情
+export function taskGroupDetail(data) {
+    return request.post({
+        url: '/patrol/patroltask/taskgroup',
+        data
+    })
+}
+
+// 异常上报表管理
+export function problemDetail(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/detail',
+        data
+    })
+}
+
+// 查询异常上报表列表
+export function problemList(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/list',
+        data
+    })
+}
+
+// 添加问题上报
+export function problemAdd(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/addproblem',
+        data
+    })
+}
+// 编辑问题
+export function problemEdit(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/editproblem',
+        data
+    })
+}
+// 删除问题
+export function problemDel(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/delproblem',
+        data
+    })
+}
+// 添加追踪记录
+export function problemAddLog(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/addproblemlog',
+        data
+    })
+}
+
+// 图片上传
+export function minioUpload(data) {
+    return request.uploadFile({
+        url: '/patrol/minio/upload',
+        ...data
+    })
+}
+// 获取minio参数
+export function minioParam(data) {
+    return request.post({
+        url: '/patrol/minio/param',
+        data
+    })
+}
+
+// 待检查的任务数量
+export function querytodaytasknum(data) {
+    return request.post({
+        url: '/patrol/patroltask/querytodaytasknum',
+        data
+    })
+}
+
+
+

src/components/NFCTemplate.vue

@@ -0,0 +1,325 @@
+<template>
+  <view class="nfc-con">
+    <view class="nfc-bg">
+        <view class="nfc-title">
+            <uni-icons type="closeempty" size="20" class="nfc-close"  @click="handleClose"></uni-icons>NFC识别
+        </view>
+        <block v-if="formData.deviceId==''">
+            <view class="nfc-pic">
+                <img  class="nfc-pic-animal" :src="'static/images/polling/nfc-logo.png'" />
+            </view>
+            <view class="nfc-desc">请将设备靠近NFC识别</view>
+        </block>
+
+        <!-- 识别成功 -->
+        <view class="result-section" v-else>
+            <block v-if="readStatus">
+                <view class="result-header">
+                    <img class="result-img" :src="'static/images/polling/icon-success.png'" />
+                    <view class="result-label">识别成功</view>
+                </view>
+                <view class="result-value">
+                    <view>识别时间</view>
+                    <view>{{parseTime(new Date().getTime(),'{y}年{m}月{d}日 星期{a} {h}:{i}')}}</view>
+                </view>
+                <view class="btn-blue" @click="handleClose">确定</view>
+            </block>
+            <block v-else>
+                <view class="result-header">
+                    <img class="result-img" :src="'static/images/polling/icon-Alert.png'" />
+                    <view class="result-label result-err">识别失败</view>
+                </view>
+                <view class="result-value">
+                    可能的失败原因：手机距离NFC设备较远、手机未联网、NFC设备故障……
+                </view>
+                <view class="btn-blue" @click="open">重新识别</view>
+            </block>
+        </view>
+    </view>
+</view>
+</template>
+ 
+<script setup>
+import { ref, onBeforeUnmount,onMounted } from "vue";
+import { parseTime } from '@/utils/datetime.js';
+
+// 定义组件 emits
+const emit = defineEmits(['close',"changeNfc"]);
+
+// 状态管理
+const formData = ref({
+  deviceId: "", //录入的id
+});
+const readStatus=ref(false);//读取状态 true 成功
+
+// 变量初始化
+let NfcAdapter = null;
+let MifareClassic = null;
+let isListening = false;
+
+// 检查NFC状态
+function open() {
+  try {
+    const main = plus.android.runtimeMainActivity();
+    NfcAdapter = plus.android.importClass("android.nfc.NfcAdapter");
+    const nfcAdapter = NfcAdapter.getDefaultAdapter(main);
+
+    if (!nfcAdapter) {
+      uni.showToast({
+        icon: "error",
+        title: "该设备不支持NFC",
+        duration: 5000,
+      });
+      return;
+    }
+
+    if (!nfcAdapter.isEnabled()) {
+      uni.showToast({
+        icon: "error",
+        title: "NFC功能未打开",
+        duration: 5000,
+      });
+      return;
+    }
+
+    initNFC();
+  } catch (e) {
+    console.error("打开NFC失败:", e);
+    uni.showToast({
+      icon: "error",
+      title: "初始化NFC失败",
+    });
+  }
+}
+
+// 初始化NFC监听
+function initNFC() {
+  try {
+    const main = plus.android.runtimeMainActivity();
+    const Intent = plus.android.importClass("android.content.Intent");
+    const Activity = plus.android.importClass("android.app.Activity");
+    const PendingIntent = plus.android.importClass("android.app.PendingIntent");
+    const IntentFilter = plus.android.importClass(
+      "android.content.IntentFilter"
+    );
+
+    // 导入需要的NFC类
+    plus.android.importClass("android.nfc.NdefRecord");
+    plus.android.importClass("android.nfc.NdefMessage");
+    MifareClassic = plus.android.importClass("android.nfc.tech.MifareClassic");
+    NfcAdapter = plus.android.importClass("android.nfc.NfcAdapter");
+
+    const nfcAdapter = NfcAdapter.getDefaultAdapter(main);
+    if (!nfcAdapter || !nfcAdapter.isEnabled()) return;
+
+    // 创建Intent过滤器
+    const ndef = new IntentFilter("android.nfc.action.NDEF_DISCOVERED");
+    const tag = new IntentFilter("android.nfc.action.TAG_DISCOVERED");
+    const tech = new IntentFilter("android.nfc.action.TECH_DISCOVERED");
+
+    const intentFiltersArray = [ndef, tag, tech];
+
+    // 技术列表
+    const techListsArray = [
+      ["android.nfc.tech.Ndef"],
+      ["android.nfc.tech.IsoDep"],
+      ["android.nfc.tech.NfcA"],
+      ["android.nfc.tech.NfcB"],
+      ["android.nfc.tech.NfcF"],
+      ["android.nfc.tech.Nfcf"],
+      ["android.nfc.tech.Nfef"],
+      ["android.nfc.tech.Ndef"],
+      ["android.nfc.tech.NfcV"],
+      ["android.nfc.tech.NdefFormatable"],
+      ["android.nfc.tech.MifareClassi"],
+      ["android.nfc.tech.MifareUltralight"],
+    ];
+
+    // 创建PendingIntent
+    const _intent = new Intent(main, main.getClass());
+    _intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+    const pendingIntent = PendingIntent.getActivity(main, 0, _intent, 0);
+    // 监听NFC事件
+    startNFCListener();
+
+    // 启用前台调度
+    nfcAdapter.enableForegroundDispatch(
+      main,
+      pendingIntent,
+      intentFiltersArray,
+      techListsArray
+    );
+  } catch (e) {
+    console.error("初始化NFC失败:", e);
+  }
+}
+
+// 开始NFC监听
+function startNFCListener() {
+  if (isListening) return;
+
+  plus.globalEvent.addEventListener("newintent", handleNewIntent);
+  isListening = true;
+}
+
+// 停止NFC监听
+function stopNFCListener() {
+  if (isListening) {
+    plus.globalEvent.removeEventListener("newintent", handleNewIntent);
+    isListening = false;
+  }
+}
+
+// 处理新的NFC意图
+function handleNewIntent() {
+  readNFCData();
+  stopNFCListener();
+}
+
+// 读取NFC数据
+function readNFCData() {
+  try {
+    const main = plus.android.runtimeMainActivity();
+    const _intent = main.getIntent();
+    // 只处理 NDEF 数据
+    let rawMsgs = _intent.getParcelableArrayExtra(
+      "android.nfc.extra.NDEF_MESSAGES"
+    );
+    if (rawMsgs && rawMsgs.length > 0) {
+      try {
+        const records = rawMsgs[0].getRecords();
+        const result = records[0].getPayload();
+        // 取 deviceId
+        function bytesToString(result) {
+          return String.fromCharCode(...result);
+        }
+        formData.value.deviceId = bytesToString(result).substring(3);
+        emit("changeNfc", formData.value.deviceId);
+        readStatus.value=true;
+      } catch (e) {
+        console.log("读取NDEF数据错误:", e);
+        uni.showToast({ title: "读取数据失败,请重新读取", icon: "none" });
+      }
+    } else {
+      uni.showToast({ title: "未识别到NFC标签", icon: "none" });
+    }
+  } catch (e) {
+    console.error("读取NFC数据失败:", e);
+    uni.showToast({ title: "读取数据失败,请重新读取", icon: "none" });
+  }
+}
+
+const handleClose = ()=>{
+	emit('close');
+}
+
+onMounted(() => {
+  open();
+});
+
+// 组件卸载前清理
+onBeforeUnmount(() => {
+  stopNFCListener();
+});
+
+
+defineExpose({
+  open
+});
+</script>
+
+<style lang="scss" scoped>
+.nfc-con {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 9999;
+}
+.nfc-con .nfc-bg{
+    position:absolute;
+    bottom:0;
+    left:0;
+    background-color:#fff;
+    border-radius:18rpx 18rpx  0 0;
+    text-align:center;
+    width:650rpx;
+    padding:30rpx 50rpx 130rpx;
+}
+.nfc-bg .nfc-title{
+    text-align:center;
+    color:#333333;
+    font-size:32rpx;
+    font-weight:bold;
+    position:relative;
+}
+.nfc-bg .nfc-title .nfc-close{
+    position:absolute;
+    top:0rpx;
+    left:-20rpx
+}
+.nfc-con .nfc-bg .nfc-pic{
+    padding:126rpx 0 86rpx;
+}
+.nfc-con .nfc-bg .nfc-pic img{
+    width:260rpx;
+    height:208rpx;
+    
+}
+.nfc-con .nfc-bg .nfc-desc{
+    text-align:center;
+    color:#0395E0;
+    font-size:36rpx;
+    font-weight:bold;
+}
+
+.nfc-pic-animal{
+    animation: elasticLoop 3s ease-in-out infinite;
+}
+@keyframes elasticLoop {
+    0%, 100% { transform: scale(1); }
+    25% { transform: scale(1.2); }
+    50% { transform: scale(0.95); }
+    75% { transform: scale(1.1); }
+}
+
+
+.result-section{
+    .result-header{
+        padding:70rpx 0 0; 
+        .result-img{
+            width:120rpx;
+            height:120rpx;
+        }
+        .result-label,.result-err{
+            text-align:center;
+            color:#00BF5A;
+            font-size:36rpx;
+            font-weight:bold;
+            padding:20rpx 0;
+        }
+        .result-err{
+            color:#FF9638;
+        }
+    }
+    .result-value{
+        color:#333;
+        text-align:center;
+        font-size:30rpx;
+        margin-top:20rpx;
+    }
+    .btn-blue{
+        background-color:#05A3F4;
+        border-radius:40rpx;
+        width:380rpx;
+        height:80rpx;
+        line-height:80rpx;
+        text-align:center;
+        color:#fff;
+        font-size:36rpx;
+        margin:50rpx auto 0;
+    }
+}
+</style>

src/components/calenderMonth.vue

@@ -0,0 +1,235 @@
+<template>
+  <view class="month-calendar">
+    <view class="header">
+      <view class="arrow" @click="prevYear">‹‹</view>
+      <view class="year">
+        <picker @change="changeYear" :value="yearIndex" :range="yearList">
+					<view class="uni-input">{{yearList[yearIndex]}}</view>
+				</picker>
+      </view>
+      <view class="arrow" @click="nextYear">››</view>
+    </view>
+
+    <view class="month-grid">
+      <view
+        v-for="month in months"
+        :key="month.number"
+        class="month-item"
+        :class="{ active: isActive(month.number) }"
+        @click="selectMonth(month.number)"
+      >
+        <view class="month-number">{{ month.number }}</view>
+        <view class="month-english">{{ month.english }}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from "vue";
+
+const props = defineProps({
+    year: {//默认当前年
+      default: new Date().getFullYear()
+    },
+    month:{//默认1月
+      default:1
+    }
+})
+
+// 年份列表
+const yearIndex = ref(100);
+const yearList = computed(() => {
+  let date = new Date();
+  let y = date.getFullYear();
+  let arr = [];
+  // 往前100年 往后61年
+  let j = 0;
+  for (let i = 0; i < 100; i++) {
+    let a = (y-100)+i;
+    arr.push(a);
+    j++;
+  }
+  
+  for (let i = 0; i < 62; i++) {
+    let a = y+i
+    arr.push(a);
+  }
+  yearIndex.value = j;
+  // console.log(arr,yearIndex.value)
+  return arr;
+});
+
+
+const currentYear = ref(props.year);
+const selectedMonth = ref(props.month);
+
+// 月份英文处理
+const months = ref([
+  { number: 1, english: "Jan" },
+  { number: 2, english: "Feb" },
+  { number: 3, english: "Mar" },
+  { number: 4, english: "Apr" },
+  { number: 5, english: "May" },
+  { number: 6, english: "Jun" },
+  { number: 7, english: "Jul" },
+  { number: 8, english: "Aug" },
+  { number: 9, english: "Sep" },
+  { number: 10, english: "Oct" },
+  { number: 11, english: "Nov" },
+  { number: 12, english: "Dec" },
+]);
+
+const isActive = (monthNumber) => {
+  return selectedMonth.value === monthNumber;
+}
+
+// 调用父组件方法
+const emit = defineEmits(["change"]);
+
+// 月份切换
+const selectMonth = (monthNumber) => {
+  selectedMonth.value = monthNumber;
+  // console.log(`选择: ${currentYear.value}年${monthNumber}月`);
+  let m = monthNumber<10?'0'+monthNumber:monthNumber
+  // { year: currentYear.value, month: m }
+  // 触发事件
+  emit('change',  {year:currentYear.value,month:monthNumber,ymStr:currentYear.value+'-'+m});
+}
+
+// 上一年
+const prevYear = () => {
+  currentYear.value--;
+  yearIndex.value--;
+  getCurrentMonth();
+}
+
+// 下一年
+const nextYear = () => {
+  currentYear.value++;
+  yearIndex.value++;
+  getCurrentMonth();
+}
+
+// 年份切换
+const changeYear=(e)=>{
+  // console.log("年份切换=>",e)
+  yearIndex.value = e.detail.value;
+  currentYear.value = yearList.value[yearIndex.value];
+  getCurrentMonth();
+}
+
+// 获取当前月份
+const getCurrentMonth = ()=>{
+  let date = new Date();
+  let year = date.getFullYear();
+  selectedMonth.value = 1;
+  if(year == currentYear.value){
+    selectedMonth.value = date.getMonth()+1;
+  }
+}
+
+</script>
+
+<style scoped>
+.month-calendar {
+  padding:0 20rpx;
+  background: #fff;
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding:0rpx 0 16rpx;
+  /* #ifdef APP-PLUS */
+  padding:20rpx 0;
+  /* #endif */
+  margin-bottom: 30rpx;
+  border-bottom:1px solid #E7E7E7;
+}
+
+.year {
+  font-size: 34rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.arrow {
+  font-size: 60rpx;
+  color: #CACACA;
+  padding: 0;
+  cursor: pointer;
+}
+
+.arrow:active {
+  color: #4A95FF;
+}
+
+.month-grid {
+  /* display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 20rpx; */
+  display: flex;
+  flex-flow:row wrap;
+}
+
+.month-item {
+  border-radius: 16rpx;
+  /* transition: all 0.3s ease; */
+  border: 1px solid #05A3F4;
+  background-color:#EAF8FF;
+  padding:0rpx 0 0;
+  /* #ifdef APP-PLUS */
+  padding:20rpx 0 0;
+  /* #endif */
+  width: calc(100% / 4 - 12px); /* 减去一些间隙以避免溢出 */
+  margin: 10rpx; /* 可选，用于添加间距 */
+}
+
+.month-item.active {
+  background: #FFF4EA;
+  border-color: #FF9638;
+  /* transform: scale(1.05); */
+}
+
+.month-item:active {
+  /* transform: scale(0.95); */
+}
+
+.month-number{
+  color:#05A3F4;
+  font-size:60rpx;
+  font-weight: bold;
+  margin-bottom: 10rpx;
+  text-align: center;
+  position: relative;
+}
+.month-number::after{
+  position: absolute;
+  content: "月";
+  right:5rpx;
+  bottom:15rpx;
+  color:#05A3F4;
+  font-size:22rpx;
+  font-weight: normal;
+}
+
+.month-english{
+  font-size: 26rpx;
+  color: #fff;
+  font-weight: bold;
+  background-color: #05A3F4;
+  border-radius: 0 0 14rpx 14rpx;
+  text-align: center;
+}
+
+.month-item.active .month-number,
+.month-item.active .month-number::after{
+  color:#FF9638;
+}
+
+.month-item.active .month-english{
+  background-color: #FF9638;
+}
+</style>

src/components/calenderMonthSimple.vue

@@ -0,0 +1,161 @@
+<template>
+  <view class="month-calendar">
+    <view class="header">
+      <view class="arrow" @click="prevYearMonth">‹‹</view>
+      <view class="year">
+        <picker mode="multiSelector" :value="dateIndex" 
+          :range="dateRange" @change="handleChange" 
+          @columnchange="onColumnChange"
+        >
+					<view class="uni-input">{{selectedYear}}-{{ selectedMonth.toString().padStart(2, '0') }}</view>
+				</picker>
+      </view>
+      <view class="arrow" @click="nextYearMonth">››</view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed,onMounted,reactive } from "vue";
+
+const props = defineProps({
+    year: {//默认当前年
+      default: new Date().getFullYear()
+    },
+    month:{//默认1月
+      default:1
+    }
+})
+
+// 年份列表
+// const yearIndex = ref(100);
+const selectedYear = ref(props.year);
+const selectedMonth = ref(props.month);
+
+const dateIndex = ref([0, 0])
+const dateRange = ref([[],[]])
+
+// 初始化数据
+onMounted(() => {
+  let date = new Date();
+  let y = date.getFullYear();
+  // 往前100年 往后61年
+  let j = 0;
+  for (let i = 0; i < 100; i++) {
+    let a = (y-100)+i;
+    dateRange.value[0].push(a);
+    j++;
+  }
+  
+  for (let i = 0; i < 62; i++) {
+    let a = y+i
+    dateRange.value[0].push(a);
+  }
+  
+  // 生成月份
+  for (let i = 1; i <= 12; i++) {
+    dateRange.value[1].push(i)// + '月'
+  }
+  
+  // 设置默认选中
+  // const yearIndex = dateRange.years.findIndex(item => item === selectedYear.value)
+  const monthIndex = dateRange.value[1].findIndex(item => item === selectedMonth.value)
+  dateIndex.value = [j, monthIndex]
+  // console.log(dateRange.value[0],dateRange.value[1],dateIndex.value)
+})
+
+
+// 调用父组件方法
+const emit = defineEmits(["change"]);
+
+// 计算月份
+const getYearMonth=(type)=>{
+  let y= selectedYear.value;
+  let m = selectedMonth.value;
+  let current_date = new Date(y+'-'+m)
+  let month=type==1? current_date.getMonth()-1:current_date.getMonth()+1;//上个月or下个月
+  current_date.setMonth(month);
+  selectedYear.value = current_date.getFullYear();
+  selectedMonth.value = current_date.getMonth()+1;
+
+  const yearIndex = dateRange.value[0].findIndex(item => item === selectedYear.value)
+  const monthIndex = dateRange.value[1].findIndex(item => item === selectedMonth.value)
+  dateIndex.value = [yearIndex, monthIndex]
+
+  let m2 = selectedMonth.value.toString().padStart(2, '0')
+  emit('change', {year:selectedYear.value,month:selectedMonth.value,ymStr:selectedYear.value+'-'+m2});
+}
+
+// 上个月
+const prevYearMonth = () => {
+  getYearMonth(1)
+}
+
+// 下个月
+const nextYearMonth = () => {
+  getYearMonth(2)
+}
+
+// 列选择
+const onColumnChange = (e) => {
+  const { column, value } = e.detail;
+  // console.log(column,value)
+  if (column === 0) { // 年份列
+    dateIndex.value[0] = column
+    selectedYear.value = dateRange.value[column][value]
+  } else if (column === 1) { // 月份列
+    dateIndex.value[1] = column
+    selectedMonth.value = dateRange.value[column][value]
+  }
+}
+
+// 年月选择
+const handleChange=(e)=>{
+  const values = e.detail.value 
+  selectedYear.value = parseInt(dateRange.value[0][values[0]])
+  selectedMonth.value = parseInt(dateRange.value[1][values[1]])
+  // console.log('选择的日期:', `${selectedYear.value}-${selectedMonth.value.toString().padStart(2, '0')}`)
+  let m = selectedMonth.value.toString().padStart(2, '0')
+  emit('change',  {year:selectedYear.value,month:selectedMonth.value,ymStr:selectedYear.value+'-'+m});
+}
+
+// 获取
+const getNextMonth = (current_date)=>{
+  current_date.setMonth(current_date.getMonth() + 1);
+}
+
+</script>
+
+<style scoped>
+.month-calendar {
+  padding:0 20rpx;
+  background: #fff;
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding:0rpx 0 16rpx;
+  /* #ifdef APP-PLUS */
+  padding:20rpx 0;
+  /* #endif */
+}
+
+.year {
+  font-size: 34rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.arrow {
+  font-size: 60rpx;
+  color: #CACACA;
+  padding: 0;
+  cursor: pointer;
+}
+
+.arrow:active {
+  color: #4A95FF;
+}
+</style>

src/components/circleTemplate.vue

@@ -0,0 +1,55 @@
+<template>
+    <view :style="{
+          width: size + 'rpx',
+          height: size + 'rpx',
+          '--offset': offset
+        }"
+        v-html="svgHtml"
+        ref="svgRef"
+    >
+    </view>
+    <!-- <svg viewBox="0 0 100 100">
+        <circle cx="50" cy="50" r="40" stroke="#7C7C7C" stroke-width="7" fill="none" />
+        <circle cx="50" cy="50" r="40" stroke="#10F6FC" stroke-width="7" fill="none" stroke-dasharray="251.2" stroke-dashoffset="251.2" class="progress-bar"/>
+    </svg> -->
+</template>
+
+<script setup>
+import { ref, computed, watch } from "vue";
+
+const props = defineProps({
+  size: {
+    type: Number,
+    default: 280,
+  },
+  color: {
+    type: String,
+    default: "#333333",
+  },
+  progress:{}
+});
+
+const svgRef = ref(null)
+const offset = ref(251.2);
+const svgHtml = ref(`<svg viewBox="0 0 100 100">
+      <circle cx="50" cy="50" r="40" stroke="#7C7C7C" stroke-width="7" fill="none" />
+      <circle cx="50" cy="50" r="40" stroke="#10F6FC" stroke-width="7" fill="none" stroke-dasharray="251.2" stroke-dashoffset="${offset.value}"/>
+  </svg>`);
+
+watch(() => props.progress, (newVal, oldVal) => {
+  updateProgress(newVal)
+},{deep:true});
+
+// 更新进度函数
+const updateProgress=(newProgress)=>{
+  offset.value = 251.2 - (251.2 * newProgress) / 100;
+  svgHtml.value = `<svg viewBox="0 0 100 100">
+      <circle cx="50" cy="50" r="40" stroke="#7C7C7C" stroke-width="7" fill="none" />
+      <circle cx="50" cy="50" r="40" stroke="#10F6FC" stroke-width="7" fill="none" stroke-dasharray="251.2" stroke-dashoffset="${offset.value}"/>
+  </svg>`
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/closeableModal.vue

@@ -0,0 +1,176 @@
+<!--
+ * @author wangzhuo
+ * @date 2025/9/18 10:30
+ * @description 模态弹窗组件（支持点击蒙层关闭、支持换行显示内容）
+-->
+<template>
+  <view class="model" v-if="modelValue" @click="handleClose" @touchmove.prevent @mousewheel.prevent>
+    <view v-if="closeTip" style="color:rgba(255,255,255,0.15); letter-spacing: 5rpx; margin-top: 50%;text-align: center">{{closeTip}}</view>
+    <view class="model-con" @click.stop>
+      <view class="model-top" v-if="title">{{ title }}</view>
+      <view :class="{'model-middle': true,'m-height': !title, 'align-center': contentAlign==='center'}">
+        <view v-for="text in content.split('\n')">{{text}}</view>
+      </view>
+      <view class="model-bottom">
+        <button v-if="cancelBtn" type="primary" class="btn-cancel" @click="handleCancel">{{ cancelText }}</button>
+        <button v-if="confirmBtn" type="default" class="btn-green" @click="handleConfirm" :loading="loading"
+                :disabled="loading">{{ confirmText }}
+        </button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref} from 'vue'
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  closeTip: {
+    type: String,
+    default: "点按空白处取消",
+  },
+  title: {
+    type: String,
+  },
+  content: {
+    type: String
+  },
+  contentAlign: {
+    type: String
+  },
+  cancelBtn: {
+    type: Boolean,
+    default: true
+  },
+  confirmBtn: {
+    type: Boolean,
+    default: true
+  },
+  cancelText: {
+    type: String,
+    default: '取消'
+  },
+  confirmText: {
+    type: String,
+    default: '确认'
+  }
+})
+
+let loading = ref(false);
+
+// 调用父组件的方法
+const emit = defineEmits(['update:modelValue', 'cancel', 'confirm', 'success'])
+
+// 点击蒙层关闭模态窗
+const handleClose = () => {
+  emit('update:modelValue', false);
+}
+
+const handleCancel = () => {
+  emit('cancel');
+  emit('success', 'cancel')
+  handleClose();
+}
+
+const handleConfirm = () => {
+  emit('confirm');
+  emit('success', 'confirm')
+  handleClose();
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.model {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 9999;
+
+  .model-con {
+    background: #fff;
+    position: fixed;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    top: 50%;
+    left: 50%;
+    width: 500rpx;
+    min-height: 278rpx;
+    margin-left: -270rpx;
+    margin-top: -139rpx;
+    border-radius: 24rpx;
+    padding: 20rpx 30rpx;
+  }
+
+  .model-top {
+    text-align: center;
+    padding: 20rpx 0;
+    font-size: 36rpx;
+    font-weight: 700;
+  }
+
+  .model-middle {
+    // margin-top:290rpx;
+    text-align: start;
+    font-size: 30rpx;
+    //line-height: 42rpx;
+    color: #333333;
+
+    .font-green {
+      color: #05A3F4;
+      font-size: 42rpx;
+      font-weight: bold;
+      padding: 20rpx 0;
+    }
+  }
+
+  .align-center{
+    text-align: center;
+  }
+
+  .m-height {
+    padding-top: 28rpx;
+  }
+
+  .model-bottom {
+    display: flex;
+    justify-content: center;
+    padding: 30rpx 0 20rpx;
+    // align-items: center;
+    .btn-green, .btn-cancel {
+      background-color: #fff;
+      color: #05A3F4;
+      border-radius: 48rpx;
+      width: 200rpx;
+      height: 65rpx;
+      line-height: 60rpx;
+      text-align: center;
+      font-size: 30rpx;
+      border: 1px solid #05A3F4;
+      margin-left: 0rpx !important;
+      margin-right: 0 !important;
+
+      &::after {
+        border: none;
+        border-radius: 37rpx;
+      }
+    }
+
+    .btn-green {
+      border: 1px solid #05A3F4;
+      background-color: #05A3F4;
+      color: #fff;
+      margin-left: 20rpx !important;
+    }
+  }
+}
+</style>

src/components/customHeader.vue

@@ -7,7 +7,9 @@
         </view>
 
         <!-- 中间标题 -->
-        <view class="navbar-title">{{ title }}</view>
+        <view class="navbar-title">{{ title }}
+            <slot name="title"></slot>
+        </view>
 
         <!-- 右侧内容 -->
         <view class="navbar-right" v-if="rightFlag">
@@ -51,22 +53,20 @@ const handleBack = () => {
 
 <style scoped>
 .custom-navbar {
-    width: 750rpx;
+    width: 100%;
     position: fixed;
     top: 0;
-    left: 50%;
-    margin-left:-375rpx;
     z-index: 999;
     /* #ifdef APP-PLUS */
-    /* background: url('@/static/images/bg-Blue-header.png') no-repeat;
+    background: #307AF5 url('@/static/images/bg-Blue-header.png') no-repeat;
-    background-size:750rpx 160rpx;
+    background-size:100% 160rpx;
-    height:160rpx; */
+    height:160rpx;
     /* #endif */
 
     /* #ifndef APP-PLUS */
-    /* background: url('@/static/images/bg-Blue-header2.png') no-repeat;
+    background: #307AF5 url('@/static/images/bg-Blue-header2.png') no-repeat;
-    background-size:750rpx 116rpx;
+    background-size:100% 116rpx;
-    height:116rpx; */
+    height:116rpx;
     /* #endif */
    
 }

src/components/customSearch.vue

@@ -5,7 +5,7 @@
             <!--   @confirm="handleSearch"  @cancel="handleCancel"-->
             <uni-search-bar class="custom-search" 
                 radius="28" 
-                placeholder="请输入您想查询的内容或服务" 
+                placeholder="请输入搜索条件" 
                 clearButton="auto"
                 bgColor="#6FA2F8" textColor="#ffffff" 
                 v-model="searchText"
@@ -240,7 +240,7 @@ const handleResultClick = (item) => {
     margin-bottom: 0;
     border-radius: 8px 8px 0 0;
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 130px);
+    height: calc(100vh - 168px);
     /* #endif */
     /* #ifndef APP-PLUS */
     height: calc(100vh - 150px);
@@ -268,7 +268,6 @@ const handleResultClick = (item) => {
 .tag-container {
     display: flex;
     flex-wrap: wrap;
-    gap:20rpx;
 }
 
 .search-tag {
@@ -276,8 +275,8 @@ const handleResultClick = (item) => {
     border:1px solid #E8E8E8;
     border-radius: 10rpx;
     padding: 10rpx 15rpx;
-    /* margin-right: 20rpx;
+    margin-right: 20rpx;
-    margin-bottom: 20rpx; */
+    margin-bottom: 20rpx;
     font-size: 28rpx;
 }
 

src/components/customShowModal.vue

@@ -0,0 +1,163 @@
+<template>
+<view class="model" v-if="visibleF">
+	<view class="model-con">
+		<view class="model-top" v-if="title">{{title}}</view>
+		<view :class="{'model-middle':true,'m-height':!title}">{{contents}}</view>
+		<view class="model-bottom">
+			<button type="primary" class="btn-cancel" @click="handleCancel" v-if="btnFlag2">取消</button>
+			<button type="default" class="btn-green" @click="handleConfirm" v-if="btnFlag" :loading="loading" :disabled="loading">{{btnTxt}}</button>
+		</view>
+	</view>
+</view>
+</template>
+
+<script setup>
+import { ref,watch } from 'vue'
+const props = defineProps({
+	visible:{
+		type:Boolean
+	},
+	title:{
+		type: String,
+	},
+	content: {
+		type: String
+	},
+	btnFlag:{
+		type:Boolean,
+		default:true
+	},
+	btnFlag2:{
+		type:Boolean,
+		default:true
+	},
+	btnTxt:{
+		type:String,
+		default:'确定'
+	}
+})
+
+let visibleF = ref(props.visible)
+let titles = ref(props.title)
+let contents = ref(props.content)
+let btnFlags = ref(props.btnFlag)
+let loading = ref(false);
+
+// 显示隐藏
+watch(() => props.visible, (newVal, oldVal) => {
+    loading.value = false;
+	visibleF = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
+
+// 标题
+watch(() => props.title, (newVal, oldVal) => {
+	titles.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+// 内容
+watch(() => props.content, (newVal, oldVal) => {
+	contents = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+// 按钮
+watch(() => props.btnFlag, (newVal, oldVal) => {
+	btnFlags.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+// 调用父组件的方法
+const emit = defineEmits(['close','confirm'])
+const handleCancel = ()=>{
+	emit('close');
+}
+
+const handleConfirm = ()=>{
+	loading.value=true;
+	emit('confirm')
+}
+
+</script>
+
+<style lang="scss" scoped>
+.model {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 9999;
+	.model-con{
+		background: #fff;
+		position: fixed;
+		top:50%;
+		left:50%;
+		width:500rpx;
+		min-height: 278rpx;
+		margin-left: -270rpx;
+		margin-top:-139rpx;
+		border-radius: 24rpx;
+		padding:20rpx 20rpx 30rpx;
+	}
+	.model-top{
+		text-align: center;
+		padding:20rpx 0;
+		font-size:36rpx;
+	}
+	.model-middle{
+		// margin-top:290rpx;
+		text-align: center;
+		font-size:36rpx;
+		color:#333333;
+		.font-green{
+			color:#05A3F4;
+			font-size: 42rpx;
+			font-weight: bold;
+			padding:20rpx 0;
+		}
+	}
+	.model-middle.m-height{
+		padding:60rpx 0 20rpx;
+	}
+	.model-bottom{
+		display: flex;
+		justify-content: center;
+		margin-top:40rpx;
+		// align-items: center;
+		.btn-green,.btn-cancel{
+			background-color: #fff;
+			color:#05A3F4;
+			border-radius: 48rpx;
+			font-size:30rpx;
+			width:200rpx;
+			height:65rpx;
+			line-height: 60rpx;
+			text-align: center;
+			font-size:30rpx;
+			border: 1px solid #05A3F4;
+			margin-left:0rpx !important;
+			margin-right:0 !important;
+			&::after{
+				border:none;
+				border-radius: 37rpx;
+			}
+		}
+		.btn-green{
+			border: 1px solid #05A3F4;
+			background-color:#05A3F4;
+			color:#fff;
+			margin-left:20rpx !important;
+		}
+	}
+}
+</style>

src/components/mediaPreview.vue

@@ -0,0 +1,93 @@
+<template>
+  <!-- 放大后的遮罩层 -->
+  <view v-if="isEnlarged" class="image-preview-overlay"  @click="handleClose">
+    <block v-if="getFileType(mediaUrl)=='image'">
+        <image 
+          :src="mediaUrl" 
+          mode="widthFix" 
+          class="enlarged-image" 
+        />
+    </block>
+    <view :class="videoClass"  v-else-if="getFileType(mediaUrl)=='video'">
+      <!--  object-fit="cover" -->
+        <video :src="mediaUrl" controls  @loadedmetadata="onVideoLoaded"></video>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref,watch } from 'vue';
+import {getFileType} from '@/utils/common.js';
+const props = defineProps({
+	visible:{
+		type:Boolean
+	},
+  url:{}//图片路径
+})
+
+const isEnlarged = ref(props.visible);
+const mediaUrl = ref(props.url);
+// const mediaType = ref('');//类型
+// 显示隐藏
+watch(() => props.visible, (newVal, oldVal) => {
+  isEnlarged.value = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
+
+watch(() => props.url, (newVal, oldVal) => {
+  mediaUrl.value = newVal;
+},{
+    deep:true,
+    immediate:true
+});
+const emit = defineEmits(['close'])
+const handleClose=()=>{
+  emit('close');
+}
+
+// 获取视频的宽和高
+let videoClass = ref('enlarged-image');
+const onVideoLoaded = (e) => {
+  // 通过事件对象获取原始宽高[citation:3]
+  let w = e.detail.width;
+  let h = e.detail.height;
+  // 你也可以在这里进行后续操作，比如根据宽高比调整UI
+  console.log(w,h)
+  if(h>w){
+    videoClass.value="enlarged-image"
+  }else{
+    videoClass.value="enlarged-image"
+  }
+};
+
+</script>
+
+<style scoped>
+.image-preview-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.9);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 10000;
+}
+
+:deep(uni-video){
+  width:100%;
+}
+
+.enlarged-image {
+  width: 100%;
+  height: auto;
+}
+.enlarged-image2 {
+  width:auto;
+  height: 100vh;
+}
+</style>

src/components/multipleSelect.vue

@@ -10,7 +10,7 @@
             </view>
             <!-- 显示框 -->
             <view class="uni-select-multiple" v-show="realValue.length">
-                <block v-if="multiple" >
+                <block v-if="multiple">
                     <view class="uni-select-multiple-item" v-for="(item, index) in changevalue" :key="index">
                         {{ item[slabel] }}
                         <view class="close-icon" v-if="showValueClear">
@@ -43,7 +43,7 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref, defineExpose} from "vue";
+import { onMounted, reactive, ref, watch} from "vue";
 const props = defineProps({
     // 是否显示全部清空按钮
     showClearIcon: {
@@ -107,8 +107,8 @@ const props = defineProps({
 });
 const emit = defineEmits(["change"]);
 const active = ref(false); // 组件是否激活，
-let changevalue = reactive([]);
+let changevalue = ref([]);
-let realValue = reactive([]);
+let realValue = ref([]);
 onMounted(() => {
     init();
 });
@@ -119,16 +119,16 @@ const init = () => {
         props.options.forEach((item) => {
             props.value.forEach((i) => {
                 if (item[props.svalue] === i) {
-                    changevalue.push(item);
+                    changevalue.value.push(item);
                 }
             })
         })
-        realValue = props.value;
+        realValue.value = props.value;
-        console.log("props---", changevalue);
+        // console.log("props---", changevalue.value);
 
     } else {
-        changevalue = [];
+        changevalue.value = [];
-        realValue = [];
+        realValue.value = [];
     }
 };
 // 点击展示选项
@@ -139,48 +139,50 @@ const handleSelect = () => {
 // 移除数据
 const handleRemove = (index) => {
     if (index === null) {
-        realValue = [];
+        realValue.value = [];
-        changevalue = [];
+        changevalue.value = [];
     } else {
-        realValue.splice(index, 1);
+        realValue.value.splice(index, 1);
-        changevalue.splice(index, 1);
+        changevalue.value.splice(index, 1);
     }
-    emit("change", changevalue, realValue);
+    emit("change", changevalue.value, realValue.value);
 };
 // 点击组件某一项
 const handleChange = (index, item) => {
-    console.log("选中了某一项", index, item);
+    // console.log("选中了某一项", index, item);
     // 如果是单选框，选中一项后直接关闭
     if (!props.multiple) {
         console.log("关闭下拉框");
-        changevalue.length = 0
+        changevalue.value.length = 0
         realValue.length = 0
-        changevalue.push(item);
+        changevalue.value.push(item);
-        realValue.push(item[props.svalue])
+        realValue.value.push(item[props.svalue])
         active.value = !active.value;
     } else {
         // 多选操作
-        const arrIndex = realValue.indexOf(item[props.svalue]);
+        const arrIndex = realValue.value.indexOf(item[props.svalue]);
         if (arrIndex > -1) {
             // 如果该选项已经选中，当点击后就不选中
-            changevalue.splice(arrIndex, 1);
+            changevalue.value.splice(arrIndex, 1);
-            realValue.splice(arrIndex, 1);
+            realValue.value.splice(arrIndex, 1);
         } else {
             // 否则选中该选项
-            changevalue.push(item);
+            changevalue.value.push(item);
-            realValue.push(item[props.svalue]);
+            realValue.value.push(item[props.svalue]);
         }
     }
     // 触发回调函数
-    emit("change", changevalue, realValue);
+    emit("change", changevalue.value, realValue.value);
 };
+
 // 失去焦点时关闭选项列表
 const handleBlur = () => {
-  active.value = false;
+    active.value = false;
 };
+
 // 定义组件实例暴露的方法
 defineExpose({
-  handleBlur
+    handleBlur
 });
 </script>
 

src/components/pollingShowModal.vue

@@ -0,0 +1,245 @@
+<template>
+<view class="model" v-if="visibleF">
+	<view class="model-con">
+		<view class="model-top" v-if="title">{{title}}</view>
+		<view class="img-title" :class="{'m-height':!title}" v-if="!isGreen">
+			<img :src="'static/images/polling/icon-Alert.png'"/>
+		</view>
+		<view class="img-title" :class="{'m-height':!title}" v-else>
+			<img :src="'static/images/polling/icon-success.png'"/>
+		</view>
+		<view class="model-middle">
+			<view :class="{'font-green':true,'font-orange':!isGreen}">{{contents}}</view>
+			<view>{{subContents}}</view>
+			<view v-if="subTimes">{{parseTime(subTimes,'{y}年{m}月{d}日 星期{a} {h}:{i}')}}</view>
+		</view>
+		<view class="model-bottom">
+			<button type="default" class="btn-green" @click="handleConfirm" 
+				v-if="btnFlags" :loading="!isGreens?false:loading" 
+				:disabled="!isGreens?false:loading"
+			>{{btnTxts}}</button>
+			<button type="primary" class="btn-cancel" @click="handleCancel" v-if="btnFlags2">{{btnCancelTxts}}</button>
+		</view>
+	</view>
+</view>
+</template>
+
+<script setup>
+import { ref,watch } from 'vue'
+import { parseTime } from '@/utils/datetime.js';
+const props = defineProps({
+	visible:{
+		type:Boolean
+	},
+	title:{//标题
+		type: String,
+	},
+	content: {//显示的内容
+		type: String
+	},
+	subContent:{//确认内容
+		type:String,
+		default:'是否确认提交?'
+	},
+	subTime:{//提交的时间
+
+	},
+	btnFlag:{//提交按钮是否显示
+		type:Boolean,
+		default:true
+	},
+	btnFlag2:{//暂不提交按钮是否显示
+		type:Boolean,
+		default:true
+	},
+	btnTxt:{//提交按钮文字
+		type:String,
+		default:'提交'
+	},
+	btnCancelTxt:{//暂不提交按钮文字
+		type:String,
+		default:'暂不提交'
+	},
+	isGreen:{//是否显示绿色
+		type:Boolean,
+		default:false
+	}
+})
+
+let visibleF = ref(props.visible)
+let titles = ref(props.title)
+let contents = ref(props.content);
+let subContents = ref(props.subContent);
+let subTimes = ref(props.subTime);
+let btnFlags = ref(props.btnFlag);
+let btnFlags2 = ref(props.btnFlag2)
+let btnTxts = ref(props.btnTxt);
+let btnCancelTxts = ref(props.btnCancelTxt);
+let isGreens = ref(props.isGreen);
+let loading = ref(false);
+
+// 显示隐藏
+watch(() => props.visible, (newVal, oldVal) => {
+    loading.value = false;
+	visibleF = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
+
+// 标题
+watch(() => props.title, (newVal, oldVal) => {
+	titles.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+// 内容
+watch(() => props.content, (newVal, oldVal) => {
+	contents.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+watch(() => props.subContent, (newVal, oldVal) => {
+	subContents.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+watch(() => props.subTime, (newVal, oldVal) => {
+	subTimes.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+// 按钮
+watch(() => props.btnFlag, (newVal, oldVal) => {
+	btnFlags.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+// 按钮
+watch(() => props.btnFlag2, (newVal, oldVal) => {
+	btnFlags2.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+watch(() => props.btnTxt, (newVal, oldVal) => {
+	btnTxts.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+watch(() => props.btnCancelTxt, (newVal, oldVal) => {
+	btnCancelTxts.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+// 调用父组件的方法
+const emit = defineEmits(['close','confirm'])
+const handleCancel = ()=>{
+	emit('close');
+}
+
+const handleConfirm = ()=>{
+	if(isGreens.value){
+		loading.value=false;
+	}else{
+		loading.value=true;
+	}
+	emit('confirm')
+}
+
+</script>
+
+<style lang="scss" scoped>
+.model {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 9999;
+	.model-con{
+		background: #fff;
+		position: fixed;
+		top:40%;
+		left:50%;
+		// width:620rpx;
+		width:580rpx;
+		min-height: 278rpx;
+		margin-left:-310rpx;
+		margin-top:-139rpx;
+		border-radius: 24rpx;
+		padding:20rpx 20rpx 30rpx;
+	}
+	.model-top{
+		text-align: center;
+		padding:20rpx 0;
+		font-size:36rpx;
+	}
+	.img-title{
+		text-align: center;
+		img{
+			width:120rpx;
+			height: 120rpx;
+		}
+	}
+	.model-middle{
+		text-align: center;
+		font-size:30rpx;
+		color:#333333;
+		margin-bottom:10rpx;
+		.font-green{
+			color:#00BF5A;
+			font-size: 36rpx;
+			font-weight: bold;
+			padding:20rpx 0;
+		}
+		.font-orange{
+			color:#FF9638;
+			font-size: 36rpx;
+			font-weight: bold;
+			padding:0rpx 0 20rpx;
+		}
+	}
+	.m-height{
+		padding:40rpx 0 20rpx;
+	}
+	.model-bottom{
+		width:380rpx;
+		margin-top:40rpx;
+		margin:40rpx auto;
+		.btn-green,.btn-cancel{
+			background-color: #fff;
+			color:#05A3F4;
+			border-radius: 48rpx;
+			font-size:36rpx;
+			text-align: center;
+			line-height: 2.2;
+			margin:10rpx 0 0 0 !important;
+			&::after{
+				border:none;
+				border-radius: 37rpx;
+			}
+		}
+		.btn-green{
+			border: 1px solid #05A3F4;
+			background-color:#05A3F4;
+			color:#fff;
+			margin:0rpx 0 0 20rpx !important;
+		}
+	}
+}
+</style>

src/components/searchDate.vue

@@ -0,0 +1,242 @@
+<template>
+<view class="date-con" v-if="isShow">
+    <view class="date-bg">
+        <view class="date-title">
+            <uni-icons type="closeempty" size="20" @click="handleClose"></uni-icons>
+            <view class="choose-title">选择时间</view>
+            <view class="date-confirm" @click="handleConfirm">确定</view>
+        </view>
+        <!-- 最近多少天 '3days' | '7days' | '1month' | '3months'-->
+        <view class="range-list">
+            <view class="range-item" :class="{active:lastType=='3days'}" @click="handleChoose('3days')">近3天</view>
+            <view class="range-item" :class="{active:lastType=='7days'}" @click="handleChoose('7days')">近7天</view>
+            <view class="range-item" :class="{active:lastType=='1month'}" @click="handleChoose('1month')">近1月</view>
+            <view class="range-item" :class="{active:lastType=='3months'}" @click="handleChoose('3months')">近3月</view>
+        </view>
+        <!-- 时间段 -->
+        <view class="range-to">
+            <view class="to-bg" :class="{blue:dateType==1}" @click="handleChooseDate(1,beginDate)">{{beginDate}}</view>
+            <view class="to">至</view>
+            <view class="to-bg" :class="{blue:dateType==2}" @click="handleChooseDate(2,endDate)">{{endDate}}</view>
+        </view>
+        <!-- 时间选择 -->
+        <picker-view class="picker-view" v-if="pickerVisible" :indicator-style="indicatorStyle" 
+            :value="dateValueArr" @change="bindChange"
+        >
+            <picker-view-column>
+                <view class="item" v-for="(item,index) in years" :key="index">{{item}}</view>
+            </picker-view-column>
+            <picker-view-column>
+                <view class="item" v-for="(item,index) in months" :key="index">{{item}}</view>
+            </picker-view-column>
+            <picker-view-column>
+                <view class="item" v-for="(item,index) in days" :key="index">{{item}}</view>
+            </picker-view-column>
+        </picker-view>
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted } from 'vue'
+import { getDateRange } from '@/utils/datetime.js';
+const props = defineProps({
+    isShow:false,
+})
+
+let years = ref([]);
+let months= ref([]);
+let days = ref([]);
+let pickerVisible =ref(false)
+let indicatorStyle=ref(`height: 88rpx`);
+let dateValueArr = ref([])
+
+// 默认最近3天
+let lastType = ref('3days');
+let dateType = ref('');
+let beginDate = ref('');
+let endDate = ref('');
+
+// 初始化日期
+const initDate=(date)=>{
+    for (let i = 1990; i <= date.getFullYear() + 61; i++) {
+        years.value.push(i)
+    }
+    for (let i = 1; i <= 12; i++) {
+        months.value.push(i.toString().padStart(2, '0'))
+    }
+    for (let i = 1; i <= 31; i++) {
+        days.value.push(i.toString().padStart(2, '0'))
+    }
+}
+
+
+// 调用父类方法
+const emit = defineEmits(['close','confirm'])
+const handleClose = ()=>{
+    emit('close');
+}
+const handleConfirm = ()=>{
+    emit('confirm',{
+        startDate:beginDate.value,
+        endDate:endDate.value,
+        lastType:lastType.value
+    });
+}
+
+// 选择最近
+const handleChoose=(type)=>{
+    lastType.value = type;
+
+    let dateObj = getDateRange(type);
+    beginDate.value = dateObj.startDate;
+    endDate.value = dateObj.endDate;
+
+    pickerVisible.value = false;
+    dateType.value=""
+}
+// 选择开始或结束时间
+const handleChooseDate=(type,dateStr)=>{
+    dateType.value = type;
+    pickerVisible.value = true;
+    lastType.value='';
+    // 回显picker
+    let strs = dateStr.split("-"); 
+    const yearIndex = years.value.findIndex(item => item == strs[0])
+    const monthIndex = months.value.findIndex(item => item == strs[1])
+    const dayIndex = days.value.findIndex(item => item == strs[2])
+    dateValueArr.value = [yearIndex, monthIndex, dayIndex];
+    // console.log(strs,dateValueArr.value)
+}
+
+// 切换日期
+const bindChange= (e)=>{
+    const val = e.detail.value
+    let year = years.value[val[0]]
+    let month = months.value[val[1]]
+    let day = days.value[val[2]]
+    // console.log(year,month,day);
+    let dateStr = `${year}-${month}-${day}`;
+    if(dateType.value==1){//开始时间
+        beginDate.value = dateStr
+    }else{
+        endDate.value = dateStr
+    }
+}
+
+onMounted(() => {
+    let date = new Date();
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+
+    initDate(date);
+
+    const yearIndex = years.value.findIndex(item => item == year)
+    const monthIndex = months.value.findIndex(item => item == month)
+    const dayIndex = days.value.findIndex(item => item == day)
+    dateValueArr.value = [yearIndex, monthIndex, dayIndex];
+
+    // 默认近3天
+    let dateObj = getDateRange('3days');
+    beginDate.value = dateObj.startDate;
+    endDate.value = dateObj.endDate
+})
+</script>
+
+<style lang="scss" scoped>
+.date-con {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 9999;
+
+    .date-bg{
+        width:670rpx;
+        border-radius: 18rpx 18rpx 0 0;
+        padding:20rpx 40rpx;
+        position: fixed;
+        bottom:0;
+        background-color: #fff;
+        min-height: 650rpx;
+        .date-title{
+            display: flex;
+            align-items: center;
+            .choose-title{
+                width:550rpx;
+                margin:0 auto;
+                text-align: center;
+                color:#333;
+                font-weight: bold;
+                font-size: 32rpx;
+            }
+            .date-confirm{
+                margin-left:auto;
+                color:#05A3F4;
+                font-size:28rpx;
+            }
+        }
+        .range-list{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-top:30rpx;
+            .range-item{
+                width:150rpx;
+                border-radius: 10rpx;
+                border:1px solid #E8E8E8;
+                text-align: center;
+                color:#333333;
+                font-size:28rpx;
+                padding:10rpx 0;
+                margin-right:15rpx;
+            }
+            .range-item.active{
+                border:1px solid #05A3F4;
+                color:#05A3F4;
+            }
+        }
+        .range-to{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-top:30rpx;
+            .to-bg{
+                border:1px solid #F5F5F5;
+                background-color: #F5F5F5;
+                width:275rpx;
+                border-radius: 28rpx;
+                text-align: center;
+                color:#919191;
+                font-size:28rpx;
+                padding:8rpx 0;
+            }
+            .to-bg.blue{
+                border:1px solid #05A3F4;
+                color:#05A3F4;
+                background-color:#fff;
+            }
+            .to{
+                color:#333333;
+                font-size:28rpx;
+                margin:0 42rpx;
+            }
+        }
+        .picker-view {
+            width: 670rpx;
+            height: 385rpx;
+            margin-top: 20rpx;
+            :deep(.item){
+                text-align: center;
+                line-height: 78rpx;
+                /* #ifdef APP-PLUS */
+                line-height: 88rpx;
+                /* #endif */
+            }
+        }
+    }
+}
+</style>

src/constants/mapApiConstants.js

@@ -0,0 +1,22 @@
+/**
+ * @description 定位API的配置
+ * @type {{URL: string, token: string}}
+ */
+export const MapApiConfig = {
+    /**
+     * @description API接口地址
+     */
+    URL: 'https://tiles.geovisearth.com/geo/v1/geocode/regeo',
+    /**
+     * @description 接口鉴权Token
+     */
+    token: '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf',
+    /**
+     * @description 打卡类型：西安办事处
+     */
+    XI_AN_BAN: {latitude: 34.1360, longitude: 108.9126, typeName: '西安办事处位置打卡'},
+    /**
+     * @description 打卡类型：第三方维护
+     */
+    OTHER: {typeName: '第三方维护打卡'}
+}

src/enums/cacheEnums.js

@@ -1,2 +1,11 @@
 export const TOKEN_KEY = 'token';
-export const AGREEWELCOME_KEY="agreewelcome"
+export const AGREEWELCOME_KEY="agreewelcome";
+
+// clientId 默认写2 
+export const CLIENT_ID="2";
+// #区分内外网 //1-内网，2-外网
+export const NETWORK_ENV=1;
+
+// miniIo 参数对象
+export const MINIO_KEY="minioKey"
+

src/enums/requestEnums.js

@@ -11,8 +11,8 @@ export const RequestMethodsEnum = {
 
 export const RequestCodeEnum = {
     SUCCESS: 200, //成功
-    FAILED: 500, // 失败
+    FAILED: -1, // 失败
-    TOKEN_INVALID: 10003 // TOKEN失效未登录
+    TOKEN_INVALID: 401 // TOKEN失效未登录
 };
 
 export const RequestErrMsgEnum = {

src/main.js

@@ -1,16 +1,28 @@
 import { createSSRApp } from "vue";
 import App from "./App.vue";
-
+import { CLIENT_ID,NETWORK_ENV } from '@/enums/cacheEnums';
 import '@/static/font/iconfont.css'
 
+
+// 注册自定义组件
+import customShowModal from '@/components/customShowModal.vue'
+
 // pinia
 import { createPinia } from 'pinia'
 const pinia = createPinia()
 
+
 export function createApp() {
 
 	const app = createSSRApp(App);
 
+	// 全局变量
+	app.config.globalProperties.$CLIENT_ID = CLIENT_ID;
+	app.config.globalProperties.$NETWORK_ENV = NETWORK_ENV;
+
+	// 全局自定义组件
+	app.component('customShowModal', customShowModal);
+	
 	app.use(pinia)
 
 	return {

src/manifest.json

@@ -1,9 +1,9 @@
 {
     "id" : "H5E705637",
-    "name" : "app",
+    "name" : "718友晟",
-    // "appid" : "",
+    "appid" : "__UNI__0B682E1",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.2",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -16,12 +16,17 @@
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
-            "waiting" : true,
+            "waiting" : false, // 是否显示等待界面
             "autoclose" : true,
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Push" : {},
+            "Camera" : {},
+            "Barcode" : {},
+            "VideoPlayer" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -41,21 +46,82 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\" />",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\" />",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
+                    "<uses-permission android:name=\"android.permission.GET_TASKS\" />",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_ADDED\" />",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_CHANGED\" />",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_INSTALL\" />",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_REPLACED\" />",
+                    "<uses-permission android:name=\"android.permission.RESTART_PACKAGES\" />",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
+                    "<uses-permission android:name=\"android.permission.NFC\"/>",
+                    "<uses-feature android:name=\"android.hardware.nfc\" android:required=\"true\"/>",
+					"<uses-permission android:name=\"android.permission.POST_NOTIFICATIONS\"/>"
                 ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "minSdkVersion" : 23,
+                "targetSdkVersion" : 35,
                 "icons" : {
                     "android" : {
-                        "hdpi" : "static/icons/72x72.png",
+                        "hdpi" : "/static/images/icon.png",
-                        "xhdpi" : "static/icons/96x96.png",
+                        "xhdpi" : "/static/images/icon.png",
-                        "xxhdpi" : "static/icons/144x144.png",
+                        "xxhdpi" : "/static/images/icon.png",
-                        "xxxhdpi" : "static/icons/192x192.png"
+                        "xxxhdpi" : "/static/images/icon.png"
                     }
                 }
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : true,
+						"icons" : {
+						    "push" : {
+						        "ldpi" : "/static/images/icon.png",
+						        "mdpi" : "/static/images/icon.png",
+						        "hdpi" : "/static/images/icon.png",
+						        "xhdpi" : "/static/images/icon.png",
+						        "xxhdpi" : "/static/images/icon.png"
+						    },
+							"small" : {
+							    "ldpi" : "/static/images/icon_small.png",
+							    "mdpi" : "/static/images/icon_small.png",
+							    "hdpi" : "/static/images/icon_small.png",
+							    "xhdpi" : "/static/images/icon_small.png",
+							    "xxhdpi" : "/static/images/icon_small.png"
+							}
+						}
+                    }
+                }
+            }
+        },
+        "nativePlugins" : {
+            "Tm-TmSafeSaveFileModule" : {
+                "__plugin_info__" : {
+                    "name" : "TmSafeSaveFileModule隐私数据保存",
+                    "description" : "TmSafeSaveFileModule隐私数据保存",
+                    "platforms" : "Android",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */
@@ -84,8 +150,8 @@
     "h5" : {
         "router" : {
             "base" : ""
-            /*,"mode": "history"   仅对 H5 平台生效 */
         },
+        /*,"mode": "history"   仅对 H5 平台生效 */
         "template" : "index.html"
     }
 }

src/pages.json

@@ -5,12 +5,19 @@
 			"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
 		}
 	},
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/loading/loading",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/deviceAuth/deviceAuth",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -20,11 +27,79 @@
 		{
 			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"renderer": "native",
+				"hardwareAccelerated": true
 			}
 		},
 		{
 			"path": "pages/business/business",
+			"style": {
+				"navigationBarTitleText": "",
+				"renderer": "native",
+				"hardwareAccelerated": true
+			}
+		},
+		{
+			"path": "pages/business/editDaily",
+			"style": {
+				"navigationBarTitleText": "",
+				"renderer": "native",
+				"hardwareAccelerated": true
+			}
+		},
+		{
+			"path": "pages/notice/notice",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/notice/noticeDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/notice/waitApprove",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/notice/waitApproveDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/userinfo/userinfo",
+			"style": {
+				"navigationBarTitleText": "",
+				"renderer": "native",
+				"hardwareAccelerated": true
+			}
+		},
+		{
+			"path": "pages/userinfo/version",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/search/search",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/h5-webview/h5-webview",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketInformation", //市场信息管理
 			"style": {
 				"navigationBarTitleText": ""
 			}
@@ -148,13 +223,6 @@
 				"navigationBarTitleText": "通用信息更新"
 			}
 		},
-		//选择客户（已更新）
-		{
-			"path": "pages/business/CRM/chooseCus",
-			"style": {
-				"navigationBarTitleText": "客户选择"
-			}
-		},
 		//选择客户人员（已更新）
 		{
 			"path": "pages/business/CRM/customerUserList",
@@ -263,7 +331,8 @@
 			"path": "pages/business/CRM/plan/planView",
 			//周计划查看
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -315,6 +384,20 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/business/CRM/mainOwner/view/viewMainOwner",
+			//客户人员主归属人变更查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/mainOwner/view/viewMainOwnerDetail",
+			//客户人员主归属人变更查看明细
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/business/CRM/customer/components/customerUserEdit",
 			//客户人员详情编辑
@@ -352,13 +435,6 @@
 		},
 		//===================================活动报告====================
 		{
-			"path": "pages/business/CRM/mainOwner/view/viewMainOwner", //查看主归属人变更信息 
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-
 			"path": "pages/business/CRM/marketActivity/visitReport",
 			//市场信息管理
 			"style": {
@@ -471,23 +547,189 @@
 				"navigationBarTitleText": ""
 			}
 		},
-		//===================================活动报告====================
 		{
-			"path": "pages/notice/notice",
+			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackIndex",
+			//质量反馈
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": ""
-				"app-plus": {
-					"bounce": "none"
-					// 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
-				},
-				"mp-alipay": {
-					"allowsBounceVertical": "NO"
-				}
-				// 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
 			}
 		},
 		{
-			"path": "pages/userinfo/userinfo",
+			"path" : "pages/business/EQF/qualityFeedback/qualityFeedbackAdd",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/chooseCus",
+			//选择客户单位
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackEnter",
+			//明细录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/qualityFeedbackDetailComponent",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/customerOrder",
+			//选择合同
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/gkCustomerOrder",
+			//选择合同
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter",
+			//明细录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/gkQualityFeedbackDetailComponent",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/searchList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/taskDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/optionDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/taskList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemReport",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemLog",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/nfcTest/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//************************考勤管理请假功能
+		//请假申请
+		{
+			"path": "pages/business/CRM/leave/askLeave",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//添加请假申请
+		{
+			"path": "pages/business/CRM/leave/addApply",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//我的申请表单
+		{
+			"path": "pages/business/CRM/leave/myApply",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//我的申请表单详情
+		{
+			"path": "pages/business/CRM/leave/myApplyDetail",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//可销假列表
+		{
+			"path": "pages/business/CRM/leave/backApply",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//添加销假申请
+		{
+			"path": "pages/business/CRM/leave/addBackApply",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//请假审批
+		{
+			"path": "pages/business/CRM/leave/reviewLeave",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//审批详情
+		{
+			"path": "pages/business/CRM/leave/reviewDetail",
+			
 			"style": {
 				"navigationBarTitleText": ""
 			}
@@ -507,7 +749,8 @@
 		"backgroundColor": "#000000",
 		"fontSize": "12px",
 		"iconWidth": "24px",
-		"list": [{
+		"list": [
+			{
 				"pagePath": "pages/home/home",
 				"iconPath": "static/images/tabs/menu-home.png",
 				"selectedIconPath": "static/images/tabs/menu-home-on.png",

src/pages/business/CRM/chooseCus.vue

@@ -1,170 +0,0 @@
-<template>
-    <view class="con-body">
-        <view >
-            <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
-            </customHeader>
-            <!-- 高度来避免头部遮挡 -->
-            <view class="top-height"></view>
-            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
-                @iconClick="iconClick">
-            </uni-easyinput>
-
-		
-		<view class="inner-box">
-			<view class="list-cont">
-				<radio-group class="block" @change="radioChange">
-					<view class="item"   v-for="(item, index) in dataList">
-						<radio class='radio' :value="index" ></radio>
-						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
-					</view>
-				</radio-group>
-			</view>
-		</view>
-
-        </view>
-    </view>
-</template>
-
-<script setup>
-import customHeader from '@/components/customHeader.vue'
-import { getYsCustomerList } from '../../../api/crm/api_ys.js'
-import { onMounted,  reactive, ref, watch } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import { useMessage } from '../../../utils/message.js'
-
-
-
-const message = useMessage();
-
-//点击查询客户人员
-const queryParams = ref({
-    cusName: '',
-    nickName:'',
-    pageNum: 1,
-    pageSize: 10
-})
-
-
-onMounted(() => {
-    
-})
-
-onLoad(options => {
-    queryParams.value.cusName = options.cusName
-})
-const dataList = ref([])
-
-
-
-
-//查询某一客户人员
-let searchContent = ref('')
-
-function iconClick() {
-    message.toast('点击了查询，当前内容：' + searchContent.value)
-}
-
-//监视查询的内容的变化
-let queryCusForm = reactive({})
-watch(searchContent,(newValue,oldValue)=>{
-    console.log("输入内容：",searchContent.value)
-    queryCusForm.cusName = searchContent.value
-    getYsCustomerList(queryCusForm).then(res=>{
-        dataList.value = res.rows
-    })
-})
-
-function radioChange(event) {
-     const selectedIndex = event.detail.value
-    let test = dataList.value[selectedIndex]
-    // 发送全局事件
-    uni.$emit('onCustomerSelected', test)
-    let cusName = test.cusName;//客户名称
-    let cusId = test.cusId;//客户ID
-    uni.navigateBack()//返回上一页
-}
-
-
-
-</script>
-
-<style scoped lang="scss">
-
-.con-body{
-    background: white;
-}
-
-
-/* Container for the checkbox group */
-.checkbox-group.block {
-    width: 100%;
-}
-
-/* Each item row */
-.itemClass {
-    display: flex;
-    align-items: center;
-    padding: 10rpx 0;
-    margin-left: 15rpx;
-    border-bottom: 1px solid #eee;
-    /* optional divider */
-}
-
-/* Checkbox styling */
-.checkBoxClass {
-    margin-right: 12rpx;
-}
-
-/* Content container */
-.clientClass {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    font-size: 36rpx;
-    color: #333;
-    /* default text color */
-}
-
-/* Blue username text */
-.blue-text {
-    /* or any blue you prefer */
-    margin-right: 5rpx;
-}
-.inner-box {
-  width: 100%;
-  padding: 10px;
-  box-sizing: border-box;
-}
-
-.list-cont {
-  width: 100%;
-}
-
-.block {
-  width: 100%;
-}
-
-.item {
-  display: flex;
-  align-items: center;
-  padding: 12px 0;
-  border-bottom: 1px solid #eee;
-}
-
-.radio {
-  margin-right: 12px;
-  transform: scale(0.9);
-}
-
-.name {
-  flex: 1;
-  font-size: 16px;
-  color: #333;
-}
-
-.checked {
-  color: #007AFF; /* 选中状态的颜色 */
-}
-</style>

src/pages/business/CRM/customer/changeCustomerOwner.vue

@@ -24,7 +24,7 @@
         </view>
 
         <!-- 分页部分  top="68rpx" -->
-        <mescroll-uni  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+        <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}"
         >
@@ -126,7 +126,10 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -146,44 +149,31 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
+  uni.showLoading();
-    uni.showLoading();
+  cssFlag.value = true;
-    cssFlag.value = true;
+  setTimeout(async () => {
-    setTimeout(async () => {
+    // 重置页码为第一页
-      // 重置页码为第一页
+    const res = await getList(1, mescroll.size || upOption.page.size);
-      const res = await getList(1, mescroll.size || upOption.page.size);
+    cssFlag.value = false;
-      list.value = res.list;
+    list.value = res.list;
-      cssFlag.value = false;
+    // 正确传递 total 参数
-      // 正确传递 total 参数
+    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+  }, 500);
-      uni.hideLoading();
-
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
+  uni.showLoading();
-    uni.showLoading();
+  setTimeout(async () => {
-    setTimeout(async () => {
+    // 使用 mescroll 提供的页码和大小参数
-      // 使用 mescroll 提供的页码和大小参数
+    const res = await getList(mescroll.num, mescroll.size);
-      const res = await getList(mescroll.num, mescroll.size);
+    if (mescroll.num === 1) {
-      if (mescroll.num === 1) {
+      list.value = res.list;
-        list.value = res.list;
+    } else {
-      } else {
+      list.value.push(...res.list);
-        list.value.push(...res.list);
+    }
-      }
+    // 正确判断是否还有更多数据
-      // 正确判断是否还有更多数据
+    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+  }, 500);
-      uni.hideLoading();
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
 }
 
 // 获取数据列表
@@ -194,12 +184,17 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
+    try {
-    let res = await SearchForAllPerson(param);
+      let res = await SearchForAllPerson(param);
-    resolve({
+      resolve({
-      list: res.rows,
+        list: res.rows,
-      total: res.total
+        total: res.total
-    });
+      });
+    } catch (e) {
+      console.log(e, '数据获取失败');
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -300,41 +295,20 @@ let handleCopyInfo = (item) => {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-
-.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;
-}
-
 .scroll-h {
-  /* #ifdef APP-PLUS */
+  height: 100%;
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
 }
 
 .white-bg {
@@ -345,10 +319,4 @@ let handleCopyInfo = (item) => {
   }
 }
 
-.white-bg:hover {
-  //background-color: #f1f1f1;
-  background-color: #f1f1f1; /* Chrome, Safari, Opera */
-  box-shadow: 0px 0px 5rpx white;
-  //filter: rgba(237, 242, 250, 0.5);
-}
 </style>

src/pages/business/CRM/customer/components/confirmForm.vue

@@ -549,7 +549,6 @@ let hobbyIds = ref([]);
 let hobbies = ref([]);
 // 选择爱好标签
 const handleHobbyChange = (items, ids) => {
-  console.log('选择爱好', items, ids);
   hobbyIds.value = [];
   hobbies.value = items;
 };

src/pages/business/CRM/customer/components/customerUserEdit.vue

@@ -1,3 +1,8 @@
+<!--
+ * @author wangzhuo
+ * @date 2025年9月1日
+ * @description 编辑客户人员信息
+-->
 <template>
   <view class="con-body">
     <view class="con-bg">
@@ -17,7 +22,7 @@
 
       <!-- 正文内容 -->
       <view class="white-bg">
-        <view class="form-con">
+        <view class="form-con" @click="handleBlur">
           <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="40%">
             <!-- 选择客户 -->
             <uni-forms-item label="客户名称" name="cusName" required class="f-c-right">
@@ -577,6 +582,11 @@ let handleWorkingStatusChange = e => {
   formData.value.workingStatus = workingStatusList[value].name;
 }
 
+const hobbySelectRef = ref(null);
+// 多选组件失去焦点关闭
+let handleBlur = () => {
+  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
+}
 let submitForm = async () => {
   let hobbyTags = hobbies.value.map(it => {
     let {name} = it;
@@ -602,12 +612,11 @@ let submitForm = async () => {
         uni.showToast({
           title: "更新成功"
         })
+        const eventChannel = instance.getOpenerEventChannel();
+        eventChannel.emit("refreshCusUserList");
         setTimeout(()=>{
           uni.navigateBack();
-          const eventChannel = instance.getOpenerEventChannel();
-          eventChannel.emit("refreshCusUserList");
         },1000);
-
       }else{
         uni.showToast({
           title: "操作失败",

src/pages/business/CRM/customer/customerAudit.vue

@@ -7,7 +7,13 @@
   <view class="con-body">
     <view class="con-bg">
       <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="false">
+      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="list.length > 0">
+        <template #right>
+          <view class="head-right" @click="handleReSort">
+            <uni-icons type="arrow-down" size="20" color="#B7D2FF"></uni-icons>
+            {{iconType==='arrow-up'?'最新':'最早'}}
+          </view>
+        </template>
       </customHeader>
 
       <!-- 高度来避免头部遮挡 -->
@@ -17,12 +23,12 @@
       <view class="all-body">
         <!-- 搜索-->
         <view class="search">
-<!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
+          <!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
-<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
+          <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
-<!--                          v-model="searchValue"-->
+          <!--                          v-model="searchValue"-->
-<!--          />-->
+          <!--          />-->
           <view class="custom-search"></view>
-          </view>
+        </view>
 
         <!-- 分页部分  -->
         <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -101,16 +107,23 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
   handleSearch()
 })
-let clearSearchValue = () => {
+// 排序图标
-  searchValue.value = '';
+const iconType = ref('arrow-up');
+let handleReSort = () => {
+  iconType.value = iconType.value === 'arrow-down' ? 'arrow-up' : 'arrow-down';
+  list.value = list.value.reverse();
 }
+
 // 查询列表
 let list = ref([]);
 
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -130,10 +143,11 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
+
-    uni.showLoading();
+  uni.showLoading();
-    cssFlag.value = true;
+  cssFlag.value = true;
-    setTimeout(async () => {
+  setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
 
@@ -141,17 +155,21 @@ const downCallback = async (mescroll) => {
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
       uni.hideLoading();
+
+    } catch (error) {
+      console.log(error)
+      mescroll.endErr();
+    } finally {
       cssFlag.value = false;
-    }, 500);
+    }
-  } catch (error) {
+  }, 500);
-    console.log(error)
+
-    mescroll.endErr();
-  }
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
+
-    setTimeout(async () => {
+  setTimeout(async () => {
+    try {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -162,11 +180,11 @@ const upCallback = async (mescroll) => {
       mescroll.endBySize(res.list.length, res.total);
       // 正确判断是否还有更多数据
       mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
+    } catch (error) {
-  } catch (error) {
+      mescroll.endErr();
-    console.log(error)
+    }
-    mescroll.endErr();
+  }, 500);
-  }
+
 }
 
 // 获取数据列表
@@ -177,12 +195,17 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
+    try {
-    let res = await getCusUserApprovalList(param);
+      let res = await getCusUserApprovalList(param);
-    resolve({
+      resolve({
-      list: res.rows,
+        list: res.rows,
-      total: res.total
+        total: res.total
-    });
+      });
+    } catch (e) {
+      console.log(e, "客户人员审核任务列表获取失败");
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -207,22 +230,17 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
 .scroll-h {
-  /* #ifdef APP-PLUS */
+  height: 100%;
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
 }
 
 .white-bg {

src/pages/business/CRM/customer/customerUserBelong.vue

@@ -134,7 +134,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -155,27 +155,27 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
+  cssFlag.value = true;
-    cssFlag.value = true;
+  uni.showLoading();
-    uni.showLoading();
+  setTimeout(async () => {
-    setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
-      cssFlag.value = false;
       list.value = res.list;
       // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      uni.hideLoading();
+    } catch (error) {
-    }, 500);
+      mescroll.endErr();
-  } catch (error) {
+    } finally {
-    console.log(error)
+      cssFlag.value = false;
-    mescroll.endErr();
+    }
-  }
+  }, 500);
+
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
+  setTimeout(async () => {
-    setTimeout(async () => {
+    try {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -184,13 +184,12 @@ const upCallback = async (mescroll) => {
         list.value.push(...res.list);
       }
       // 正确判断是否还有更多数据
-      mescroll.endBySize(res.list.length, res.total)
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
       // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
+    } catch (error) {
-  } catch (error) {
+      mescroll.endErr();
-    console.log(error)
+    }
-    mescroll.endErr();
+  }, 500);
-  }
 }
 
 // 获取数据列表
@@ -201,12 +200,18 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
+    try {
+      let res = await SearchForAllCustomersSalesperson(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, "获取所有客户人员所属失败");
+    } finally {
+      uni.hideLoading();
+    }
 
-    let res = await SearchForAllCustomersSalesperson(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
   });
 }
 
@@ -217,6 +222,7 @@ let handleDetail = (item) => {
       url: "/pages/business/CRM/customer/components/customerUserEdit",
       events: {
         refreshCusUserList() {
+          console.log('refreshCusUserList',"响应刷新")
           handleSearch();
         }
       },
@@ -224,7 +230,7 @@ let handleDetail = (item) => {
         res.eventChannel.emit('editCusData', {param: item, isAdd: false})
       }
     })
-  }else{
+  } else {
     uni.showToast({
       title: '已完成审核，不可修改',
       icon: 'none'
@@ -278,16 +284,15 @@ let handleDelete = async (item) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-
 .search .btn-search {
   border: none;
   background: none;

src/pages/business/CRM/customer/selectCustomer.vue

@@ -80,7 +80,10 @@ let cssFlag=ref(false);//控制样式
 const upOption = ref({
   page: { num: 0, size: 10 },
   noMoreSize: 5,
-  empty: { tip: '~ 空空如也 ~' },
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -192,15 +195,14 @@ const radioChange = (e) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
-
 .search .btn-search {
   border: none;
   background: none;

src/pages/business/CRM/customerUserList.vue

@@ -11,8 +11,7 @@
             </uni-easyinput>
                 <checkbox-group class="block" @change="checkboxChange">
                     <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                        <checkbox class='checkBoxClass' :value="item.userName" 
+                        <checkbox class='checkBoxClass' :value="item.userName"></checkbox>
-                            v-model="item.userName"></checkbox>
                         <view class="clientClass">
                             <text class="blue-text">{{ item.userName }}</text>
                             {{ " | " }}

src/pages/business/CRM/leave/addApply.vue

@@ -0,0 +1,255 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<customHeader ref="customHeaderRef" :title="'请假申请'" :leftFlag="true">
+			</customHeader>
+			<!-- #ifdef H5 -->
+			<view style="height:30rpx"></view>
+			<!-- #endif -->
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<view class="white-bg">
+				<view class="example">
+					<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="80">
+						<uni-forms-item label="请假模式">
+							<uni-data-select v-model="baseFormData.typeval" :localdata="range"
+								@change="change" :clear="false"></uni-data-select>
+						</uni-forms-item>
+						<uni-forms-item label="开始日期">
+							<uni-datetime-picker type="date" :clear-icon="false"
+								placeholder="请输入开始日期" v-model="baseFormData.startDate"
+								@change="change" />
+						</uni-forms-item>
+						<uni-forms-item v-show="baseFormData.typeval=='1'" label="结束日期">
+							<uni-datetime-picker type="date" :clear-icon="false"
+								placeholder="请输入结束日期" v-model="baseFormData.endDate"
+								@change="change" />
+						</uni-forms-item>
+						<uni-forms-item label="开始时间" v-show="baseFormData.typeval!='1'">
+							<input type="text" class="inputborder" style="text-align: center;"
+								v-model="baseFormData.startTime" :disabled="true" />
+						</uni-forms-item>
+						<uni-forms-item label="结束时间" v-show="baseFormData.typeval!='1'">
+							<input type="text" class="inputborder" style="text-align: center;"
+								v-model="baseFormData.endTime" :disabled="true" />
+						</uni-forms-item>
+						<uni-forms-item label="请假天数">
+							<input type="text" class="inputborder" style="text-align: center;"
+								v-model="baseFormData.days" :disabled="true" />
+						</uni-forms-item>
+						<uni-forms-item label="详细说明" class="custom-label-height">
+							<uni-easyinput type="textarea" v-model="baseFormData.reason"
+								placeholder="请输入详细说明" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+				<view>
+					<button type="primary" @click="submit()">提交</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getNavBarPaddingTop
+	} from '@/utils/system.js'
+
+	import {
+		addLeaveApply
+	} from '@/api/crm/activity/activity';
+
+	// 获取导航栏高度用于内容区域padding
+	const navBarPaddingTop = ref(0);
+	onMounted(() => {
+		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+	})
+
+	// 表单ref
+	const baseForm = ref(null);
+
+	const baseFormData = reactive({
+		typeval: 1,
+		startDate: getDate(Date.now()),
+		endDate: getDate(Date.now()),
+		days: 1,
+		reason: '',
+		startTime: '08:30',
+		endTime: '12:30',
+	});
+
+	const range = ref([{
+		"value": 1,
+		"text": "全天"
+	}, {
+		"value": 2,
+		"text": "前半个班次"
+	}, {
+		"value": 3,
+		"text": "后半个班次"
+	}]);
+
+	const submit = async () => {
+		try {
+
+			
+			if (baseFormData.reason == null || baseFormData.reason == "") {
+				uni.showToast({
+					title: '请填写详细说明',
+					icon: 'error'
+				});
+			} else if (baseFormData.days == 0 || baseFormData.startDate < getDate(Date.now()) || baseFormData.endDate < getDate(Date.now())) {
+				uni.showToast({
+					title: '请确认日期',
+					icon: 'error'
+				});
+			} else {
+				if (baseFormData.typeval != 1) {
+					baseFormData.endDate = baseFormData.startDate
+				}
+				// 验证表单
+				await baseForm.value.validate();
+				// 验证通过后的操作
+				uni.showToast({
+					title: '验证通过',
+					icon: 'success'
+				});
+
+				addLeaveApply(baseFormData).then(
+					res => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: '提交成功',
+								duration: 2000
+							});
+							setTimeout(function() {
+								uni.navigateBack({
+									success: () => {}
+								})
+							}, 500);
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+							});
+						}
+					},
+				);
+			}
+
+
+		} catch (err) {
+			console.log('表单验证失败:', err);
+		}
+	};
+
+	let change = () => {
+		if (baseFormData.typeval != 1) {
+			if (baseFormData.typeval == 2) {
+				baseFormData.startTime = '08:30'
+				baseFormData.endTime = '12:30'
+			} else {
+				baseFormData.startTime = '13:00'
+				baseFormData.endTime = '17:00'
+			}
+
+			baseFormData.days = 0.5
+		} else {
+			let start = baseFormData.startDate
+			let end = baseFormData.endDate
+			baseFormData.days = getDayDiff(start, end);
+		}
+	}
+
+	function getDate(dateval) {
+		const date = new Date(dateval)
+		const year = date.getFullYear()
+		const month = date.getMonth() + 1
+		const day = date.getDate()
+		return `${year}-${addZero(month)}-${addZero(day)}`
+	}
+
+	function addZero(num) {
+		if (num < 10) {
+			num = `0${num}`
+		}
+		return num
+	}
+
+	// 计算两个日期的天数差
+	function getDayDiff(startDate, endDate) {
+		// 处理日期格式（兼容iOS）
+		const start = startDate.replace(/-/g, '/');
+		const end = endDate.replace(/-/g, '/');
+
+		const date1 = new Date(start).getTime();
+		const date2 = new Date(end).getTime();
+
+		if (date2 < date1) {
+			return 0
+		}
+
+		// 计算天数差（含边界值+1天）
+		return Math.floor(Math.abs(date2 - date1) / (24 * 3600 * 1000)) + 1;
+	}
+</script>
+
+<style lang="scss">
+	.example {
+		padding: 15px;
+		background-color: #fff;
+	}
+
+	.segmented-control {
+		margin-bottom: 15px;
+	}
+
+	.button-group {
+		margin-top: 15px;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+	}
+
+	.button {
+		display: flex;
+		align-items: center;
+		height: 35px;
+		margin-left: 10px;
+	}
+
+	.inputborder {
+		width: 100%;
+		text-align: left;
+		border: 1px solid #dcdfe6;
+		border-radius: 4px;
+		font-size: 14px;
+		height: 35px;
+	}
+
+	:deep(.uni-forms-item__label) {
+		padding: 0 20rpx;
+		background-color: rgba(103, 194, 58, 0.2);
+	}
+
+	:deep(.custom-label-height .uni-forms-item__label) {
+		height: 190rpx;
+	}
+
+	::v-deep .uni-easyinput__content-textarea {
+		height: 152rpx !important;
+	}
+</style>

src/pages/business/CRM/leave/addBackApply.vue

@@ -0,0 +1,316 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'销假申请'" :leftFlag="true" :rightFlag="false">
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<view class="white-bg">
+				<view class="example">
+					<view class="r-list" style="display: flex;font-size: 14px;padding-top: 32rpx;
+					background-color: #03aa0315;height: 76rpx;">
+						<view class="r-left">
+							<label style="color: #03aa03;font-size: 34rpx;
+							padding: 32rpx;background-color: #dcd8d933;">
+								{{ applyData.days.replace('.0','')}} 天</label>
+						</view>
+						<view style="margin-top: -20rpx;">
+
+							<view class="r-right" style="margin-left: 30rpx;">
+								{{ applyData.startDate }}
+								至
+								{{ applyData.endDate }}
+							</view>
+							<view class="r-right" style="margin-left: 30rpx;color: #00000095;">
+								{{ applyData.reason }}
+							</view>
+						</view>
+					</view>
+					<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="80"
+						style="margin-top: 20rpx;">
+						<uni-forms-item label="销假模式">
+							<uni-data-select v-model="baseFormData.typeval" :localdata="range"
+								@change="change" :clear="false"></uni-data-select>
+						</uni-forms-item>
+						<uni-forms-item label="开始日期">
+							<uni-datetime-picker type="date" :clear-icon="false"
+								placeholder="请输入开始日期" v-model="baseFormData.startDate"
+								@change="change" />
+						</uni-forms-item>
+						<uni-forms-item v-show="baseFormData.typeval==1" label="结束日期">
+							<uni-datetime-picker type="date" :clear-icon="false"
+								placeholder="请输入结束日期" v-model="baseFormData.endDate"
+								@change="change" />
+						</uni-forms-item>
+						<uni-forms-item label="开始时间" v-show="baseFormData.typeval!='1'">
+							<uni-easyinput v-model="baseFormData.startTime" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="结束时间" v-show="baseFormData.typeval!='1'">
+							<uni-easyinput v-model="baseFormData.endTime" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="销假天数">
+							<uni-easyinput v-model="baseFormData.days" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="详细说明" class="custom-label-height">
+							<uni-easyinput type="textarea" v-model="baseFormData.reason" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+				<view>
+					<button type="primary" @click="submit()">提交</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive
+	} from 'vue'
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		addBackApply
+	} from '@/api/crm/activity/activity';
+
+	// 表单ref
+	let baseForm = ref(null);
+
+	const range = ref([{
+		"value": 1,
+		"text": "全天"
+	}, {
+		"value": 2,
+		"text": "前半个班次"
+	}, {
+		"value": 3,
+		"text": "后半个班次"
+	}]);
+
+	let baseFormData = reactive({
+		typeName: "全天",
+		typeval: 1,
+		startDate: getDate(Date.now()),
+		endDate: getDate(Date.now()),
+		days: 1,
+		reason: '',
+		startTime: '08:30',
+		endTime: '12:30',
+	});
+
+	let leaveId = ref(null);
+	let applyData = ref(null);
+
+	onLoad((options) => {
+		if (options.data) {
+			applyData.value = JSON.parse(decodeURIComponent(options.data))
+			leaveId.value = applyData.value.leaveId
+		}
+	})
+
+	// 查询详情
+	let item = ref({});
+	const submit = async () => {
+		try {
+			if (baseFormData.days == 0 ||
+				(baseFormData.typeval == 1 &&
+					(applyData.value.endDate < baseFormData.endDate ||
+						applyData.value.startDate > baseFormData.endDate)) ||
+				applyData.value.endDate < baseFormData.startDate ||
+				applyData.value.startDate > baseFormData.startDate ||
+				baseFormData.startDate < getDate(Date.now()) ||
+				parseFloat(baseFormData.days) > parseFloat(applyData.value.days) ||
+				(parseFloat(applyData.value.days) == 0.5 && baseFormData.typeval != applyData
+					.value.typeval)) {
+				uni.showToast({
+					title: '请确认日期',
+					icon: 'error'
+				});
+			} else {
+				if (baseFormData.typeval != 1) {
+					baseFormData.endDate = baseFormData.startDate
+				}
+				// 验证表单
+				await baseForm.value.validate();
+				// 验证通过后的操作
+				uni.showToast({
+					title: '验证通过',
+					icon: 'success'
+				});
+
+				baseFormData.leaveId = leaveId.value
+
+				addBackApply(baseFormData).then(
+					res => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: '提交成功',
+								duration: 2000
+							});
+							setTimeout(function() {
+								uni.navigateBack({
+									success: () => {
+										uni.$emit('isRefresh');
+									}
+								})
+							}, 500);
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+							});
+						}
+					},
+				);
+			}
+
+
+		} catch (err) {
+			console.log('表单验证失败:', err);
+		}
+	}
+
+	function getDate(dateval) {
+		const date = new Date(dateval)
+		const year = date.getFullYear()
+		const month = date.getMonth() + 1
+		const day = date.getDate()
+		return `${year}-${addZero(month)}-${addZero(day)}`
+	}
+
+	function addZero(num) {
+		if (num < 10) {
+			num = `0${num}`
+		}
+		return num
+	}
+
+	let change = () => {
+		if (baseFormData.typeval != 1) {
+			if (baseFormData.typeval == 2) {
+				baseFormData.startTime = '08:30'
+				baseFormData.endTime = '12:30'
+			} else {
+				baseFormData.startTime = '13:00'
+				baseFormData.endTime = '17:00'
+			}
+
+			baseFormData.days = 0.5
+		} else {
+			let start = baseFormData.startDate
+			let end = baseFormData.endDate
+			baseFormData.days = getDayDiff(start, end);
+		}
+
+		baseFormData.days = baseFormData.days.toString()
+	}
+
+	// 计算两个日期的天数差
+	function getDayDiff(startDate, endDate) {
+		// 处理日期格式（兼容iOS）
+		const start = startDate.replace(/-/g, '/');
+		const end = endDate.replace(/-/g, '/');
+
+		const date1 = new Date(start).getTime();
+		const date2 = new Date(end).getTime();
+
+		if (date2 < date1) {
+			return 0
+		}
+
+		// 计算天数差（含边界值+1天）
+		return Math.floor(Math.abs(date2 - date1) / (24 * 3600 * 1000)) + 1;
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 690rpx;
+		margin: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.white-bg.white-bg-2 {
+		border-radius: 0;
+		margin-bottom: 20rpx;
+	}
+
+	:deep(.tabs-header) {
+		/* background: none !important; */
+		border-bottom: none !important;
+		margin: 0 auto;
+		gap: 5rpx;
+	}
+
+	:deep(.tab-item) {
+		color: #919191;
+		font-size: 32rpx;
+		font-weight: bold;
+		/* flex:none; */
+		/* margin: 0 -50rpx; */
+		/* padding: 0 50rpx; */
+	}
+
+	:deep(.tab-item:first-child) {
+		text-align: right;
+		margin-left: 230rpx;
+	}
+
+	:deep(.tab-item:last-child) {
+		text-align: left;
+		margin-right: 230rpx;
+	}
+
+	:deep(.tab-item.active) {
+		color: #3384DF;
+		font-weight: bold;
+	}
+
+	:deep(.tab-item.active::after) {
+		width: 100rpx;
+		height: 8rpx;
+	}
+
+	:deep(.is-disabled) {
+		background-color: rgba(255, 255, 255, 1) !important;
+		color: #333;
+	}
+
+	.btn-success {
+		background-color: #67c23a;
+		border: 1rpx solid #67c23a;
+		color: #fff;
+		/* padding: 0rpx 60rpx; */
+	}
+
+	.btn-warning {
+		background-color: #e6a23c;
+		border: 1rpx solid #e6a23c;
+		color: #fff;
+		/* padding: 0rpx 60rpx; */
+	}
+
+	:deep(.uni-forms-item__label) {
+		padding: 0 20rpx;
+		background-color: rgba(230, 162, 60, 0.2);
+	}
+
+	:deep(.custom-label-height .uni-forms-item__label) {
+		height: 190rpx;
+	}
+
+	::v-deep .uni-easyinput__content-textarea {
+		height: 152rpx !important;
+	}
+</style>

src/pages/business/CRM/leave/askLeave.vue

@@ -0,0 +1,58 @@
+<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"></view>
+
+			<view class="white-bg">
+				<view class="logo-list">
+					<view class="l-l-item" @click="handleJump('addApply')">
+						<img :src="'static/images/business/icon-xxck.png'" />
+						<text class="font-gray">请假申请</text>
+					</view>
+					<view class="l-l-item" @click="handleJump('backApply')">
+						<img :src="'static/images/business/icon-xxtj.png'" />
+						<text class="font-gray">销假申请</text>
+					</view>
+					<view class="l-l-item" @click="handleJump('myApply')">
+						<img :src="'static/images/business/icon-zfbg.png'" />
+						<text class="font-gray">我的表单</text>
+					</view>
+				</view>
+			</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;
+	})
+	
+	// 跳转
+	let handleJump=(url)=>{
+	    if(url){
+	        uni.navigateTo({ url })
+	    }
+	}
+</script>
+
+<style scoped>
+	
+</style>

src/pages/business/CRM/leave/backApply.vue

@@ -0,0 +1,159 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'销假申请'" :leftFlag="true" :rightFlag="true">
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="tabs-container">
+					<view class="white-bg-2" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+						<view class="report-list">
+
+							<view class="title" style="margin-top: 10rpx;font-size: 30rpx">
+								{{ item.typeval == '1' ? '全天' : item.typeval == '2' ? '前半个班次' : '后半个班次' }}
+
+								<label v-if="item.applyType == '请假'" style="float: right;color: #03aa03;">
+									{{ item.applyType }}</label>
+								<label v-if="item.applyType == '销假'" style="float: right;color: #aa9303;">
+									{{ item.applyType }}</label>
+							</view>
+							<view class="apply-row" style="margin-top: 10px;">
+								<view class="r-left" style="font-size: 15px;font-weight: 500;">
+									申请日期  {{ item.applyDate }}
+								</view>
+							</view>
+							<view class="r-list">
+								<view class="r-left">休假日期</view>
+								<view class="r-right">{{ item.startDate }} 至 {{ item.endDate }}
+									（ <label style="color: #03aa03;">
+										{{ item.days.replace('.0', '') }}天</label> ）
+								</view>
+							</view>
+							<view class="r-list">
+								<view class="r-left">详细说明</view>
+								<view v-if="item.reason && item.reason.length <= 18" class="r-right">{{ item.reason }}
+								</view>
+							</view>
+							<view class="r-list" style="margin-top: -30rpx;"
+								v-if="item.reason && item.reason.length > 18">
+								<view class="r-right">{{ item.reason }}</view>
+							</view>
+							<view class="border-bottom" style="margin: 20rpx 0;"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import {
+	ref,
+	onMounted
+} from 'vue'
+import {
+	onShow
+} from '@dcloudio/uni-app'
+import customHeader from '@/components/customHeader.vue'
+import {
+	getNavBarPaddingTop
+} from '@/utils/system.js'
+import {
+	getBackLeaveList
+} from '@/api/crm/activity/activity'
+
+let list = ref([]);
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+	getApplyList();
+})
+
+onShow(() => {
+	uni.$on('isRefresh', function () {
+		getApplyList();
+	})
+})
+
+async function getApplyList() {
+	let param = {
+		num: 0,
+		size: 10
+	}
+	let res = await getBackLeaveList(param);
+	list.value = res.rows;
+}
+
+// 跳转到添加申请
+let handleDetail = (item) => {
+	uni.navigateTo({
+		url: "/pages/business/CRM/leave/addBackApply?data=" + encodeURIComponent(JSON
+			.stringify(item))
+	})
+}
+</script>
+
+<style scoped>
+.all-body {
+	/* #ifdef APP-PLUS */
+	top: 150rpx;
+	height: calc(100vh - 75px);
+	/* #endif */
+	/* #ifndef APP-PLUS */
+	top: 120rpx;
+	height: calc(100vh);
+	/* #endif */
+}
+
+.search {
+	display: flex;
+}
+
+.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 .custom-search {
+	width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+	padding-right: 0 !important;
+}
+
+.scroll-h {
+	/* #ifdef APP-PLUS */
+	height: calc(100vh - 120px);
+	/* #endif */
+	/* #ifndef APP-PLUS */
+	height: calc(100vh - 110px);
+	/* #endif */
+}
+
+.white-bg {
+	padding-bottom: 10rpx;
+}
+
+:deep(.report-list .r-list) {
+	padding: 0.5rem 0;
+}
+</style>

src/pages/business/CRM/leave/myApply.vue

@@ -0,0 +1,237 @@
+<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"></view>
+
+			<view class="white-bg">
+				<view class="tabs-container">
+					<view class="tabs-scorll">
+						<view class="tabs-header">
+							<view v-for="(tab, index) in tabList" :key="index"
+								:class="['tab-item', { 'active': activeTab === index }]"
+								@click="switchTab(index)">
+								{{ tab }}
+							</view>
+						</view>
+					</view>
+					<view class="white-bg-2" v-for="item in detailList">
+						<view class="report-list" @click="showDetail(item)">
+							<view class="title" style="margin-top: 20rpx;font-size: 30rpx">
+								{{ item.typeval=="1"?'全天':item.typeval=="2"?'前半个班次':'后半个班次' }}
+								<label v-if="item.applyType=='请假'"
+									style="float: right;color: #03ca03;">
+									{{ item.applyType}}</label>
+								<label v-if="item.applyType=='销假'"
+									style="float: right;color: #eaa303;">
+									{{ item.applyType}}</label>
+							</view>
+							<view class="r-list">
+								<view class="r-left" style="font-size: 30rpx;font-weight: 500;">
+									申请日期：{{ item.applyDate }}
+									（ <label v-if="item.status=='待审批'"
+										style="color: #03ca03;">{{ item.reviewStatus }}</label>
+									<label v-if="item.status=='审批中'"
+										style="color: #03ca03;">{{ item.reviewStatus }}</label>
+									<label v-if="item.status=='驳回'"
+										style="color: #fa3303;">{{ item.reviewStatus }}</label>
+									<label v-if="item.status=='完成'"
+										style="color: #03aaf3;">{{ item.reviewStatus }}</label>）
+								</view>
+							</view>
+							<view class="r-list">
+								<view class="r-left">休假日期</view>
+								<view class="r-right">{{ item.startDate }} 至 {{ item.endDate }}
+									（ <label v-if="item.applyType=='请假'" style="color: #03ca03;">
+										{{ item.days.replace('.0','')}}天</label>
+									<label v-if="item.applyType=='销假'" style="color: #eaa303;">
+										{{ item.days.replace('.0','')}}天</label> ）
+								</view>
+							</view>
+							<view class="r-list">
+								<view class="r-left">详细说明</view>
+								<view v-if="item.reason && item.reason.length <= 18"
+									class="r-right">{{ item.reason }}</view>
+							</view>
+							<view class="border-bottom" style="margin: 20rpx 0;"></view>
+						</view>
+					</view>
+					<view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize"
+							:current="pageCurrent" :total="total" @change="change" /></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive
+	} from 'vue'
+	import {
+		onShow
+	} from '@dcloudio/uni-app'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getNavBarPaddingTop
+	} from '@/utils/system.js'
+
+	import {
+		getLeaveApplyList
+	} from '@/api/crm/activity/activity';
+
+	// 获取导航栏高度用于内容区域padding
+	const navBarPaddingTop = ref(0);
+	onMounted(() => {
+		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+		getlist();
+	})
+
+	onShow(() => {
+		uni.$on('isRefresh', function() {
+			getlist();
+		})
+	})
+
+	const pageSize = ref(4);
+	const pageCurrent = ref(1);
+	const loading = ref(false);
+	let tabList = ref([])
+
+	let total = ref(0);
+	const totalAll = ref(0);
+	const totalReview = ref(0);
+	const totalReject = ref(0);
+	const totalPass = ref(0);
+
+
+	let activeTab = ref(0);
+
+	let detailList = ref([])
+	let detailLists = ref([])
+
+	let reviewList = ref([])
+	let rejectList = ref([])
+	let passList = ref([])
+
+	const getlist = async () => {
+		loading.value = true
+
+		let res = await getLeaveApplyList();
+		detailLists.value = res.rows;
+		reviewList.value = res.rows.filter(t => t.status == '待审批' || t.status == '审批中')
+		rejectList.value = res.rows.filter(t => t.status == '驳回')
+		passList.value = res.rows.filter(t => t.status == '完成')
+
+		total.value = res.total
+		totalAll.value = res.total
+		totalReview.value = reviewList.value.length
+		totalReject.value = rejectList.value.length
+		totalPass.value = passList.value.length
+
+		change({
+			current: 1
+		})
+		loading.value = false
+
+		let all = '全部(' + totalAll.value + ')'
+		let review = '审核中(' + totalReview.value + ')'
+		let reject = '已驳回(' + totalReject.value + ')'
+		let pass = '已通过(' + totalPass.value + ')'
+
+		tabList.value = [all, review, reject, pass]
+	}
+
+	const switchTab = (index) => {
+		activeTab.value = index
+
+		change({
+			current: 1
+		})
+	}
+
+	// 分页触发
+	let change = (e) => {
+		pageCurrent.value = e.current
+
+		let end = pageSize.value * e.current
+		let start = end - pageSize.value
+
+		if (activeTab.value == 0) {
+			detailList.value = detailLists.value.slice(start, end)
+			total.value = totalAll.value
+		} else if (activeTab.value == 1) {
+			detailList.value = reviewList.value.slice(start, end)
+			total.value = totalReview.value
+		} else if (activeTab.value == 2) {
+			detailList.value = rejectList.value.slice(start, end)
+			total.value = totalReject.value
+		} else if (activeTab.value == 3) {
+			detailList.value = passList.value.slice(start, end)
+			total.value = totalPass.value
+		}
+	}
+
+	// 跳转
+	let showDetail = (item) => {
+		uni.navigateTo({
+			url: "/pages/business/CRM/leave/myApplyDetail?data=" + encodeURIComponent(JSON
+				.stringify(item))
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.apply-row {
+		margin: 5px;
+	}
+
+	.border-bottom {
+		margin: 5px;
+		width: 100%;
+	}
+
+	.tabs-header {
+		display: flex;
+		height: 80rpx;
+		background: #fff;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.tab-item {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		color: #666;
+	}
+
+	.tab-item.active {
+		color: #007AFF;
+		position: relative;
+	}
+
+	.tab-item.active::after {
+		content: '';
+		position: absolute;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		width: 150rpx;
+		height: 4rpx;
+		background-color: #007AFF;
+	}
+
+	:deep(.report-list .r-list) {
+		padding: 0.5rem 0;
+	}
+</style>

src/pages/business/CRM/leave/myApplyDetail.vue

@@ -0,0 +1,313 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'表单详情'" :leftFlag="true" :rightFlag="false">
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+			<view class="white-bg">
+				<view class="example">
+					<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="80">
+						<uni-forms-item :label="baseFormData.applyType == '请假' ? '请假模式' : '销假模式'"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.typeName" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="开始日期"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.startDate" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item v-show="baseFormData.typeval == '1'" label="结束日期"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.endDate" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="开始时间" v-show="baseFormData.typeval != '1'"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.startTime" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="结束时间" v-show="baseFormData.typeval != '1'"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.endTime" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item :label="baseFormData.applyType == '请假' ? '请假天数' : '销假天数'"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.days" class="inputborder"
+								:disabled="true" style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="详细说明"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple custom-label-height' : 'backLeave custom-label-height'">
+							<uni-easyinput type="textarea" v-model="baseFormData.reason"
+								:disabled="true" />
+						</uni-forms-item>
+
+						<view v-if="baseFormData.reviewList.length > 0" class="reviewContent">
+							<view style="display: flex;margin-top: 10rpx;"
+								v-for="(item, index) in baseFormData.reviewList" :key="index">
+								<label style="width: 150rpx;">{{ item.userName }}：</label>
+								<label style="width: 100rpx;color: #03aa03;"
+									v-if="item.reviewResult == '通过'">{{
+									item.reviewResult }}</label>
+								<label style="width: 100rpx;color:  #fa3303;"
+									v-if="item.reviewResult == '驳回'">{{
+									item.reviewResult }}</label>
+								<view style="max-width: 400rpx; overflow-y: auto;">
+									{{ item.rejectReason }}
+								</view>
+
+							</view>
+						</view>
+
+						<view class="footer-con" style="margin-top: 20rpx;"
+							v-if="baseFormData.status == '待审批' || baseFormData.status == '审批中'">
+							<button class="btn-warning" @click="cancelApply()">撤销</button>
+						</view>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive
+	} from 'vue'
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+	import customHeader from '@/components/customHeader.vue'
+	import customTabs from '@/components/customTabs.vue';
+	import {
+		getDelLeaveApply
+	} from '@/api/crm/activity/activity';
+
+	// 表单ref
+	let baseForm = ref(null);
+
+	let baseFormData = reactive({
+		typeName: "全天",
+		typeval: 1,
+		startDate: getDate(Date.now()),
+		endDate: getDate(Date.now()),
+		days: 1,
+		reason: '',
+		startTime: '08:30',
+		endTime: '12:30',
+		reviewList: []
+	});
+
+	onLoad((options) => {
+		if (options.data) {
+			baseFormData = JSON.parse(decodeURIComponent(options.data))
+			change()
+
+			baseFormData.days = baseFormData.days.toString()
+		}
+	})
+
+	const cancelApply = async () => {
+		try {
+			uni.showModal({
+				title: '',
+				content: '您确定要撤销申请吗？',
+				confirmColor: '#007AFF',
+				cancelColor: '#999999',
+				success: (res) => {
+					if (res.confirm) {
+						getDelLeaveApply({
+							leaveId: baseFormData.leaveId,
+							backId: baseFormData.backId,
+							applyType: baseFormData.applyType
+						}).then(
+							res => {
+								if (res.code == 200) {
+									uni.showToast({
+										title: '撤销成功',
+										duration: 2000
+									});
+									setTimeout(function() {
+										uni.navigateBack({
+											success: () => {
+												uni.$emit('isRefresh');
+											}
+										})
+									}, 500);
+								} else {
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+									});
+								}
+							},
+						);
+
+					} else if (res.cancel) {
+
+					}
+				}
+			});
+
+		} catch (err) {
+			console.log('表单验证失败:', err);
+		}
+	};
+
+	function getDate(dateval) {
+		const date = new Date(dateval)
+		const year = date.getFullYear()
+		const month = date.getMonth() + 1
+		const day = date.getDate()
+		return `${year}-${addZero(month)}-${addZero(day)}`
+	}
+
+	function addZero(num) {
+		if (num < 10) {
+			num = `0${num}`
+		}
+		return num
+	}
+
+	let change = () => {
+		if (baseFormData.typeval != 1) {
+			if (baseFormData.typeval == 2) {
+				baseFormData.startTime = '08:30'
+				baseFormData.endTime = '12:30'
+
+				baseFormData.typeName = '前半个班次'
+			} else {
+				baseFormData.startTime = '13:00'
+				baseFormData.endTime = '17:00'
+
+				baseFormData.typeName = '后半个班次'
+			}
+
+			baseFormData.days = 0.5
+		} else {
+			let start = baseFormData.startDate
+			let end = baseFormData.endDate
+			baseFormData.days = getDayDiff(start, end);
+
+			baseFormData.typeName = '全天'
+		}
+
+		baseFormData.days = baseFormData.days.toString()
+	}
+
+	// 计算两个日期的天数差
+	function getDayDiff(startDate, endDate) {
+		// 处理日期格式（兼容iOS）
+		const start = startDate.replace(/-/g, '/');
+		const end = endDate.replace(/-/g, '/');
+
+		const date1 = new Date(start).getTime();
+		const date2 = new Date(end).getTime();
+
+		if (date2 < date1) {
+			return 0
+		}
+
+		// 计算天数差（含边界值+1天）
+		return Math.floor(Math.abs(date2 - date1) / (24 * 3600 * 1000)) + 1;
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 690rpx;
+		margin: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.white-bg.white-bg-2 {
+		border-radius: 0;
+		margin-bottom: 20rpx;
+	}
+
+	:deep(.tabs-header) {
+		/* background: none !important; */
+		border-bottom: none !important;
+		margin: 0 auto;
+		gap: 5px;
+	}
+
+	:deep(.tab-item) {
+		color: #919191;
+		font-size: 32rpx;
+		font-weight: bold;
+		/* flex:none; */
+		/* margin: 0 -50rpx; */
+		/* padding: 0 50rpx; */
+	}
+
+	:deep(.tab-item:first-child) {
+		text-align: right;
+		margin-left: 230rpx;
+	}
+
+	:deep(.tab-item:last-child) {
+		text-align: left;
+		margin-right: 230rpx;
+	}
+
+	:deep(.tab-item.active) {
+		color: #3384DF;
+		font-weight: bold;
+	}
+
+	:deep(.tab-item.active::after) {
+		width: 100rpx;
+		height: 8rpx;
+	}
+
+	:deep(.is-disabled) {
+		background-color: rgba(255, 255, 255, 1) !important;
+		color: #333;
+	}
+
+	.btn-success {
+		background-color: #67c23a;
+		border: 1px solid #67c23a;
+		color: #fff;
+		/* padding: 0rpx 60rpx; */
+	}
+
+	.btn-warning {
+		background-color: #f6b23c;
+		border: 1px solid #f6b23c;
+		color: #fff;
+		/* padding: 0rpx 60rpx; */
+	}
+
+	.leaveApple {
+		background-color: rgba(103, 194, 58, 0.2);
+	}
+
+	.backLeave {
+		background-color: rgba(230, 162, 60, 0.2);
+	}
+
+	:deep(.uni-forms-item__label) {
+		padding: 0 12px;
+	}
+
+	:deep(.custom-label-height .uni-forms-item__label) {
+		height: 190rpx;
+	}
+
+	::v-deep .uni-easyinput__content-textarea {
+		height: 166rpx !important;
+	}
+
+	.reviewContent {
+		border: 1px solid #dcdfe6;
+		padding: 20rpx;
+	}
+</style>

src/pages/business/CRM/leave/reviewDetail.vue

@@ -0,0 +1,318 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'审批详情'" :leftFlag="true" :rightFlag="false">
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<view class="white-bg">
+				<view class="example">
+					<view v-if="baseFormData.applyType != '请假'" style="display: flex;font-size: 14px;padding-top: 32rpx;
+					background-color: #03aa0315;height: 76rpx;">
+						<view class="r-left">
+							<label style="color: #03aa03;font-size: 34rpx;
+							padding: 32rpx;background-color: #dcd8d933;">
+								{{ baseFormData.days.replace('.0', '') }} 天</label>
+						</view>
+						<view style="margin-top: -20rpx;">
+							<view class="r-right" style="margin-left: 30rpx;">
+								{{ baseFormData.startDate }}
+								至
+								{{ baseFormData.endDate }}
+							</view>
+							<view class="r-right" style="margin-left: 30rpx;color: #00000095;">
+								{{ baseFormData.reason }}
+							</view>
+						</view>
+					</view>
+
+					<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="80" style="margin-top: 10rpx;">
+						<uni-forms-item :label="baseFormData.applyType == '请假' ? '请假模式' : '销假模式'"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.typeName" class="inputborder" :disabled="true"
+								style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="开始日期" :class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.startDate" class="inputborder" :disabled="true"
+								style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item v-show="baseFormData.typeval == '1'" label="结束日期"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.endDate" class="inputborder" :disabled="true"
+								style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="开始时间" v-show="baseFormData.typeval != '1'"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.startTime" class="inputborder" :disabled="true"
+								style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="结束时间" v-show="baseFormData.typeval != '1'"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.endTime" class="inputborder" :disabled="true"
+								style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item :label="baseFormData.applyType == '请假' ? '请假天数' : '销假天数'"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
+							<uni-easyinput v-model="baseFormData.days" class="inputborder" :disabled="true"
+								style="text-align: center;" />
+						</uni-forms-item>
+						<uni-forms-item label="详细说明"
+							:class="baseFormData.applyType == '请假' ? 'leaveApple custom-label-height' : 'backLeave custom-label-height'">
+							<uni-easyinput type="textarea" v-model="baseFormData.reason" :disabled="true" />
+						</uni-forms-item>
+						<view class="border-bottom" style="width: 100%;"></view>
+						<view style="margin-top: 20rpx;">
+							<uni-forms-item label="审核意见" class="custom-label-height">
+								<uni-easyinput type="textarea" v-model="rejectReason" />
+							</uni-forms-item>
+						</view>
+					</uni-forms>
+				</view>
+				<view class="footer-con" style="display: flex;" v-if="baseFormData.reviewerId != 0">
+					<button class="btn-warning" type="warning" @click="submit('驳回')" size="mini">驳回</button>
+					<button class="btn-success" type="success" @click="submit('同意')" size="mini">同意</button>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import {
+	ref,
+	onMounted,
+	reactive
+} from 'vue'
+import {
+	onLoad
+} from '@dcloudio/uni-app'
+import customHeader from '@/components/customHeader.vue'
+import customTabs from '@/components/customTabs.vue';
+import {
+	addReviewLeave
+} from '@/api/crm/activity/activity';
+
+// 表单ref
+let baseForm = ref(null);
+
+let rejectReason = ref(null);
+
+let baseFormData = reactive({
+	typeName: "全天",
+	typeval: 1,
+	startDate: getDate(Date.now()),
+	endDate: getDate(Date.now()),
+	days: 1,
+	reason: '',
+	startTime: '08:30',
+	endTime: '12:30',
+});
+
+onLoad((options) => {
+	rejectReason.value = ""
+	if (options.data) {
+		baseFormData = JSON.parse(decodeURIComponent(options.data))
+		change()
+
+		baseFormData.days = baseFormData.days.toString()
+		baseFormData.leaveDays = baseFormData.leaveDays.replace('.0', '')
+
+		if (baseFormData.reviewerIdR != null) {
+			rejectReason.value = baseFormData.rejectReason
+		}
+	}
+})
+
+// 查询详情
+let item = ref({});
+const submit = async (status) => {
+	if (status == '驳回' && (rejectReason.value == null || rejectReason.value == "")) {
+		uni.showToast({
+			title: '请填写驳回原因',
+			duration: 2000
+		});
+	} else {
+		let param = {
+			reviewStatus: status == '同意' ? '完成' : '驳回',
+			reviewResult: status == '同意' ? '通过' : '驳回',
+			rejectReason: rejectReason.value,
+			applyType: baseFormData.applyType,
+			leaveId: baseFormData.leaveId,
+			backId: baseFormData.backId,
+			days: baseFormData.days,
+		}
+		addReviewLeave(param).then(
+			res => {
+				if (res.code == 200) {
+					uni.showToast({
+						title: '提交成功',
+						duration: 2000
+					});
+					setTimeout(function () {
+						uni.navigateBack({
+							success: () => {
+								uni.$emit('isRefresh');
+							}
+						})
+					}, 500);
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+					});
+				}
+			},
+		);
+	}
+}
+
+function getDate(dateval) {
+	const date = new Date(dateval)
+	const year = date.getFullYear()
+	const month = date.getMonth() + 1
+	const day = date.getDate()
+	return `${year}-${addZero(month)}-${addZero(day)}`
+}
+
+function addZero(num) {
+	if (num < 10) {
+		num = `0${num}`
+	}
+	return num
+}
+
+let change = () => {
+	if (baseFormData.typeval != 1) {
+		if (baseFormData.typeval == 2) {
+			baseFormData.startTime = '08:30'
+			baseFormData.endTime = '12:30'
+
+			baseFormData.typeName = '前半个班次'
+		} else {
+			baseFormData.startTime = '13:00'
+			baseFormData.endTime = '17:00'
+
+			baseFormData.typeName = '后半个班次'
+		}
+
+		baseFormData.days = 0.5
+	} else {
+		let start = baseFormData.startDate
+		let end = baseFormData.endDate
+		baseFormData.days = getDayDiff(start, end);
+
+		baseFormData.typeName = '全天'
+	}
+
+	baseFormData.days = baseFormData.days.toString()
+}
+
+// 计算两个日期的天数差
+function getDayDiff(startDate, endDate) {
+	// 处理日期格式（兼容iOS）
+	const start = startDate.replace(/-/g, '/');
+	const end = endDate.replace(/-/g, '/');
+
+	const date1 = new Date(start).getTime();
+	const date2 = new Date(end).getTime();
+
+	if (date2 < date1) {
+		return 0
+	}
+
+	// 计算天数差（含边界值+1天）
+	return Math.floor(Math.abs(date2 - date1) / (24 * 3600 * 1000)) + 1;
+}
+</script>
+
+<style scoped>
+.white-bg {
+	width: 690rpx;
+	margin: 0;
+	border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+	border-radius: 0;
+	margin-bottom: 20rpx;
+}
+
+:deep(.tabs-header) {
+	/* background: none !important; */
+	border-bottom: none !important;
+	margin: 0 auto;
+	gap: 5px;
+}
+
+:deep(.tab-item) {
+	color: #919191;
+	font-size: 32rpx;
+	font-weight: bold;
+	/* flex:none; */
+	/* margin: 0 -50rpx; */
+	/* padding: 0 50rpx; */
+}
+
+:deep(.tab-item:first-child) {
+	text-align: right;
+	margin-left: 230rpx;
+}
+
+:deep(.tab-item:last-child) {
+	text-align: left;
+	margin-right: 230rpx;
+}
+
+:deep(.tab-item.active) {
+	color: #3384DF;
+	font-weight: bold;
+}
+
+:deep(.tab-item.active::after) {
+	width: 100rpx;
+	height: 8rpx;
+}
+
+:deep(.is-disabled) {
+	background-color: rgba(255, 255, 255, 1) !important;
+	color: #333;
+}
+
+.btn-success {
+	background-color: #67d23a;
+	border: 1px solid #67d23a;
+	color: #fff;
+	/* padding: 0rpx 60rpx; */
+}
+
+.btn-warning {
+	background-color: #f6b23c;
+	border: 1px solid #f6b23c;
+	color: #fff;
+	/* padding: 0rpx 60rpx; */
+}
+
+.leaveApple {
+	background-color: rgba(103, 194, 58, 0.2);
+}
+
+.backLeave {
+	background-color: rgba(230, 162, 60, 0.2);
+}
+
+:deep(.uni-forms-item__label) {
+	padding: 0 12px;
+}
+
+:deep(.custom-label-height .uni-forms-item__label) {
+	height: 190rpx;
+}
+
+::v-deep .uni-easyinput__content-textarea {
+	height: 166rpx !important;
+}
+</style>

src/pages/business/CRM/leave/reviewLeave.vue

@@ -0,0 +1,376 @@
+<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"></view>
+
+			<view class="white-bg">
+				<view class="tabs-container">
+					<view class="search">
+						<uni-search-bar class="custom-search" radius="28" placeholder="姓名" clearButton="auto"
+							cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
+						<button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+					</view>
+
+					<view class="tabs-scorll">
+						<view class="tabs-header">
+							<view v-for="(tab, index) in tabHeaderList" :key="index"
+								:class="['tab-item-main', { 'active': activeTabHeader === index }]"
+								@click="switchTabHeader(index)">
+								{{ tab }}
+							</view>
+						</view>
+					</view>
+					<view class="tabs-scorll">
+						<view class="tabs-header">
+							<view v-for="(tab, index) in tabList" :key="index"
+								:class="['tab-item', { 'active': activeTab === index }]" @click="switchTab(index)">
+								{{ tab }}
+							</view>
+						</view>
+					</view>
+
+					<view class="white-bg-2" v-for="item in detailList">
+						<view class="report-list" @click="showDetail(item)">
+							<view class="report-list">
+								<view class="title" style="font-size: 30rpx;margin-top: 20rpx;">
+									{{ item.typeval == '1' ? '全天' : item.typeval == '2' ? '前半个班次' : '后半个班次' }}
+
+									<label v-if="item.applyType == '请假'" style="float: right;color: #03ca03;">
+										{{ item.applyType }}</label>
+									<label v-if="item.applyType == '销假'" style="float: right;color: #eaa303;">
+										{{ item.applyType }}</label>
+								</view>
+								<view class="r-list">
+									<view class="r-left">姓名</view>
+									<view class="r-right">{{ item.applyUserName }} </view>
+								</view>
+								<view class="r-list">
+									<view class="r-left">{{ item.applyType }}日期</view>
+									<view class="r-right">{{ item.startDate }} 至 {{ item.endDate }}
+										（ <label v-if="item.applyType == '请假'" style="color: #03ca03;">
+											{{ item.days.replace('.0', '') }}天</label>
+										<label v-if="item.applyType == '销假'" style="color: #eaa303;">
+											{{ item.days.replace('.0', '') }}天</label> ）
+									</view>
+								</view>
+
+								<view class="r-list">
+									<view class="r-left">详细说明</view>
+									<view v-if="item.reason && item.reason.length <= 18" class="r-right">{{ item.reason
+										}}</view>
+								</view>
+								<view class="r-list" style="margin-top: -30rpx;"
+									v-if="item.reason && item.reason.length > 18">
+									<view class="r-right">{{ item.reason }}</view>
+								</view>
+
+							</view>
+							<view class="border-bottom" style="margin: 20rpx 0;"></view>
+						</view>
+					</view>
+					<view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize"
+							:current="pageCurrent" :total="total" @change="change" /></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import {
+	ref,
+	onMounted,
+	reactive
+} from 'vue'
+import {
+	onShow
+} from '@dcloudio/uni-app'
+import customHeader from '@/components/customHeader.vue'
+import {
+	getNavBarPaddingTop
+} from '@/utils/system.js'
+
+import {
+	getMyReviewList
+} from '@/api/crm/activity/activity';
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+	getlist();
+})
+
+onShow(() => {
+	uni.$on('isRefresh', function () {
+		isRefresh.value = true
+		getApplyList();
+	})
+})
+
+function getApplyList() {
+	getlist({
+		applyUserName: searchValue.value
+	})
+}
+
+let isRefresh = ref(false)
+
+let searchValue = ref(null)
+// 查询搜索跳转
+let handleSearch = () => {
+	isRefresh.value = true
+	getApplyList();
+}
+
+const pageSize = ref(4);
+const pageCurrent = ref(1);
+const loading = ref(false);
+let tabList = ref([])
+let tabHeaderList = ref(['待审核', '已审核'])
+
+let total = ref(0);
+const totalAll = ref(0);
+const totalReview = ref(0);
+const totalReviewA = ref(0);
+const totalReviewB = ref(0);
+const totalReject = ref(0);
+const totalPass = ref(0);
+
+
+let activeTab = ref(0);
+let activeTabHeader = ref(0);
+
+let detailList = ref([])
+let detailLists = ref([])
+
+//请假
+let reviewListA = ref([])
+//销假
+let reviewListB = ref([])
+//驳回
+let rejectList = ref([])
+//通过
+let passList = ref([])
+//已审批
+let reviewList = ref([])
+
+const getlist = async (param) => {
+	loading.value = true
+
+	let res = await getMyReviewList(param);
+	detailLists.value = res.rows;
+	reviewListA.value = res.rows.filter(t => (t.status == '待审批' || t.status == '审批中') && t
+		.applyType == '请假' && t.reviewerIdR == null)
+	reviewListB.value = res.rows.filter(t => (t.status == '待审批' || t.status == '审批中') && t
+		.applyType == '销假' && t.reviewerIdR == null)
+
+	rejectList.value = res.rows.filter(t => t.status == '驳回' && t.reviewerIdR != null)
+	passList.value = res.rows.filter(t => t.status != '驳回' && t.reviewerIdR != null)
+
+	reviewList.value = res.rows.filter(t => t.reviewerIdR != null)
+
+	total.value = res.total
+
+	totalReviewA.value = reviewListA.value.length
+	totalReviewB.value = reviewListB.value.length
+
+	totalReview.value = totalReviewA.value + totalReviewB.value
+	totalReject.value = rejectList.value.length
+	totalPass.value = passList.value.length
+
+	totalAll.value = reviewList.value.length
+
+	if (isRefresh.value == false) {
+		switchTabHeader(0)
+		switchTab(0)
+	}
+
+	if (activeTabHeader.value == 0) {
+		tabList.value = ['请假(' + totalReviewA.value + ')', '销假(' + totalReviewB.value + ')']
+	} else if (activeTabHeader.value == 1) {
+		let all = '全部(' + totalAll.value + ')'
+		let pass = '已批准(' + totalPass.value + ')'
+		let reject = '已驳回(' + totalReject.value + ')'
+
+		tabList.value = [all, pass, reject]
+	}
+
+	change({
+		current: 1
+	})
+
+	loading.value = false
+}
+
+const switchTab = (index) => {
+	isRefresh.value = false
+	activeTab.value = index
+
+	change({
+		current: 1
+	})
+}
+
+const switchTabHeader = (index) => {
+	isRefresh.value = false
+	tabList.value = []
+	activeTabHeader.value = index
+
+	if (activeTabHeader.value == 0) {
+		tabList.value = ['请假(' + totalReviewA.value + ')', '销假(' + totalReviewB.value + ')']
+	} else if (activeTabHeader.value == 1) {
+		let all = '全部(' + totalAll.value + ')'
+		let pass = '已批准(' + totalPass.value + ')'
+		let reject = '已驳回(' + totalReject.value + ')'
+
+		tabList.value = [all, pass, reject]
+	}
+
+	switchTab(0)
+}
+
+// 分页触发
+let change = (e) => {
+	pageCurrent.value = e.current
+
+	let end = pageSize.value * e.current
+	let start = end - pageSize.value
+
+	if (activeTabHeader.value == 0) {
+		if (activeTab.value == 0) {
+			detailList.value = reviewListA.value.slice(start, end)
+			total.value = totalReviewA.value
+		} else if (activeTab.value == 1) {
+			detailList.value = reviewListB.value.slice(start, end)
+			total.value = totalReviewB.value
+		}
+	} else if (activeTabHeader.value == 1) {
+		if (activeTab.value == 0) {
+			detailList.value = reviewList.value.slice(start, end)
+			total.value = totalAll.value
+		} else if (activeTab.value == 1) {
+			detailList.value = passList.value.slice(start, end)
+			total.value = totalPass.value
+		} else if (activeTab.value == 2) {
+			detailList.value = rejectList.value.slice(start, end)
+			total.value = totalReject.value
+		}
+	}
+}
+
+// 跳转
+let showDetail = (item) => {
+	uni.navigateTo({
+		url: "/pages/business/CRM/leave/reviewDetail?data=" + encodeURIComponent(JSON
+			.stringify(item))
+	})
+}
+</script>
+
+<style lang="scss" scoped>
+.apply-row {
+	margin: 5px;
+}
+
+.border-bottom {
+	margin: 5px;
+	width: 100%;
+}
+
+.tabs-header {
+	display: flex;
+	height: 80rpx;
+	background: #fff;
+	border-bottom: 1rpx solid #eee;
+}
+
+.tab-item {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 28rpx;
+	color: #666;
+}
+
+.tab-item.active {
+	color: #007AFF;
+	position: relative;
+}
+
+.tab-item.active::after {
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: 50%;
+	transform: translateX(-50%);
+	width: 200rpx;
+	height: 4rpx;
+	background-color: #007AFF;
+}
+
+.tab-item-main {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 30rpx;
+	color: #666;
+}
+
+.tab-item-main.active {
+	color: #007AFF;
+	position: relative;
+}
+
+.tab-item-main.active::after {
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: 50%;
+	transform: translateX(-50%);
+	width: 300rpx;
+	height: 4rpx;
+	background-color: #007AFF;
+}
+
+:deep(.report-list .r-list) {
+	padding: 0.5rem 0;
+}
+
+.search {
+	display: flex;
+}
+
+.search .btn-search {
+	border: none;
+	background: none;
+	line-height: normal;
+	color: #666;
+	line-height: 56rpx !important;
+	padding: 10rpx 0 0;
+	text-align: left;
+	cursor: pointer;
+}
+
+.search .btn-search::after {
+	display: none;
+}
+
+.search .custom-search {
+	width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+	padding-right: 0 !important;
+}
+</style>

src/pages/business/CRM/mainOwner/audit/confirmForm.vue

@@ -602,11 +602,11 @@ let handleReject = () => {
     async success(res){
       if(res.confirm){
         if(res.content){
-          let res = await changeOfPrimaryOwnershipNoApproved({
+          let response = await changeOfPrimaryOwnershipNoApproved({
             opinionOwn: res.content,
             userId: formData.value.userId
           })
-          if(res.code==200){
+          if(response.code===200){
             uni.showToast({
               title: '操作成功',
               success(){

src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue

@@ -21,7 +21,6 @@
 <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
 <!--                          v-model="searchValue"-->
 <!--          />-->
-<!--          <button type="default" @click="clearSearchValue" size="mini" class="btn-search">清空</button>-->
 <!--        </view>-->
 
         <!-- 分页部分  -->
@@ -31,9 +30,11 @@
         >
           <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index">
             <view class="report-list" @click.stop="handleDetail(item)">
-              <view class="r-list title" >
+              <view class="r-list title">
                 {{ item.cusName }}
-                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">{{item.auditStatus?'':'待您审批'}}</view>
+                <view class="r-right no-wrap" :class="item.auditStatus ? 'btn-blue' : 'btn-pink' ">
+                  {{ item.auditStatus ?  item.auditStatus : '待您审核' }}
+                </view>
               </view>
               <view class="r-list">
                 <view class="r-left">客户人员名称</view>
@@ -98,7 +99,8 @@ const mescrollRef = ref(null);
 let timerId = null;
 // 查询搜索跳转
 let handleSearch = () => {
-  // 防抖搜索    console.log(searchValue.value)
+  // 防抖搜索
+  console.log(searchValue.value)
   if (timerId) clearTimeout(timerId);
 
   timerId = setTimeout(async () => {
@@ -113,7 +115,7 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
   handleSearch()
 })
-let clearSearchValue = ()=>{
+let clearSearchValue = () => {
   searchValue.value = '';
 }
 // 查询列表
@@ -122,7 +124,10 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -142,28 +147,28 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
+  cssFlag.value = true;
-    cssFlag.value = true;
+  uni.showLoading();
-    uni.showLoading();
+  setTimeout(async () => {
-    setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
-
       list.value = res.list;
-      cssFlag.value = false;
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-      uni.hideLoading();
+    } catch (error) {
-    }, 500);
+      console.log(error)
-  } catch (error) {
+      mescroll.endErr();
-    console.log(error)
+    } finally {
-    mescroll.endErr();
+      cssFlag.value = false;
-  }
+    }
+  }, 500);
+
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
+  setTimeout(async () => {
-    setTimeout(async () => {
+    try {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -173,11 +178,11 @@ const upCallback = async (mescroll) => {
       }
       // 正确判断是否还有更多数据
       mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
+    } catch (error) {
-  } catch (error) {
+      console.log(error)
-    console.log(error)
+      mescroll.endErr();
-    mescroll.endErr();
+    }
-  }
+  }, 500);
 }
 
 // 获取数据列表
@@ -188,12 +193,16 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
+    try {
-    let res = await personnelAwaitingReviewForChange(param);
+      let res = await personnelAwaitingReviewForChange(param);
-    resolve({
+      resolve({
-      list: res.rows,
+        list: res.rows,
-      total: res.total
+        total: res.total
-    });
+      });
+    } catch (e) {
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -203,11 +212,11 @@ let handleDetail = (item) => {
   uni.navigateTo({
     url: "/pages/business/CRM/mainOwner/audit/confirmForm",
     events: {
-      refreshOwnerChangeList(){
+      refreshOwnerChangeList() {
         handleSearch();
       }
     },
-    success(res){
+    success(res) {
       res.eventChannel.emit('auditCusOwner', {data: {userId}, editable: false})
     }
   })
@@ -218,60 +227,39 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-.search {
+.scroll-h{
-  display: flex;
-}
-
-.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 .custom-search {
-  width: 80%;
-
-}
-
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
-.scroll-h {
   /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
 .white-bg {
   padding-bottom: 10rpx;
-  .title{
+
+  .title {
     align-items: flex-start;
   }
 }
 
-.btn-pink{
+.no-wrap {
   white-space: nowrap;
 }
+
+.btn-blue {
+  border-radius: 10rpx;
+}
 </style>

src/pages/business/CRM/mainOwner/view/viewMainOwner.vue

@@ -1,19 +1,17 @@
+<!--
+ * @description 查看主归属人变更
+ * @update date 2025/9/17 21:45
+-->
 <template>
   <view class="con-body">
     <view class="con-bg">
       <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true" :rightFlag="false"></customHeader>
+      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true"
+                    :rightFlag="false"></customHeader>
       <!-- 高度来避免头部遮挡 -->
       <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
       <view class="all-body">
-        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
-        <view class="search">
-<!--          <uni-search-bar class="custom-search" radius="28" placeholder="检索功能待开发，感谢您的耐心等待" clearButton="auto"-->
-<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />-->
-<!--          <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"
@@ -22,25 +20,17 @@
                 @click="showDetail(item)">
             <view>
               <view class="report-list">
-                <view class="title">客户：{{ item.cusName }}</view>
+                <view class="r-list title">{{ item.cusName }}
-                <view class="r-list">
                   <view class="r-name">{{ item.visistCode }}</view>
-                  <view>
+                  <view class="r-right btn-blue no-wrap"> 查看 </view>
-
-                    <view
-                        class="r-right btn-blue"
-                        size="mini">
-                      查看
-                    </view>
-                  </view>
-
                 </view>
+
                 <view class="border-bottom"></view>
                 <view class="r-list">
                   <view class="r-left">客户人员名称</view>
-                  <view class="r-right">{{ item.userName}}</view>
+                  <view class="r-right">{{ item.userName }}</view>
                 </view>
-                <view class="r-list" >
+                <view class="r-list">
                   <view class="r-left">目前业务员</view>
                   <view class="r-right">{{ item.belonger }}</view>
                 </view>
@@ -68,7 +58,7 @@
 
 <script setup>
 import customHeader from "../../../../../components/customHeader.vue";
-import { onMounted, ref } from 'vue';
+import {onMounted, ref} from 'vue';
 
 import {getNavBarPaddingTop} from "../../../../../utils/system";
 import MescrollUni from "mescroll-uni/mescroll-uni.vue";
@@ -88,16 +78,17 @@ let queryParams = ref({
 onMounted(() => {
   navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
-onShow(()=>{
+onShow(() => {
   getList(queryParams)
 })
 
 
 let list = ref([])
+
 //获取列表信息
-function getList(queryParams){
+function getList(queryParams) {
   queryViewMainOwnerList(queryParams.value).then(res => {
-      list.value = res.rows
+    list.value = res.rows
   })
 }
 
@@ -153,9 +144,12 @@ const upCallback = async (mescroll) => {
 }
 
 const upOption = ref({
-  page: { num: 0, size: 10 },
+  page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: { tip: '~ 空空如也 ~' },
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -177,57 +171,43 @@ function showDetail(item) {
 
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-.search {
+.scroll-h{
-  display: flex;
-}
-
-.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 .custom-search {
-  width: 80%;
-
-}
-
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
-.scroll-h {
   /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
 .white-bg {
   padding-bottom: 10rpx;
 }
+
+.title {
+  align-items: baseline
+}
+
+.no-wrap {
+  white-space: nowrap;
+}
+
+.btn-blue {
+  border-radius: 10rpx;
+}
 </style>

src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue

@@ -135,7 +135,19 @@ function getCrmCusUserNewChangeOwnerList() {
 <style scoped>
 .con-bg{
   background: white;
-  min-height: 100vh;
+/*  min-height: 100vh; */
+}
+
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
+  /* #endif */
+  overflow-y: auto;
 }
 
 .white-bg {

src/pages/business/CRM/map/addRearkSignIn.vue

@@ -22,8 +22,8 @@
 <script setup>
 import customHeader from '@/components/customHeader.vue'
 import { onMounted, reactive, ref } from 'vue';
-import { addStartMap } from '../../../../api/crm/activity/map';
+import { addStartMap } from '@/api/crm/activity/map';
-import { dateFormat } from '../../../../utils/formatter';
+import { parseTime } from '@/utils/datetime.js';
 import { onLoad } from '@dcloudio/uni-app';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 let form = reactive({
@@ -46,7 +46,7 @@ onMounted(() => {
 onLoad(option => {
 	form.visistId = option.visistId
 	let date = new Date();
-	form.craeteTime = dateFormat("YYYY-mm-dd", date)
+	form.craeteTime = parseTime(date, '{y}-{m}-{d}');
 })
 
 function addInsertMapClockIn() {

src/pages/business/CRM/map/checkInView.vue

@@ -1,164 +1,171 @@
 <template>
-    <view class="con-body">
+  <view class="con-body">
-        <view class="con-bg">
+    <view class="con-bg">
-            <!-- 头部 -->
+      <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
+      <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
 
-            <!-- 高度来避免头部遮挡 -->
+      <!-- 高度来避免头部遮挡 -->
-            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
-            <!-- 正文内容 -->
+      <!-- 正文内容 -->
-            <view>
+      <view>
-                <!-- 搜索 -->
+        <!-- 搜索 -->
-                <view class="search">
+        <!--                <view class="search">-->
-                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
+        <!--                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"-->
-                        class="picker-bg">
+        <!--                        class="picker-bg">-->
-                        <view class="picker">
+        <!--                        <view class="picker">-->
-                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+        <!--                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"-->
-                                size="18"></uni-icons>
+        <!--                                size="18"></uni-icons>-->
-                            <view>{{ defaultDate }}</view>
+        <!--                            <view>{{ defaultDate }}</view>-->
-                            <uni-icons type="down" size="18"></uni-icons>
+        <!--                            <uni-icons type="down" size="18"></uni-icons>-->
-                        </view>
+        <!--                        </view>-->
-                    </picker>
+        <!--                    </picker>-->
-                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+        <!--                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
-                </view>
+        <!--                </view>-->
 
-                <!-- 分页部分  -->
+        <!-- 分页部分  -->
-                <view class="white-bg margin-bottom20" v-for="(item, index) in list">
+        <view class="white-bg margin-bottom20" v-for="(item, index) in list">
-                    <view class="report-list" >
+          <view class="report-list">
-                            <view class="title"
+            <view class="title"
-                            :style="{color: item.mapType == 1 ? '#F5813A' : '#1989FA'}"
+                  :style="{color: MapType[item.mapType].color}"
-                            >类型：{{ item.mapType == 1 ? '签到' : '打卡' }}</view>
+            >类型：{{ MapType[item.mapType].label }}
-                            <view class="r-list">
+            </view><!--item.mapType == 1 ? '#F5813A' : '#1989FA'}-->
-                                <view class="r-left">开始签到时间</view>
+            <view class="r-list">
-                                <view class="r-right">{{ item.goVisistStartTime }}</view>
+              <view class="r-left">开始签到时间</view>
-                            </view>
+              <view class="r-right">{{ item.goVisistStartTime }}</view>
-                            <view class="border-bottom"></view>
+            </view>
-                            <view class="r-list">
+            <view class="border-bottom"></view>
-                                <view class="r-left">开始签到地点</view>
+            <view class="r-list">
-                                <view class="r-right">{{ item.addressForStart }}</view>
+              <view class="r-left">开始签到地点</view>
-                            </view>
+              <view class="r-right">{{ item.addressForStart }}</view>
-                            <view class="border-bottom"></view>
+            </view>
-                            <view class="r-list">
+            <view class="border-bottom"></view>
-                                <view class="r-left">结束签到时间</view>
+            <view class="r-list">
-                                <view class="r-right">{{ item.goVisistEndTime }}</view>
+              <view class="r-left">结束签到时间</view>
-                            </view>
+              <view class="r-right">{{ item.goVisistEndTime }}</view>
-                            <view class="border-bottom"></view>
+            </view>
-                            <view class="r-list">
+            <view class="border-bottom"></view>
-                                <view class="r-left">结束签到地点</view>
+            <view class="r-list">
-                                <view class="r-right">{{ item.addressForEnd }}</view>
+              <view class="r-left">结束签到地点</view>
-                            </view>
+              <view class="r-right">{{ item.addressForEnd }}</view>
-                            <view class="r-list" v-if="item.remark != null">
+            </view>
-                                <view class="r-left">备注内容</view>
+            <view class="r-list" v-if="item.remark != null">
-                                <view class="r-right">{{ item.remark }}</view>
+              <view class="r-left">备注内容</view>
-                            </view>
+              <view class="r-right">{{ item.remark }}</view>
-                        </view>
+            </view>
-                    </view>
+          </view>
-                </view>
         </view>
+      </view>
     </view>
+  </view>
 </template>
 
 <script setup>
 import customHeader from '@/components/customHeader.vue'
-import { getNavBarPaddingTop } from '@/utils/system.js'
+import {getNavBarPaddingTop} from '@/utils/system.js'
-import { onMounted, ref } from 'vue';
+import {onMounted, ref} from 'vue';
-import { getDate } from '@/utils/datetime.js'
+import {getDate} from '@/utils/datetime.js'
-import { CheckInInformationViewing } from '../../../../api/crm/activity/map';
+import {CheckInInformationViewing} from '../../../../api/crm/activity/map';
-import { onLoad } from '@dcloudio/uni-app';
+import {onLoad} from '@dcloudio/uni-app';
+import {MapType} from "./dataMap";
 
 const navBarPaddingTop = ref(0);
 onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
 // 开始时间
 let startDate = getDate('start');
 // 结束时间，间隔10年
 let endDate = getDate('end');
-let defaultDate = getDate({ format: true })
+let defaultDate = getDate({format: true})
 let bindDateChange = (e) => {
-    defaultDate = e.detail.value
+  defaultDate = e.detail.value
 }
 
 //获取list集合信息
 let list = ref([])
+
 function getList() {
-    CheckInInformationViewing().then(res => {
+  CheckInInformationViewing().then(res => {
-        list.value = res.rows
+    list.value = res.rows
-    })
+  })
 }
 
 onLoad(() => {
-    getList()
+  getList()
 })
 
-
-
-
-
 </script>
 
 <style scoped>
+.r-left {
+  min-width: 6em;
+}
+
+.con-bg {
+  overflow-y: auto;
+}
+
 .search {
-    display: flex;
+  display: flex;
-    margin-bottom: 30rpx;
+  margin-bottom: 30rpx;
-    padding: 0 30rpx;
+  padding: 0 30rpx;
 }
 
 .search .btn-search {
-    border: none;
+  border: none;
-    background: none;
+  background: none;
-    color: #fff;
+  color: #fff;
-    display: flex;
+  display: flex;
-    align-items: center;
+  align-items: center;
-    justify-content: center;
+  justify-content: center;
-    font-size: 28rpx;
+  font-size: 28rpx;
-    /* 调整为更合适的字号 */
+  /* 调整为更合适的字号 */
-    font-weight: normal;
+  font-weight: normal;
-    /* 如果不需要加粗，可以去掉 bolder */
+  /* 如果不需要加粗，可以去掉 bolder */
-    margin-left: 0rpx;
+  margin-left: 0rpx;
-    padding: 0 20rpx;
+  padding: 0 20rpx;
-    /* 调整 padding，去掉 padding-top */
+  /* 调整 padding，去掉 padding-top */
-    height: 56rpx;
+  height: 56rpx;
-    /* 固定高度，确保与 picker 对齐 */
+  /* 固定高度，确保与 picker 对齐 */
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .search .btn-search::after {
-    display: none;
+  display: none;
 }
 
 .search .picker-bg {
-    display: flex;
+  display: flex;
-    background-color: #6FA2F8;
+  background-color: #6FA2F8;
-    border-radius: 25px;
+  border-radius: 25px;
-    color: #fff;
+  color: #fff;
-    font-size: 28rpx;
+  font-size: 28rpx;
-    padding: 0rpx 20rpx;
+  padding: 0rpx 20rpx;
-    /* #ifndef APP-PLUS */
+  /* #ifndef APP-PLUS */
-    padding: 10rpx 20rpx 0 20rpx;
+  padding: 10rpx 20rpx 0 20rpx;
-    /* #endif */
+  /* #endif */
-    margin-right: 20rpx;
+  margin-right: 20rpx;
 }
 
 .search .picker-bg .picker {
-    display: flex;
+  display: flex;
-    align-items: center;
+  align-items: center;
-    /* #ifndef APP-PLUS */
+  /* #ifndef APP-PLUS */
-    padding-top: 2rpx;
+  padding-top: 2rpx;
-    /* #endif */
+  /* #endif */
 }
 
 .search .picker-bg .picker .uni-icons {
-    color: #fff !important;
+  color: #fff !important;
 }
 
 .search .picker-bg .picker .uni-icons:first-child {
-    margin-right: 10rpx;
+  margin-right: 10rpx;
 }
 
 .search .picker-bg .picker .uniui-down {
-    margin-left: 10rpx;
+  margin-left: 10rpx;
 }
 </style>

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

@@ -0,0 +1,9 @@
+/**
+ * 签到/打卡/出差
+ * @type {{"1": {label: 签到, bgc: string}, "2": {label: 打卡, bgc: string}, "3": {label: 出差, bgc: string}}}
+ */
+export const MapType = {
+    '1': {label:'签到', color:'#F5813A'},
+    '2': {label:'打卡', color:'#1989FA'},
+    '3': {label:'出差', color:'#42b883'}
+}

src/pages/business/CRM/map/vistorCheckin.vue

@@ -1,363 +1,538 @@
 <template>
-    <view class="con-body">
+  <view class="con-body">
-        <view class="con-bg">
+    <view class="content">
-            <!-- 头部 -->
+      <view class="pub-add-box1" @click="addInsertMapForSignIn">
-            <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
+        <view style="color: aliceblue; font-size: 22px;">签到</view>
+      </view>
 
-            <!-- 高度来避免头部遮挡 -->
+      <view class="pub-add-box" @click="addInsertMapClockIn">
-            <view class="top-height"></view>
+        <view style="color: aliceblue; font-size: 22px;">打卡</view>
+      </view>
 
-            <!-- 正文内容 -->
+      <!-- 自定义打卡确认弹窗 -->
-            <view class="white-bg">
+      <view class="clock-in-modal" v-if="showClockInModal" @click="cancelClockIn">
-                <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn" />
+        <view class="modal-content" @click.stop>
-                <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn" />
+          <view class="modal-header">
-                <view class="check-desc">
+            <text class="modal-title">请选择工作状态</text>
-                    业务人员可通过<text class="font-orange">签到</text>或<text
+          </view>
-                        class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
+          <view class="modal-body">
-                </view>
+            <text class="address-text">{{ clockInAddress }}</text>
+          </view>
+          <view class="modal-footer">
+            <view class="btn-group">
+              <button class="cancel-btn" @click="businessTripClockIn">出差</button>
+              <button class="confirm-btn" @click="confirmClockIn">未出差</button>
             </view>
+          </view>
         </view>
-
+      </view>
-        <!-- 打卡遮罩层 -->
-        <!-- <view class="check-con" v-if="checkFlag">
-            <view class="check-in">
-                <view class="check-tip">打卡</view>
-                <view class="check-title">确定要在此处打卡吗？</view>
-                <view class="check-location">
-                    <uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
-                </view>
-                <view class="check-address">北京市朝阳区天辰东路1号院</view>
-                <view class="check-footer">
-                    <button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
-                    <button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
-                </view>
-            </view>
-        </view> -->
-
     </view>
+  </view>
+
 </template>
 
-<script setup>
+<script>
-import { ref, onMounted, reactive } from 'vue'
+import { addStartMapForClockIn, businessTripClockIn } from '@/api/crm/activity/map.js';
-import customHeader from '@/components/customHeader.vue'
-import { addStartMapForClockIn } from '../../../../api/crm/activity/map';
 
-let form = reactive({
+export default {
-    addressForStart: null,
+  data() {
-    addressForEnd: null,
+    return {
-    createId: null,
+      arrUrl: null,
-    staffName: null,
+      mescroll: undefined,
-    visistCode: null,
+      // 打卡相关数据
-    visistId: null,
+      showClockInModal: false,
-    mapId: null
+      clockInAddress: '',
-})
+      clockInData: null,
-// 签到
+      downOption: {
-let handleCheckIn = () => {
+        auto: false //是否在初始化后,自动执行downCallback; 默认true
-    uni.navigateTo({
+      },
-        url: './addRearkSignIn'
+      upOption: {
+        onScroll: true,
+        use: true, // 是否启用上拉加载; 默认true
+        auto: true, // 是否在初始化完毕之后自动执行上拉加载的回调; 默认true
+        page: {
+          num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+          size: 10 // 每页数据的数量,默认10
+        },
+        noMoreSize: 1, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+        empty: {
+          tip: '暂无相关数据'
+        }
+      },
+      dataList: [],
+      dzList: [],
+      searchContent: '',
+      form: {
+        addressForStart: null,
+        addressForEnd: null,
+        createId: null,
+        staffName: null,
+        visistCode: null,
+        visistId: null,
+        mapId: null,
+      }
+    }
+  },
+  onLoad() {
+    // 修改顶部导航背景色
+    uni.setNavigationBarColor({
+      frontColor: '#ffffff',
+      backgroundColor: '#29abe2',
+      animation: {
+        duration: 400,
+        timingFunc: 'easeIn'
+      }
     })
-}
+    let date = new Date();
-// 打卡
+    this.form.createTime = this.dateFormat("YYYY-mm-dd", date);
-let handleClockIn = () => {
+  },
-    uni.getLocation({
+  onShow() {
+    this.arrUrl = uni.getStorageSync("avatar");
+  },
+  methods: {
+    addInsertMap() {
+      uni.navigateTo({
+        url: './insertMap'
+      })
+    },
+    //签到
+    addInsertMapForSignIn() {
+
+      uni.navigateTo({
+        url: './addRearkSignIn'
+      })
+
+    },
+    //打卡
+    addInsertMapClockIn() {
+      var that = this;
+      uni.getLocation({
         type: 'wgs84',
         success: (res) => {
-            const latiude = res.latitude;
+          const latiude = res.latitude;
-            const longitude = res.longitude;
+          const longitude = res.longitude;
-            //进行解析
+          //进行解析
-            inverseGeocoding(latiude, longitude);
+          this.inverseGeocoding(latiude, longitude);
         },
         fail: function (err) {
-            console.log("获取地址失败" + err)
+          console.log("获取地址失败" + err)
         }
-    })
+      })
-}
+    },
-
+    // 显示打卡确认弹窗
-function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
+    showClockInConfirm(address, data) {
-    const distance = haversineDistance(centerLat, centerLon, lat, lon);
+      this.clockInAddress = address;
-    return distance <= rangeKm;
+      this.clockInData = data;
-}
+      this.showClockInModal = true;
-function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
+    },
-    const dLat = degToRad(lat2 - lat1);
+    // 取消打卡（点击遮罩层）
-    const dLon = degToRad(lon2 - lon1);
+    cancelClockIn() {
-    const a =
+      this.showClockInModal = false;
+      this.clockInAddress = '';
+      this.clockInData = null;
+    },
+    // 确认打卡
+    confirmClockIn() {
+      const that = this;
+      addStartMapForClockIn(this.clockInData).then(res => {
+        if (res.code == 200) {
+          uni.showToast({
+            icon: 'success',
+            title: res.msg,
+            duration: 1500,
+          });
+          setTimeout(() => {
+            uni.navigateBack(1)
+          }, 500)
+        } else {
+          uni.showToast({
+            icon: 'none',
+            title: res.msg,
+          });
+        }
+        that.cancelClockIn(); // 关闭弹窗
+      })
+    },
+    // 出差打卡
+    businessTripClockIn() {
+      const that = this;
+      businessTripClockIn(this.clockInData).then(res => {
+        if (res.code == 200) {
+          uni.showToast({
+            icon: 'success',
+            title: res.msg,
+            duration: 1500,
+          });
+          setTimeout(() => {
+            uni.navigateBack(1)
+          }, 500)
+        } else {
+          uni.showToast({
+            icon: 'none',
+            title: res.msg,
+          });
+        }
+        that.cancelClockIn(); // 关闭弹窗
+      })
+    },
+    isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
+      const distance = this.haversineDistance(centerLat, centerLon, lat, lon);
+      return distance <= rangeKm;
+    },
+    dateFormat(fmt, date) {
+      let ret;
+      const opt = {
+        "Y+": date.getFullYear().toString(),        // 年
+        "m+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "M+": date.getMinutes().toString(),         // 分
+        "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      };
+      for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+          fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+      };
+      return fmt;
+    },
+    haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
+      const dLat = this.degToRad(lat2 - lat1);
+      const dLon = this.degToRad(lon2 - lon1);
+      const a =
         Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-        Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
+        Math.cos(this.degToRad(lat1)) * Math.cos(this.degToRad(lat2)) *
         Math.sin(dLon / 2) * Math.sin(dLon / 2);
-    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+      const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-    return radius * c; // 距离，单位：公里
+      return radius * c; // 距离，单位：公里  
-}
+    },
-function degToRad(deg) {
+    degToRad(deg) {
-    return deg * (Math.PI / 180);
+      return deg * (Math.PI / 180);
-}
+    },
-
+    inverseGeocoding(latiude, longitude) {
-//解析地址
+      var that = this;
-function inverseGeocoding(latiude, longitude) {
+      let points = longitude + ',' + latiude
-    let points = longitude + ',' + latiude
+      const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
-    const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
+      const params = {
-    const params = {
         lat: latiude,
         lng: longitude,
         radius: 1000,
         pageSize: 1,
         currentPage: 1,
-        //classify: 220100
+      };
-    };
+      const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
-    const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
+      uni.request({
-    uni.request({
         url: apiURL,
         method: 'GET',
         data: params,
         header: {
-            'Authorization': 'Bearer ' + token
+          'Authorization': 'Bearer ' + token
         },
         success: (res) => {
-            console.log(res, "----")
+          if (res.statusCode == 200 && res.data.status == 200) {
-            if (res.statusCode == 200 && res.data.status == 200) {
+            let resdata = res.data.data.rows[0].address
-                let resdata = res.data.data.rows[0].address
+            if (resdata == null) {
-                if (resdata == null) {
+              const latiude1 = 34.1360;
-                    console.log(resdata.srcLat)
+              const longitude1 = 108.9126;
-                    const latiude1 = 34.1360;
+              if (this.isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
-                    const longitude1 = 108.9126;
+                this.form.addressForStart = "西安办事处位置打卡"
-                    if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
+                let data = {
-                        form.addressForStart = "西安办事处位置打卡"
+                  mapId: that.form.mapId,
-                        uni.showModal({
+                  addressForStart: that.form.addressForStart,
-                            title: '确定要在此处打卡吗',
+                  cusName: that.form.cusName,
-                            content: form.addressForStart,
+                  cusId: that.form.cusId,
-                            success: function (res) {
+                  remark: that.form.remark,
-                                if (res.confirm) {
+                  path: longitude1 + "," + latiude1
-                                    var data = {
-                                        mapId: form.mapId,
-                                        addressForStart: form.addressForStart,
-                                        cusName: form.cusName,
-                                        cusId: form.cusId,
-                                        remark: form.remark,
-                                        path: longitude1 + "," + latiude1
-                                    }
-                                    addStartMapForClockIn(data).then(res => {
-                                        if (res.code == 200) {
-                                            uni.showToast({
-                                                icon: 'success',
-                                                title: res.msg,
-                                                duration: 1500,
-                                            });
-                                            setTimeout(() => {
-                                                uni.navigateBack(1)
-                                            }, 500)
-                                        } else {
-                                            uni.showToast({
-                                                icon: 'none',
-                                                title: res.msg,
-                                            });
-                                        }
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('用户点击取消');
-                                }
-                            }
-                        });
-                    }
-                } else {
-                    form.addressForStart = resdata;
-                    uni.showModal({
-                        title: '确定要在此处打卡吗',
-                        content: form.addressForStart,
-                        success: function (res) {
-                            if (res.confirm) {
-                                var data = {
-                                    mapId: form.mapId,
-                                    addressForStart: form.addressForStart,
-                                    cusName: form.cusName,
-                                    cusId: form.cusId,
-                                    path: points
-                                }
-                                addStartMapForClockIn(data).then(res => {
-                                    if (res.code == 200) {
-                                        uni.showToast({
-                                            icon: 'success',
-                                            title: res.msg,
-                                            duration: 1500,
-                                        });
-                                    } else {
-                                        uni.showToast({
-                                            icon: 'none',
-                                            title: res.msg,
-                                        });
-                                    }
-                                })
-                            } else if (res.cancel) {
-                                console.log('用户点击取消');
-                            }
-                        }
-                    });
                 }
+                that.showClockInConfirm(that.form.addressForStart, data);
+              }
             } else {
-                form.addressForStart = "第三方维护打卡"
+              this.form.addressForStart = resdata;
-                uni.showModal({
+              let data = {
-                    title: '确定要在此处打卡吗',
+                mapId: that.form.mapId,
-                    content: form.addressForStart,
+                addressForStart: that.form.addressForStart,
-                    success: function (res) {
+                cusName: that.form.cusName,
-                        if (res.confirm) {
+                cusId: that.form.cusId,
-                            var data = {
+                path: points
-                                mapId: form.mapId,
+              }
-                                addressForStart: form.addressForStart,
+              that.showClockInConfirm(that.form.addressForStart, data);
-                                cusName: form.cusName,
-                                cusId: form.cusId,
-                                path: points
-                            }
-                            addStartMapForClockIn(data).then(res => {
-                                if (res.code == 200) {
-                                    uni.showToast({
-                                        icon: 'success',
-                                        title: '第三方维护打卡',
-                                        duration: 1500,
-                                    });
-                                } else {
-                                    uni.showToast({
-                                        icon: 'none',
-                                        title: res.msg,
-                                    });
-                                }
-                            })
-                        } else if (res.cancel) {
-                            console.log('用户点击取消');
-                        }
-                    }
-                });
             }
-
+          } else {
+            this.form.addressForStart = "第三方维护打卡"
+            let data = {
+              mapId: that.form.mapId,
+              addressForStart: that.form.addressForStart,
+              cusName: that.form.cusName,
+              cusId: that.form.cusId,
+              path: points
+            }
+            that.showClockInConfirm(that.form.addressForStart, data);
+          }
         },
         fail(e) {
-            console.log("获取位置失败", e)
+          console.log("获取位置失败", e)
         }
-    })
+      })
-
+    },
+    fail: function (err) {
+      console.log("调用失败" + err)
+    }
 
+  }
 }
-
 </script>
 
-<style scoped>
+<style scoped lang="scss">
-.white-bg {
+.bg-green {
-    width: 650rpx;
+  background-color: #29abe2;
-    margin: 0;
-    border-radius: 8px 8px 0 0;
-    padding: 50rpx;
-    /* #ifdef APP-PLUS */
-    height: calc(100vh - 125px);
-    /* #endif */
-    /* #ifndef APP-PLUS */
-    height: calc(100vh - 98px);
-    /* #endif */
-
-
 }
 
-.btn-image {
+.avatar {
-    width: 340rpx;
+  align-items: center;
-    height: 340rpx;
+  overflow: hidden;
-    margin: 30rpx auto 60rpx;
+  width: 50rpx;
-    display: block;
+  height: 60rpx;
+  border-radius: 50%;
+  margin: 0 auto;
+  margin-right: 10px;
 }
 
-.check-desc {
+.pub-add-box {
-    background-color: #F5F5F5;
+  z-index: 9999;
-    padding: 40rpx 50rpx;
+  width: 320upx;
-    font-size: 28rpx;
+  height: 320upx;
-    border-radius: 10px;
+  border-radius: 50%;
-    margin-top: 100rpx;
+  background: #13579E;
+  position: fixed;
+  right: 205upx;
+  bottom: 200upx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0px 0px 80upx #13579E;
+
+  .img {
+    width: 40upx;
+    height: 40upx;
+  }
 }
 
-.check-desc .font-orange {
+.pub-add-box1 {
-    color: #F5813A;
+  z-index: 9999;
-    font-size: 32rpx;
+  width: 320upx;
-    font-weight: bold;
+  height: 320upx;
+  border-radius: 50%;
+  background: #EA8021;
+  position: fixed;
+  right: 205upx;
+  top: 100upx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0px 0px 80upx #EA8021;
+
+  .img {
+    width: 40upx;
+    height: 40upx;
+  }
 }
 
-.check-desc .font-blue {
+.avatarInner {
-    color: #2CBAEF;
+  align-items: center;
-    font-size: 32rpx;
+  overflow: hidden;
-    font-weight: bold;
+  width: 50rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  margin: 0 auto;
+  margin-right: 10px;
 }
 
-/* 弹窗处理 */
+.info-item-flex2 {
-.check-con {
+  width: 100rpx;
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.4);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    z-index: 999;
 }
 
-/* 遮罩层内容样式 */
+.info-item1 {
-.check-in {
+  align-items: center;
-    background-color: #fff;
+  // height: 100rpx;
-    padding: 40rpx 30rpx 60rpx;
-    border-radius: 10px;
-    /* width: 620rpx; */
-    width: 560rpx;
-    position: absolute;
-    top: 48%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    text-align: center;
 }
 
-.check-in .check-tip {
+.scroolView {
-    font-weight: bold;
+  width: 630rpx;
+  white-space: nowrap;
+  display: flex;
+  align-items: baseline;
 }
 
-.check-in .check-title {
+// 筛选
-    font-size: 32rpx;
+// .screen-cont{
-    padding: 20rpx 0;
+// 	height: 80upx;
+// 	background: #fff;
+// 	margin-top: 100upx;
+// }
+// 客户列表
+.cus-list {
+
+  background: #fff;
+
+  .item {
+    padding: 20upx 40upx;
+    border-bottom: 1px solid #f7f7f7;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .head {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .text {
+        font-size: 32upx;
+        color: #000;
+      }
+
+      .btn-box {
+        .deal-btn {
+          width: 100upx;
+          text-align: center;
+          padding: 10upx 0;
+          font-size: 24upx;
+          border-radius: 4upx;
+
+          &.deal {
+            background: #29abe2;
+            color: #fff;
+          }
+
+          &.un-deal {
+            background: #EFEFEF;
+            color: #BDBDBD;
+          }
+        }
+
+        .nameContent {
+          font-size: 17upx;
+        }
+      }
+    }
+
+    .head {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .name {
+        font-size: 32upx;
+        color: #000;
+      }
+    }
+
+    .cus-info {
+      .info-item {
+        &.flex {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+
+          .img-box {
+            display: flex;
+            align-items: center;
+
+            .img {
+              width: 40upx;
+              height: 40upx;
+              margin-left: 10upx;
+            }
+          }
+        }
+
+        .left {
+          font-size: 28upx;
+          color: #737373;
+        }
+      }
+    }
+  }
 }
 
-.check-in .check-location {
+/* 自定义打卡弹窗样式 */
-    color: #0395E0;
+.clock-in-modal {
-    font-size: 42rpx;
+  position: fixed;
-    font-weight: bold;
+  top: 0;
-    display: flex;
+  left: 0;
-    align-items: center;
+  width: 100%;
-    justify-content: center;
+  height: 100%;
-    margin: 30rpx 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
-.check-in .check-location .uniui-location-filled {
+.modal-content {
-    font-weight: normal;
+  width: 80%;
-    margin-right: 20rpx;
+  max-width: 500rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.3);
 }
 
-.check-in .check-address {
+.modal-header {
-    color: #919191;
+  padding: 40rpx 30rpx 20rpx;
-    font-size: 32rpx;
+  text-align: center;
-    margin-bottom: 80rpx;
+  border-bottom: 1rpx solid #f0f0f0;
 }
 
-.check-in .check-footer {
+.modal-title {
-    display: flex;
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
 }
 
-.check-in .check-footer .btn-default,
+.modal-body {
-.check-in .check-footer .btn-primary {
+  padding: 30rpx;
-    background-color: #fff;
+  text-align: center;
-    border: 1px solid #05A3F4;
-    color: #05A3F4;
-    border-radius: 25px;
-    padding: 0rpx 80rpx;
-    font-size: 34rpx;
-    /* margin-left: 0;
-    margin-right: 20rpx; */
 }
 
-.check-in .check-footer .btn-primary {
+.address-text {
-    background-color: #05A3F4;
+  font-size: 28rpx;
-    border: 1px solid #05A3F4;
+  color: #666;
-    color: #fff;
+  line-height: 1.6;
-    /* padding: 0rpx 60rpx; */
+}
+
+.modal-footer {
+  padding: 20rpx 30rpx 30rpx;
+}
+
+.btn-group {
+  display: flex;
+  gap: 20rpx;
+}
+
+.cancel-btn,
+.confirm-btn {
+  flex: 1;
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  border-radius: 40rpx;
+  font-size: 28rpx;
+  border: none;
+}
+
+.cancel-btn {
+  background-color: #f5f5f5;
+  color: #666;
+}
+
+.confirm-btn {
+  background-color: #13579E;
+  color: #fff;
 }
 </style>

src/pages/business/CRM/marketActivity/activityTypeList.vue

@@ -10,8 +10,7 @@
             
                 <checkbox-group class="block" @change="checkboxChange">
                     <view class="itemClass" v-for="(item, index) in dataList" :key="item.id">
-                        <checkbox class='checkBoxClass' :value="item.name" 
+                        <checkbox class='checkBoxClass' :value="item.name"></checkbox>
-                            v-model="item.name"></checkbox>
                         <view class="clientClass">
                             <text class="blue-text">{{ item.name }}</text>
                         </view>

src/pages/business/CRM/marketActivity/auditReport.vue

@@ -65,7 +65,7 @@ import { ref, reactive, onMounted } from 'vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { onShow } from '@dcloudio/uni-app';
-import { getApprovalList, getUserInfo } from '../../../../api/crm/activity/activity';
+import { getApprovalList } from '../../../../api/crm/activity/activity';
 
 
 let list = ref([])
@@ -80,7 +80,10 @@ onMounted(() => {
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { tip: '~ 空空如也 ~' },
+    empty: {
+        tip: '~ 空空如也 ~',
+        icon: "../../../../static/images/mescroll-empty.png"
+    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });
@@ -107,24 +110,24 @@ function upCallback(page) {
     getVisistList(page);
 }
 
-onShow(() => {
+// onShow(() => {
-    getUserInfoMethod();
+//     getUserInfoMethod();
-})
+// })
 
 let nickName = ref();
 let deptName = ref();
 let userId = ref();
 let posts = ref();
 
-//获取用户信息
+// //获取用户信息
-function getUserInfoMethod() {
+// function getUserInfoMethod() {
-    getUserInfo().then(res => {
+//     getUserInfo().then(res => {
-        nickName.value = res.user.nickName;
+//         nickName.value = res.user.nickName;
-        deptName.value = res.user.dept.deptName;
+//         deptName.value = res.user.dept.deptName;
-        userId.value = res.user.userId;
+//         userId.value = res.user.userId;
-        posts.value = res.post;
+//         posts.value = res.post;
-    })
+//     })
-}
+// }
 
 //查询待审批的列表信息
 let dataList = ref([])

src/pages/business/CRM/marketActivity/chooseCus.vue

@@ -1,170 +1,257 @@
 <template>
-    <view class="con-body">
+  <view class="con-body">
-        <view >
+    <view class="con-bg">
-            <!-- 头部 -->
+      <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
+      <customHeader ref="customHeaderRef" :title="'客户名称列表'" :leftFlag="true" :rightFlag="false">
-            </customHeader>
+        <template #right>
-            <!-- 高度来避免头部遮挡 -->
+          <view class="head-right" @click="handleAdd">
-            <view class="top-height"></view>
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>
-            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
+            新增
-                @iconClick="iconClick">
+          </view>
-            </uni-easyinput>
+        </template>
+      </customHeader>
 
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
-		<view class="inner-box">
+      <!-- 正文内容 -->
-			<view class="list-cont">
+      <view class="all-body">
-				<radio-group class="block" @change="radioChange">
+        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
-					<view class="item"   v-for="(item, index) in dataList">
+        <view class="search">
-						<radio class='radio' :value="index" ></radio>
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
-						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
-					</view>
+                          v-model="searchValue" @clear="searchValue=''"
-				</radio-group>
+          />
-			</view>
+          <!--          <button type="default" @click="searchValue=''" size="mini" class="btn-search">清空</button>-->
-		</view>
-
         </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}"
+        ><!-- @down="downCallback"-->
+          <radio-group class="block" @change="radioChange">
+            <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+              <radio class='radio'
+                     :class="index === selectIndex ? 'checked' : ''"
+                     :checked="index === selectIndex"
+                     :value="index+''">
+              </radio>
+
+              <view class="report-list">
+                <view class="title">{{ item.cusName }}</view>
+                <!--              <view class="r-list">
+                                <view class="r-name">{{ item.shortName }}</view>
+                                <view class="r-right btn-orange" size="mini">{{ item.statusName }}</view>
+                              </view>-->
+                <view class="border-bottom"></view>
+                <!--              <view class="r-list">
+                                <view class="r-left">日期</view>
+                                <view class="r-right">{{ new Date(item.createTime).toLocaleDateString()}}</view>
+                              </view>-->
+              </view>
+            </view>
+          </radio-group>
+        </mescroll-uni>
+      </view>
     </view>
+  </view>
 </template>
 
 <script setup>
+
+import {ref, onMounted, getCurrentInstance, watch} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import { getYsCustomerList } from '../../../../api/crm/activity/activity'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
-import { onMounted,  reactive, ref, watch } from 'vue'
+import {getNavBarPaddingTop} from '@/utils/system.js'
-import { onLoad } from '@dcloudio/uni-app'
+import {onLoad} from "@dcloudio/uni-app";
-import { useMessage } from '../../../../utils/message'
+import {getCustomerList} from "@/api/crm/customer/getCustomer";
 
+let instance = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+let searchValue = ref('')
 
+let cssFlag=ref(false);//控制样式
 
-const message = useMessage();
+const upOption = ref({
+  page: { num: 0, size: 10 },
+  noMoreSize: 5,
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
 
-//点击查询客户人员
+const downOption = ref({
-const queryParams = ref({
+  auto: true,
-    cusName: '',
+  textInOffset: '下拉刷新',
-    nickName:'',
+  textOutOffset: '释放更新',
-    pageNum: 1,
+  textLoading: '刷新中...'
-    pageSize: 10
+});
-})
 
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
 
 onMounted(() => {
-
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
-onLoad(options => {
+
-    queryParams.value.cusName = options.cusName
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('requestCusList', async (res) => {
+    let {cusName} = res.data;
+    // console.log(cusName, "客户选择页读取到参数");
+    searchValue.value = cusName;
+  })
 })
-const dataList = ref([])
 
+let timerId = null;
+// 搜索
+watch(searchValue, (newValue, oldValue) => {
+  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
+  if(timerId) clearTimeout(timerId);
+  timerId = setTimeout(async ()=>{
+    handleSearch();
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500);
+});
 
-
+// 下拉刷新
-
+const downCallback = async (mescroll) => {
-//查询某一客户人员
+  try {
-let searchContent = ref('')
+    const res = await getList(1, upOption.value.page.size);
-
+    list.value = res.list;
-function iconClick() {
+    // 正确结束下拉刷新状态
-    message.toast('点击了查询，当前内容：' + searchContent.value)
+    mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束下拉刷新
+    mescroll.endErr();
+  }
 }
 
-//监视查询的内容的变化
+// 上拉加载更多
-let queryCusForm = reactive({})
+const upCallback = async (mescroll) => {
-watch(searchContent,(newValue,oldValue)=>{
+  try {
-    queryCusForm.cusName = searchContent.value
+    const res = await getList(mescroll.num, mescroll.size);
-    getYsCustomerList(queryCusForm).then(res=>{
+    if (mescroll.num === 1) {
-        dataList.value = res.rows
+      list.value = res.list;
-    })
+    } else {
-})
+      list.value.push(...res.list);
-
+    }
-function radioChange(event) {
+    // 正确结束上拉加载状态
-     const selectedIndex = event.detail.value
+    mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
-    let test = dataList.value[selectedIndex]
+  } catch (error) {
-    // 发送全局事件
+    console.log(error)
-    uni.$emit('onCustomerSelected', test)
+    // 发生错误时结束上拉加载
-    let cusName = test.cusName;//客户名称
+    mescroll.endErr();
-    let cusId = test.cusId;//客户ID
+  }
-    uni.navigateBack()//返回上一页
 }
 
+// 查询搜索跳转
+let handleSearch = async () => {
+  // 触发下拉刷新以重新加载数据
+  if (mescrollRef.value) {
+    cssFlag.value = true;
+    uni.showLoading()
+    await downCallback(mescrollRef.value.mescroll);
+    uni.hideLoading()
+    cssFlag.value = false;
+  }
+}
+// 获取数据列表
+const getList = async (pageIndex, pageSize) => {
+  let param = {
+    pageNum: pageIndex,
+    pageSize,
+    cusName: searchValue.value
+  }
+  let { rows, total  } = await getCustomerList(param)
+  return {list: rows, total};
+}
+// 选中项的索引号
+const selectIndex = ref(null);
+const radioChange = (e) => {
+  const selectedIndex = e.detail.value;
+  //发送全局事件
+  uni.$emit('onCustomerSelected',list.value[selectedIndex])
+  uni.navigateBack()
+}
 
 
 
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
-
+.all-body {
-.con-body{
+  /* #ifdef APP-PLUS */
-    background: white;
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
 }
 
-
+.search .btn-search {
-/* Container for the checkbox group */
+  border: none;
-.checkbox-group.block {
+  background: none;
-    width: 100%;
+  line-height: normal;
+  color: #fff;
+  line-height: 56rpx !important;
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
 }
 
-/* Each item row */
+.search .btn-search::after {
-.itemClass {
+  display: none;
-    display: flex;
-    align-items: center;
-    padding: 10rpx 0;
-    margin-left: 15rpx;
-    border-bottom: 1px solid #eee;
-    /* optional divider */
 }
 
-/* Checkbox styling */
+.scroll-h {
-.checkBoxClass {
+  /* #ifdef APP-PLUS */
-    margin-right: 12rpx;
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
 }
 
-/* Content container */
+.white-bg {
-.clientClass {
+  //padding-bottom:10rpx;
-    flex: 1;
+  margin-bottom: 0;
-    display: flex;
+  overflow: hidden;
-    align-items: center;
-    flex-wrap: wrap;
-    font-size: 36rpx;
-    color: #333;
-    /* default text color */
-}
-
-/* Blue username text */
-.blue-text {
-    /* or any blue you prefer */
-    margin-right: 5rpx;
-}
-.inner-box {
-  width: 100%;
-  padding: 10px;
-  box-sizing: border-box;
-}
-
-.list-cont {
-  width: 100%;
-}
-
-.block {
-  width: 100%;
-}
-
-.item {
   display: flex;
   align-items: center;
-  padding: 12px 0;
-  border-bottom: 1px solid #eee;
 }
 
 .radio {
-  margin-right: 12px;
+  padding-right: 20rpx;
-  transform: scale(0.9);
 }
 
-.name {
+.title {
-  flex: 1;
+  font-size: 32rpx;
-  font-size: 16px;
+  line-height: 48rpx;
-  color: #333;
 }
 
-.checked {
+.report-list {
-  color: #007AFF; /* 选中状态的颜色 */
+  width: calc(100% - 70rpx);
+  //background-color: pink;
+}
+
+.border-bottom {
+  margin-top: 6rpx;
 }
 </style>

src/pages/business/CRM/marketActivity/customerUserList.vue

@@ -11,7 +11,7 @@
             </uni-easyinput>
             <checkbox-group class="block" @change="checkboxChange">
                 <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                    <checkbox class='checkBoxClass' :value="item.userName" v-model="item.userName"></checkbox>
+                    <checkbox class='checkBoxClass' :value="item.userName"></checkbox>
                     <view class="clientClass">
                         <text class="blue-text">{{ item.userName }}</text>
                         {{ " | " }}

src/pages/business/CRM/marketActivity/detailForApproval.vue

@@ -95,7 +95,12 @@ import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import customHeader from '@/components/customHeader.vue'
 import customTabs from '@/components/customTabs.vue';
-import { auditActivityReport, getVisistDetailList, getYsVisistInfo } from '../../../../api/crm/activity/activity';
+import {
+  auditActivityReport,
+  getRejectReason,
+  getVisistDetailList,
+  getYsVisistInfo
+} from '../../../../api/crm/activity/activity';
 
 
 let visistId = ref(0)
@@ -127,10 +132,38 @@ const activeTab = ref(0);//默认报告明细
 const tabList = ['报告明细'];
 
 //点击驳回
-function refuse() {
+// 修正后的驳回方法
-    uni.navigateTo({
+const refuse = async () => {
-        url: './auditReject?visistId=' + visistId.value
+  uni.showModal({
-    })
+    title: '驳回原因',
+    content: '',
+    editable: true,
+    success: async function (modalRes) { // 使用modalRes避免重名
+      if (modalRes.confirm) {
+        try {
+          const param = {
+            visistId: visistId.value,
+            rejectReason: modalRes.content // 用户输入的驳回原因
+          };
+          const apiRes = await getRejectReason(param); // 避免与modalRes重名
+          uni.showToast({
+            title: '驳回成功',
+            icon: 'success'
+          });
+          // 操作完成后返回
+          setTimeout(() => {
+            uni.navigateBack(1);
+          }, 800);
+        } catch (err) {
+          console.log('驳回失败:', err);
+          uni.showToast({
+            title: '驳回失败',
+            icon: 'error'
+          });
+        }
+      }
+    }
+  });
 }
 
 //点击通过
@@ -145,7 +178,7 @@ function adopt(item) {
                     reportStaffName: item.staffName,
                 }).then(res => {
                     if (res.code == 200) {
-                        // that.mescroll.resetUpScroll()
+                        mescroll.resetUpScroll()
                     } else {
                         uni.showToast({
                             icon: 'none',
@@ -153,6 +186,10 @@ function adopt(item) {
                         });
                     }
                 })
+
+              uni.navigateBack({
+              })
+
             }
         }
 

src/pages/business/CRM/marketActivity/myUserList.vue

@@ -11,8 +11,7 @@
             </uni-easyinput>
                 <checkbox-group class="block" @change="checkboxChange">
                     <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                        <checkbox class='checkBoxClass' :value="item.nickName"
+                        <checkbox class='checkBoxClass' :value="item.nickName"></checkbox>
-                            v-model="item.nickName"></checkbox>
                         <view class="clientClass">
                             <text class="blue-text">{{ item.nickName }}</text>
                         </view>

src/pages/business/CRM/marketActivity/visitReport.vue

@@ -27,14 +27,17 @@
                       :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
                       class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
           <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
-                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
+                @longpress="touchstart(item)"
+                longpress-time="1500"
+                @tap="touchend(item)"
+                >
             <view>
               <view class="report-list">
                 <view class="title">客户：{{ item.cusName }}</view>
                 <view class="r-list">
                   <view class="r-name">{{ item.visistCode }}</view>
-                  <view @touchstart.stop="handleStatusTouchStart"
+                  <view
-                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
+                        @click.stop="chooseStatus(item)">
                     <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
                       {{ item.status == '驳回' ? '再次提交' : item.status }}
                     </view>
@@ -78,7 +81,6 @@ import { ref, onMounted, watch } from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
-import { visitorReportList } from '@/api/business.js'
 import { getYsVisistList, removeVisist, updateStatus } from '../../../../api/crm/activity/activity';
 
 // 获取导航栏高度用于内容区域padding
@@ -141,7 +143,10 @@ const mescrollRef = ref(null);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: {
+      tip: '~ 空空如也 ~',
+      icon: "../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -200,7 +205,7 @@ const getVisitorReportList = (pageNum, pageSize) => {
       pageNum,
       pageSize
     }
-    let res = await visitorReportList(param);
+    let res = await getYsVisistList(param);
     resolve({
       list: res.rows,
       total: res.total
@@ -209,8 +214,6 @@ const getVisitorReportList = (pageNum, pageSize) => {
 }
 
 
-let Loop = ref(0)
-let now
 const visistId = ref();
 const cusName = ref();
 const cusId = ref();
@@ -221,9 +224,6 @@ function touchstart(item) {
   cusName.value = item.cusName
   cusId.value = item.cusId
   status.value = item.status
-  now = new Date();
-  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
-  Loop.value = setTimeout(() => {
     uni.showModal({
       title: '删除',
       content: '请问要删除本条消息吗？',
@@ -255,21 +255,29 @@ function touchstart(item) {
         }
       }
     });
-  }, 750);
 
 }
-
+let isLongPressed = ref(false);
-function touchend() {
+function touchend(item) {
-  let endDate = new Date();
+  visistId.value = item.visistId
-  console.log('结束时间', endDate)
+  cusName.value = item.cusName
-  let cha = endDate.getTime() - now.getTime();
+  cusId.value = item.cusId
-  console.log(cha, 'casd')
+  status.value = item.status
-  if (cha < 750) {
+  // 如果未触发长按，则执行点击逻辑
+  if (!isLongPressed.value) {
     uni.navigateTo({
-      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value
+      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId="
+          + visistId.value
+          + '&cusName='
+          + cusName.value
+          + '&cusId='
+          + cusId.value
+          + '&status='
+          + status.value
     })
   }
-  clearInterval(Loop.value);
+  // 重置状态（避免影响下次事件）
+  isLongPressed.value = false;
 }
 
 //点击状态按钮

src/pages/business/CRM/marketActivity/visitReportView.vue

@@ -140,7 +140,10 @@ const upCallback = async (mescroll) => {
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { tip: '~ 空空如也 ~' },
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../../../static/images/mescroll-empty.png"
+    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });

src/pages/business/CRM/marketActivity/visitorReportAdd.vue

@@ -69,7 +69,10 @@
                             class="uni-forms-item is-direction-top is-top">
 
                             <multipleSelect :multiple="true" :value="chooseMyLeaderList" downInner
-                                :options="myLeaderList" @change="changeValue2" :key="Math.round()" :slabel="'text'">
+                                :options="myLeaderList" 
+                                @change="changeValue2" :key="Math.round()" 
+                                :slabel="'text'"
+                            >
                             </multipleSelect>
                         </uni-forms-item>
 
@@ -138,7 +141,9 @@ const submitForm = async () => {
             icon: 'success'
         });
         saveVisistReportForm.cusId = formData.value.cusId
-        saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
+        if (Array.isArray(formData.value.leader)) {
+          saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',');
+        }
         saveVisistReportForm.visistDate = formData.value.visitDate
         saveVisistReportForm.visistType = 'I类活动（走访）'
         saveVisistReportForm.mapId = mapId.value
@@ -249,10 +254,11 @@ function chooseRecord(e) {
 
 .form-con {
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 100px)
+    height: calc(100vh - 95px) !important;
-        /* #endif */
+    /* #endif */
-        /* #ifndef APP-PLUS */
+    /* #ifndef APP-PLUS */
-        /* #endif */
+    height:calc(100vh - 68px) !important;
+    /* #endif */
 }
 
 :deep(.uni-date-x) {

src/pages/business/CRM/marketInformation.vue

@@ -73,7 +73,7 @@ let handleNav = (index)=>{
 
 // 新增
 let handleAdd = () => {
-    // uni.navigateTo({ url: '/pages/business/crm/visitorReportAdd' })
+    // uni.navigateTo({ url: '/pages/business/CRM/visitorReportAdd' })
 }
 
 // 查询列表
@@ -82,7 +82,10 @@ const mescrollRef = ref(null);
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { tip: '~ 空空如也 ~' },
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../static/images/mescroll-empty.png"
+    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });

src/pages/business/CRM/marketInformation/beCurrent.vue

@@ -143,7 +143,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/beCurrentDetail.vue

@@ -148,7 +148,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/competitor.vue

@@ -340,7 +340,7 @@ const dynamicPlaceholder = computed(() => {
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/competitorDetail.vue

@@ -348,7 +348,7 @@ const dynamicPlaceholder = computed(() => {
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/infomationView.vue

@@ -243,7 +243,8 @@ const inputval = ref(''); // 搜索内容
 		},
 		noMoreSize: 5,
 		empty: {
-			tip: '~ 空空如也 ~'
+			tip: '~ 空空如也 ~',
+			icon: "../../../../static/images/mescroll-empty.png"
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'

src/pages/business/CRM/marketInformation/keyModelTasks.vue

@@ -147,7 +147,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
@@ -203,7 +203,7 @@
 		height: calc(120vh - 100px)
 			/* #endif */
 			/* #ifndef APP-PLUS */
-			height:calc(120vh - 80px)
+			height:calc(140vh - 80px)
 			/* #endif */
 	}
 

src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue

@@ -152,7 +152,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/majorMatter.vue

@@ -172,7 +172,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/majorMatterDetail.vue

@@ -179,7 +179,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/marketInformation.vue

@@ -31,7 +31,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -50,7 +50,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -69,7 +69,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.competitiveUnits }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -88,7 +88,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -109,7 +109,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -127,7 +127,7 @@
 							<view class="report-list">
 								<view class="title r-list">
 									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -236,14 +236,15 @@
 		},
 		noMoreSize: 5,
 		empty: {
-			tip: '~ 空空如也 ~'
+			tip: '~ 空空如也 ~',
+			icon: "../../../../static/images/mescroll-empty.png"			
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'
 	});
 
 	const downOption = ref({
-		auto: true,
+		auto: false,
 		textInOffset: '下拉刷新',
 		textOutOffset: '释放更新',
 		textLoading: '刷新中...'
@@ -303,7 +304,6 @@
 		};
 
 		const res = await CrmMarketInformationList(param);
-
 		return {
 			list: res.rows,
 			total: res.total
@@ -432,7 +432,6 @@
 		top: 100rpx;
 		height: calc(100vh - 48px);
 		/* #endif */
-
 	}
 
 	/*.market-con{
@@ -494,4 +493,8 @@
 	.report-list .title {
 		display: flex;
 	}
+	.btn-blue {
+	  background-color: #3384DF; /* 蓝色背景 */
+	  color: #ffffff;
+	}
 </style>

src/pages/business/CRM/marketInformation/marketInformationReview.vue

@@ -103,7 +103,10 @@ const mescrollRef = ref(null);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: { 
+      tip: '~ 空空如也 ~',
+      icon: "../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });

src/pages/business/CRM/marketInformation/marketOpportunities.vue

@@ -232,7 +232,8 @@
 	// 选择客户页面跳转
 	function chooseCustomer(){
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
+			
 		})  
 	} 
 	//定义数据接收的值
@@ -311,7 +312,7 @@
 		height: calc(120vh - 100px)
 			/* #endif */
 			/* #ifndef APP-PLUS */
-			height:calc(120vh - 80px)
+			height:calc(140vh - 80px)
 			/* #endif */
 	}
 

src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue

@@ -244,7 +244,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer(){
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url:'/pages/business/CRM/marketActivity/chooseCus'
 		})  
 	} 
 	//定义数据接收的值
@@ -337,11 +337,12 @@ onMounted(() => {
 
 	.form-con {
 		/* #ifdef APP-PLUS */
-		height: calc(120vh - 100px)
+		height: calc(100vh - 95px) !important;
-			/* #endif */
+		/* #endif */
-			/* #ifndef APP-PLUS */
+		/* #ifndef APP-PLUS */
-			height:calc(120vh - 80px)
+		height:calc(100vh - 68px) !important;
-			/* #endif */
+		/* #endif */
+		overflow-y: auto;
 	}
 
 	:deep(.uni-date-x) {

src/pages/business/CRM/marketInformation/personnelChanges.vue

@@ -201,7 +201,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/personnelChangesDetail.vue

@@ -202,7 +202,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/paymentCollection.vue

@@ -81,6 +81,7 @@ let bindPickerChange = (e)=>{
 let searchValue = ref(null)
 // 查询搜索跳转
 let handleSearch = () => {
+    console.log(searchValue.value)
 }
 
 const tableData = [

src/pages/business/CRM/paymentCollection/addPaymentCollection.vue

@@ -101,7 +101,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

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

@@ -108,13 +108,16 @@ const mescrollRef = ref(null);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: { 
+      tip: '~ 空空如也 ~',
+      icon: "../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
 
 const downOption = ref({
-  auto: true,
+  auto: false,
   textInOffset: '下拉刷新',
   textOutOffset: '释放更新',
   textLoading: '刷新中...'

src/pages/business/CRM/paymentCollection/paymentDetail.vue

@@ -105,7 +105,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值

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

@@ -40,7 +40,7 @@ export const COLOR_MAP = {
     "办事处": "#307af5",
     "请假": "#f2c55c",
     "法定假日": "#e88f89",/*#ED8A73*/
-    "null": "#e7e7e7"
+    "null": "#e7e7e782"
 };
 // 地区/部门
 export const AreaList = [

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

@@ -17,7 +17,7 @@
       <view class="top-height"></view>
 
       <view class="week-plan-title">
-        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
         <view v-if="weekNum">
           {{ yearMonth }}
           <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,35 +28,42 @@
       </view>
 
       <view class="nav-list">
-        <view class="nav-item" :class="{active:index==activeTab}"
+        <view class="nav-item" :class="{'active': index == activeTab}"
               v-for="(item,index) in allPlans" :key="index"
               @click="handleNav(index)"
         >{{ getTapLabel(item) }}
         </view>
       </view>
-
+      <uni-transition :duration="300"
-      <block v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="item">
+                      :mode-class="['fade','slide-bottom']"
-        <!-- 计划详情 -->
+                      :styles="{'width':'100%', 'background-color':'#f0f0f0','border-top-left-radius': '8px', 'border-top-right-radius': '8px'}"
-        <view class="white-bg white-bg-2" :class="index == 0 ? 'white-bg-r' : ''">
+                      :show="showTrans">
-          <view class="report-list">
+        <view v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="index">
-            <view class="w-b-title">
+          <!-- 计划详情 -->
-              <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
+          <view class="white-bg white-bg-2" :class="{'white-bg-r':index === 0}">
-              <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
+            <view class="report-list">
-            </view>
+              <view class="w-b-title">
-            <view class="r-list">
+                <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
-              <view class="r-left">工作类型</view>
+                <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
-              <view class="r-right">{{ getWorkType(index) || '' }}</view>
+              </view>
-            </view>
+              <view class="r-list">
-            <view class="border-bottom b-width"></view>
+                <view class="r-left">工作类型</view>
-            <view class="r-list">
+                <view class="r-right">{{ getWorkType(index) || '' }}</view>
-              <view class="r-left">内容</view>
+              </view>
-              <view class="r-right">{{ getWorkEvent(index) || '' }}</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>
+          <view class='bottom-spliter'></view>
         </view>
-        <view class='bottom-spliter bg-gray'></view>
-      </block>
 
+        <view v-else style="text-align: center; margin-top: 50%; color: white">
+          暂无数据
+        </view>
+      </uni-transition>
       <!-- 底部加高度来避免tabbar遮挡 -->
       <!-- <view class="bottom-height bg-gray"></view> -->
     </view>
@@ -67,13 +74,12 @@
 
 <script setup>
 
-import {onMounted, ref, reactive, computed} from "vue";
+import {onMounted, ref, computed, watch} 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/crm/plan/getPlan";
+import {getWeeklyPlanList} from "@/api/crm/plan/getPlan";
-import {useMessage} from "@/utils/message";
 import {judgeThisWeek} from "@/api/crm/plan/updatePlan";
 
 const userInfo = ref(null)
@@ -92,8 +98,6 @@ 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]] : '';
 };
@@ -105,7 +109,8 @@ let getWorkEvent = (index) => {
 };
 // 刷新计划列表
 const refreshPlanList = () => {
-  message.showLoading();
+  showTrans.value = false;
+  uni.showLoading();
   // 获取用户信息
   // getUserInfo().then(res => {
   //   userInfo.value = res.user;
@@ -122,12 +127,12 @@ const refreshPlanList = () => {
       weekNum.value = rows[0].date;
       yearMonth.value = rows[0].firstDayOfTheWeek.substring(0, 7);
     }
-    console.log(route.path, "：用户周计划列表获取成功");
+    console.log(route.path, "用户周计划列表获取成功");
   }).catch(err => {
-    console.warn(err, "用户周计划列表获取失败");
+    console.log(err, "周计划列表获取失败")
-    message.error("周计划获取失败");
   }).finally(() => {
-    message.hideLoading();
+    uni.hideLoading();
+    setTimeout(() => showTrans.value = true, 20);
   })
 }
 
@@ -137,7 +142,7 @@ onMounted(() => {
 
 // 判断计划是否为本周
 let isThisWeek = computed(() => {
-  let theYear = onShowPlan.value.year || onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
+  let theYear = 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) &&
@@ -202,6 +207,19 @@ function getTapLabel(row) {
   return row.firstDayOfTheWeek.substring(0, 4) + '年' + row.month + '月 第' + row.date + '周';
 }
 
+// 展示动画
+const showTrans = ref(false);
+// 监听 activeTab 变化，触发动画
+watch(activeTab, (newVal, oldVal) => {
+  if (oldVal !== newVal) { // 确保不是初始化时的触发
+    showTrans.value = false; // 先隐藏
+    setTimeout(() => {
+      onShowPlan.value = allPlans.value[newVal]; // 更新计划列表视图
+      showTrans.value = true; // 再显示，触发动画
+    }, 20);
+  }
+});
+
 // 选中计划时间段
 function handleNav(index) {
   console.log(index, "tab更换时间段");
@@ -245,7 +263,7 @@ function handleEdit(index) {
 <style scoped>
 .week-plan-title {
   color: #fff;
-  padding: 0 30rpx 30rpx;
+  padding: 0 30rpx;
   display: flex;
   justify-content: space-between;
 }
@@ -271,27 +289,31 @@ function handleEdit(index) {
 .white-bg.white-bg-2 {
   /*  margin-bottom: 20rpx; */
 }
-.bottom-spliter{
+
+.bottom-spliter {
   height: 20rpx;
 }
-.bg-gray{
+
+.bg-gray {
   background-color: #f0f0f0;
 }
+
 .report-list .w-b-title .btn-edit {
   background-color: #5C96F7;
 }
 
 .con-bg {
-  height: 445rpx;
+  /*height: 100%;*/
+  /*  overflow-y: auto;*/
 }
 
 .nav-list {
   /*  display: flex;*/
   /*  width: 690rpx;*/
-  overflow-x: auto;   /* 允许横向滚动 */
+  overflow-x: auto; /* 允许横向滚动 */
   /*overflow-y: hidden;  隐藏垂直滚动 */
   /*-ms-overflow-style: none;   IE 隐藏滚动条 */
-  /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
+  /* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */
   /* 添加高度以确保有足够的空间 */
   /*  height: 80rpx;*/
   white-space: nowrap; /* 保持子元素在同一行显示 */
@@ -304,10 +326,12 @@ function handleEdit(index) {
   padding: 20rpx 30rpx 0;
   /* #endif */
 }
+
 /* 为 Webkit 浏览器隐藏滚动条 */
 .nav-list::-webkit-scrollbar {
   background-color: transparent;
 }
+
 .nav-list .nav-item {
   /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
   /*  width: 200rpx;*/
@@ -332,5 +356,4 @@ function handleEdit(index) {
   color: #3384DF;
   font-weight: bold;
 }
-
 </style>

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

@@ -16,11 +16,11 @@
 
       <!-- 正文内容 -->
       <view class="week-plan-title">
-        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+<!--        <view v-if="userInfo.nickName">姓名：<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 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] }}
@@ -29,7 +29,8 @@
               </text>
             </view>
 
-            <view v-show="expandFlag[index]" class="form-con">
+            <!--v-show="expandFlag[index]"-->
+            <view class="form-con" :class="{'show': expandFlag[index], 'hidden': !expandFlag[index]}">
               <uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays">
                 <view class="form-picker">
                   <picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)">
@@ -41,13 +42,13 @@
                 </view>
               </uni-forms-item>
               <uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays">
-                <uni-easyinput type="textarea" autoHeight v-model="weekPlanFormData[getEventField(index)]"
+                <uni-easyinput type="textarea" v-model="weekPlanFormData[getEventField(index)]"
                                placeholder="请输入" class="form-texarea"/>
               </uni-forms-item>
             </view>
 
           </view>
-        </block>
+        </view>
       </uni-forms>
 
     </view>
@@ -62,7 +63,6 @@ import {useRoute} from "vue-router"
 import {useMessage} from "@/utils/message";
 import {onLoad} from "@dcloudio/uni-app";
 import {updateWeekPlanList, addPlan} from "@/api/crm/plan/updatePlan";
-import {getUserInfo} from "@/api/crm/plan/getPlan";
 import {getDate} from "@/utils/datetime";
 import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils";
 
@@ -127,17 +127,10 @@ const workDays = 5;
 // const instance = getCurrentInstance().proxy;
 let instance = null;
 // 初始化创建任务
-let initCreate = (params)=>{
+let initCreate = (params) => {
   const {itemList, selectIndex} = params;
-  // 获取用户信息
+  console.log(route.path, `：创建${itemList[selectIndex]}计划`);
-  getUserInfo().then(res => {
+  title.value = "创建周计划";
-    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]); // 获取本周/下周一周日期
@@ -147,11 +140,11 @@ let initCreate = (params)=>{
   const {year, month} = week;
   weekPlanFormData.value.year = year;
   weekPlanFormData.value.month = month;
-  for(let index in OrdinalDate){
+  for (let index in OrdinalDate) {
     let dateField = getDateField(index);
     weekPlanFormData.value[dateField] = week[dateField];
     // console.log(week[dateField]);
-    if(index>=workDays){
+    if (index >= workDays) {
       let typeField = getTypeField(index);
       weekPlanFormData.value[typeField] = "法定假日"; // TODO: 换成更规范代码
       workTypeIndex.value[typeField] = WORK_TYPE.indexOf("法定假日");
@@ -180,7 +173,7 @@ onLoad((options) => {
         expandFlag.value[index] = editFields.includes(getTypeField(index)) || editFields.includes(getEventField(index));
         // console.log(index, expandFlag.value[index], "展开状态");
       }
-    }else{
+    } else {
       initCreate(data.param);
     }
 
@@ -203,7 +196,7 @@ function getEventField(index) {
 }
 
 // 初始化校验规则
-(function bindRules(){
+(function bindRules() {
   for (let i in WorkType) {
     if (i < workDays) {
       rules[getTypeField(i)] = {
@@ -253,25 +246,25 @@ const submitForm = async () => {
     // console.log('表单数据:', weekPlanFormData.value);
 
     // 这里可以添加提交到服务器的代码
-    if(!isAdd.value){ // 请求修改
+    if (!isAdd.value) { // 请求修改
-      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err=>{
+      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err => {
         message.error('操作失败!');
         console.warn(err, "更新周计划失败");
       })
       message.success('修改成功!');
-      setTimeout(()=>{
+      setTimeout(() => {
         const eventChannel = instance.getOpenerEventChannel();
         eventChannel.emit('refreshData');
         uni.navigateBack()
       }, 500);
-    }else{ // 请求新增
+    } else { // 请求新增
-      console.log(weekPlanFormData.value,"新增计划");
+      console.log(weekPlanFormData.value, "新增计划");
-      let res = await addPlan(weekPlanFormData.value).catch(err=>{
+      let res = await addPlan(weekPlanFormData.value).catch(err => {
         message.error('操作失败!');
         console.error(err, "周计划新增失败");
       })
       message.success('保存成功!');
-      setTimeout(()=>{
+      setTimeout(() => {
         const eventChannel = instance.getOpenerEventChannel();
         eventChannel.emit('refreshData');
         uni.navigateBack()
@@ -279,8 +272,8 @@ const submitForm = async () => {
     }
   } catch (err) {
     uni.showToast({
-      icon:'none',
+      icon: 'none',
-      title:"请完善内容",
+      title: "请完善内容",
       duration: 1500
     })
     console.log('表单验证失败:', err);
@@ -301,6 +294,7 @@ const submitForm = async () => {
 .white-bg {
   width: 690rpx;
   margin: 0;
+  padding-bottom: 0;
   border-radius: 8px 8px 0 0;
 }
 
@@ -309,7 +303,7 @@ const submitForm = async () => {
 }
 
 .white-bg.white-bg-3 {
-  border-top:  1rpx solid #E5E5E5;
+  border-top: 1rpx solid #E5E5E5;
   border-radius: 0
 }
 
@@ -320,10 +314,17 @@ const submitForm = async () => {
 
 .form-con {
   padding: 30rpx 0 0;
+  height: 500rpx;
+  overflow: hidden;
+  transition: height 0.3s;
 }
 
 :deep(.form-con .uni-forms-item) {
   margin-bottom: 22px !important;
 }
 
+.hidden{
+  height: 0;
+}
+
 </style>

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

@@ -1,3 +1,8 @@
+<!--
+ * @author wangzhuo
+ * @update date 2025/9/18 19:38
+ * @description 所有人周计划查看
+-->
 <template>
   <view class="con-body">
     <view class="con-bg">
@@ -32,94 +37,105 @@
               <uni-icons type="down" size="18"></uni-icons>
             </view>
           </picker>
-          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+<!--          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
         </view>
 
         <!-- 分页部分  -->
-<!--        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
+        <!--        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
-<!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
+        <!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
-<!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
+        <!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
-          <view class="white-bg" v-if="list.length">
+        <view class="white-bg" v-if="list.length">
-            <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
+          <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
-            <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
+          <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
-              {{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(5, 7) }}月
-              <span class="line"></span>
+            <span class="line"></span>
-              {{searchValue.selectDate.substring(0, 4) }}年
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(0, 4) }}年
-            </view>
+          </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]" class="font-bold">{{ list[0][field].substring(8) }}</text>
+                  <text v-else class="font-bold">{{ getWeek(i) }}</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">序号</view>
+                <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">姓名</view>
+                <view class="demo-uni-col left-radius">
+                  <text>{{ item.nickName || item.userName }}</text>
+                </view>
               </uni-col>
-              <block v-for="(field, i) in OrdinalDate">
+              <block v-for="(field, i) in WorkType">
                 <uni-col :span="3">
-                  <view class="demo-uni-col mar-left">
+                  <view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
-                    <text>{{ WeekShortCN[i] }}</text>
+                        :style="{ backgroundColor: COLOR_MAP[item[field]] }"
-                    <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
+                  ><!--@click="handleView(index, i)"-->
+                    <text v-if="item[field]">{{ item[field] }}</text>
+                    <text v-else style="font-weight: 300; color: gray">暂无</text>
                   </view>
                 </uni-col>
               </block>
             </uni-row>
-            <block v-for="(item, index) in list" :key="index">
+          </block>
-              <uni-row class="demo-uni-row">
+        </view>
-                <uni-col :span="1">
+        <view v-else style="text-align: center; margin-top: 50%; color: white">
-                  <view class="demo-uni-col right-radius">
+          暂无数据
-                    <text>{{ index + 1 }}</text>
+        </view>
-                  </view>
+        <!--        </mescroll-uni>-->
-                </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 v-if="item[field]">{{ item[field] }}</text>
-                      <text v-else style="color: gray">暂无</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>
+
+  <closeable-modal closeTip=""
+                   v-model="modalVisible"
+                   :title="modalData.title"
+                   :content="modalData.content"
+                   :cancelBtn="modalData.showCancel"
+                   confirmText="关闭"
+                   @success="modalData.success"/>
+
 </template>
 
 <script setup>
 import {ref, onMounted} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import CloseableModal from "@/components/closeableModal.vue";
 import {getNavBarPaddingTop} from '@/utils/system.js'
 import {getAllWeekPlanList} from "@/api/crm/plan/getPlan";
 import {AreaList, COLOR_MAP, OrdinalDate, WeekShortCN, WorkEvent, WorkType} from "./dataMap";
-import {getCurrentWeekNum} from "./dateTimeUtils";
+import {getCurrentWeekNum, getWeek2} from "./dateTimeUtils";
 import {getDate} from "@/utils/datetime";
 import {getWeekPlanListByDate} from "@/api/crm/plan/getPlan";
-
+import {onPullDownRefresh} from "@dcloudio/uni-app";
-// 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=>{
+  getPlanList().then(res => {
     let {total, rows} = res;
-    console.log(rows, "周计划数据获取成功")
+    console.log(total, rows, "周计划数据获取成功")
     list.value = rows;
+  }).catch((err) => {
+    console.warn(err, "周计划数据获取失败")
+  }).finally(() => {
     uni.hideLoading();
   })
 })
@@ -139,36 +155,38 @@ let searchValue = ref({
 
 // 查询列表
 let list = ref([]);
-const mescrollRef = ref(null);
+// const mescrollRef = ref(null);
-const upOption = ref({
+onPullDownRefresh(() => {
-  page: {num: 0, size: 10},
+  uni.showLoading();
-  noMoreSize: 5,
+  getPlanList().then(res => {
-  empty: {tip: '~ 空空如也 ~'},
+    const {rows} = res;
-  textLoading: '加载中...',
+    list.value = rows;
-  textNoMore: '已经到底了'
+    console.log(rows,'刷新周计划成功');
+  }).finally(()=>{
+    uni.stopPullDownRefresh();
+    uni.hideLoading();
+  })
 });
 
-const downOption = ref({
+// 查询当前周一周日期
-  auto: true,
+// const currentYear = new Date().getFullYear();
-  textInOffset: '下拉刷新',
+const currentWeekNum = getCurrentWeekNum();
-  textOutOffset: '释放更新',
+const aweek = getWeek2('本周');
-  textLoading: '刷新中...'
+const currentMonth = aweek.month;
+console.log(currentWeekNum, '当前周数');
+const getWeek = (i) => {
+  return aweek[OrdinalDate[i]].substring(7)
+}
+const queryParams = ref({
+  month: currentMonth,
+  date: currentWeekNum,
+  pageNum: 1,
+  pageSize: 10
 });
-
-let cssFlag = ref(false);//控制样式
-
 // 获取数据列表
-const getPlanList = (month, date, pageIndex, pageSize) => {
+const getPlanList = () => {
   return new Promise(async (resolve) => {
-    // 查询参数
+    let {rows, total} = await getAllWeekPlanList(queryParams.value);
-    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
@@ -187,20 +205,17 @@ let bindDateChange = (e) => {
 let handleSearch = () => {
   console.log(searchValue.value, '查询参数')
   uni.showLoading();
-  getWeekPlanListByDate(searchValue.value).then(res=>{
+  getWeekPlanListByDate(searchValue.value).then(res => {
-    const {total, rows } = res;
+    const {total, rows} = res;
     list.value = rows;
     console.log(rows, '查询成功');
-  }).catch(err=>{
+  }).catch(err => {
-    console.warn(err,'数据获取失败');
+    console.warn(err, '数据获取失败');
-  }).finally(()=>{
+  }).finally(() => {
     uni.hideLoading();
   })
 }
-const mescrollInit = (mescroll) => {
+
-  cssFlag.value = true;
-  mescrollRef.value = mescroll;
-};
 // 搜索区域变更
 const bindPickerChange = (e) => {
   // console.log('picker发送选择改变，携带值为', peopleIndex.value)
@@ -209,32 +224,43 @@ const bindPickerChange = (e) => {
   // 查询
   handleSearch();
 }
-
+// 模态窗可见性
-// 跳转到详情
+const modalVisible = ref(false);
-let handleDetail = (rowIndex, colIndex) => {
+// 模态框的配置内容
+const modalData = ref({
+  title: null,
+  content: null,
+  showCancel: false,
+  success: console.log
+});
+const showCloseableModal = (param)=>{
+  modalVisible.value = true;
+  Object.assign(modalData.value, param);
+  console.log(modalData.value);
+}
+// 查看计划详情
+const 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){
+  if (workType && workEvent) {
-    uni.showModal({
+    showCloseableModal({
-      title: `${workDate}\n${workType}`,
+      title: `${workType}`,
-      content: `${workEvent}`,
+      content: `姓名：${detail.userName}\n时间：${workDate}\n内容：${workEvent}`
-      confirmText: '关闭',
+    });
-      showCancel: false,
+    // uni.showModal({
-      maskClosable: true, // 允许点击蒙层关闭弹窗
+    //   title: `${workDate}\n${workType}`,
-      success: function (res) {
+    //   content: `${workEvent}`,
-        if (res.confirm) {
+    //   confirmText: '关闭',
+    //   showCancel: false,
+    //   maskClosable: true, // 允许点击蒙层关闭弹窗
+    //   success: console.log
+    // })
 
-        } else if (res.cancel) {
+  } else {
-
-        }
-      }
-    })
-  }
-  else{
     uni.showToast({
-      title: "暂无内容",
+      title: "无计划内容",
       icon: "none",
       duration: 1500
     })
@@ -328,8 +354,9 @@ let handleDetail = (rowIndex, colIndex) => {
 
 .demo-uni-col {
   height: 36px;
-  border-radius: 4px;
+  border-radius: 4rpx;
-  background-color: #E7E7E7;
+  /*background-color: #E7E7E7;*/
+  background-color: #e7e7e782;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -366,35 +393,17 @@ let handleDetail = (rowIndex, colIndex) => {
   margin: 20rpx 0 0 0;
   border-radius: 8px 8px 0 0;
   /* #ifdef APP-PLUS */
-  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  );
   /* #endif */
   /* #ifndef APP-PLUS */
-  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  );
   /* #endif */
-  //overflow-y: auto;
-}
-
-.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>

src/pages/business/CRM/visitorReport.vue

@@ -75,6 +75,7 @@ onMounted(() => {
 let searchValue = ref(null)
 // 查询搜索跳转
 let handleSearch = () => {
+    console.log(searchValue.value)
 }
 
 // 新增
@@ -88,7 +89,10 @@ const mescrollRef = ref(null);
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { tip: '~ 空空如也 ~' },
+    empty: {
+        tip: '~ 空空如也 ~',
+        icon: "../../static/images/mescroll-empty.png"
+    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });

src/pages/business/CRM/visitorReportAdd.vue

@@ -63,6 +63,7 @@ selectGuestList();
 
 // 选择客户列表
 let bindPickerChange = (e)=>{
+    console.log('picker发送选择改变，携带值为', e.detail.value)
     guestIndex.value = e.detail.value
 }
 
@@ -87,6 +88,7 @@ const rules = {
 
 // 修改日期
 let changeDate = (e)=>{
+    console.log('changeDate:', e);
 };
 
 // 保存走访报告

src/pages/business/EQF/components/chooseCus.vue

@@ -0,0 +1,257 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'客户名称列表'" :leftFlag="true" :rightFlag="false">
+        <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 class="all-body">
+        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
+        <view class="search">
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
+                          v-model="searchValue" @clear="searchValue=''"
+          />
+          <!--          <button type="default" @click="searchValue=''" 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}"
+        ><!-- @down="downCallback"-->
+          <radio-group class="block" @change="radioChange">
+            <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+              <radio class='radio'
+                     :class="index === selectIndex ? 'checked' : ''"
+                     :checked="index === selectIndex"
+                     :value="index+''">
+              </radio>
+
+              <view class="report-list">
+                <view class="title">{{ item.cusName }}</view>
+                <!--              <view class="r-list">
+                                <view class="r-name">{{ item.shortName }}</view>
+                                <view class="r-right btn-orange" size="mini">{{ item.statusName }}</view>
+                              </view>-->
+                <view class="border-bottom"></view>
+                <!--              <view class="r-list">
+                                <view class="r-left">日期</view>
+                                <view class="r-right">{{ new Date(item.createTime).toLocaleDateString()}}</view>
+                              </view>-->
+              </view>
+            </view>
+          </radio-group>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+
+import {ref, onMounted, getCurrentInstance, watch} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import {getNavBarPaddingTop} from '@/utils/system.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {getCustomerList} from "@/api/crm/customer/getCustomer";
+
+let instance = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+let searchValue = ref('')
+
+let cssFlag=ref(false);//控制样式
+
+const upOption = ref({
+  page: { num: 0, size: 10 },
+  noMoreSize: 5,
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('requestCusList', async (res) => {
+    let {cusName} = res.data;
+    // console.log(cusName, "客户选择页读取到参数");
+    searchValue.value = cusName;
+  })
+})
+
+let timerId = null;
+// 搜索
+watch(searchValue, (newValue, oldValue) => {
+  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
+  if(timerId) clearTimeout(timerId);
+  timerId = setTimeout(async ()=>{
+    handleSearch();
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500);
+});
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    const res = await getList(1, upOption.value.page.size);
+    list.value = res.list;
+    // 正确结束下拉刷新状态
+    mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束下拉刷新
+    mescroll.endErr();
+  }
+}
+
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    const res = await getList(mescroll.num, mescroll.size);
+    if (mescroll.num === 1) {
+      list.value = res.list;
+    } else {
+      list.value.push(...res.list);
+    }
+    // 正确结束上拉加载状态
+    mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束上拉加载
+    mescroll.endErr();
+  }
+}
+
+// 查询搜索跳转
+let handleSearch = async () => {
+  // 触发下拉刷新以重新加载数据
+  if (mescrollRef.value) {
+    cssFlag.value = true;
+    uni.showLoading()
+    await downCallback(mescrollRef.value.mescroll);
+    uni.hideLoading()
+    cssFlag.value = false;
+  }
+}
+// 获取数据列表
+const getList = async (pageIndex, pageSize) => {
+  let param = {
+    pageNum: pageIndex,
+    pageSize,
+    cusName: searchValue.value
+  }
+  let { rows, total  } = await getCustomerList(param)
+  return {list: rows, total};
+}
+// 选中项的索引号
+const selectIndex = ref(null);
+const radioChange = (e) => {
+  const selectedIndex = e.detail.value;
+  //发送全局事件
+  uni.$emit('onCustomerSelected',list.value[selectedIndex])
+  uni.navigateBack()
+}
+
+
+
+</script>
+
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
+}
+
+.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;
+}
+
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  //padding-bottom:10rpx;
+  margin-bottom: 0;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+}
+
+.radio {
+  padding-right: 20rpx;
+}
+
+.title {
+  font-size: 32rpx;
+  line-height: 48rpx;
+}
+
+.report-list {
+  width: calc(100% - 70rpx);
+  //background-color: pink;
+}
+
+.border-bottom {
+  margin-top: 6rpx;
+}
+</style>