Merge remote-tracking branch 'origin/develop' 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,18 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "standard",
+            "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,40 @@
     "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",
     "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

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

src/api/crm/activity/map.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //新增地图开始签到接口
 export function addStartMap(data) {
   return request.post({
-    url: "/app/appVisistMap/Startadd",
+    url: "/crm/app/appVisistMap/Startadd",
     data,
   },{
     isTransformResponse:false
@@ -13,7 +13,7 @@ export function addStartMap(data) {
 //新增地图开始打卡接口
 export function addStartMapForClockIn(data) {
   return request.post({
-    url: "/app/appVisistMap/StartaddForClockIn",
+    url: "/crm/app/appVisistMap/StartaddForClockIn",
     data,
   },{
     isTransformResponse:false
@@ -23,7 +23,7 @@ export function addStartMapForClockIn(data) {
 //打卡信息查看
 export function CheckInInformationViewing(data) {
   return request.get({
-    url: "/app/appVisistMap/DKList",
+    url: "/crm/app/appVisistMap/DKList",
     data
   },{
     isTransformResponse:false
@@ -33,7 +33,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 +43,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,59 +1,175 @@
 import request from "@/utils/request"
 
 
-	export function getYsVisistList(data) {
+export function getYsVisistList(data) {
 	return request.get({
-	        url: '/app/appVisistReport/list',
+		url: '/crm/app/appVisistReport/list',
 		data: data
+	},{
+		isTransformResponse:false
 	})
-	}
+}
-	//市场信息列表接口
+//市场信息列表接口
-	export function CrmMarketInformationList(data) {
+export function CrmMarketInformationList(data) {
 	return request.get({
-	        url: '/app/informationMarketInformation/list',
+		url: '/crm/app/informationMarketInformation/list',
 		data: data
+	},{
+		isTransformResponse:false
 	})
-	}
+}
-	//市场信息模块待审核改为提交
+//市场信息模块待审核改为提交
-	export function handleCrmMarketInfo(data) {
+export function handleCrmMarketInfo(data) {
 	return request.post({
-			    url: '/app/informationMarketInformation/handleCrmMarketInfo',
+		url: '/crm/app/informationMarketInformation/handleCrmMarketInfo',
 		data
+	},{
+		isTransformResponse:false
 	})
-	}
+}
-	//获取客户名称
+//获取客户名称
-	export function getYsCustomerList(data) {
+export function getYsCustomerList(data) {
 	return request.get({
-			    url: '/app/appCustomerIfno/pageList',
+		url: '/crm/app/appCustomerIfno/pageList',
 		data
+	},{
+		isTransformResponse:false
 	})
-	}
+}
-	//市场信息模块提交
+//市场信息模块提交
-	export function crmMarketInformationAdd(data) {
+export function crmMarketInformationAdd(data) {
 	return request.post({
-			    url: '/app/informationMarketInformation/add',
+		url: '/crm/app/informationMarketInformation/add',
 		data
+	},{
+		isTransformResponse:false
 	})
-	}
+}
-	//市场信息模块查询
+//市场信息模块查询
-	export function crminformationItemForDetail(data) {
+export function crminformationItemForDetail(data) {
 	return request.get({
-			    url: '/app/informationMarketInformation/getDetail',
+		url: '/crm/app/informationMarketInformation/getDetail',
 		data
+	},{
+		isTransformResponse:false
 	})
-	}
+}
-	//客户人员信息查询
+//客户人员信息查询
-	export function crmCustomerUser(data) {
+export function crmCustomerUser(data) {
 	return request.get({
-			    url: '/app/appCrmCusUserNewController/crmCustomerUser',
+		url: '/crm/app/appCrmCusUserNewController/crmCustomerUser',
 		data
+	},{
+		isTransformResponse:false
 	})
-	}
+}
-	//市场信息根据ID删除
+//市场信息根据ID删除
-	export function crmMarketInformationDelete(data) {
+export function crmMarketInformationDelete(data) {
 	return request.get({
-			    url: '/app/informationMarketInformation/delete',
+		url: '/crm/app/informationMarketInformation/delete',
 		data
+	},{
+		isTransformResponse:false
 	})
-	}
+}
+//市场信息查询接口
+export function viewingMarketInfForAllMembers(data) {
+	return request.get({
+		url: '/crm/app/informationMarketInformation/viewList',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+//市场信息详情查询接口
+export function viewingMarketInfgetDetail(data) {
+	return request.get({
+		url: '/crm/app/informationMarketInformation/getDetail',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+//市场信审核列表接口
+export function approvalMarketInfget(data) {
+	return request.get({
+		url: '/crm/app/informationMarketInformation/Approval',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+//回款模块列表查询
+export function getPaymentList(data) {
+	return request.get({
+		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) {
+	return request.get({
+		url: '/crm/app/InformationReviewController/getFullStaffStatisticsViewingTable',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+//个人查询回款接口
+export function getPersonalPaymentCollectionTable(data) {
+	return request.get({
+		url: '/crm/app/InformationReviewController/getPersonalPaymentCollectionTable',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+
+//市场信息审核通过接口
+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

@@ -0,0 +1,54 @@
+import request from "@/utils/request"
+
+// 查询客户人员列表
+export function getCustomerList(params){
+    return request.get({
+        url: '/crm/app/appCustomerIfno/pageList',
+        data: params
+    },{isTransformResponse: false})
+}
+
+// 查询系统推荐等级
+export function getCustomerLevel(params){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/queryCustomerLevel',
+        data: params
+    },{isTransformResponse: false})
+}
+// 客户人员新增
+export function saveappCrmCusUserNew(params){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/add',
+        data: params
+    },{isTransformResponse: false})
+}
+// 查询业务员名下所有的客户
+export function SearchForAllCustomersSalesperson(params){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
+        data: params
+    },{isTransformResponse: false})
+}
+// 客户人员归属审核详情
+export function getCusUserApprovalListDetail(params){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalListDetail',
+        data: params
+    },{isTransformResponse: false})
+}
+// 查询主归属人列表
+export function SearchForAllPerson(params){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllPerson',
+        data: params
+    },{isTransformResponse: false})
+}
+
+// 客户人员新增审核列表
+export　function　getCusUserApprovalList(params) {
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
+        data: params
+        }, {isTransformResponse: false}
+    )
+}

src/api/crm/customer/updateCustomer.js

@@ -0,0 +1,36 @@
+import request from "@/utils/request"
+// 删除客户人员归属消息
+export function removeVisit(params){
+    return request.get({
+        url: '/crm/app/appVisistReport/remove',
+        data: params
+    },{isTransformResponse: false})
+}
+// 更新客户人员
+export function upadateappCrmCusUserNew (data){
+    return request.post({
+        url: '/crm/app/appCrmCusUserNewController/update',
+        data
+    },{isTransformResponse: false})
+}
+// 客户人员审核通过
+export function clientPersonnelsApproval(data) {
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/clientPersonnelsApproval',
+        data
+    }, {isTransformResponse: false});
+}
+//客户人员驳回
+export function customerPersonnelsRejectio(data) {
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/customerPersonnelsRejectio',
+        data
+    }, {isTransformResponse: false});
+}
+//主归属人变更提交
+export function submissionOfChangeOfMainOwner (data){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/submissionOfChangeOfMainOwner',
+        data
+    },{isTransformResponse: false})
+}

src/api/crm/mainOwner/mainOwner.js

@@ -0,0 +1,41 @@
+import request from "@/utils/request";
+
+
+//主归属人变更信息查看（列表）
+export function queryViewMainOwnerList(params){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership',
+        data: params
+    },{isTransformResponse: false})
+}
+
+//主归属人变更信息查看（详情）
+export function queryViewMainOwnerDetail(params){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList',
+        data: params
+    },{isTransformResponse: false})
+}
+
+//查询主归属人变更人员的列表数据
+export function personnelAwaitingReviewForChange(params){
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/personnelAwaitingReviewForChange',
+        data: params
+    },{isTransformResponse: false})
+}
+
+//主归属人变更驳回
+export function changeOfPrimaryOwnershipNoApproved(params) {
+    return request.get({
+        url:'/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved',
+        data: params
+    }, {isTransformResponse: false});
+}
+//主归属人变更通过
+export function changeOfPrimaryOwnershipApproved (params) {
+    return request.get({
+        url: '/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved',
+        data: params
+    }, {isTransformResponse: false});
+}

src/api/crm/plan/getPlan.js

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

src/api/crm/plan/updatePlan.js

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

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/components/customHeader.vue

@@ -25,6 +25,7 @@ const props = defineProps({
     title: String,
     leftFlag:true,//默认左侧显示 false-不显示
     rightFlag:false,//默认右侧不显示
+    searchType:{default:0}//搜索返回为1，其他暂时不处理
 })
 
 const emit = defineEmits(['back'])
@@ -35,7 +36,7 @@ let navbarHeight = ref(0)
 let navHeight = ref(0)
 
 onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop();console.log(navBarPaddingTop.value)
+    navBarPaddingTop.value = getNavBarPaddingTop();
     statusBarHeight.value = getStatusBarHeight();
     navbarHeight.value = getNavBarHeight();
     navHeight.value = navbarHeight.value - statusBarHeight.value
@@ -43,27 +44,26 @@ onMounted(() => {
 
 const handleBack = () => {
     emit('back')
+    if(!props.searchType)
         uni.navigateBack()
 }
 </script>
 
 <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;
     /* #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;
     /* #endif */
    

src/components/customSearch.vue

@@ -1,84 +1,306 @@
 <template>
     <view>
         <!-- 搜索框 -->
-        <uni-search-bar v-model="searchText" @confirm="handleSearch" />
+        <view class="search search-sao">
+            <!--   @confirm="handleSearch"  @cancel="handleCancel"-->
+            <uni-search-bar class="custom-search" 
+                radius="28" 
+                placeholder="请输入搜索条件" 
+                clearButton="auto"
+                bgColor="#6FA2F8" textColor="#ffffff" 
+                v-model="searchText"
+                cancelButton="none"
+                focus
+            />
+            <text class="search-btn" @click="handleSearch">查询</text>
+        </view>
+        <view class="white-bg">
 
-        <!-- <view v-if="showSuggestions" class="suggestions-list">
+            <!-- 类型列表 -->
-            <view 
+            <view class="search-section" v-if="searchTypeList.length>0">
-                v-for="(item, index) in suggestions" 
+                <view class="section-header">
-                :key="index"
+                    <text class="section-title">{{ searchType.typeName }}</text>
-                class="suggestion-item"
+                </view>
-                @click="selectSuggestion(item)"
+                <view class="tag-container">
+                    <view class="search-tag notice-tag" :class="{'notice-check':!searchCheckObj.id}"  @click="handleNoticeClick({})">全部</view>
+                    <view class="search-tag notice-tag" :class="{'notice-check':item.id==searchCheckObj.id}"
+                        v-for="(item, index) in searchTypeList"
+                        :key="'notice-' + index"
+                        @click="handleNoticeClick(item)"
                     >
+                        {{ item.name }}
+                    </view>
+                </view>
+            </view>
+
+            <!-- 历史记录  v-if="historyList.length>0" -->
+            <view class="search-section">
+                <view class="section-header">
+                    <text class="section-title">历史搜索</text>
+                    <uni-icons type="trash" size="18" color="#999" @click="clearHistory"></uni-icons>
+                </view>
+                <view class="tag-container">
+                    <view class="search-tag" v-for="(item, index) in historyList" :key="'history-' + index"
+                        @click="handleHistoryClick(item)">
                         {{ item }}
                     </view>
-        </view> -->
+                </view>
-
-        <!-- 筛选条件 -->
-        <view class="filter-container">
-            <picker mode="selector" :range="categoryOptions" @change="handleCategoryChange">
-                <view class="filter-item">{{ categoryText }}</view>
-            </picker>
-            <picker mode="selector" :range="sortOptions" @change="handleSortChange">
-                <view class="filter-item">{{ sortText }}</view>
-            </picker>
             </view>
 
             <!-- 搜索结果 -->
-        <search-results :list="results" />
+            <!-- <view class="search-result" v-if="searchResult.length > 0">
+                <view class="result-item"
+                    v-for="(item, index) in searchResult"
+                    :key="'result-' + index"
+                    @click="handleResultClick(item)"
+                >
+                    {{ item.name }}
+                </view>
+            </view> -->
+        </view>
     </view>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref,watch } from 'vue'
 
-// const suggestions = ref([])
+const props = defineProps({
-// const showSuggestions = ref(false)
+    searchKeywords:{//搜索文本
+        type:String
+    },
+    searchType:{//哪种类型显示对象 typeId:1-首页，2-业务首页，3-消息  之后可以自动添加
+        type:Object
+    },
+    searchTypeList:{//类型列表
+        type:Array,
+        default:[]
+    },
+    checkTypeObj:{//选中的类型对象
+        type:Object
+    },
    
-// const handleInput = debounce(async () => {
+})
-//   if (!searchText.value.trim()) {
-//     showSuggestions.value = false
-//     return
-//   }
 
-//   try {
+const searchText = ref('');// 搜索文本
-//     const res = await getSuggestions(searchText.value)
+const searchCheckObj = ref({});//选中的类型对象
-//     suggestions.value = res
-//     showSuggestions.value = true
-//   } catch (error) {
-//     console.error('获取搜索建议失败:', error)
-//   }
-// }, 300)
 
-const searchText = ref('')
+const showCancel = ref(false)// 是否显示取消按钮
-const category = ref(0)
+const historyList = ref([])// 历史记录列表
-const sort = ref(0)
 
-const categoryOptions = ['全部类别', '电子产品', '服装', '食品']
+const searchResult = ref([])// 搜索结果
-const sortOptions = ['默认排序', '价格从低到高', '价格从高到低', '销量最高']
 
-const categoryText = computed(() => categoryOptions[category.value])
+// 搜索文本内容
-const sortText = computed(() => sortOptions[sort.value])
+watch(() => props.searchKeywords, (newVal, oldVal) => {
+    searchText.value = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
 
-const handleSearch = async () => {
+// 选中类型对象
-    const params = {
+watch(() => props.checkTypeObj, (newVal, oldVal) => {
-        keyword: searchText.value,
+    searchCheckObj.value = newVal
-        category: category.value,
+},{
-        sort: sort.value
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
+
+
+// 调用父组件的方法
+const emit = defineEmits(['confirm']);
+
+//  加载历史记录
+const loadHistory = () => {
+    let typeId = props.searchType?props.searchType.typeId:undefined
+    const history = uni.getStorageSync('searchHistory'+typeId) || []
+    historyList.value = history
+}
+loadHistory();
+
+// 处理搜索
+const handleSearch = () => {
+    let txtContent = searchText.value?searchText.value.trim():undefined
+    if (txtContent) {
+        // uni.showToast({
+        //     title: '请输入搜索内容',
+        //     icon: 'none'
+        // })
+        // return
+        // 添加到历史记录
+        addToHistory(txtContent)
     }
 
-    // 调用搜索API
+    // 模拟搜索请求
-    const res = await searchAPI(params)
+    // searchResult.value = [
-    results.value = res.data
+    //     { id: 1, name: `${searchText.value} 结果1` },
+    //     { id: 2, name: `${searchText.value} 结果2` },
+    //     { id: 3, name: `${searchText.value} 结果3` }
+    // ]
+
+
+    // 传给父组件
+    emit('confirm',searchCheckObj,searchText);
 }
 
-const handleCategoryChange = (e) => {
+// 处理输入
-    category.value = e.detail.value
+const handleInput = () => {
+    showCancel.value = searchText.value.length > 0
+}
+
+// 清除搜索
+const clearSearch = () => {
+    searchText.value = ''
+    showCancel.value = false
+    searchResult.value = []
+}
+
+
+// 添加到历史记录
+const addToHistory = (keyword) => {
+    const index = historyList.value.indexOf(keyword)
+    if (index !== -1) {
+        historyList.value.splice(index, 1)
+    }
+    historyList.value.unshift(keyword)
+
+    // 限制历史记录数量
+    if (historyList.value.length > 10) {
+        historyList.value = historyList.value.slice(0, 10)
+    }
+
+    let typeId = props.searchType.typeId
+    uni.setStorageSync('searchHistory'+typeId, historyList.value)
+}
+
+// 清除历史记录
+const clearHistory = () => {
+    uni.showModal({
+        title: '提示',
+        content: '确定要清空历史记录吗？',
+        success: (res) => {
+            if (res.confirm) {
+                historyList.value = []
+                let typeId = props.searchType.typeId;
+                uni.removeStorageSync('searchHistory'+typeId)
+            }
+        }
+    })
+}
+
+// 点击历史记录
+const handleHistoryClick = (item) => {
+    searchText.value = item
     handleSearch()
 }
 
-const handleSortChange = (e) => {
+// 点击消息类型
-    sort.value = e.detail.value
+const handleNoticeClick = (item) => {
+    // searchText.value = item
+    searchCheckObj.value = item;
     handleSearch()
 }
+
+// 点击搜索结果
+const handleResultClick = (item) => {
+    uni.showToast({
+        title: `点击了 ${item.name}`,
+        icon: 'none'
+    })
+    // 实际项目中这里可以跳转到详情页
+    // uni.navigateTo({ url: `/pages/detail/detail?id=${item.id}` })
+}
 </script>
+<style scoped>
+
+.search-sao {
+    display: flex;
+}
+
+.search-sao .custom-search {
+    /* width:615rpx; */
+    width: 590rpx;
+    padding: 0 20rpx;
+    margin-bottom:15rpx;
+}
+
+.search-sao :deep(.custom-search.uni-searchbar) {
+    padding-bottom: 15rpx !important;
+}
+
+.search-sao .search-btn {
+    margin: 15rpx 30rpx 10rpx 0;
+    color: #fff;
+    font-size: 28rpx;
+    font-weight: bold;
+    text-align: center;
+}
+.white-bg {
+    width: 750rpx;
+    padding: 40rpx 0;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 168px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 150px);
+    /* #endif */
+}
+
+.search-section {
+    margin-bottom: 40rpx;
+    padding:0 45rpx;
+}
+
+.section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20rpx;
+}
+
+.section-title {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: bold;
+}
+
+.tag-container {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.search-tag {
+    background-color: #fff;
+    border:1px solid #E8E8E8;
+    border-radius: 10rpx;
+    padding: 10rpx 15rpx;
+    margin-right: 20rpx;
+    margin-bottom: 20rpx;
+    font-size: 28rpx;
+}
+
+.search-tag.notice-tag{
+    padding: 10rpx 45rpx;
+}
+.notice-tag:nth-child(3n){
+    margin-right: 0;
+}
+
+.notice-check{
+    background-color: #05A3F4;
+    color:#fff;
+    border-color:#05A3F4;
+}
+.search-result {
+    margin-top: 20rpx;
+    padding:0 20rpx;
+}
+
+.result-item {
+    padding: 20rpx 0;
+    border-bottom: 1rpx solid #eee;
+    font-size: 28rpx;
+    color: #333;
+}
+</style>

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">Cancel</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/multipleSelect.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref } from "vue";
+import { onMounted, reactive, ref, defineExpose} from "vue";
 
 const props = defineProps({
     // 是否显示全部清空按钮
@@ -111,7 +111,7 @@ const active = ref(false); // 组件是否激活，
 let changevalue = reactive([]);
 let realValue = reactive([]);
 onMounted(() => {
-    init();
+    // init();
 });
 
 // 初始化函数
@@ -175,6 +175,17 @@ const handleChange = (index, item) => {
     // 触发回调函数
     emit("change", changevalue, realValue);
 };
+
+// 失去焦点时关闭选项列表
+const handleBlur = () => {
+  active.value = false;
+};
+
+// 定义组件实例暴露的方法
+defineExpose({
+  handleBlur
+});
+
 </script>
 
 <style lang="scss" scoped>

src/enums/cacheEnums.js

@@ -1,2 +1,8 @@
 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=2;
+

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,7 +1,7 @@
 {
     "id" : "H5E705637",
-    "name" : "app",
+    "name" : "718友晟",
-    // "appid" : "",
+    "appid" : "__UNI__4C459F4",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -16,12 +16,14 @@
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
-            "waiting" : true,
+            "waiting" : false, // 是否显示等待界面
             "autoclose" : true,
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Push" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -41,21 +43,72 @@
                     "<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\" />"
                 ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "minSdkVersion" : 26,
+                "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" : {
+                            "small" : {
+                                "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"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "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 +137,8 @@
     "h5" : {
         "router" : {
             "base" : ""
-            /*,"mode": "history"   仅对 H5 平台生效 */
         },
+        /*,"mode": "history"   仅对 H5 平台生效 */
         "template" : "index.html"
     }
 }

src/pages.json

@@ -1,5 +1,4 @@
 {
-
 	"easycom": {
 		"autoscan": true,
 		"custom": {
@@ -7,13 +6,18 @@
 		}
 	},
 	"pages": [
-
 		{
 			"path": "pages/loading/loading",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/deviceAuth/deviceAuth",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -23,35 +27,107 @@
 		{
 			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"renderer": "native",
+				"hardwareAccelerated": true
 			}
 		},
 		{
 			"path": "pages/business/business",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"renderer": "native",
+				"hardwareAccelerated": true
 			}
 		},
 		{
-			"path": "pages/business/CRM/visitorReport",//市场信息管理
+			"path": "pages/business/editDaily",
+			"style": {
+				"navigationBarTitleText": "",
+				"renderer": "native",
+				"hardwareAccelerated": true
+			}
+		},
+		{
+			"path": "pages/notice/notice",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/visitorReportAdd",//走访报告添加
+			"path": "pages/notice/noticeDetail",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/visitorReportDetail",//走访报告详情
+			"path": "pages/notice/waitApprove",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/visitorReportEnter",//走访报告内容录入
+			"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": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/visitorReport",
+			//市场信息管理
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/visitorReportAdd",
+			//走访报告添加
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/visitorReportDetail",
+			//走访报告详情
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/visitorReportEnter",
+			//走访报告内容录入
 			"style": {
 				"navigationBarTitleText": ""
 			}
@@ -147,13 +223,6 @@
 				"navigationBarTitleText": "通用信息更新"
 			}
 		},
-		//选择客户（已更新）
-		{
-			"path": "pages/business/CRM/chooseCus",
-			"style": {
-				"navigationBarTitleText": "客户选择"
-			}
-		}, 
 		//选择客户人员（已更新）
 		{
 			"path": "pages/business/CRM/customerUserList",
@@ -161,146 +230,322 @@
 				"navigationBarTitleText": "客户人员选择"
 			}
 		},
+		//市场信息查看（已更新）
 		{
-			"path": "pages/business/CRM/weekPlanUpdate",//修改周计划
+			"path": "pages/business/CRM/marketInformation/infomationView",
+			"style": {
+				"navigationBarTitleText": "市场信息查看"
+			}
+		},
+		//市场信息详情（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/informationDetail",
+			"style": {
+				"navigationBarTitleText": "市场信息详情"
+			}
+		},
+		//市场信息审核（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketInformationReview",
+			"style": {
+				"navigationBarTitleText": "市场信息审核"
+			}
+		},
+		//市场信息审核详情（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketInformationReviewDetail",
+			"style": {
+				"navigationBarTitleText": "市场信息审核"
+			}
+		},
+		//回款首页查看（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/index",
+			"style": {
+				"navigationBarTitleText": "回款首页查看"
+			}
+		},
+		//回款新增（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/addPaymentCollection",
+			"style": {
+				"navigationBarTitleText": "回款新增"
+			}
+		},
+		//回款更新（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/paymentDetail",
+			"style": {
+				"navigationBarTitleText": "回款新增"
+			}
+		},
+		//回款查看公用页面（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/paymentCollectionCheck",
+			"style": {
+				"navigationBarTitleText": "回款查看"
+			}
+		},
+		//回款查看全员统计查看（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable",
+			"style": {
+				"navigationBarTitleText": "全员统计查看"
+			}
+		},
+		//回款查看个人详情查看（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/personalPaymentCollectionTable",
+			"style": {
+				"navigationBarTitleText": "个人详情查看"
+			}
+		},
+		{
+			"path": "pages/business/CRM/weekPlanUpdate",
+			//修改周计划
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/vistorCheckin",//签到打卡
+			"path": "pages/business/CRM/plan/index",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/checkinStatistics",//打卡统计
+			"path": "pages/business/CRM/plan/myPlan",
+			//我的计划列表
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/paymentCollection",//回款查看
+			"path": "pages/business/CRM/plan/planEdit",
+			//计划修改
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/notice/notice",
+			"path": "pages/business/CRM/plan/planView",
+			//周计划查看
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": ""
-				"app-plus" : {
-					"bounce" : "none" // 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
-				},
-				"mp-alipay":{"allowsBounceVertical":"NO"} // 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
 			}
 		},
 		{
-			"path": "pages/userinfo/userinfo",
+			"path": "pages/business/CRM/customer/customerAdd",
+			//客户人员新增
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/customerAudit",
+			//客户人员审核
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/customerUserBelong",
+			//客户人员归属
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/components/confirmForm",
+			//客户人员主归属人变更审核提交
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/changeCustomerOwner",
+			//客户人员主归属人变更
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit",
+			//客户人员主归属人变更审核
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/mainOwner/audit/confirmForm",
+			//客户人员主归属人变更审核提交
+			"style": {
+				"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",
+			//客户人员详情编辑
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/selectCustomer",
+			//选择客户
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/vistorCheckin",
+			//签到打卡
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/checkinStatistics",
+			//打卡统计
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/paymentCollection",
+			//回款查看
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		//===================================活动报告====================
 		{
-			"path": "pages/business/CRM/marketActivity/visitReport",//市场信息管理
+			"path": "pages/business/CRM/marketActivity/visitReport",
+			//市场信息管理
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/visitorReportAdd",//走访报告添加
+			"path": "pages/business/CRM/marketActivity/visitorReportAdd",
+			//走访报告添加
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/visitReportView",//走访报告查看
+			"path": "pages/business/CRM/marketActivity/visitReportView",
+			//走访报告查看
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/visitReportDetail",//走访报告查看具体明细
+			"path": "pages/business/CRM/marketActivity/visitReportDetail",
+			//走访报告查看具体明细
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/auditReport",//走访报告审批列表查看
+			"path": "pages/business/CRM/marketActivity/auditReport",
+			//走访报告审批列表查看
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/detailForApproval",//走访报告明细审批
+			"path": "pages/business/CRM/marketActivity/detailForApproval",
+			//走访报告明细审批
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/visitorReportEnter",//走访报告内容录入
+			"path": "pages/business/CRM/marketActivity/visitorReportEnter",
+			//走访报告内容录入
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/auditReject",//走访报告驳回输入原因
+			"path": "pages/business/CRM/marketActivity/auditReject",
+			//走访报告驳回输入原因
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/customerUserList",//客户公司人员信息
+			"path": "pages/business/CRM/marketActivity/customerUserList",
+			//客户公司人员信息
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/myUserList",//我公司人员信息
+			"path": "pages/business/CRM/marketActivity/myUserList",
+			//我公司人员信息
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/activityTypeList",//活动类型
+			"path": "pages/business/CRM/marketActivity/activityTypeList",
+			//活动类型
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/marketActivity/chooseCus",//选择客户单位
+			"path": "pages/business/CRM/marketActivity/chooseCus",
+			//选择客户单位
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		//====================地图======
 		{
-			"path": "pages/business/CRM/map/vistorCheckin",//签到打卡
+			"path": "pages/business/CRM/map/vistorCheckin",
+			//签到打卡
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/map/addRearkSignIn",//签到备注
+			"path": "pages/business/CRM/map/addRearkSignIn",
+			//签到备注
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/map/checkInView",//打卡信息（考勤查看）
+			"path": "pages/business/CRM/map/checkInView",
+			//打卡信息（考勤查看）
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/business/CRM/map/checkinStatistics",//打卡统计
+			"path": "pages/business/CRM/map/checkinStatistics",
+			//打卡统计
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		},
+		}
-
-
 		//===================================活动报告====================
 	],
 	"globalStyle": {

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

@@ -0,0 +1,332 @@
+<!--
+ * @author wangzhuo
+ * @date 2025年8月19日
+ * @description 主归属人变更
+-->
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <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" @clear="clearSearchValue"
+          />
+        </view>
+
+        <!-- 分页部分  top="68rpx" -->
+        <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}"
+        >
+          <block v-for="(item, index) in list" :key="index">
+            <view class="white-bg margin-bottom20"
+                  @touchstart="handleTouchStart(item)"
+                  @touchend="handleTouchEnd"
+                  v-if="item && item.auditStatus !== '办事处审核通过'"
+            >
+              <view class="report-list">
+                <view class="w-b-title title" @dblclick.stop="handleDetail(item)">
+                  {{ item.cusName }}
+                  <!--<view v-if="item.nodeCode" class="r-right btn-edit" @click.prevent="handleCopyInfo(item)"> 复制信息 </view>-->
+                </view>
+                <view class="r-list">
+                  <view class="r-left">客户人员名称</view>
+                  <view class="r-right">{{ item.userName }}</view>
+                </view>
+                <view class="border-bottom"></view>
+
+                <view class="r-list">
+                  <view class="r-left">性别</view>
+                  <view class="r-right">{{ item.sex }}</view>
+                </view>
+                <view class="border-bottom"></view>
+
+                <view class="r-list">
+                  <view class="r-left">手机号</view>
+                  <view class="r-right">{{ item.mobilePhone || item.iphone }}</view>
+                </view>
+                <view class="border-bottom"></view>
+
+                <view class="r-list">
+                  <view class="r-left">部门</view>
+                  <view class="r-right">{{ item.userDept }}</view>
+                </view>
+                <view class="border-bottom"></view>
+
+                <view class="r-list">
+                  <view class="r-left">业务员认定等级</view>
+                  <view class="r-right">{{ item.salesmanThinkLevel }}</view>
+                </view>
+
+                <!--<view v-if="item.systemThinkLevel" class="r-list">
+                  <view class="r-left">系统认定等级</view>
+                  <view class="r-right">{{ item.systemThinkLevel }}</view>
+                </view>-->
+
+              </view>
+            </view>
+          </block>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+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 {SearchForAllPerson} from "@/api/crm/customer/getCustomer"
+import {submissionOfChangeOfMainOwner} from "@/api/crm/customer/updateCustomer"
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+// 搜索内容
+let searchValue = ref(null);
+// 分页
+const mescrollRef = ref(null);
+// 防抖计时
+let timerId = null;
+// 查询搜索跳转
+let handleSearch = () => {
+  // 防抖搜索    console.log(searchValue.value)
+  if (timerId) clearTimeout(timerId);
+  timerId = setTimeout(async () => {
+
+    // let res = await getList(1, upOption.value.page.size)
+    await downCallback(mescrollRef.value.mescroll);
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500)
+}
+
+watch(searchValue, (newValue, oldValue) => {
+  handleSearch()
+})
+let clearSearchValue = () => {
+  searchValue.value = '';
+}
+// 查询列表
+let list = ref([]);
+
+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: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  uni.showLoading();
+  cssFlag.value = true;
+  setTimeout(async () => {
+    // 重置页码为第一页
+    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);
+  }, 500);
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  uni.showLoading();
+  setTimeout(async () => {
+    // 使用 mescroll 提供的页码和大小参数
+    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.total >= mescroll.size);
+  }, 500);
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum: pageIndex,
+      pageSize,
+      searchContent: searchValue.value
+    }
+    try {
+      let res = await SearchForAllPerson(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, '数据获取失败');
+    } finally {
+      uni.hideLoading();
+    }
+  });
+}
+
+// 跳转到详情
+let handleDetail = (item) => {
+  uni.navigateTo({
+    url: "/pages/business/CRM/customer/components/customerUserEdit",
+    events: {},
+    success(res) {
+      res.eventChannel.emit('editCusData', {param: item, isAdd: false})
+    }
+  })
+}
+
+// 长按定时器ID
+let touchTimerId = null;
+
+// 开始触摸
+let handleTouchStart = (item) => {
+  touchTimerId = setTimeout(() => {
+    // console.log(item, "长按客户人员项")
+    handleChange(item)
+
+    clearTimeout(touchTimerId);
+  }, 1500)
+}
+
+// 结束触摸
+let handleTouchEnd = () => {
+  if (touchTimerId !== null) {
+    clearTimeout(touchTimerId);
+  }
+}
+
+// 变更主归属人
+let handleChange = (item) => {
+
+  uni.showModal({
+    title: '是否将该客户人员主的归属人变更为自己？',
+    editable: true,
+    placeholderText: '请输入变更理由',
+    success(res) {
+      if (res.confirm) {
+        if (res.content) {
+          submissionOfChangeOfMainOwner({
+            userId: item.userId,
+            userName: item.userName,
+            reasonForChange: res.content
+          }).then(res => {
+            if (res.code === 200) {
+              uni.showToast({
+                title: '操作成功'
+              })
+            } else {
+              uni.showToast({
+                title: '操作失败',
+                icon: 'error'
+              })
+            }
+          })
+        } else {
+          uni.showToast({
+            title: '操作失败！变更原因不能为空',
+            icon: 'none'
+          })
+        }
+      }
+    }
+  })
+}
+
+// 复制信息
+let handleCopyInfo = (item) => {
+  const {cusName, userName, sex, iphone, mobilePhone, jobTelphone, userDept, salesmanThinkLevel} = item;
+  /*  item = JSON.stringify({
+      '客户名称':item.cusName,
+      '客户人员名称': item.userName,
+      '性别': item.sex,
+      '手机号': item.iphone || item.mobilePhone || item.jobTelphone,
+      '部门': item.userDept,
+      '业务员认定等级': item.salesmanThinkLevel}
+    );
+    console.log(item, '复制信息');*/
+  uni.setClipboardData({
+    data: `客户名称：${cusName}
+客户人员名称：${userName}
+性别：${iphone || mobilePhone || jobTelphone}
+部门：${userDept}
+业务员认定等级：${salesmanThinkLevel}`,
+    success: function () {
+      uni.showToast({
+        title: '已复制到剪贴板',
+        icon: 'none'
+      })
+    }
+  });
+
+}
+</script>
+
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  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;
+}
+
+.white-bg {
+  padding-bottom: 10rpx;
+
+  .w-b-title {
+    align-items: flex-start;
+  }
+}
+
+</style>

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

@@ -0,0 +1,729 @@
+<!--
+ * @author wangzhuo
+ * @date 2025年8月20日
+ * @description 提交客户人员审批意见
+-->
+<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="form-con">
+          <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="40%">
+            <!-- 选择客户 -->
+            <uni-forms-item label="客户名称" name="cusName" required class="f-c-right">
+              <view class="customer-name" ><!--@click="handleCustomerClick"-->
+                <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+                <text> {{ customerUser.cusName || '查询客户名称' }}</text>
+              </view>
+            </uni-forms-item>
+            <!-- 系统推荐等级 -->
+            <uni-forms-item label="系统公司等级" name="cusEstate" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.cusEstate"
+                             :placeholder="customerUser.sysThinkLevel?customerUser.sysThinkLevel:'默认显示公司等级'"
+                             disabled/>
+            </uni-forms-item>
+            <!-- 输入人员名称 -->
+            <uni-forms-item label="人员姓名" name="userName" required
+                            class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.userName" placeholder="请输入姓名" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 选择人员等级 -->
+            <uni-forms-item label="人员等级(K)" name="userType"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleUserTypeChange" :value="userTypeIndex" :range="userTypeList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择等级 索引：index5 ，范围：palceArray3，响应：handlePlace6-->
+                  <view class="flex">
+                    {{ formData.userType ? formData.userType : '请选择' }} <!-- 等级：userType -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入人员工作电话 -->
+            <uni-forms-item label="工作电话" name="jobTelphone" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.jobTelphone" placeholder="请输入工作电话" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入人员手机号 -->
+            <uni-forms-item v-if="formData.mobilePhone" label="人员手机号" name="mobilePhone" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.mobilePhone" placeholder="请输入手机号" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入人员部门 -->
+            <uni-forms-item label="部门" name="userDept" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.userDept" placeholder="请输入所属部门" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 选择职能 -->
+            <uni-forms-item label="职能" name="functionalRequirements" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleFunctionChange" :range="functionalRequirementList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择职能 索引： :value="functionIndex" index1 响应：handlePlace1 -->
+                  <view class="flex">
+                    {{ formData.functionalRequirements ? formData.functionalRequirements : '请选择' }}
+                    <!-- 职能：functionalRequirements -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 系统推荐等级 -->
+            <uni-forms-item label="系统推荐等级" name="systemThinkLevel" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.systemThinkLevel" :placeholder="recommendLevel || '默认显示系统推荐等级'"
+                             disabled/>
+            </uni-forms-item>
+            <!-- 业务员选择人员等级 -->
+            <uni-forms-item label="业务人员填写等级" name="salesmanThinkLevel" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleThinkLevelChange" :range="salesmanThinkLevelList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择推荐等级 索引:value="thinkLevelIndex" index8 响应：handlePlace9 -->
+                  <view class="flex">
+                    {{ formData.salesmanThinkLevel ? formData.salesmanThinkLevel : '请选择' }}
+                    <!-- 思考人员等级：salesmanThinkLevel-->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+
+            <!-- 输入人员职务 -->
+            <uni-forms-item label="职务" name="job" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.job" placeholder="请输入职务" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入专业产品 majorProduct-->
+            <uni-forms-item label="专业产品" name="majorProduct" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.majorProduct" placeholder="请输入专业产品" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入产品需求 product-->
+            <uni-forms-item label="产品需求" name="product" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.product" placeholder="请输入产品需求" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入办公场地 -->
+            <uni-forms-item label="办公场地" name="officeSite" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.officeSite" placeholder="请输入办公场地" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入性别 -->
+            <uni-forms-item label="性别" name="sex" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleGenderChange" :value="genderIndex" :range="genderList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择性别 索引：index2 ，范围：palceArray2，响应：handlePlace2-->
+                  <view class="flex">
+                    {{ formData.sex ? formData.sex : '请选择' }} <!--  性别：sex -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+
+            <!-- 选择任职时间 tenureTime-->
+            <uni-forms-item label="任职日期" name="tenureTime" class="uni-forms-item is-direction-top is-top">
+              <uni-datetime-picker type="date" :clear-icon="false" v-model="formData.tenureTime"
+                                   @change="handleTenureTimeChange" :disabled="!editable"/> <!-- 响应：orderDateChange-->
+            </uni-forms-item>
+            <!-- 输入需求层次 hierarchyNeeds-->
+            <uni-forms-item label="需求层次" name="hierarchyNeeds"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleHierarchyNeedsChange" :value="hierarchyNeedsIndex" :range="hierarchyNeedsList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择层次 索引：index4 ，范围：palceArray5，响应：handlePlace5-->
+                  <view class="flex">
+                    {{ formData.hierarchyNeeds ? formData.hierarchyNeeds : '请选择' }} <!-- 层次：hierarchyNeeds -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入职务变化 jobChange-->
+            <uni-forms-item label="职务变化" name="jobChange" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.jobChange" placeholder="请输入职务变化" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 选择发展潜能 develop-->
+            <uni-forms-item label="发展潜能" name="develop"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleDevelopChange" :value="developIndex" :range="developList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择潜力 索引：index3 ，范围：handlePlace4，响应：handlePlace5-->
+                  <view class="flex">
+                    {{ formData.develop ? formData.develop : '请选择' }} <!--  潜能：develop -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入生日 -->
+            <uni-forms-item label="生日" name="birthday" class="uni-forms-item is-direction-top is-top">
+              <uni-datetime-picker type="date" :clear-icon="false" v-model="formData.birthday"
+                                   @change="handleBirthdayChange" :disabled="!editable"/> <!-- 响应：birthdayChange-->
+            </uni-forms-item>
+            <!-- 输入爱好 -->
+            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
+              <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
+              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" :disabled="!editable"/>
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @change="handleHobbyChange" :slabel="'name'"
+
+              ></multipleSelect><!--placeholder="请选择爱好标签"-->
+            </uni-forms-item>
+
+            <!--            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">-->
+            <!--              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" @click="chooseHobby"/>-->
+            <!-- chooseHobby选择标签 -->
+            <!--            </uni-forms-item>-->
+            <!-- 输入禁忌 taboo-->
+            <uni-forms-item label="禁忌" name="taboo" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.taboo" placeholder="请输入禁忌" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入籍贯 nativec-->
+            <uni-forms-item label="籍贯" name="nativec" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.nativec" placeholder="请输入或选择籍贯" :disabled="!editable"/>
+              <uni-data-picker placeholder="请选择" :localdata="city"
+                               :clear-icon="false"
+                               :map="{text:'label',value:'value'}"
+                               @change="handleNativeChange" :readonly="!editable">
+
+              </uni-data-picker>
+              <!--              {{formData.nativec? formData.nativec:'请选择'}}--><!-- 响应：address-->
+            </uni-forms-item>
+            <!-- 输入家庭住址 homeAddress-->
+            <uni-forms-item label="家庭住址" name="homeAddress" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.homeAddress" placeholder="请输入家庭住址" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入家庭情况 familyStatus-->
+            <uni-forms-item label="家庭情况" name="familyStatus" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.familyStatus" placeholder="请输入家庭情况" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入婚姻状况 maritalStatus-->
+            <uni-forms-item label="婚姻状况" name="maritalStatus" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.maritalStatus" placeholder="请输入婚姻状况" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入车型及牌号 motorcycleType-->
+            <uni-forms-item label="车型及牌号" name="motorcycleType" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.motorcycleType" placeholder="请输入车型及牌号" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入毕业院校 graduateIns-->
+            <uni-forms-item label="毕业院校" name="graduateIns" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.graduateIns" placeholder="请输入毕业院校" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入人脉关系 interpersonal-->
+            <uni-forms-item label="人脉关系" name="interpersonal" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.interpersonal" placeholder="请输入人脉关系" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入支持程度 support-->
+            <uni-forms-item label="支持程度" name="support" class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleSupportChange" :value="supportIndex" :range="supportLevelList" :disabled="!editable"
+                        :range-key="'name'"> <!--选择支持程度 索引：index6 ，范围：palceArray6，响应：handlePlace7-->
+                  <view class="flex">
+                    {{ formData.support ? formData.support : '请选择' }} <!-- 支持：support -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 选择工作状态 workingStatus-->
+            <uni-forms-item label="工作状态" name="workingStatus" class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleWorkingStatusChange" :value="workingStatusIndex" :range="workingStatusList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择支持程度 索引：index7 ，范围：palceArray7，响应：handlePlace8-->
+                  <view class="flex">
+                    {{ formData.workingStatus ? formData.workingStatus : '请选择' }} <!-- 工作：workingStatus -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入备注 -->
+            <uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top" style="padding-bottom: 220rpx;">
+              <uni-easyinput type="textarea" autoHeight v-model="formData.reasonForChange" placeholder="请输入备注"
+                             class="form-texarea" :disabled="!editable"/>
+            </uni-forms-item>
+
+            <view v-if="formData.userId" class="fab">
+              <button class="mini-btn btn" type="warn" @click="handleReject">✘ 驳回</button>
+              <button class="mini-btn btn" type="primary"  @click="handleApprove">✔ 通过</button>
+            </view>
+          </uni-forms>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref, reactive, getCurrentInstance} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import multipleSelect from '@/components/multipleSelect.vue'
+import {
+  developList,
+  functionalRequirementList,
+  genderList,
+  hierarchyNeedsList, hobbyList,
+  salesmanThinkLevelList, supportLevelList,
+  userTypeList, workingStatusList
+} from "../dataMap";
+import city from "@/utils/area";
+import {getCustomerLevel, getCusUserApprovalListDetail} from "@/api/crm/customer/getCustomer";
+import {customerPersonnelsRejectio, clientPersonnelsApproval} from "@/api/crm/customer/updateCustomer";
+import {onLoad} from "@dcloudio/uni-app";
+// 表单引用
+const formRef = ref({});
+// 表单数据
+const formData = ref({
+  // 客户人员的ID
+  userId: null,
+  //部门
+  userDept: null,
+  //客户（公司）ID
+  cusId: null,
+  //客户人员名称
+  customerUserName: null,
+  userName: null,
+
+  //等级（K）
+  userType: null,
+  //手机号
+  iphone: null,
+  mobilePhone: null,
+  //客户姓名
+  cusName: null,
+  //系统中公司等级
+  cusEstate: null,
+  //工作手机号
+  jobTelphone: null,
+  //职能
+  functionalRequirements: '',
+  //职务
+  job: null,
+  //专业产品
+  majorProduct: null,
+  //产品需求
+  product: null,
+  //办公场地
+  officeSite: null,
+  //性别
+  sex: '男',
+  //任职时间
+  tenureTime: null,
+  //需求层次
+  hierarchyNeeds: null,
+  //职务变化
+  jobChange: null,
+  //发展潜能
+  develop: null,
+  //生日
+  birthday: null,
+  //爱好
+  hobby: null,
+  //禁忌
+  taboo: null,
+  //籍贯
+  nativec: null,
+  //家庭情况
+  familyStatus: null,
+  //婚姻状况
+  maritalStatus: null,
+  //车辆及牌号
+  motorcycleType: null,
+  //毕业院校
+  graduateIns: null,
+  //家庭住址
+  homeAddress: null,
+  //人脉关系
+  interpersonal: null,
+  //支持程度
+  support: null,
+  //工作状态
+  workingStatus: null,
+  //备注
+  remark: null,
+  //业务员认为的等级
+  salesmanThinkLevel: null,
+  //系统认为的等级
+  systemThinkLevel: null,
+  //职能
+  function: null,
+});
+
+// 客户人员信息
+const customerUser = ref({
+  cusName: null,
+  sysThinkLevel: null
+});
+
+// 表单校验规则
+let rules;
+// 初始化校验规则
+(function bindRules() {
+  rules = reactive({
+    cusName: {rules: [{required: true, errorMessage: '客户名称不能为空', trigger: 'blur'}]},
+    customerUserName: {rules: [{required: true, errorMessage: '人员名称不能为空', trigger: 'blur'}]},
+    iphone: {
+      rules: [{
+        required: true,
+        errorMessage: '请填写手机号码',
+      }, {
+        validateFunction: function (rule, value, data, callback) {
+          let iphoneReg = (
+              /^(13[0-9]|14[1579]|15[0-3,5-9]|16[6]|17[0123456789]|18[0-9]|19[89])\d{8}$/
+          ); //手机号码
+          if (!iphoneReg.test(value)) {
+            callback('手机号码格式不正确，请重新填写')
+          }
+        }
+      }]
+    },
+    userDept: {rules: [{required: true, errorMessage: '所属部门不能为空', trigger: 'blur'}]},
+    functionalRequirements: {rules: [{required: true, errorMessage: '职能不能为空', trigger: 'blur'}]},
+    salesmanThinkLevel: {rules: [{required: true, errorMessage: '手填等级不能为空', trigger: 'blur'}]},
+    job: {rules: [{required: true, errorMessage: '职务不能为空', trigger: 'blur'}]},
+    officeSite: {rules: [{required: true, errorMessage: '办公场地不能为空', trigger: 'blur'}]},
+    sex: {rules: [{required: true, errorMessage: '性别不能为空', trigger: 'blur'}]},
+  });
+  console.log(rules, "校验规则");
+})();
+const editable = ref(true);
+// getCurrentInstance().proxy
+let instance = null;
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('auditCusUser', async (param) => {
+    editable.value = param.editable;
+    if(!param.editable){ // 只读模式
+      let {userId} = param.data;
+      console.log(param.data, "客户人员所属详情编辑页面读取到参数");
+      let res = await getCusUserApprovalListDetail({userId}).catch(err=>{
+        console.warn(err,'客户人员所属编辑信息获取失败');
+      })
+      const {rows} = res;
+      let source = rows[0];
+      const filteredData = Object.keys(source)
+          .filter(key => source[key] !== null && source[key] !== "null")
+          .reduce((obj, key) => {
+            obj[key] = source[key];
+            return obj;
+          }, {});
+      const {cusName} = source;
+      customerUser.value.cusName = cusName;
+      console.log(filteredData, "过滤空值属性")
+      if(rows.length) Object.assign(formData.value, filteredData); // 对表单赋值
+      formData.value.functionalRequirements = source.function; // 特殊处理
+    }
+  })
+})
+// 选择客户人员
+let handleCustomerClick = () => {
+  // 在起始页面跳转到test.vue页面，并监听test.vue发送过来的事件数据
+  uni.navigateTo({
+    url: '/pages/business/CRM/customer/selectCustomer',
+    events: {
+      // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
+      cuSelected(data) {
+        console.log(data, "获取到返回的数据")
+        let {
+          cusName, // 公司名称
+          cusEstate, // 等级
+          cusId,
+        } = data;
+        customerUser.value.cusName = cusName;
+        if (!cusEstate) customerUser.value.sysThinkLevel = "该客户暂无等级信息，无法进行系统推荐"
+        formData.value.cusEstate = cusEstate;
+        formData.value.cusName = cusName;
+        formData.value.cusId = cusId;
+        getRecommendLevel();
+      }
+    },
+    success: function (res) {
+      // 通过eventChannel向被打开页面传送数据
+      res.eventChannel.emit('requestCusList', {data: {cusName: customerUser.value.cusName}})
+    }
+  })
+
+}
+
+// 选择职能
+let handleFunctionChange = (e) => {
+  console.log(e.detail.value, '职能索引');
+  const {name} = functionalRequirementList[e.detail.value];
+  formData.value.functionalRequirements = name;
+  getRecommendLevel();
+}
+
+// 选择等级
+let handleThinkLevelChange = (e) => {
+  console.log(e.detail.value, '人员等级');
+  const {name} = salesmanThinkLevelList[e.detail.value];
+  formData.value.salesmanThinkLevel = name;
+}
+// 系统推荐等级
+let recommendLevel = ref("");
+let getRecommendLevel = async () => {
+  if (formData.value.cusEstate) {
+    let {cusEstate, functionalRequirements} = formData.value;
+    let param = {cusEstate, functionalRequirements};
+    if (formData.value.salesmanThinkLevel) {
+      param.personnelLevel = formData.value.salesmanThinkLevel;
+    }
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
+      console.error(err, "客户的系统推荐等级获取失败")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
+    }
+  } else {
+    recommendLevel.value = "无公司等级信息，无法推荐等级";
+  }
+};
+
+// 性别索引
+let genderIndex = ref(0);
+// 选择性别
+let handleGenderChange = (e) => {
+  const {value} = e.detail;
+  console.log(e.detail.value);
+  const {name} = genderList[value];
+  genderIndex.value = value;
+  formData.value.sex = name;
+}
+
+// 人员等级索引
+let userTypeIndex = ref(0);
+// 选择人员等级
+let handleUserTypeChange = (e) => {
+  let {value} = e.detail;
+  userTypeIndex.value = value;
+  const {name} = userTypeList[value];
+  formData.value.userType = name;
+}
+
+// 选择日期
+function handleTenureTimeChange(e) {
+  formData.value.tenureTime = e;
+}
+
+// 需求层次索引
+let hierarchyNeedsIndex = ref(0);
+// 选择需求层次
+let handleHierarchyNeedsChange = e => {
+  let {value} = e.detail;
+  const {name} = hierarchyNeedsList[value];
+  hierarchyNeedsIndex.value = value;
+  formData.value.hierarchyNeeds = name;
+}
+// 发展潜能索引
+let developIndex = ref(0);
+// 选择发展潜能
+let handleDevelopChange = e => {
+  let {value} = e.detail;
+  developIndex.value = value;
+  formData.value.develop = developList[value].name;
+}
+
+// 选择生日
+function handleBirthdayChange(e) {
+  formData.value.birthday = e;
+}
+
+// 爱好标签索引
+let hobbyIds = ref([]);
+let hobbies = ref([]);
+// 选择爱好标签
+const handleHobbyChange = (items, ids) => {
+  hobbyIds.value = [];
+  hobbies.value = items;
+};
+// 选择
+const handleNativeChange = (e) => {
+  formData.value.nativec = (e.detail.value.map(item => {
+    return item.text;
+  }).join("-"))
+}
+// 支持程度索引
+let supportIndex = ref(0);
+// 选择支持程度
+let handleSupportChange = e => {
+  let {value} = e.detail;
+  supportIndex.value = value;
+  formData.value.support = supportLevelList[value].name;
+}
+// 工作状态索引
+let workingStatusIndex = ref(0);
+let handleWorkingStatusChange = e => {
+  let {value} = e.detail;
+  workingStatusIndex.value = 0;
+  formData.value.workingStatus = workingStatusList[value].name;
+}
+let handleReject = () => {
+  uni.showModal({
+    title: '是否确认驳回？',
+    editable: true,
+    placeholderText: '请输入驳回原因',
+    async success(res){
+      if(res.confirm){
+        if(res.content){
+          uni.showLoading()
+          let ret = await customerPersonnelsRejectio({
+            userRejectedGrounds: res.content,
+            userId: formData.value.userId
+          })
+          uni.hideLoading()
+          if(ret.code === 200){
+            uni.showToast({
+              title: '驳回成功'
+            })
+            setTimeout(()=>{
+              uni.navigateBack();
+              const eventChannel = instance.getOpenerEventChannel();
+              eventChannel.emit('refreshUserAuditList')
+            },1000)
+          }else{
+            uni.showToast({
+              title: '操作失败',
+              icon: 'error'
+            })
+          }
+        }else{
+          uni.showToast({
+            title: '操作失败！驳回原因不能为空',
+            icon: 'none'
+          })
+        }
+      }
+    }
+  })
+}
+let handleApprove  = () => {
+  uni.showLoading();
+  clientPersonnelsApproval({
+    userId: formData.value.userId
+  }).then(res=>{
+    uni.hideLoading();
+    if(res.code==200){
+      uni.showToast({
+        title: '操作成功'
+      })
+      setTimeout(()=>{
+        uni.navigateBack()
+        const eventChannel = instance.getOpenerEventChannel();
+        eventChannel.emit('refreshUserAuditList')
+      },1000)
+    }
+  }).catch(err=>{
+    uni.showToast({
+      title: '操作失败',
+      icon: 'error'
+    })
+  })
+}
+
+</script>
+
+<style lang="scss" scoped>
+:deep(.uni-easyinput__content.is-input-border) {
+  overflow: hidden;
+}
+
+:deep(.uni-easyinput__content.is-input-border.is-disabled) {
+  border: none;
+}
+
+:deep(.uni-easyinput__content.is-input-border.is-disabled .uni-easyinput__content-input) {
+  background-color: #f0f0f0 !important;
+}
+
+:deep(.is-disabled .uni-easyinput__placeholder-class) {
+  color: #999;
+}
+
+:deep(.uni-select-dc-select .uni-select-multiple) {
+  overflow: auto;
+}
+
+.form-picker {
+  padding: 15rpx;
+  font-size: 12px;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+  font-size: 12px;
+}
+
+.white-bg {
+  width: 750rpx;
+  padding: 30rpx 0 0;
+  margin-bottom: 0;
+  border-radius: 8px 8px 0 0;
+}
+
+.customer-name {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  flex-direction: row-reverse
+}
+
+:deep(.uni-date-x) {
+  display: block;
+}
+
+:deep(.uni-date-x .icon-calendar) {
+  float: right;
+  margin-top: 15rpx;
+  margin-right: 20rpx;
+  background: url('../../../../../static/images/business/icon-date.png') no-repeat;
+  background-size: 32rpx 35rpx;
+  width: 32rpx;
+  height: 35rpx;
+}
+
+:deep(.uni-date-x .icon-calendar::before) {
+  display: none;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+  padding-left: 20rpx;
+  color: #919191;
+}
+.btn{
+  height: 100rpx;
+  width: 180rpx;
+  border-radius: 50rpx;
+  border: none;
+  line-height: 100rpx;
+  text-align: center;
+  font-size: 26rpx;
+}
+.fab{
+  padding-top: 10rpx;
+  padding-bottom: 100rpx;
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  width: 100vw;
+  left: 0;
+  background-color: rgba(255, 255, 255, 0.4);
+  backdrop-filter: blur(10px);
+  box-shadow: 0 0 60rpx rgba(255, 255, 255, 0.9);
+  z-index: 999;
+}
+</style>

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

@@ -0,0 +1,710 @@
+<!--
+ * @author wangzhuo
+ * @date 2025年9月1日
+ * @description 编辑客户人员信息
+-->
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="isAdd?'客户人员新增':'客户人员归属详情'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="submitForm">
+            <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+                       color="#B7D2FF"></uni-icons>
+            保存
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height"></view>
+
+      <!-- 正文内容 -->
+      <view class="white-bg">
+        <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">
+              <view class="customer-name" @click="handleCustomerClick">
+                <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+                <text> {{ customerUser.cusName || '查询客户名称' }}</text> <!---->
+              </view>
+            </uni-forms-item>
+            <!-- 系统推荐等级 -->
+            <uni-forms-item label="系统公司等级" name="cusEstate" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.cusEstate"
+                             :placeholder="customerUser.sysThinkLevel?customerUser.sysThinkLevel:'默认显示公司等级'"
+                             disabled/>
+            </uni-forms-item>
+            <!-- 输入人员名称 -->
+            <uni-forms-item label="人员姓名" name="userName" required
+                            class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.userName" placeholder="请输入姓名"/>
+            </uni-forms-item>
+            <!-- 输入人员手机号 -->
+            <uni-forms-item v-if="formData.mobilePhone" label="人员手机号" name="mobilePhone" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.mobilePhone" placeholder="请输入手机号"/>
+            </uni-forms-item>
+            <!-- 输入人员部门 -->
+            <uni-forms-item label="部门" name="userDept" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.userDept" placeholder="请输入所属部门"/>
+            </uni-forms-item>
+            <!-- 选择职能 -->
+            <uni-forms-item label="职能" name="functionalRequirements" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleFunctionChange" :range="functionalRequirementList"
+                        :range-key="'name'"> <!--选择职能 索引： :value="functionIndex" index1 响应：handlePlace1 -->
+                  <view class="flex">
+                    {{ formData.functionalRequirements ? formData.functionalRequirements : '请选择' }}
+                    <!-- 职能：functionalRequirements -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 业务员选择人员等级 -->
+            <uni-forms-item label="业务人员填写等级" name="salesmanThinkLevel" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleThinkLevelChange" :range="salesmanThinkLevelList"
+                        :range-key="'name'"> <!--选择推荐等级 索引:value="thinkLevelIndex" index8 响应：handlePlace9 -->
+                  <view class="flex">
+                    {{ formData.salesmanThinkLevel ? formData.salesmanThinkLevel : '请选择' }}
+                    <!-- 思考人员等级：salesmanThinkLevel-->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 系统推荐等级 -->
+            <uni-forms-item label="系统推荐等级" name="systemThinkLevel" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.systemThinkLevel" :placeholder="recommendLevel || '默认显示系统推荐等级'"
+                             disabled/>
+            </uni-forms-item>
+            <!-- 输入人员职务 -->
+            <uni-forms-item label="职务" name="job" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.job" placeholder="请输入职务"/>
+            </uni-forms-item>
+            <!-- 输入办公场地 -->
+            <uni-forms-item label="办公场地" name="officeSite" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.officeSite" placeholder="请输入办公场地"/>
+            </uni-forms-item>
+            <!-- 输入性别 -->
+            <uni-forms-item label="性别" name="sex" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleGenderChange" :value="genderIndex" :range="genderList"
+                        :range-key="'name'"> <!--选择性别 索引：index2 ，范围：palceArray2，响应：handlePlace2-->
+                  <view class="flex">
+                    {{ formData.sex ? formData.sex : '请选择' }} <!--  性别：sex -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入人员工作电话 -->
+            <uni-forms-item label="工作电话" name="jobTelphone" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.jobTelphone" placeholder="请输入工作电话"/>
+            </uni-forms-item>
+            <!-- 选择人员等级 -->
+            <uni-forms-item label="人员等级(K)" name="userType"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleUserTypeChange" :value="userTypeIndex" :range="userTypeList"
+                        :range-key="'name'"> <!--选择等级 索引：index5 ，范围：palceArray3，响应：handlePlace6-->
+                  <view class="flex">
+                    {{ formData.userType ? formData.userType : '请选择' }} <!-- 等级：userType -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入专业产品 majorProduct-->
+            <uni-forms-item label="专业产品" name="majorProduct" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.majorProduct" placeholder="请输入专业产品"/>
+            </uni-forms-item>
+            <!-- 输入产品需求 product-->
+            <uni-forms-item label="产品需求" name="product" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.product" placeholder="请输入产品需求"/>
+            </uni-forms-item>
+            <!-- 选择任职时间 tenureTime-->
+            <uni-forms-item label="任职日期" name="tenureTime" class="uni-forms-item is-direction-top is-top">
+              <uni-datetime-picker type="date" :clear-icon="false" v-model="formData.tenureTime"
+                                   @change="handleTenureTimeChange"/> <!-- 响应：orderDateChange-->
+            </uni-forms-item>
+            <!-- 输入需求层次 hierarchyNeeds-->
+            <uni-forms-item label="需求层次" name="hierarchyNeeds"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleHierarchyNeedsChange" :value="hierarchyNeedsIndex" :range="hierarchyNeedsList"
+                        :range-key="'name'"> <!--选择层次 索引：index4 ，范围：palceArray5，响应：handlePlace5-->
+                  <view class="flex">
+                    {{ formData.hierarchyNeeds ? formData.hierarchyNeeds : '请选择' }} <!-- 层次：hierarchyNeeds -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入职务变化 jobChange-->
+            <uni-forms-item label="职务变化" name="jobChange" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.jobChange" placeholder="请输入职务变化"/>
+            </uni-forms-item>
+            <!-- 选择发展潜能 develop-->
+            <uni-forms-item label="发展潜能" name="develop"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleDevelopChange" :value="developIndex" :range="developList"
+                        :range-key="'name'"> <!--选择潜力 索引：index3 ，范围：handlePlace4，响应：handlePlace5-->
+                  <view class="flex">
+                    {{ formData.develop ? formData.develop : '请选择' }} <!--  潜能：develop -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入生日 -->
+            <uni-forms-item label="生日" name="birthday" class="uni-forms-item is-direction-top is-top">
+              <uni-datetime-picker type="date" :clear-icon="false" v-model="formData.birthday"
+                                   @change="handleBirthdayChange"/> <!-- 响应：birthdayChange-->
+            </uni-forms-item>
+            <!-- 输入爱好 -->
+            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
+              <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
+              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @change="handleHobbyChange" :slabel="'name'"
+
+              ></multipleSelect><!--placeholder="请选择爱好标签"-->
+            </uni-forms-item>
+
+            <!--            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">-->
+            <!--              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" @click="chooseHobby"/>-->
+            <!-- chooseHobby选择标签 -->
+            <!--            </uni-forms-item>-->
+            <!-- 输入禁忌 taboo-->
+            <uni-forms-item label="禁忌" name="taboo" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.taboo" placeholder="请输入禁忌"/>
+            </uni-forms-item>
+            <!-- 输入籍贯 nativec-->
+            <uni-forms-item label="籍贯" name="nativec" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.nativec" placeholder="请输入或选择籍贯"/>
+              <uni-data-picker placeholder="请选择" :localdata="city"
+                               :clear-icon="false"
+                               :map="{text:'label',value:'value'}"
+                               @change="handleNativeChange">
+
+              </uni-data-picker>
+              <!--              {{formData.nativec? formData.nativec:'请选择'}}--><!-- 响应：address-->
+            </uni-forms-item>
+            <!-- 输入家庭住址 homeAddress-->
+            <uni-forms-item label="家庭住址" name="homeAddress" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.homeAddress" placeholder="请输入家庭住址"/>
+            </uni-forms-item>
+            <!-- 输入家庭情况 familyStatus-->
+            <uni-forms-item label="家庭情况" name="familyStatus" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.familyStatus" placeholder="请输入家庭情况"/>
+            </uni-forms-item>
+            <!-- 输入婚姻状况 maritalStatus-->
+            <uni-forms-item label="婚姻状况" name="maritalStatus" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.maritalStatus" placeholder="请输入婚姻状况"/>
+            </uni-forms-item>
+            <!-- 输入车型及牌号 motorcycleType-->
+            <uni-forms-item label="车型及牌号" name="motorcycleType" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.motorcycleType" placeholder="请输入车型及牌号"/>
+            </uni-forms-item>
+            <!-- 输入毕业院校 graduateIns-->
+            <uni-forms-item label="毕业院校" name="graduateIns" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.graduateIns" placeholder="请输入毕业院校"/>
+            </uni-forms-item>
+            <!-- 输入人脉关系 interpersonal-->
+            <uni-forms-item label="人脉关系" name="interpersonal" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.interpersonal" placeholder="请输入人脉关系"/>
+            </uni-forms-item>
+            <!-- 输入支持程度 support-->
+            <uni-forms-item label="支持程度" name="support" class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleSupportChange" :value="supportIndex" :range="supportLevelList"
+                        :range-key="'name'"> <!--选择支持程度 索引：index6 ，范围：palceArray6，响应：handlePlace7-->
+                  <view class="flex">
+                    {{ formData.support ? formData.support : '请选择' }} <!-- 支持：support -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 选择工作状态 workingStatus-->
+            <uni-forms-item label="工作状态" name="workingStatus" class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleWorkingStatusChange" :value="workingStatusIndex" :range="workingStatusList"
+                        :range-key="'name'"> <!--选择支持程度 索引：index7 ，范围：palceArray7，响应：handlePlace8-->
+                  <view class="flex">
+                    {{ formData.workingStatus ? formData.workingStatus : '请选择' }} <!-- 工作：workingStatus -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入备注 -->
+            <uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+                             class="form-texarea"/>
+            </uni-forms-item>
+
+            <view  style="padding-bottom: 30rpx; font-size: 12px; color: gray; text-align: center;">*★,°*:.☆(￣▽￣)/$:*.°★*
+              。<p v-if="isAdd">恭喜你完成了信息填写，赶快提交吧！</p>
+            </view>
+            <view v-if="isAdd" style="padding-bottom: 80rpx;">
+              <button type="primary" @click="submitForm">保存</button>
+            </view>
+          </uni-forms>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref, onMounted, computed, reactive, getCurrentInstance} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import multipleSelect from '@/components/multipleSelect.vue'
+import {
+  developList,
+  functionalRequirementList,
+  genderList,
+  hierarchyNeedsList, hobbyList,
+  salesmanThinkLevelList, supportLevelList,
+  userTypeList, workingStatusList
+} from "../dataMap";
+import city from "@/utils/area";
+import {getCustomerLevel, getCusUserApprovalListDetail} from "@/api/crm/customer/getCustomer";
+import {upadateappCrmCusUserNew} from "@/api/crm/customer/updateCustomer";
+import {onLoad} from "@dcloudio/uni-app";
+// 表单引用
+const formRef = ref({});
+// 表单数据
+const formData = ref({
+  //部门
+  userDept: null,
+  //客户ID
+  cusId: null,
+  //客户人员名称
+  customerUserName: null,
+  userName: null,
+
+  //等级（K）
+  userType: null,
+  //手机号
+  iphone: null,
+  mobilePhone: null,
+  //客户姓名
+  cusName: null,
+  //系统中公司等级
+  cusEstate: null,
+  //工作手机号
+  jobTelphone: null,
+  //职能
+  functionalRequirements: '',
+  //职务
+  job: null,
+  //专业产品
+  majorProduct: null,
+  //产品需求
+  product: null,
+  //办公场地
+  officeSite: null,
+  //性别
+  sex: '男',
+  //任职时间
+  tenureTime: null,
+  //需求层次
+  hierarchyNeeds: null,
+  //职务变化
+  jobChange: null,
+  //发展潜能
+  develop: null,
+  //生日
+  birthday: null,
+  //爱好
+  hobby: null,
+  //禁忌
+  taboo: null,
+  //籍贯
+  nativec: null,
+  //家庭情况
+  familyStatus: null,
+  //婚姻状况
+  maritalStatus: null,
+  //车辆及牌号
+  motorcycleType: null,
+  //毕业院校
+  graduateIns: null,
+  //家庭住址
+  homeAddress: null,
+  //人脉关系
+  interpersonal: null,
+  //支持程度
+  support: null,
+  //工作状态
+  workingStatus: null,
+  //备注
+  remark: null,
+  //业务员认为的等级
+  salesmanThinkLevel: null,
+  //系统认为的等级
+  systemThinkLevel: null,
+  //职能
+  function: null,
+});
+
+// 客户人员信息
+const customerUser = ref({
+  cusName: null,
+  sysThinkLevel: null
+});
+
+// 表单校验规则
+let rules;
+// 初始化校验规则
+(function bindRules() {
+  rules = reactive({
+    cusName: {rules: [{required: true, errorMessage: '客户名称不能为空', trigger: 'blur'}]},
+    customerUserName: {rules: [{required: true, errorMessage: '人员名称不能为空', trigger: 'blur'}]},
+    iphone: {
+      rules: [{
+        required: true,
+        errorMessage: '请填写手机号码',
+      }, {
+        validateFunction: function (rule, value, data, callback) {
+          let iphoneReg = (
+              /^(13[0-9]|14[1579]|15[0-3,5-9]|16[6]|17[0123456789]|18[0-9]|19[89])\d{8}$/
+          ); //手机号码
+          if (!iphoneReg.test(value)) {
+            callback('手机号码格式不正确，请重新填写')
+          }
+        }
+      }]
+    },
+    userDept: {rules: [{required: true, errorMessage: '所属部门不能为空', trigger: 'blur'}]},
+    functionalRequirements: {rules: [{required: true, errorMessage: '职能不能为空', trigger: 'blur'}]},
+    salesmanThinkLevel: {rules: [{required: true, errorMessage: '手填等级不能为空', trigger: 'blur'}]},
+    job: {rules: [{required: true, errorMessage: '职务不能为空', trigger: 'blur'}]},
+    officeSite: {rules: [{required: true, errorMessage: '办公场地不能为空', trigger: 'blur'}]},
+    sex: {rules: [{required: true, errorMessage: '性别不能为空', trigger: 'blur'}]},
+  });
+  console.log(rules, "校验规则");
+})();
+const isAdd = ref(true);
+// getCurrentInstance().proxy
+let instance = null;
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('editCusData', async (data) => {
+    isAdd.value = data.isAdd;
+    if(!data.isAdd){ // 查看模式
+      let {userId} = data.param;
+      console.log(data.param, "客户人员所属详情编辑页面读取到参数");
+      let res = await getCusUserApprovalListDetail({userId}).catch(err=>{
+        console.warn(err,'客户人员所属编辑信息获取失败');
+      })
+      const {rows} = res;
+      let source = rows[0];
+      const filteredData = Object.keys(source)
+          .filter(key => source[key] !== null && source[key] !== "null")
+          .reduce((obj, key) => {
+            obj[key] = source[key];
+            return obj;
+          }, {});
+      const {cusName} = source;
+      customerUser.value.cusName = cusName;
+      console.log(filteredData, "过滤空值属性")
+      if(rows.length) Object.assign(formData.value, filteredData); // 对表单赋值
+      formData.value.functionalRequirements = source.function; // 特殊处理
+    }
+  })
+})
+// 选择客户人员
+let handleCustomerClick = () => {
+  // 在起始页面跳转到test.vue页面，并监听test.vue发送过来的事件数据
+  uni.navigateTo({
+    url: '/pages/business/CRM/customer/selectCustomer',
+    events: {
+      // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
+      cuSelected(data) {
+        console.log(data, "获取到返回的数据")
+        let {
+          cusName, // 公司名称
+          cusEstate, // 等级
+          cusId,
+        } = data;
+        customerUser.value.cusName = cusName;
+        if (!cusEstate) customerUser.value.sysThinkLevel = "该客户暂无等级信息，无法进行系统推荐"
+        formData.value.cusEstate = cusEstate;
+        formData.value.cusName = cusName;
+        formData.value.cusId = cusId;
+        getRecommendLevel();
+      }
+    },
+    success: function (res) {
+      // 通过eventChannel向被打开页面传送数据
+      res.eventChannel.emit('requestCusList', {data: {cusName: customerUser.value.cusName}})
+    }
+  })
+
+}
+
+// 选择职能
+let handleFunctionChange = (e) => {
+  console.log(e.detail.value, '职能索引');
+  const {name} = functionalRequirementList[e.detail.value];
+  formData.value.functionalRequirements = name;
+  formData.value.function = name;
+  getRecommendLevel();
+}
+
+// 选择等级
+let handleThinkLevelChange = (e) => {
+  console.log(e.detail.value, '人员等级');
+  const {name} = salesmanThinkLevelList[e.detail.value];
+  formData.value.salesmanThinkLevel = name;
+}
+// 系统推荐等级
+let recommendLevel = ref("");
+let getRecommendLevel = async () => {
+  if (formData.value.cusEstate) {
+    let {cusEstate, functionalRequirements} = formData.value;
+    let param = {cusEstate, functionalRequirements};
+    if (formData.value.salesmanThinkLevel) {
+      param.personnelLevel = formData.value.salesmanThinkLevel;
+    }
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
+      console.error(err, "客户的系统推荐等级获取失败")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
+    }
+  } else {
+    recommendLevel.value = "无公司等级信息，无法推荐等级";
+  }
+};
+
+// 性别索引
+let genderIndex = ref(0);
+// 选择性别
+let handleGenderChange = (e) => {
+  const {value} = e.detail;
+  console.log(e.detail.value);
+  const {name} = genderList[value];
+  genderIndex.value = value;
+  formData.value.sex = name;
+}
+
+// 人员等级索引
+let userTypeIndex = ref(0);
+// 选择人员等级
+let handleUserTypeChange = (e) => {
+  let {value} = e.detail;
+  userTypeIndex.value = value;
+  const {name} = userTypeList[value];
+  formData.value.userType = name;
+}
+
+// 选择日期
+function handleTenureTimeChange(e) {
+  formData.value.tenureTime = e;
+}
+
+// 需求层次索引
+let hierarchyNeedsIndex = ref(0);
+// 选择需求层次
+let handleHierarchyNeedsChange = e => {
+  let {value} = e.detail;
+  const {name} = hierarchyNeedsList[value];
+  hierarchyNeedsIndex.value = value;
+  formData.value.hierarchyNeeds = name;
+}
+// 发展潜能索引
+let developIndex = ref(0);
+// 选择发展潜能
+let handleDevelopChange = e => {
+  let {value} = e.detail;
+  developIndex.value = value;
+  formData.value.develop = developList[value].name;
+}
+
+// 选择生日
+function handleBirthdayChange(e) {
+  formData.value.birthday = e;
+}
+
+// 爱好标签索引
+let hobbyIds = ref([]);
+let hobbies = ref([]);
+// 选择爱好标签
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  hobbyIds.value = [];
+  hobbies.value = items;
+};
+
+// 选择
+const handleNativeChange = (e) => {
+  formData.value.nativec = (e.detail.value.map(item => {
+    return item.text;
+  }).join("-"))
+}
+// 支持程度索引
+let supportIndex = ref(0);
+// 选择支持程度
+let handleSupportChange = e => {
+  let {value} = e.detail;
+  supportIndex.value = value;
+  formData.value.support = supportLevelList[value].name;
+}
+// 工作状态索引
+let workingStatusIndex = ref(0);
+let handleWorkingStatusChange = e => {
+  let {value} = e.detail;
+  workingStatusIndex.value = 0;
+  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;
+    return name;
+  })
+  const hobbyTagString = hobbyTags.join('，');
+  console.log(hobbyTagString);
+  if (hobbyTagString || formData.value.hobby) {
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
+  // console.log(formData.value, "校验表单数据")
+  // console.log(recommendLevel);
+  formData.value.cusName = customerUser.value.cusName;
+  try {
+    await formRef.value.validate()
+    console.log(formData.value, "提交表单数据")
+    // 请求保存
+    uni.showLoading()
+    upadateappCrmCusUserNew(formData.value).then(ret=>{
+      uni.hideLoading();
+      if(ret.code === 200){
+        uni.showToast({
+          title: "更新成功"
+        })
+        setTimeout(()=>{
+          uni.navigateBack();
+          const eventChannel = instance.getOpenerEventChannel();
+          eventChannel.emit("refreshCusUserList");
+        },1000);
+
+      }else{
+        uni.showToast({
+          title: "操作失败",
+          icon: "error"
+        })
+      }
+
+    })
+    // 重置表单
+    // 清除校验
+
+  } catch (err) {
+    uni.showToast({
+      icon: 'none',
+      title: '请检查并完善信息'
+    })
+    console.warn(err);
+  }
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+:deep(.uni-easyinput__content.is-input-border) {
+  overflow: hidden;
+}
+
+:deep(.uni-easyinput__content.is-input-border.is-disabled) {
+  border: none;
+}
+
+:deep(.uni-easyinput__content.is-input-border.is-disabled .uni-easyinput__content-input) {
+  background-color: #f0f0f0 !important;
+}
+
+:deep(.is-disabled .uni-easyinput__placeholder-class) {
+  color: #999;
+}
+
+:deep(.uni-select-dc-select .uni-select-multiple) {
+  overflow: auto;
+}
+
+.form-picker {
+  padding: 15rpx;
+  font-size: 12px;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+  font-size: 12px;
+}
+
+.white-bg {
+  width: 750rpx;
+  padding: 30rpx 0 0;
+  margin-bottom: 0;
+  border-radius: 8px 8px 0 0;
+}
+
+.customer-name {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  flex-direction: row-reverse
+}
+
+:deep(.uni-date-x) {
+  display: block;
+}
+
+:deep(.uni-date-x .icon-calendar) {
+  float: right;
+  margin-top: 15rpx;
+  margin-right: 20rpx;
+  background: url('../../../../../static/images/business/icon-date.png') no-repeat;
+  background-size: 32rpx 35rpx;
+  width: 32rpx;
+  height: 35rpx;
+}
+
+:deep(.uni-date-x .icon-calendar::before) {
+  display: none;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+  padding-left: 20rpx;
+  color: #919191;
+}
+</style>

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

@@ -0,0 +1,756 @@
+<!--
+ * @author wangzhuo
+ * @description 客户人员新增
+-->
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'客户人员新增'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="submitForm">
+            <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+                       color="#B7D2FF"></uni-icons>
+            保存
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height"></view>
+
+      <!-- 正文内容 -->
+      <view class="white-bg">
+        <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">
+              <!--              <picker @change="bindPickerChange" :value="guestIndex" :range="guestArr">-->
+              <!--                <view class="f-c-text">-->
+              <!--                  {{guestArr[guestIndex]}}-->
+              <!--                  -->
+              <!--                </view>-->
+              <!--              </picker>-->
+              <view class="customer-name" @click="handleCustomerClick">
+                <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+                <text> {{ customerUser.cusName || '查询客户名称' }}</text> <!---->
+              </view>
+            </uni-forms-item>
+            <!-- 系统推荐等级 -->
+            <uni-forms-item label="系统公司等级" name="cusEstate" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.cusEstate"
+                             :placeholder="customerUser.sysThinkLevel?customerUser.sysThinkLevel:'默认显示公司等级'"
+                             disabled/>
+            </uni-forms-item>
+            <!-- 输入人员名称 -->
+            <uni-forms-item label="人员姓名" name="customerUserName" required
+                            class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.customerUserName" placeholder="请输入姓名"/>
+            </uni-forms-item>
+            <!-- 输入人员手机号 -->
+            <uni-forms-item label="人员手机号" name="iphone" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.iphone" placeholder="请输入手机号"/>
+            </uni-forms-item>
+            <!-- 输入人员部门 -->
+            <uni-forms-item label="部门" name="userDept" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.userDept" placeholder="请输入所属部门"/>
+            </uni-forms-item>
+            <!-- 选择职能 -->
+            <uni-forms-item label="职能" name="functionalRequirements" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleFunctionChange" :range="functionalRequirementList"
+                        :range-key="'name'"> <!--选择职能 索引： :value="functionIndex" index1 响应：handlePlace1 -->
+                  <view class="flex">
+                    {{ formData.functionalRequirements ? formData.functionalRequirements : '请选择' }}
+                    <!-- 职能：functionalRequirements -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 业务员选择人员等级 -->
+            <uni-forms-item label="业务人员填写等级" name="salesmanThinkLevel" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleThinkLevelChange" :range="salesmanThinkLevelList"
+                        :range-key="'name'"> <!--选择推荐等级 索引:value="thinkLevelIndex" index8 响应：handlePlace9 -->
+                  <view class="flex">
+                    {{ formData.salesmanThinkLevel ? formData.salesmanThinkLevel : '请选择' }}
+                    <!-- 思考人员等级：salesmanThinkLevel-->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 系统推荐等级 -->
+            <uni-forms-item label="系统推荐等级" name="systemThinkLevel" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.systemThinkLevel" :placeholder="recommendLevel || '默认显示系统推荐等级'"
+                             disabled/>
+            </uni-forms-item>
+            <!-- 输入人员职务 -->
+            <uni-forms-item label="职务" name="job" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.job" placeholder="请输入职务"/>
+            </uni-forms-item>
+            <!-- 输入办公场地 -->
+            <uni-forms-item label="办公场地" name="officeSite" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.officeSite" placeholder="请输入办公场地"/>
+            </uni-forms-item>
+            <!-- 输入性别 -->
+            <uni-forms-item label="性别" name="sex" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleGenderChange" :value="genderIndex" :range="genderList"
+                        :range-key="'name'"> <!--选择性别 索引：index2 ，范围：palceArray2，响应：handlePlace2-->
+                  <view class="flex">
+                    {{ formData.sex ? formData.sex : '请选择' }} <!--  性别：sex -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入人员工作电话 -->
+            <uni-forms-item label="工作电话" name="jobTelphone" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.jobTelphone" placeholder="请输入工作电话"/>
+            </uni-forms-item>
+            <!-- 选择人员等级 -->
+            <uni-forms-item label="人员等级(K)" name="userType"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleUserTypeChange" :value="userTypeIndex" :range="userTypeList"
+                        :range-key="'name'"> <!--选择等级 索引：index5 ，范围：palceArray3，响应：handlePlace6-->
+                  <view class="flex">
+                    {{ formData.userType ? formData.userType : '请选择' }} <!-- 等级：userType -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入专业产品 majorProduct-->
+            <uni-forms-item label="专业产品" name="majorProduct" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.majorProduct" placeholder="请输入专业产品"/>
+            </uni-forms-item>
+            <!-- 输入产品需求 product-->
+            <uni-forms-item label="产品需求" name="product" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.product" placeholder="请输入产品需求"/>
+            </uni-forms-item>
+            <!-- 选择任职时间 tenureTime-->
+            <uni-forms-item label="任职日期" name="tenureTime" class="uni-forms-item is-direction-top is-top">
+              <uni-datetime-picker type="date" :clear-icon="false" v-model="formData.tenureTime"
+                                   @change="handleTenureTimeChange"/> <!-- 响应：orderDateChange-->
+            </uni-forms-item>
+            <!-- 输入需求层次 hierarchyNeeds-->
+            <uni-forms-item label="需求层次" name="hierarchyNeeds"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleHierarchyNeedsChange" :value="hierarchyNeedsIndex" :range="hierarchyNeedsList"
+                        :range-key="'name'"> <!--选择层次 索引：index4 ，范围：palceArray5，响应：handlePlace5-->
+                  <view class="flex">
+                    {{ formData.hierarchyNeeds ? formData.hierarchyNeeds : '请选择' }} <!-- 层次：hierarchyNeeds -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入职务变化 jobChange-->
+            <uni-forms-item label="职务变化" name="jobChange" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.jobChange" placeholder="请输入职务变化"/>
+            </uni-forms-item>
+            <!-- 选择发展潜能 develop-->
+            <uni-forms-item label="发展潜能" name="develop"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleDevelopChange" :value="developIndex" :range="developList"
+                        :range-key="'name'"> <!--选择潜力 索引：index3 ，范围：handlePlace4，响应：handlePlace5-->
+                  <view class="flex">
+                    {{ formData.develop ? formData.develop : '请选择' }} <!--  潜能：develop -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入生日 -->
+            <uni-forms-item label="生日" name="birthday" class="uni-forms-item is-direction-top is-top">
+              <uni-datetime-picker type="date" :clear-icon="false" v-model="formData.birthday"
+                                   @change="handleBirthdayChange"/> <!-- 响应：birthdayChange-->
+            </uni-forms-item>
+            <!-- 输入爱好 -->
+            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
+              <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
+              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @change="handleHobbyChange" :slabel="'name'"
+
+              ></multipleSelect><!--placeholder="请选择爱好标签"-->
+            </uni-forms-item>
+
+            <!--            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">-->
+            <!--              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" @click="chooseHobby"/>-->
+            <!-- chooseHobby选择标签 -->
+            <!--            </uni-forms-item>-->
+            <!-- 输入禁忌 taboo-->
+            <uni-forms-item label="禁忌" name="taboo" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.taboo" placeholder="请输入禁忌"/>
+            </uni-forms-item>
+            <!-- 输入籍贯 nativec-->
+            <uni-forms-item label="籍贯" name="nativec" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.nativec" placeholder="请输入或选择籍贯"/>
+              <uni-data-picker placeholder="请选择" :localdata="city"
+                               :clear-icon="false"
+                               :map="{text:'label',value:'value'}"
+                               @change="handleNativeChange">
+
+              </uni-data-picker>
+              <!--              {{formData.nativec? formData.nativec:'请选择'}}--><!-- 响应：address-->
+            </uni-forms-item>
+            <!-- 输入家庭住址 homeAddress-->
+            <uni-forms-item label="家庭住址" name="homeAddress" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.homeAddress" placeholder="请输入家庭住址"/>
+            </uni-forms-item>
+            <!-- 输入家庭情况 familyStatus-->
+            <uni-forms-item label="家庭情况" name="familyStatus" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.familyStatus" placeholder="请输入家庭情况"/>
+            </uni-forms-item>
+            <!-- 输入婚姻状况 maritalStatus-->
+            <uni-forms-item label="婚姻状况" name="maritalStatus" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.maritalStatus" placeholder="请输入婚姻状况"/>
+            </uni-forms-item>
+            <!-- 输入车型及牌号 motorcycleType-->
+            <uni-forms-item label="车型及牌号" name="motorcycleType" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.motorcycleType" placeholder="请输入车型及牌号"/>
+            </uni-forms-item>
+            <!-- 输入毕业院校 graduateIns-->
+            <uni-forms-item label="毕业院校" name="graduateIns" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.graduateIns" placeholder="请输入毕业院校"/>
+            </uni-forms-item>
+            <!-- 输入人脉关系 interpersonal-->
+            <uni-forms-item label="人脉关系" name="interpersonal" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.interpersonal" placeholder="请输入人脉关系"/>
+            </uni-forms-item>
+            <!-- 输入支持程度 support-->
+            <uni-forms-item label="支持程度" name="support" class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleSupportChange" :value="supportIndex" :range="supportLevelList"
+                        :range-key="'name'"> <!--选择支持程度 索引：index6 ，范围：palceArray6，响应：handlePlace7-->
+                  <view class="flex">
+                    {{ formData.support ? formData.support : '请选择' }} <!-- 支持：support -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 选择工作状态 workingStatus-->
+            <uni-forms-item label="工作状态" name="workingStatus" class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleWorkingStatusChange" :value="workingStatusIndex" :range="workingStatusList"
+                        :range-key="'name'"> <!--选择支持程度 索引：index7 ，范围：palceArray7，响应：handlePlace8-->
+                  <view class="flex">
+                    {{ formData.workingStatus ? formData.workingStatus : '请选择' }} <!-- 工作：workingStatus -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入备注 -->
+            <uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+                             class="form-texarea"/>
+            </uni-forms-item>
+
+            <view style="padding-bottom: 30rpx; font-size: 12px; color: gray; text-align: center;">*★,°*:.☆(￣▽￣)/$:*.°★*
+              。<br>恭喜你完成了信息填写，赶快提交吧！
+            </view>
+            <view style="padding-bottom: 80rpx;">
+              <button type="primary" @click="submitForm">保存</button>
+            </view>
+          </uni-forms>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref, reactive} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import multipleSelect from '@/components/multipleSelect.vue'
+import {
+  developList,
+  functionalRequirementList,
+  genderList,
+  hierarchyNeedsList, hobbyList,
+  salesmanThinkLevelList, supportLevelList,
+  userTypeList, workingStatusList
+} from "./dataMap";
+import city from "@/utils/area";
+import {getCustomerLevel, saveappCrmCusUserNew} from "@/api/crm/customer/getCustomer";
+// 对 multipleSelect 组件的引用
+const hobbySelectRef = ref(null);
+// 表单引用
+const formRef = ref({});
+// 表单数据
+const formData = ref({
+  //部门
+  userDept: null,
+  //客户ID
+  cusId: null,
+  //客户人员名称
+  customerUserName: null,
+  userName: null,
+
+  //等级（K）
+  userType: null,
+  //手机号
+  iphone: null,
+  mobilePhone: null,
+  //客户姓名
+  cusName: null,
+  //系统中公司等级
+  cusEstate: null,
+  //工作手机号
+  jobTelphone: null,
+  //职能
+  functionalRequirements: '',
+  //职务
+  job: null,
+  //专业产品
+  majorProduct: null,
+  //产品需求
+  product: null,
+  //办公场地
+  officeSite: null,
+  //性别
+  sex: '男',
+  //任职时间
+  tenureTime: null,
+  //需求层次
+  hierarchyNeeds: null,
+  //职务变化
+  jobChange: null,
+  //发展潜能
+  develop: null,
+  //生日
+  birthday: null,
+  //爱好
+  hobby: null,
+  //禁忌
+  taboo: null,
+  //籍贯
+  nativec: null,
+  //家庭情况
+  familyStatus: null,
+  //婚姻状况
+  maritalStatus: null,
+  //车辆及牌号
+  motorcycleType: null,
+  //毕业院校
+  graduateIns: null,
+  //家庭住址
+  homeAddress: null,
+  //人脉关系
+  interpersonal: null,
+  //支持程度
+  support: null,
+  //工作状态
+  workingStatus: null,
+  //备注
+  remark: null,
+  //业务员认为的等级
+  salesmanThinkLevel: null,
+  //系统认为的等级
+  systemThinkLevel: null,
+  //职能
+  function: null,
+});
+
+// 客户人员信息
+const customerUser = ref({
+  cusName: null,
+  sysThinkLevel: null
+});
+
+// 表单校验规则
+let rules;
+// 初始化校验规则
+(function bindRules() {
+  rules = reactive({
+    cusName: {rules: [{required: true, errorMessage: '客户名称不能为空', trigger: 'blur'}]},
+    customerUserName: {rules: [{required: true, errorMessage: '人员名称不能为空', trigger: 'blur'}]},
+    iphone: {
+      rules: [{
+        required: true,
+        errorMessage: '请填写手机号码',
+      }, {
+        validateFunction: function (rule, value, data, callback) {
+          let iphoneReg = (
+              /^(13[0-9]|14[1579]|15[0-3,5-9]|16[6]|17[0123456789]|18[0-9]|19[89])\d{8}$/
+          ); //手机号码
+          if (!iphoneReg.test(value)) {
+            callback('手机号码格式不正确，请重新填写')
+          }
+        }
+      }]
+    },
+    userDept: {rules: [{required: true, errorMessage: '所属部门不能为空', trigger: 'blur'}]},
+    functionalRequirements: {rules: [{required: true, errorMessage: '职能不能为空', trigger: 'blur'}]},
+    salesmanThinkLevel: {rules: [{required: true, errorMessage: '手填等级不能为空', trigger: 'blur'}]},
+    job: {rules: [{required: true, errorMessage: '职务不能为空', trigger: 'blur'}]},
+    officeSite: {rules: [{required: true, errorMessage: '办公场地不能为空', trigger: 'blur'}]},
+    sex: {rules: [{required: true, errorMessage: '性别不能为空', trigger: 'blur'}]},
+  });
+  console.log(rules, "校验规则");
+})();
+
+// 选择客户人员
+let handleCustomerClick = () => {
+  // 在起始页面跳转到test.vue页面，并监听test.vue发送过来的事件数据
+  uni.navigateTo({
+    url: '/pages/business/CRM/customer/selectCustomer',
+    events: {
+      // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
+      cuSelected(data) {
+        console.log(data, "获取到返回的数据")
+        let {
+          cusName, // 公司名称
+          cusEstate, // 等级
+          cusId,
+        } = data;
+        customerUser.value.cusName = cusName;
+        if (!cusEstate) customerUser.value.sysThinkLevel = "该客户暂无等级信息，无法进行系统推荐"
+        formData.value.cusEstate = cusEstate;
+        formData.value.cusName = cusName;
+        formData.value.cusId = cusId;
+        getRecommendLevel();
+      }
+    },
+    success: function (res) {
+      // 通过eventChannel向被打开页面传送数据
+      res.eventChannel.emit('requestCusList', {data: {cusName: customerUser.value.cusName}})
+    }
+  })
+
+}
+
+// 选择职能
+let handleFunctionChange = (e) => {
+  console.log(e.detail.value, '职能索引');
+  const {name} = functionalRequirementList[e.detail.value];
+  formData.value.functionalRequirements = name;
+  formData.value.function = name;
+  getRecommendLevel();
+}
+
+// 选择等级
+let handleThinkLevelChange = (e) => {
+  console.log(e.detail.value, '人员等级');
+  const {name} = salesmanThinkLevelList[e.detail.value];
+  formData.value.salesmanThinkLevel = name;
+}
+// 系统推荐等级
+let recommendLevel = ref("");
+let getRecommendLevel = async () => {
+  if (formData.value.cusEstate) {
+    let {cusEstate, functionalRequirements} = formData.value;
+    let param = {cusEstate, functionalRequirements};
+    if (formData.value.salesmanThinkLevel) {
+      param.personnelLevel = formData.value.salesmanThinkLevel;
+    }
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
+      console.error(err, "客户的系统推荐等级获取失败")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
+    }
+  } else {
+    recommendLevel.value = "无公司等级信息，无法推荐等级";
+  }
+};
+
+// 性别索引
+let genderIndex = ref(0);
+// 选择性别
+let handleGenderChange = (e) => {
+  const {value} = e.detail;
+  console.log(e.detail.value);
+  const {name} = genderList[value];
+  genderIndex.value = value;
+  formData.value.sex = name;
+}
+
+// 人员等级索引
+let userTypeIndex = ref(0);
+// 选择人员等级
+let handleUserTypeChange = (e) => {
+  let {value} = e.detail;
+  userTypeIndex.value = value;
+  const {name} = userTypeList[value];
+  formData.value.userType = name;
+}
+
+// 选择日期
+function handleTenureTimeChange(val) {
+  console.log(val)
+  formData.value.tenureTime = val;
+}
+
+// 需求层次索引
+let hierarchyNeedsIndex = ref(0);
+// 选择需求层次
+let handleHierarchyNeedsChange = e => {
+  let {value} = e.detail;
+  const {name} = hierarchyNeedsList[value];
+  hierarchyNeedsIndex.value = value;
+  formData.value.hierarchyNeeds = name;
+}
+// 发展潜能索引
+let developIndex = ref(0);
+// 选择发展潜能
+let handleDevelopChange = e => {
+  let {value} = e.detail;
+  developIndex.value = value;
+  formData.value.develop = developList[value].name;
+}
+
+// 选择生日
+function handleBirthdayChange(val) {
+  formData.value.birthday = val;
+}
+
+// 爱好标签索引
+let hobbyIds = ref([]);
+let hobbies = ref([]);
+// 选择爱好标签
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  hobbyIds.value = [];
+  hobbies.value = items;
+};
+
+// 选择
+const handleNativeChange = (e) => {
+  formData.value.nativec = (e.detail.value.map(item => {
+    return item.text;
+  }).join("-"))
+}
+// 支持程度索引
+let supportIndex = ref(0);
+// 选择支持程度
+let handleSupportChange = e => {
+  let {value} = e.detail;
+  supportIndex.value = value;
+  formData.value.support = supportLevelList[value].name;
+}
+// 工作状态索引
+let workingStatusIndex = ref(0);
+let handleWorkingStatusChange = e => {
+  let {value} = e.detail;
+  workingStatusIndex.value = 0;
+  formData.value.workingStatus = workingStatusList[value].name;
+}
+// 多选组件失去焦点关闭
+let handleBlur = () => {
+  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
+}
+// 提取爱好标签处理逻辑
+const processHobbyTags = () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
+    return name;
+  })
+  const hobbyTagString = hobbyTags.join('，');
+  console.log(hobbyTagString);
+  if (hobbyTagString || formData.value.hobby) {
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+};
+
+// 提取表单验证逻辑
+const validateForm = async () => {
+  formData.value.cusName = customerUser.value.cusName;
+  await formRef.value.validate();
+  console.log(formData.value, "提交表单数据");
+};
+
+// 提取API调用逻辑
+const saveCustomerUser = async () => {
+  uni.showLoading();
+  try {
+    const res = await saveappCrmCusUserNew(formData.value);
+    if(res.code === 200){
+      uni.showToast({
+        title: "保存成功"
+      });
+    } else {
+      uni.showToast({
+        title: "操作失败",
+        icon: "error"
+      });
+    }
+    setTimeout(() => uni.navigateBack(), 1500);
+  } catch(err) {
+    uni.showToast({
+      icon: 'none',
+      title: "保存失败"
+    });
+  }
+  finally{
+    uni.hideLoading()
+  }
+};
+
+// 简化后的 submitForm 方法
+let submitForm = async () => {
+  console.log(formData.value);
+  try {
+    if(formData.value.iphone){
+      formData.value.mobilePhone = formData.value.iphone;
+    }
+    // 处理爱好标签
+    processHobbyTags();
+
+    // 表单验证
+    await validateForm();
+
+    // 保存客户人员信息
+    await saveCustomerUser();
+  } catch (err) {
+    uni.showToast({
+      icon: 'none',
+      title: '请检查并完善信息'
+    });
+    console.warn(err);
+  }
+};
+
+/*let submitForm = async () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
+    return name;
+  })
+  const hobbyTagString = hobbyTags.join('，');
+  console.log(hobbyTagString);
+  if (hobbyTagString || formData.value.hobby) {
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+  if(formData.value.iphone){
+    formData.value.mobilePhone = formData.value.iphone;
+  }
+  // console.log(formData.value, "校验表单数据")
+  // console.log(recommendLevel);
+  formData.value.cusName = customerUser.value.cusName;
+  try {
+    await formRef.value.validate()
+    console.log(formData.value, "提交表单数据")
+    // 请求保存
+    uni.showLoading()
+    saveappCrmCusUserNew(formData.value).then(res => {
+      uni.hideLoading();
+      if (res.code === 200) {
+        uni.showToast({
+          title: "保存成功"
+        })
+      } else {
+        uni.showToast({
+          title: "操作失败"
+        })
+      }
+      setTimeout(() => uni.navigateBack(), 1500);
+    }).catch(() => {
+      uni.showToast({
+        icon: 'none',
+        title: "保存失败"
+      })
+    })
+    // 重置表单
+    // 清除校验
+
+  } catch (err) {
+    uni.showToast({
+      icon: 'none',
+      title: '请检查并完善信息'
+    })
+    console.warn(err);
+  }
+}*/
+
+
+</script>
+
+<style lang="scss" scoped>
+:deep(.uni-easyinput__content.is-input-border) {
+  overflow: hidden;
+}
+
+:deep(.uni-easyinput__content.is-input-border.is-disabled) {
+  border: none;
+}
+
+:deep(.uni-easyinput__content.is-input-border.is-disabled .uni-easyinput__content-input) {
+  background-color: #f0f0f0 !important;
+}
+
+:deep(.is-disabled .uni-easyinput__placeholder-class) {
+  color: #999;
+}
+
+:deep(.uni-select-dc-select .uni-select-multiple) {
+  overflow: auto;
+}
+
+.form-picker {
+  padding: 15rpx;
+  font-size: 12px;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+  font-size: 12px;
+}
+
+.white-bg {
+  width: 750rpx;
+  padding: 30rpx 0 0;
+  margin-bottom: 0;
+  border-radius: 8px 8px 0 0;
+}
+
+.customer-name {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  flex-direction: row-reverse
+}
+
+:deep(.uni-date-x) {
+  display: block;
+}
+
+:deep(.uni-date-x .icon-calendar) {
+  float: right;
+  margin-top: 15rpx;
+  margin-right: 20rpx;
+  background: url('../../../../static/images/business/icon-date.png') no-repeat;
+  background-size: 32rpx 35rpx;
+  width: 32rpx;
+  height: 35rpx;
+}
+
+:deep(.uni-date-x .icon-calendar::before) {
+  display: none;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+  padding-left: 20rpx;
+  color: #919191;
+}
+</style>

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

@@ -0,0 +1,252 @@
+<!--
+ * @author wangzhuo
+ * @date 2025年8月20日
+ * @description 客户人员审核
+-->
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="false">
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view class="all-body">
+        <!-- 搜索-->
+        <view class="search">
+          <!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
+          <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
+          <!--                          v-model="searchValue"-->
+          <!--          />-->
+          <view class="custom-search"></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}"
+        >
+          <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">
+                {{ item.cusName }}
+                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">
+                  {{ item.auditStatus ? '' : '待您审批' }}
+                </view>
+              </view>
+              <view class="r-list">
+                <view class="r-left">客户人员名称</view>
+                <view class="r-right">{{ item.userName }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">目前业务员</view>
+                <view class="r-right">{{ item.belonger }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">创建时间</view>
+                <view class="r-right">{{ item.createTime }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">职能</view>
+                <view class="r-right">{{ item.function }}</view>
+              </view>
+
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+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'
+import {getCusUserApprovalList} from "@/api/crm/customer/getCustomer"
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+// 搜索内容
+let searchValue = ref(null);
+// 分页
+const mescrollRef = ref(null);
+// 防抖计时
+let timerId = null;
+// 查询搜索跳转
+let handleSearch = () => {
+  // 防抖搜索    console.log(searchValue.value)
+  if (timerId) clearTimeout(timerId);
+  timerId = setTimeout(async () => {
+    // let res = await getList(1, upOption.value.page.size)
+    await downCallback(mescrollRef.value.mescroll);
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500)
+}
+
+watch(searchValue, (newValue, oldValue) => {
+  handleSearch()
+})
+let clearSearchValue = () => {
+  searchValue.value = '';
+}
+// 查询列表
+let list = ref([]);
+
+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: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+
+  uni.showLoading();
+  cssFlag.value = true;
+  setTimeout(async () => {
+    try {
+      // 重置页码为第一页
+      const res = await getList(1, mescroll.size || upOption.page.size);
+
+      list.value = res.list;
+      // 正确传递 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);
+
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+
+  setTimeout(async () => {
+    try {
+      // 使用 mescroll 提供的页码和大小参数
+      const res = await getList(mescroll.num, mescroll.size);
+      if (mescroll.num === 1) {
+        list.value = res.list;
+      } else {
+        list.value.push(...res.list);
+      }
+      mescroll.endBySize(res.list.length, res.total);
+      // 正确判断是否还有更多数据
+      mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
+    } catch (error) {
+      mescroll.endErr();
+    }
+  }, 500);
+
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum: pageIndex,
+      pageSize,
+      searchContent: searchValue.value
+    }
+    try {
+      let res = await getCusUserApprovalList(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, "客户人员审核任务列表获取失败");
+    } finally {
+      uni.hideLoading();
+    }
+  });
+}
+
+// 跳转到详情
+let handleDetail = (item) => {
+  const {userId} = item;
+  uni.navigateTo({
+    url: "/pages/business/CRM/customer/components/confirmForm",
+    events: {
+      refreshUserAuditList() {
+        handleSearch();
+      }
+    },
+    success(res) {
+      res.eventChannel.emit('auditCusUser', {data: {userId}, editable: false})
+    }
+  })
+}
+
+</script>
+
+<style scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
+  /* #endif */
+}
+
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  padding-bottom: 10rpx;
+
+  .title {
+    align-items: flex-start;
+  }
+}
+
+.btn-pink {
+  white-space: nowrap;
+}
+</style>

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

@@ -0,0 +1,351 @@
+<!--
+  * @author wangzhuo
+  * @date 2025年8月18日
+  * @description 客户人员所属
+-->
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <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"
+                          @clear="clearSearchValue"
+                          v-model="searchValue"
+          />
+        </view>
+
+        <!-- 分页部分  -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{'loading-scroll':cssFlag}"
+        >
+          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+                @click.stop="handleDetail(item)">
+            <view class="report-list">
+              <view class="w-b-title title" @touchstart="handleTouchStart(item)"
+                    @touchend="handleTouchEnd">
+                {{ item.cusName }}
+                <view v-if="item.nodeCode" class="r-right btn-edit" :class="statusColorMap[item.nodeCode]">
+                  {{ item.nodeCode }}
+                </view><!---->
+              </view>
+              <view class="r-list">
+                <view class="r-left">客户人员名称</view>
+                <view class="r-right">{{ item.userName }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">客户等级</view>
+                <view class="r-right">{{ item.cusEstate }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">职能</view>
+                <view class="r-right">{{ item.function }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">创建时间</view>
+                <view class="r-right">{{ item.createTime }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">业务员认定等级</view>
+                <view class="r-right">{{ item.salesmanThinkLevel }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">系统认定等级</view>
+                <view class="r-right">{{ item.systemThinkLevel }}</view>
+              </view>
+              <view v-if="item.opinion" class="border-bottom"></view>
+
+              <view v-if="item.opinion" class="r-list">
+                <view class="r-left">驳回原因</view>
+                <view class="r-right">{{ item.opinion }}</view>
+              </view>
+
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+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 {SearchForAllCustomersSalesperson} from "@/api/crm/customer/getCustomer"
+import {statusColorMap} from "./dataMap";
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+// 搜索内容
+let searchValue = ref(null);
+// 分页
+const mescrollRef = ref(null);
+// 防抖计时
+let timerId = null;
+// 查询搜索跳转
+let handleSearch = () => {
+  console.log(searchValue.value)
+  if (timerId) clearTimeout(timerId);
+
+  timerId = setTimeout(async () => {
+    // let res = await getList(1, upOption.value.page.size)
+    await downCallback(mescrollRef.value.mescroll);
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500)
+}
+
+watch(searchValue, (newValue, oldValue) => {
+  handleSearch()
+})
+let clearSearchValue = () => {
+  searchValue.value = '';
+}
+// 查询列表
+let list = ref([]);
+
+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: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  cssFlag.value = true;
+  uni.showLoading();
+  setTimeout(async () => {
+    try {
+      // 重置页码为第一页
+      const res = await getList(1, mescroll.size || upOption.page.size);
+      list.value = res.list;
+      // 正确传递 total 参数
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+    } catch (error) {
+      mescroll.endErr();
+    } finally {
+      cssFlag.value = false;
+    }
+  }, 500);
+
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  setTimeout(async () => {
+    try {
+      // 使用 mescroll 提供的页码和大小参数
+      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.total >= mescroll.size);
+      // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
+    } catch (error) {
+      mescroll.endErr();
+    }
+  }, 500);
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum: pageIndex,
+      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 handleDetail = (item) => {
+  if (item.nodeCode !== '完成') {
+    uni.navigateTo({
+      url: "/pages/business/CRM/customer/components/customerUserEdit",
+      events: {
+        refreshCusUserList() {
+          handleSearch();
+        }
+      },
+      success(res) {
+        res.eventChannel.emit('editCusData', {param: item, isAdd: false})
+      }
+    })
+  } else {
+    uni.showToast({
+      title: '已完成审核，不可修改',
+      icon: 'none'
+    })
+  }
+}
+
+// 长按定时器ID
+let touchTimerId = null;
+
+// 开始触摸
+let handleTouchStart = (item) => {
+  touchTimerId = setTimeout(() => {
+    // console.log(item, "长按客户人员项")
+    uni.showModal({
+      title: "提示",
+      content: "是否确认删除本条消息？",
+      success(res) {
+        if (res.confirm) {
+          handleDelete(item);
+        } else if (res.cancel) {
+
+        }
+      },
+
+    })
+    clearTimeout(touchTimerId);
+  }, 1500)
+}
+
+// 结束触摸
+let handleTouchEnd = () => {
+  if (touchTimerId !== null) {
+    clearTimeout(touchTimerId);
+  }
+}
+
+// 删除消息
+let handleDelete = async (item) => {
+  // console.log(item)
+  const visitId = item.visitId;
+  // await removeVisit({visitId})
+  // uni.hideLoading();
+  uni.showToast({
+    title: visitId ? visitId : "没有visitId字段，无法删除",
+    icon: 'none'
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  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: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  padding-bottom: 10rpx;
+
+  .w-b-title {
+    align-items: flex-start;
+  }
+}
+
+.btn-edit {
+  white-space: nowrap;
+
+  &.wancheng-deal {
+    border: solid 1rpx #00aa7f;
+    background-color: #00aa7f;
+  }
+
+  &.daishenhe-un-deal {
+    border: solid 1rpx #ffaa7f;
+    background-color: #ffaa7f;
+  }
+
+  &.chaoqi-deal {
+    border: 1rpx solid #ff0000;
+    background-color: #ff0000;
+  }
+
+  &.tijiao-deal {
+    border: 1rpx solid #00aaff;
+    background-color: #00aaff;
+  }
+}
+</style>

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

@@ -0,0 +1,126 @@
+/**
+ * 职能选项列表
+ * @type {[{id: number, name: string}]}
+ */
+export const functionalRequirementList = [
+    {id: 1, name: '客户一把手'},
+    {id: 2, name: '主管科研的高层领导'},
+    {id: 3, name: '主管物资的高层领导'},
+    {id: 4, name: '主管技术的重点型号两总'},
+    {id: 5, name: '物资部门一把手'},
+    {id: 6, name: '主管技术的型号两总'},
+    {id: 7, name: '主管技术的中层领导'},
+    {id: 8, name: '主管物资的中层领导'},
+    {id: 9, name: '设计组长'},
+    {id: 10, name: '重点设计师'},
+    {id: 11, name: '采购组长'},
+    {id: 12, name: '采购员'},
+    {id: 13, name: '质量部门和其他相关部门中层领导'},
+    {id: 14, name: '基层设计人员'},
+    {id: 15, name: '其他相关人员'}
+]
+/**
+ * 等级选项列表
+ */
+export const salesmanThinkLevelList = [
+    {id: 1, name: 'Y1(D)', value: 'A'},
+    {id: 2, name: 'Y2(C)', value: 'B'},
+    {id: 3, name: 'Y3(B)', value: 'C'},
+    {id: 4, name: 'Y4(A)', value: 'D'}
+]
+/**
+ * 性别选项列表
+ */
+export const genderList = [
+    {id: 1, name: '男'},
+    {id: 2, name: '女'}
+]
+/**
+ * 人员等级选项列表
+ */
+export const userTypeList = [
+    {id: 1, name: 'YA'},
+    {id: 2, name: 'NA'},
+    {id: 3, name: 'YB-'},
+    {id: 4, name: 'YB'},
+    {id: 5, name: 'YB+'},
+    {id: 6, name: 'NB'},
+    {id: 7, name: 'YC'},
+    {id: 8, name: 'YC+'},
+    {id: 9, name: 'NC'},
+    {id: 10, name: 'YD'},
+    {id: 11, name: 'ND'}
+]
+/**
+ * 需求层次列表
+ */
+export const hierarchyNeedsList = [
+    {id: 1, name: '生理'},
+    {id: 2, name: '安全'},
+    {id: 3, name: '归属'},
+    {id: 4, name: '尊重'},
+    {id: 5, name: '自我实现'}
+]
+/**
+ * 发展潜力列表
+ */
+export const developList = [
+    {id: 1, name: '上行'},
+    {id: 2, name: '平行'},
+    {id: 3, name: '下行'}
+]
+/**
+ * 爱好标签列表
+ */
+export const hobbyList = [
+    {id: '1', value: 1, name: '游戏'},
+    {id: '2', value: 2, name: '羽毛球'},
+    {id: '3', value: 3, name: '篮球'},
+    {id: '4', value: 4, name: '足球'},
+    {id: '5', value: 5, name: '打牌'},
+    {id: '6', value: 6, name: '唱歌'},
+    {id: '7', value: 7, name: '钓鱼'},
+    {id: '8', value: 8, name: '跑步'},
+    {id: '9', value: 9, name: '滑雪'},
+    {id: '11', value: 11, name: '旅游'},
+    {id: '12', value: 12, name: '读书'},
+    {id: '13', value: 13, name: '摩托'},
+    {id: '14', value: 14, name: '汽车'},
+    {id: '15', value: 15, name: '军事'},
+    {id: '16', value: 16, name: '美食'},
+    {id: '17', value: 17, name: '文玩'},
+    {id: '18', value: 18, name: '其他'}
+]
+/**
+ * 支持程度列表
+ */
+export const supportLevelList = [
+    {id: 1, name: '+5:热情拥护'},
+    {id: 2, name: '+4:大力支持'},
+    {id: 3, name: '+3:支持'},
+    {id: 4, name: '+2:感兴趣'},
+    {id: 5, name: '+1:认知相同'},
+    {id: 10, name: '-1:不会拒绝'},
+    {id: 9, name: '-2:不感兴趣'},
+    {id: 8, name: '-3:负面评价'},
+    {id: 7, name: '-4:抗拒建议'},
+    {id: 6, name: '-5:支持对手'}
+]
+/**
+ * 工作状态列表
+ */
+export const workingStatusList = [
+    {id: 1, name: '正常上班'},
+    {id: 2, name: '离职'},
+    {id: 3, name: '退休'}
+]
+/**
+ * 人员所属审核状态字典
+ */
+export const statusColorMap = {
+    '提交': 'tijiao-deal',
+    '驳回': 'chaoqi-deal',
+    '超期': 'chaoqi-deal',
+    '完成': 'wancheng-deal',
+    '待审核': 'daishenhe-un-deal'
+}

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

@@ -0,0 +1,255 @@
+<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) => {
+  let {value} = e.detail; // index
+  // console.log(value);
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.emit('cuSelected', list.value[value]);
+  uni.navigateBack()
+}
+
+</script>
+
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  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: 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>

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/mainOwner/audit/confirmForm.vue

@@ -0,0 +1,755 @@
+<!--
+ * @author wangzhuo
+ * @date 2025年8月19日
+ * @description 提交审批意见
+-->
+<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="form-con">
+          <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="40%">
+            <!-- 选择客户 -->
+            <uni-forms-item label="客户名称" name="cusName" required class="f-c-right">
+              <view class="customer-name" ><!--@click="handleCustomerClick"-->
+                <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+                <text> {{ customerUser.cusName || '查询客户名称' }}</text>
+              </view>
+            </uni-forms-item>
+            <!-- 系统推荐等级 -->
+            <uni-forms-item label="系统公司等级" name="cusEstate" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.cusEstate"
+                             :placeholder="customerUser.sysThinkLevel?customerUser.sysThinkLevel:'默认显示公司等级'"
+                             disabled/>
+            </uni-forms-item>
+            <!-- 输入人员名称 -->
+            <uni-forms-item label="人员姓名" name="userName" required
+                            class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.userName" placeholder="请输入姓名" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 选择人员等级 -->
+            <uni-forms-item label="人员等级(K)" name="userType"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleUserTypeChange" :value="userTypeIndex" :range="userTypeList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择等级 索引：index5 ，范围：palceArray3，响应：handlePlace6-->
+                  <view class="flex">
+                    {{ formData.userType ? formData.userType : '请选择' }} <!-- 等级：userType -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入人员工作电话 -->
+            <uni-forms-item label="工作电话" name="jobTelphone" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.jobTelphone" placeholder="请输入工作电话" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入人员手机号 -->
+            <uni-forms-item v-if="formData.mobilePhone" label="人员手机号" name="mobilePhone" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.mobilePhone" placeholder="请输入手机号" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入人员部门 -->
+            <uni-forms-item label="部门" name="userDept" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.userDept" placeholder="请输入所属部门" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 选择职能 -->
+            <uni-forms-item label="职能" name="functionalRequirements" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleFunctionChange" :range="functionalRequirementList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择职能 索引： :value="functionIndex" index1 响应：handlePlace1 -->
+                  <view class="flex">
+                    {{ formData.functionalRequirements ? formData.functionalRequirements : '请选择' }}
+                    <!-- 职能：functionalRequirements -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 系统推荐等级 -->
+            <uni-forms-item label="系统推荐等级" name="systemThinkLevel" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.systemThinkLevel" :placeholder="recommendLevel || '默认显示系统推荐等级'"
+                             disabled/>
+            </uni-forms-item>
+            <!-- 业务员选择人员等级 -->
+            <uni-forms-item label="业务人员填写等级" name="salesmanThinkLevel" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleThinkLevelChange" :range="salesmanThinkLevelList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择推荐等级 索引:value="thinkLevelIndex" index8 响应：handlePlace9 -->
+                  <view class="flex">
+                    {{ formData.salesmanThinkLevel ? formData.salesmanThinkLevel : '请选择' }}
+                    <!-- 思考人员等级：salesmanThinkLevel-->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+
+            <!-- 输入人员职务 -->
+            <uni-forms-item label="职务" name="job" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.job" placeholder="请输入职务" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入专业产品 majorProduct-->
+            <uni-forms-item label="专业产品" name="majorProduct" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.majorProduct" placeholder="请输入专业产品" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入产品需求 product-->
+            <uni-forms-item label="产品需求" name="product" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.product" placeholder="请输入产品需求" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入办公场地 -->
+            <uni-forms-item label="办公场地" name="officeSite" required class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.officeSite" placeholder="请输入办公场地" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入性别 -->
+            <uni-forms-item label="性别" name="sex" required
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleGenderChange" :value="genderIndex" :range="genderList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择性别 索引：index2 ，范围：palceArray2，响应：handlePlace2-->
+                  <view class="flex">
+                    {{ formData.sex ? formData.sex : '请选择' }} <!--  性别：sex -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+
+            <!-- 选择任职时间 tenureTime-->
+            <uni-forms-item label="任职日期" name="tenureTime" class="uni-forms-item is-direction-top is-top">
+              <uni-datetime-picker type="date" :clear-icon="false" v-model="formData.tenureTime"
+                                   @change="handleTenureTimeChange" :disabled="!editable"/> <!-- 响应：orderDateChange-->
+            </uni-forms-item>
+            <!-- 输入需求层次 hierarchyNeeds-->
+            <uni-forms-item label="需求层次" name="hierarchyNeeds"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleHierarchyNeedsChange" :value="hierarchyNeedsIndex" :range="hierarchyNeedsList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择层次 索引：index4 ，范围：palceArray5，响应：handlePlace5-->
+                  <view class="flex">
+                    {{ formData.hierarchyNeeds ? formData.hierarchyNeeds : '请选择' }} <!-- 层次：hierarchyNeeds -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入职务变化 jobChange-->
+            <uni-forms-item label="职务变化" name="jobChange" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.jobChange" placeholder="请输入职务变化" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 选择发展潜能 develop-->
+            <uni-forms-item label="发展潜能" name="develop"
+                            class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleDevelopChange" :value="developIndex" :range="developList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择潜力 索引：index3 ，范围：handlePlace4，响应：handlePlace5-->
+                  <view class="flex">
+                    {{ formData.develop ? formData.develop : '请选择' }} <!--  潜能：develop -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入生日 -->
+            <uni-forms-item label="生日" name="birthday" class="uni-forms-item is-direction-top is-top">
+              <uni-datetime-picker type="date" :clear-icon="false" v-model="formData.birthday"
+                                   @change="handleBirthdayChange" :disabled="!editable"/> <!-- 响应：birthdayChange-->
+            </uni-forms-item>
+            <!-- 输入爱好 -->
+            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
+              <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
+              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" :disabled="!editable"/>
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @change="handleHobbyChange" :slabel="'name'"
+
+              ></multipleSelect><!--placeholder="请选择爱好标签"-->
+            </uni-forms-item>
+
+            <!--            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">-->
+            <!--              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" @click="chooseHobby"/>-->
+            <!-- chooseHobby选择标签 -->
+            <!--            </uni-forms-item>-->
+            <!-- 输入禁忌 taboo-->
+            <uni-forms-item label="禁忌" name="taboo" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.taboo" placeholder="请输入禁忌" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入籍贯 nativec-->
+            <uni-forms-item label="籍贯" name="nativec" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.nativec" placeholder="请输入或选择籍贯" :disabled="!editable"/>
+              <uni-data-picker placeholder="请选择" :localdata="city"
+                               :clear-icon="false"
+                               :map="{text:'label',value:'value'}"
+                               @change="handleNativeChange" :readonly="!editable">
+
+              </uni-data-picker>
+              <!--              {{formData.nativec? formData.nativec:'请选择'}}--><!-- 响应：address-->
+            </uni-forms-item>
+            <!-- 输入家庭住址 homeAddress-->
+            <uni-forms-item label="家庭住址" name="homeAddress" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.homeAddress" placeholder="请输入家庭住址" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入家庭情况 familyStatus-->
+            <uni-forms-item label="家庭情况" name="familyStatus" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.familyStatus" placeholder="请输入家庭情况" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入婚姻状况 maritalStatus-->
+            <uni-forms-item label="婚姻状况" name="maritalStatus" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.maritalStatus" placeholder="请输入婚姻状况" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入车型及牌号 motorcycleType-->
+            <uni-forms-item label="车型及牌号" name="motorcycleType" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.motorcycleType" placeholder="请输入车型及牌号" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入毕业院校 graduateIns-->
+            <uni-forms-item label="毕业院校" name="graduateIns" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.graduateIns" placeholder="请输入毕业院校" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入人脉关系 interpersonal-->
+            <uni-forms-item label="人脉关系" name="interpersonal" class="uni-forms-item is-direction-top is-top">
+              <uni-easyinput v-model="formData.interpersonal" placeholder="请输入人脉关系" :disabled="!editable"/>
+            </uni-forms-item>
+            <!-- 输入支持程度 support-->
+            <uni-forms-item label="支持程度" name="support" class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleSupportChange" :value="supportIndex" :range="supportLevelList" :disabled="!editable"
+                        :range-key="'name'"> <!--选择支持程度 索引：index6 ，范围：palceArray6，响应：handlePlace7-->
+                  <view class="flex">
+                    {{ formData.support ? formData.support : '请选择' }} <!-- 支持：support -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 选择工作状态 workingStatus-->
+            <uni-forms-item label="工作状态" name="workingStatus" class="uni-forms-item is-direction-top is-top">
+              <view class="form-picker">
+                <picker @change="handleWorkingStatusChange" :value="workingStatusIndex" :range="workingStatusList"
+                        :range-key="'name'" :disabled="!editable"> <!--选择支持程度 索引：index7 ，范围：palceArray7，响应：handlePlace8-->
+                  <view class="flex">
+                    {{ formData.workingStatus ? formData.workingStatus : '请选择' }} <!-- 工作：workingStatus -->
+                    <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
+                  </view>
+                </picker>
+              </view>
+            </uni-forms-item>
+            <!-- 输入备注 -->
+            <uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top" style="padding-bottom: 220rpx;">
+              <uni-easyinput type="textarea" autoHeight v-model="formData.reasonForChange" placeholder="请输入备注"
+                             class="form-texarea" :disabled="!editable"/>
+            </uni-forms-item>
+
+            <view v-if="formData.userId" class="fab">
+              <button class="mini-btn btn" type="warn" @click="handleReject">✘ 驳回</button>
+              <button class="mini-btn btn" type="primary"  @click="handleApprove">✔ 通过</button>
+            </view>
+          </uni-forms>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref, reactive, getCurrentInstance} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import multipleSelect from '@/components/multipleSelect.vue'
+import {
+  developList,
+  functionalRequirementList,
+  genderList,
+  hierarchyNeedsList, hobbyList,
+  salesmanThinkLevelList, supportLevelList,
+  userTypeList, workingStatusList
+} from "../../customer/dataMap";
+import city from "@/utils/area";
+import {getCustomerLevel, getCusUserApprovalListDetail} from "@/api/crm/customer/getCustomer";
+import {changeOfPrimaryOwnershipNoApproved, changeOfPrimaryOwnershipApproved} from "@/api/crm/mainOwner/mainOwner";
+import {onLoad} from "@dcloudio/uni-app";
+// 表单引用
+const formRef = ref({});
+// 表单数据
+const formData = ref({
+  // 客户人员的ID
+  userId: null,
+  //部门
+  userDept: null,
+  //客户（公司）ID
+  cusId: null,
+  //客户人员名称
+  customerUserName: null,
+  userName: null,
+
+  //等级（K）
+  userType: null,
+  //手机号
+  iphone: null,
+  mobilePhone: null,
+  //客户姓名
+  cusName: null,
+  //系统中公司等级
+  cusEstate: null,
+  //工作手机号
+  jobTelphone: null,
+  //职能
+  functionalRequirements: '',
+  //职务
+  job: null,
+  //专业产品
+  majorProduct: null,
+  //产品需求
+  product: null,
+  //办公场地
+  officeSite: null,
+  //性别
+  sex: '男',
+  //任职时间
+  tenureTime: null,
+  //需求层次
+  hierarchyNeeds: null,
+  //职务变化
+  jobChange: null,
+  //发展潜能
+  develop: null,
+  //生日
+  birthday: null,
+  //爱好
+  hobby: null,
+  //禁忌
+  taboo: null,
+  //籍贯
+  nativec: null,
+  //家庭情况
+  familyStatus: null,
+  //婚姻状况
+  maritalStatus: null,
+  //车辆及牌号
+  motorcycleType: null,
+  //毕业院校
+  graduateIns: null,
+  //家庭住址
+  homeAddress: null,
+  //人脉关系
+  interpersonal: null,
+  //支持程度
+  support: null,
+  //工作状态
+  workingStatus: null,
+  //备注
+  remark: null,
+  //业务员认为的等级
+  salesmanThinkLevel: null,
+  //系统认为的等级
+  systemThinkLevel: null,
+  //职能
+  function: null,
+});
+
+// 客户人员信息
+const customerUser = ref({
+  cusName: null,
+  sysThinkLevel: null
+});
+
+// 表单校验规则
+let rules;
+// 初始化校验规则
+(function bindRules() {
+  rules = reactive({
+    cusName: {rules: [{required: true, errorMessage: '客户名称不能为空', trigger: 'blur'}]},
+    customerUserName: {rules: [{required: true, errorMessage: '人员名称不能为空', trigger: 'blur'}]},
+    iphone: {
+      rules: [{
+        required: true,
+        errorMessage: '请填写手机号码',
+      }, {
+        validateFunction: function (rule, value, data, callback) {
+          let iphoneReg = (
+              /^(13[0-9]|14[1579]|15[0-3,5-9]|16[6]|17[0123456789]|18[0-9]|19[89])\d{8}$/
+          ); //手机号码
+          if (!iphoneReg.test(value)) {
+            callback('手机号码格式不正确，请重新填写')
+          }
+        }
+      }]
+    },
+    userDept: {rules: [{required: true, errorMessage: '所属部门不能为空', trigger: 'blur'}]},
+    functionalRequirements: {rules: [{required: true, errorMessage: '职能不能为空', trigger: 'blur'}]},
+    salesmanThinkLevel: {rules: [{required: true, errorMessage: '手填等级不能为空', trigger: 'blur'}]},
+    job: {rules: [{required: true, errorMessage: '职务不能为空', trigger: 'blur'}]},
+    officeSite: {rules: [{required: true, errorMessage: '办公场地不能为空', trigger: 'blur'}]},
+    sex: {rules: [{required: true, errorMessage: '性别不能为空', trigger: 'blur'}]},
+  });
+  console.log(rules, "校验规则");
+})();
+const editable = ref(true);
+// getCurrentInstance().proxy
+let instance = null;
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('auditCusOwner', async (param) => {
+    editable.value = param.editable;
+    if(!param.editable){ // 只读模式
+      let {userId} = param.data;
+      console.log(param.data, "客户人员所属详情编辑页面读取到参数");
+      let res = await getCusUserApprovalListDetail({userId}).catch(err=>{
+        console.warn(err,'客户人员所属编辑信息获取失败');
+      })
+      const {rows} = res;
+      let source = rows[0];
+      const filteredData = Object.keys(source)
+          .filter(key => source[key] !== null && source[key] !== "null")
+          .reduce((obj, key) => {
+            obj[key] = source[key];
+            return obj;
+          }, {});
+      const {cusName} = source;
+      customerUser.value.cusName = cusName;
+      console.log(filteredData, "过滤空值属性")
+      if(rows.length) Object.assign(formData.value, filteredData); // 对表单赋值
+      formData.value.functionalRequirements = source.function; // 特殊处理
+    }
+  })
+})
+
+// 选择职能
+let handleFunctionChange = (e) => {
+  console.log(e.detail.value, '职能索引');
+  const {name} = functionalRequirementList[e.detail.value];
+  formData.value.functionalRequirements = name;
+  formData.value.function = name; // 职能需要特殊处理
+  getRecommendLevel();
+}
+
+// 选择等级
+let handleThinkLevelChange = (e) => {
+  console.log(e.detail.value, '人员等级');
+  const {name} = salesmanThinkLevelList[e.detail.value];
+  formData.value.salesmanThinkLevel = name;
+}
+// 系统推荐等级
+let recommendLevel = ref("");
+let getRecommendLevel = async () => {
+  if (formData.value.cusEstate) {
+    let {cusEstate, functionalRequirements} = formData.value;
+    let param = {cusEstate, functionalRequirements};
+    if (formData.value.salesmanThinkLevel) {
+      param.personnelLevel = formData.value.salesmanThinkLevel;
+    }
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
+      console.error(err, "客户的系统推荐等级获取失败")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
+    }
+  } else {
+    recommendLevel.value = "无公司等级信息，无法推荐等级";
+  }
+};
+
+// 性别索引
+let genderIndex = ref(0);
+// 选择性别
+let handleGenderChange = (e) => {
+  const {value} = e.detail;
+  console.log(e.detail.value);
+  const {name} = genderList[value];
+  genderIndex.value = value;
+  formData.value.sex = name;
+}
+
+// 人员等级索引
+let userTypeIndex = ref(0);
+// 选择人员等级
+let handleUserTypeChange = (e) => {
+  let {value} = e.detail;
+  userTypeIndex.value = value;
+  const {name} = userTypeList[value];
+  formData.value.userType = name;
+}
+
+// 选择日期
+function handleTenureTimeChange(e) {
+  formData.value.tenureTime = e;
+}
+
+// 需求层次索引
+let hierarchyNeedsIndex = ref(0);
+// 选择需求层次
+let handleHierarchyNeedsChange = e => {
+  let {value} = e.detail;
+  const {name} = hierarchyNeedsList[value];
+  hierarchyNeedsIndex.value = value;
+  formData.value.hierarchyNeeds = name;
+}
+// 发展潜能索引
+let developIndex = ref(0);
+// 选择发展潜能
+let handleDevelopChange = e => {
+  let {value} = e.detail;
+  developIndex.value = value;
+  formData.value.develop = developList[value].name;
+}
+
+// 选择生日
+function handleBirthdayChange(e) {
+  formData.value.birthday = e;
+}
+
+// 爱好标签索引
+let hobbyIds = ref([]);
+let hobbies = ref([]);
+// 选择爱好标签
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  hobbyIds.value = [];
+  hobbies.value = items;
+};
+
+// 选择
+const handleNativeChange = (e) => {
+  formData.value.nativec = (e.detail.value.map(item => {
+    return item.text;
+  }).join("-"))
+}
+// 支持程度索引
+let supportIndex = ref(0);
+// 选择支持程度
+let handleSupportChange = e => {
+  let {value} = e.detail;
+  supportIndex.value = value;
+  formData.value.support = supportLevelList[value].name;
+}
+// 工作状态索引
+let workingStatusIndex = ref(0);
+let handleWorkingStatusChange = e => {
+  let {value} = e.detail;
+  workingStatusIndex.value = 0;
+  formData.value.workingStatus = workingStatusList[value].name;
+}
+
+let submitForm = async () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
+    return name;
+  })
+  const hobbyTagString = hobbyTags.join('，');
+  console.log(hobbyTagString);
+  if (hobbyTagString || formData.value.hobby) {
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
+
+  // console.log(formData.value, "校验表单数据")
+  // console.log(recommendLevel);
+  formData.value.cusName = customerUser.value.cusName;
+  try {
+    await formRef.value.validate()
+    console.log(formData.value, "提交表单数据")
+    // 请求保存
+    uni.showLoading()
+    upadateappCrmCusUserNew(formData.value).then(res=>{
+      uni.hideLoading();
+      uni.showToast({
+        title: "更新成功"
+      })
+      setTimeout(()=>uni.navigateBack(), 1500);
+    }).catch(err=>{
+      uni.showToast({
+        icon: 'none',
+        title: "更新失败"
+      })
+    })
+    // 重置表单
+    // 清除校验
+
+  } catch (err) {
+    uni.showToast({
+      icon: 'none',
+      title: '请检查并完善信息'
+    })
+    console.warn(err);
+  }
+}
+
+
+let handleReject = () => {
+  uni.showModal({
+    title: '是否确认驳回？',
+    editable: true,
+    placeholderText: '请输入驳回原因',
+    async success(res){
+      if(res.confirm){
+        if(res.content){
+          let response = await changeOfPrimaryOwnershipNoApproved({
+            opinionOwn: res.content,
+            userId: formData.value.userId
+          })
+          if(response.code===200){
+            uni.showToast({
+              title: '操作成功',
+              success(){
+                const eventChannel = instance.getOpenerEventChannel();
+                eventChannel.emit('refreshOwnerChangeList')
+                setTimeout(()=>{
+                  uni.navigateBack()
+                },1000)
+              }
+            })
+          }else{
+            uni.showToast({
+              title: '操作失败',
+              icon: 'error'
+            })
+          }
+        }else{
+          uni.showToast({
+            title: '操作失败！驳回原因不能为空',
+            icon: 'none'
+          })
+        }
+      }
+    }
+  })
+}
+let handleApprove  = () => {
+  changeOfPrimaryOwnershipApproved({
+    userId: formData.value.userId
+  }).then(res=>{
+    if(res.code==200){
+      uni.showToast({
+        title: '操作成功',
+        success(){
+          setTimeout(()=>{
+            uni.navigateBack()
+            const eventChannel = instance.getOpenerEventChannel();
+            eventChannel.emit('refreshOwnerChangeList')
+          },1000)
+        }
+      })
+    }else{
+      uni.showToast({
+        title: '操作失败',
+        icon: 'error'
+      })
+    }
+  }).catch(err=>{
+    uni.showToast({
+      title: '操作失败',
+      icon: 'error'
+    })
+  })
+}
+
+</script>
+
+<style lang="scss" scoped>
+:deep(.uni-easyinput__content.is-input-border) {
+  overflow: hidden;
+}
+
+:deep(.uni-easyinput__content.is-input-border.is-disabled) {
+  border: none;
+}
+
+:deep(.uni-easyinput__content.is-input-border.is-disabled .uni-easyinput__content-input) {
+  background-color: #f0f0f0 !important;
+}
+
+:deep(.is-disabled .uni-easyinput__placeholder-class) {
+  color: #999;
+}
+
+:deep(.uni-select-dc-select .uni-select-multiple) {
+  overflow: auto;
+}
+
+.form-picker {
+  padding: 15rpx;
+  font-size: 12px;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+  font-size: 12px;
+}
+
+.white-bg {
+  width: 750rpx;
+  padding: 30rpx 0 0;
+  margin-bottom: 0;
+  border-radius: 8px 8px 0 0;
+}
+
+.customer-name {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  flex-direction: row-reverse
+}
+
+:deep(.uni-date-x) {
+  display: block;
+}
+
+:deep(.uni-date-x .icon-calendar) {
+  float: right;
+  margin-top: 15rpx;
+  margin-right: 20rpx;
+  background: url('../../../../../static/images/business/icon-date.png') no-repeat;
+  background-size: 32rpx 35rpx;
+  width: 32rpx;
+  height: 35rpx;
+}
+
+:deep(.uni-date-x .icon-calendar::before) {
+  display: none;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+  padding-left: 20rpx;
+  color: #919191;
+}
+.btn{
+  height: 100rpx;
+  width: 180rpx;
+  border-radius: 50rpx;
+  border: none;
+  line-height: 100rpx;
+  text-align: center;
+  font-size: 26rpx;
+}
+.fab{
+  padding-top: 10rpx;
+  padding-bottom: 100rpx;
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  width: 100vw;
+  left: 0;
+  background-color: rgba(255, 255, 255, 0.4);
+  backdrop-filter: blur(10px);
+  box-shadow: 0 0 60rpx rgba(255, 255, 255, 0.9);
+  z-index: 999;
+}
+</style>

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

@@ -0,0 +1,292 @@
+<!--
+ * @author wangzhuo
+ * @date 2025年8月19日
+ * @description 主归属人变更审核
+-->
+<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="all-body">
+        <!-- 搜索-->
+        <!--        <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="clearSearchValue" size="mini" class="btn-search">清空</button>-->
+        <!--        </view>-->
+
+        <!-- 分页部分  -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{'loading-scroll':cssFlag}"
+        >
+          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index">
+            <view class="report-list" @click.stop="handleDetail(item)">
+              <view class="r-list title">
+                {{ item.cusName }}
+                <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>
+                <view class="r-right">{{ item.userName }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">目前业务员</view>
+                <view class="r-right">{{ item.belonger }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">创建时间</view>
+                <view class="r-right">{{ item.createTime }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">职能</view>
+                <view class="r-right">{{ item.function }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list" style="font-weight: bold">
+                <view class="r-left">申请变更人姓名</view>
+                <view class="r-right">{{ item.applicantName }}</view>
+              </view>
+              <view class="border-bottom"></view>
+
+              <view class="r-list">
+                <view class="r-left">申请原因</view>
+                <view class="r-right">{{ item.reasonForChange }}</view>
+              </view>
+
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+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 {personnelAwaitingReviewForChange} from "@/api/crm/mainOwner/mainOwner"
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+// 搜索内容
+let searchValue = ref(null);
+// 分页
+const mescrollRef = ref(null);
+// 防抖计时
+let timerId = null;
+// 查询搜索跳转
+let handleSearch = () => {
+  // 防抖搜索    console.log(searchValue.value)
+  if (timerId) clearTimeout(timerId);
+
+  timerId = setTimeout(async () => {
+
+    // let res = await getList(1, upOption.value.page.size)
+    await downCallback(mescrollRef.value.mescroll);
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500)
+}
+
+watch(searchValue, (newValue, oldValue) => {
+  handleSearch()
+})
+let clearSearchValue = () => {
+  searchValue.value = '';
+}
+// 查询列表
+let list = ref([]);
+
+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: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  cssFlag.value = true;
+  uni.showLoading();
+  setTimeout(async () => {
+    try {
+      // 重置页码为第一页
+      const res = await getList(1, mescroll.size || upOption.page.size);
+      list.value = res.list;
+      // 正确传递 total 参数
+      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
+    } catch (error) {
+      console.log(error)
+      mescroll.endErr();
+    } finally {
+      cssFlag.value = false;
+    }
+  }, 500);
+
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  setTimeout(async () => {
+    try {
+      // 使用 mescroll 提供的页码和大小参数
+      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.total > mescroll.num * mescroll.size);
+    } catch (error) {
+      console.log(error)
+      mescroll.endErr();
+    }
+  }, 500);
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum: pageIndex,
+      pageSize,
+      searchContent: searchValue.value
+    }
+    try {
+      let res = await personnelAwaitingReviewForChange(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+    } finally {
+      uni.hideLoading();
+    }
+  });
+}
+
+// 跳转到详情
+let handleDetail = (item) => {
+  const {userId} = item;
+  uni.navigateTo({
+    url: "/pages/business/CRM/mainOwner/audit/confirmForm",
+    events: {
+      refreshOwnerChangeList() {
+        handleSearch();
+      }
+    },
+    success(res) {
+      res.eventChannel.emit('auditCusOwner', {data: {userId}, editable: false})
+    }
+  })
+}
+
+</script>
+
+<style scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
+  /* #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%;
+
+}
+.scroll-h{
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
+  /* #endif */
+}
+
+.search .custom-search.uni-searchbar {
+  padding-right: 0 !important;
+}
+
+.white-bg {
+  padding-bottom: 10rpx;
+
+  .title {
+    align-items: flex-start;
+  }
+}
+
+.no-wrap{
+  white-space: nowrap;
+}
+
+.btn-blue{
+  border-radius: 10rpx;
+}
+</style>

src/pages/business/CRM/mainOwner/view/components/qianjue-step.vue

@@ -0,0 +1,143 @@
+<template>
+	<view class="steps">
+		<view class="step" v-for="(item, i) in list" :key="i">
+			<!-- 左侧 -->
+			<view class="step_left"> {{ item.createTime !== null ? item.createTime : '未审核' }}</view>
+			<!-- 中部 -->
+			<view class="step_mid">
+				<view class="step_dot" :style="{ backgroundColor: item.stateFlow ? activeColor : '' }">{{ stepType === 'number' ? i + 1 : '' }}</view>
+				<template v-if="i < list.length - 1">
+					<view class="step_line" :style="{ backgroundColor: item.stateFlow ? activeColor : '' }"></view>
+				</template>
+			</view>
+			<!-- 右侧 -->
+			<view class="step_right">
+				<view class="step_name">{{ item.state }}</view>
+				<view class="step_idea"  :style="{ color: getStateColor(item.stateFlow) }">{{ getStateText(item.stateFlow) }}</view>
+				<view class="step_idea" :style="{ color: getStateColor(item.stateFlow) }" v-if="item.stateFlow==1">同意</view>
+				<view class="step_idea"> {{ item.opinionOwn !== null ? item.opinionOwn : '' }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		// 步骤条格式 数字或者为点
+		stepType: {
+			type: String,
+			default: 'dot'
+		},
+		// 激活颜色
+		activeColor: {
+			type: String,
+			default: '#55aaff'
+		},
+		// 数据列表
+		list: {
+			type: Array,
+			default: () => {
+				return [];
+			}
+		}
+	},
+	  methods: {
+	    // 根据 stateFlow 获取状态文本
+	    getStateText(stateFlow) {
+	      // 状态映射对象（可根据需求扩展）
+	      const stateMap = {
+	        0: '待审核',   // 未通过
+	        1: '已通过',   // 通过
+	        2: '已驳回'    // 驳回
+	      };
+	      // 未知状态返回默认文本
+	      return stateMap[stateFlow] || '未知状态';
+	    },
+	
+	    // 根据 stateFlow 获取状态颜色
+	    getStateColor(stateFlow) {
+	      // 颜色映射对象（可根据需求调整）
+	      const colorMap = {
+	        0: '#dcdcdc',  // 待审核：灰色
+	        1: '#55aaff',  // 已通过：蓝色（使用 activeColor）
+	        2: '#ff4d4f'   // 已驳回：红色
+	      };
+	      // 未知状态返回默认颜色
+	      return colorMap[stateFlow] || '#dcdcdc';
+	    }
+	  },
+	data() {
+		return {};
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.steps {
+	.step {
+		display: flex;
+		.step_left {
+			width: 150rpx;
+			margin-top: -5rpx;
+			font-size: 26rpx;
+			line-height: 36rpx;
+			text-align: right;
+		}
+		.step_mid {
+			// width: 50rpx;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: center;
+			margin: 0 25rpx;
+			.step_dot {
+				width: 40rpx;
+				height: 40rpx;
+				background: #dcdcdc;
+				border: 5rpx solid #f5f5f5;
+				border-radius: 50%;
+				color: #ffffff;
+				font-size: 28rpx;
+				text-align: center;
+				line-height: 40rpx;
+			}
+			.active_dot {
+				background: #2a62ed;
+				border: 5rpx solid #e3ebff;
+			}
+			.step_line {
+				width: 4rpx;
+				height: 160rpx;
+				background-color: #eeeeee;
+			}
+			.active_line {
+				background: #2a62ed;
+			}
+		}
+		.step_right {
+			width: 430rpx;
+			height: fit-content;
+			padding: 25rpx 30rpx;
+			margin-top: -14rpx;
+			background-color: #f8f8f8;
+			border-radius: 10rpx;
+			display: flex;
+			flex-wrap: wrap;
+			align-content: center;
+
+			view {
+				width: 100%;
+			}
+			.step_name {
+				font-size: 30rpx;
+				margin-bottom: 10rpx;
+			}
+			.step_idea {
+				color: #999999;
+				font-size: 26rpx;
+				line-height: 40rpx;
+			}
+		}
+	}
+}
+</style>

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

@@ -0,0 +1,236 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <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"
+                      class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+                @click="showDetail(item)">
+            <view>
+              <view class="report-list">
+                <view class="title">客户：{{ item.cusName }}</view>
+                <view class="r-list">
+                  <view class="r-name">{{ item.visistCode }}</view>
+                  <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>
+                <view class="r-list" >
+                  <view class="r-left">目前业务员</view>
+                  <view class="r-right">{{ item.belonger }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">创建时间</view>
+                  <view class="r-right">{{ item.createTime }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">职能</view>
+                  <view class="r-right">{{ item.function }}</view>
+                </view>
+
+              </view>
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+
+
+    </view>
+  </view>
+</template>
+
+<script setup>
+import customHeader from "../../../../../components/customHeader.vue";
+import { onMounted, ref } from 'vue';
+
+import {getNavBarPaddingTop} from "../../../../../utils/system";
+import MescrollUni from "mescroll-uni/mescroll-uni.vue";
+import {getQueryVisistList} from "../../../../../api/crm/activity/activity";
+import {queryViewMainOwnerList} from "../../../../../api/crm/mainOwner/mainOwner";
+import {onShow} from "@dcloudio/uni-app";
+
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+
+let queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+})
+
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+onShow(()=>{
+  getList(queryParams)
+})
+
+
+let list = ref([])
+//获取列表信息
+function getList(queryParams){
+  queryViewMainOwnerList(queryParams.value).then(res => {
+      list.value = res.rows
+  })
+}
+
+let cssFlag = ref(false);//控制样式
+let mescrollRef = ref(null);
+
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      queryParams.pageNum = 1;
+      queryParams.pageSize = upOption.value.page.size;
+      //获取当前页的信息
+      const res = await queryViewMainOwnerList(queryParams)
+      cssFlag.value = false;
+      list.value = res.rows;
+      mescroll.resetUpScroll();
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  } finally {
+    setTimeout(async () => {
+      mescroll.endSuccess();
+    }, 500);
+  }
+}
+
+
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      queryParams.pageNum = 1;
+      queryParams.pageSize = upOption.value.page.size;
+      const res = await queryViewMainOwnerList(queryParams);
+      if (mescroll.num === 1) {
+        list.value = res.rows;
+      } else {
+        list.value.push(...res.rows);
+      }
+      mescroll.endBySize(res.rows.length, res.total);
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  }
+
+}
+
+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: '刷新中...'
+});
+
+
+// 查看信息详情
+function showDetail(item) {
+  uni.navigateTo({
+    url: './viewMainOwnerDetail?userId=' + item.userId
+  })
+}
+
+</script>
+
+<style lang="scss" scoped>
+
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
+  /* #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;
+}
+</style>

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

@@ -0,0 +1,161 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'查看主归属人变更详细信息'" :leftFlag="true"
+                    :rightFlag="false"></customHeader>
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="all-body">
+        <!-- 分页部分  -->
+
+        <view class="white-bg margin-bottom20"
+              @click="showDetail(item)">
+          <view>
+            <view class="report-list">
+              <view class="title">客户公司名称：{{ detailInfo.cusName }}</view>
+              <view class="border-bottom"></view>
+              <view class="r-list">
+                <view class="r-left">客户人员名称</view>
+                <view class="r-right">{{ detailInfo.userName }}</view>
+              </view>
+              <view class="border-bottom"></view>
+              <view class="r-list">
+                <view class="r-left">性别</view>
+                <view class="r-right">{{ detailInfo.sex }}</view>
+              </view>
+              <view class="border-bottom"></view>
+              <view class="r-list">
+                <view class="r-left">手机号</view>
+                <view class="r-right">{{ detailInfo.mobilePhone }}</view>
+              </view>
+              <view class="border-bottom"></view>
+              <view class="r-list">
+                <view class="r-left">部门</view>
+                <view class="r-right">{{ detailInfo.userDept }}</view>
+              </view>
+              <view class="border-bottom"></view>
+              <view class="r-list">
+                <view class="r-left title">业务员认定等级</view>
+                <view class="r-right title">{{ detailInfo.salesmanThinkLevel }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+
+
+        <view class="tezt">
+          <qianjue-step :list="list"></qianjue-step>
+        </view>
+
+      </view>
+    </view>
+  </view>
+
+</template>
+
+<script setup>
+import customHeader from "../../../../../components/customHeader.vue";
+import {onMounted, reactive, ref} from "vue";
+import {onLoad, onShow} from "@dcloudio/uni-app";
+import {queryViewMainOwnerDetail, queryViewMainOwnerList} from "../../../../../api/crm/mainOwner/mainOwner";
+import QianjueStep from "./components/qianjue-step.vue";
+import {getNavBarPaddingTop} from "../../../../../utils/system";
+
+
+let userId = ref()
+let detailInfo = reactive({})
+let list = ref([])
+
+// 获取导航栏高度用于内容区域padding
+let navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+onLoad(option => {
+  userId.value = option.userId
+})
+
+onMounted(() => {
+  getDetails()
+  getCrmCusUserNewChangeOwnerList()
+})
+
+function getDetails() {
+  let data = {
+    userId: userId.value
+  };
+  queryViewMainOwnerList(data).then(
+      res => {
+        if (res.code === 200) {
+          const targetUserId = userId.value;
+          const matchedItem = res.rows.find(item => item.userId == targetUserId);
+          if (matchedItem) {
+            Object.assign(detailInfo, matchedItem);
+          } else {
+            console.warn('没有找到匹配 userId 的数据');
+          }
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none',
+          });
+        }
+      },
+      rej => {
+      }
+  );
+}
+
+
+function getCrmCusUserNewChangeOwnerList() {
+  let data = {
+    userId: userId.value
+  };
+  queryViewMainOwnerDetail(data).then(
+      res => {
+        if (res.code == 200) {
+          list.value = res.rows
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none',
+          });
+        }
+      },
+      rej => {
+      }
+  );
+}
+
+</script>
+
+<style scoped>
+.con-bg{
+  background: white;
+/*  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 {
+  padding-bottom: 10rpx;
+}
+
+.tezt {
+  padding-top: 50rpx;
+}
+
+</style>

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

@@ -10,18 +10,18 @@
             <!-- 正文内容 -->
             <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">

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([])
@@ -143,14 +146,14 @@ function getVisistList(page) {
             } else {
                 dataList.value = dataList.value.concat(res.rows);
             }
-            mescrollRef.value.endBySize(res.rows.length, 1000);
+            mescrollRef.value.mescroll.endBySize(res.rows.length, 1000);
         } else {
             uni.showToast({
                 icon: 'none',
                 title: "请求失败",
             });
             dataList.value = null;
-            mescrollRef.value.endErr();
+            mescrollRef.value.mescroll.endErr();
         }
     })
 }

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

@@ -1,171 +1,257 @@
 <template>
   <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">
+        <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"></view>
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
-            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
-                @iconClick="iconClick">
-            </uni-easyinput>
 
+      <!-- 正文内容 -->
+      <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>
 
-		<view class="inner-box">
+        <!-- 分页部分  -->
-			<view class="list-cont">
+        <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="item"   v-for="(item, index) in dataList">
+            <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
-						<radio class='radio' :value="index" ></radio>
+              <radio class='radio'
-						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
+                     :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>
   </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
-})
-const dataList = ref([])
 
-
+onLoad((options)=>{
-
+  instance = getCurrentInstance().proxy;
-
+  const eventChannel = instance.getOpenerEventChannel();
-//查询某一客户人员
+  eventChannel.on('requestCusList', async (res) => {
-let searchContent = ref('')
+    let {cusName} = res.data;
-
+    // console.log(cusName, "客户选择页读取到参数");
-function iconClick() {
+    searchValue.value = cusName;
-    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) {
+let timerId = null;
-     const selectedIndex = event.detail.value
+// 搜索
-    let test = dataList.value[selectedIndex]
+watch(searchValue, (newValue, oldValue) => {
-    // 发送全局事件
+  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
-    uni.$emit('onCustomerSelected', test)
+  if(timerId) clearTimeout(timerId);
-    let cusName = test.cusName;//客户名称
+  timerId = setTimeout(async ()=>{
-    let cusId = test.cusId;//客户ID
+    handleSearch();
-    uni.navigateBack()//返回上一页
+    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 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;
+}
+
+.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;
-    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;
+  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/components/dailyVisitComponent.vue

@@ -213,7 +213,6 @@ onUnload(() => {
 
 //选择客户人员
 function chooseClientUser() {
-    console.log('点击了输入框', props.cusName);
     uni.navigateTo({
         url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=日常走访'
     })

src/pages/business/CRM/marketActivity/components/lyVisistComponent.vue

@@ -11,7 +11,7 @@
                      @focus="chooseMyUser"></uni-easyinput>
     </uni-forms-item>
 
-<uni-forms-item label="住宿天数" name="stayDays">
+    <uni-forms-item label="住宿天数" name="stayDays">
       <picker
           @change="handlePickerChange"
           :value="stayDaysIndex"
@@ -29,7 +29,7 @@
 
     <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
       <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
-                class="form-texarea" />
+                     class="form-texarea"/>
     </uni-forms-item>
   </uni-forms>
   <view class="footer-con">
@@ -39,10 +39,10 @@
 </template>
 
 <script setup name="lyVisitComponent">
-import { ref, reactive } from 'vue'
+import {ref, reactive} from 'vue'
 import cache from '../../../../../utils/cache'
-import { onShow, onUnload } from '@dcloudio/uni-app';
+import {onShow, onUnload} from '@dcloudio/uni-app';
-import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+import {addVisistDetail, deleVisistDetailItem, getVisistDetailItem} from '../../../../../api/crm/activity/activity';
 
 let customerUserList = ref([])
 let myUserList = ref([])
@@ -56,7 +56,6 @@ const props = defineProps({
 })
 
 
-
 // 表单数据
 const formData = ref({
   customerUserList,
@@ -69,6 +68,7 @@ const formRef = ref(null);
 
 //删除明细项的内容
 let lyDeleteForm = reactive({})
+
 function handleDeleteVisistDetailItem() {
   lyDeleteForm.treeName = '联谊活动'
   lyDeleteForm.visistId = props.visistId
@@ -94,6 +94,7 @@ let handleDelete = () => {
   formData.value.customerUserList = null
   formData.value.myUserList = null
   formData.value.activeTxt = null
+  stayDaysIndex.value = 0
   if (cache.get('checkedLYClientList') != null) {
     cache.remove('checkedYWClientList');
   }
@@ -136,7 +137,7 @@ const submitForm = async () => {
     }
 
     lyForm.bandResult = activeTxt.value
-        lyForm.multiple = stayDaysIndex.value+1
+    lyForm.multiple = stayDaysIndex.value + 1
     // 提交服务器进行新增
     addVisistDetail(lyForm).then(res => {
       if (res.code == 200) {
@@ -168,11 +169,10 @@ onShow(() => {
   if (cache.get('checkedLYMyUserList') != null && cache.get('checkedLYMyUserList') != []) {
     myUserList.value = cache.get('checkedLYMyUserList')
   }
-        console.log(props.status,'获取的状态')
 
-    if(props.status=='完成'){
+  if (props.status == '完成') {
     isDisabled.value = true
-    }else{
+  } else {
     isDisabled.value = false
   }
 })
@@ -187,14 +187,13 @@ let getLYVisitReportDetailContent = () => {
     if (res.rows[0] != null) {
       customerUserList.value = res.rows[0].customerPersonnel
       myUserList.value = res.rows[0].ourPersonnel
-            stayDaysIndex.value = res.rows[0].multiple-1
+      stayDaysIndex.value = res.rows[0].multiple - 1
       activeTxt.value = res.rows[0].bandResult
     }
   })
 }
 
 
-
 //页面卸载之后，删除缓存信息
 onUnload(() => {
   handleDeleteLocal()
@@ -221,7 +220,7 @@ const stayDaysIndex = ref(0) // 默认未选择
 
 const handlePickerChange = (e) => {
   stayDaysIndex.value = e.detail.value
-  console.log("天数数字：",stayDaysIndex.value+1)
+  console.log("天数数字：", stayDaysIndex.value + 1)
 }
 
 // 明确暴露给父组件的方法

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>
                         {{ " | " }}
@@ -60,7 +60,6 @@ const dataList = ref([])
 
 function getClientUserName() {
     crmCustomerUser(queryParams.value).then(res => {
-        console.log(res, '相应测试')
         dataList.value = res.rows
     })
 }

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,15 +132,42 @@ 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'
+          });
+        }
+      }
+    }
+  });
 }
 
 //点击通过
 function adopt(item) {
-    console.log(item.visistId,4123123)
     uni.showModal({
         title: '提交',
         content: '是否要通过本报告？',
@@ -146,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',
@@ -154,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
@@ -101,7 +103,7 @@ watch(searchValue, (newValue, oldValue) => {
     searchContent: searchValue.value
   };
   getYsVisistList(data).then(res => {
-    if (res.code == 200) {
+    if (res.code === 200) {
       //设置列表数据
       list.value = res.rows;
     }
@@ -129,7 +131,6 @@ let handleSearch = () => {
     }
 
   })
-  console.log(searchValue.value)
 }
 
 // 新增
@@ -142,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: '已经到底了'
 });
@@ -201,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
@@ -210,8 +214,6 @@ const getVisitorReportList = (pageNum, pageSize) => {
 }
 
 
-let Loop = ref(0)
-let now
 const visistId = ref();
 const cusName = ref();
 const cusId = ref();
@@ -222,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: '请问要删除本条消息吗？',
@@ -256,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/visitReportDetail.vue

@@ -80,9 +80,9 @@
                     </view>
                 </block>
                 <!-- 评论 -->
-                <block v-if="activeTab === 1">
+<!--                <block v-if="activeTab === 1">-->
-                    <view class="white-bg white-bg-2">评论内容</view>
+<!--                    <view class="white-bg white-bg-2">评论内容</view>-->
-                </block>
+<!--                </block>-->
             </customTabs>
 
 
@@ -112,7 +112,6 @@ onLoad((options) => {
 onShow(()=>{
     getUserLike(visistId.value).then(res=>{
         zanFlag.value = res.rows[0]?.status==1?true:false
-        console.log(zanFlag.value,'点赞响应数据内容')
      if(zanFlag.value==false){
         iconType.value = 'hand-up'
     }else{
@@ -139,7 +138,7 @@ const getVisitorReportDetail = async () => {
 
 // 报告明细&评论
 const activeTab = ref(0);//默认报告明细
-const tabList = ['报告明细', '评论'];
+const tabList = ['报告明细'];
 
 // 点击赞
 let zanFlag = ref(false)

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

@@ -71,7 +71,11 @@ import { ref, reactive, onMounted } from 'vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { getQueryVisistList } from '../../../../api/crm/activity/activity';
+import {onShow} from "@dcloudio/uni-app";
 
+onShow(()=>{
+  downCallback(mescrollRef.value.mescroll)
+})
 
 let list = ref([])
 let queryParams = reactive({
@@ -118,13 +122,15 @@ const downCallback = async (mescroll) => {
 const upCallback = async (mescroll) => {
     try {
         setTimeout(async () => {
-            // const res = await getVisitorReportList(mescroll.num, mescroll.size);
+          queryParams.pageNum = 1;
+          queryParams.pageSize = upOption.value.page.size;
+            const res = await getQueryVisistList(queryParams);
             if (mescroll.num === 1) {
-                // list.value = res.list;
+                list.value = res.rows;
             } else {
-                // list.value.push(...res.list);
+                list.value.push(...res.rows);
             }
-            // mescroll.endBySize(res.list.length, res.total);
+            mescroll.endBySize(res.rows.length, res.total);
         }, 500);
     } catch (error) {
         mescroll.endErr();
@@ -134,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

@@ -17,7 +17,7 @@
             <!-- 正文内容 -->
             <view class="white-bg">
                 <view class="form-con">
-                    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+                    <uni-forms ref="formRef" :model="formData"  label-width="100px">
                         <view @click="addVisistReport" class="form-item-container">
                             <uni-forms-item label="客户名称" name="cusName" class="f-c-right">
                                 <text class="name">{{ formData.cusName }}</text>
@@ -65,14 +65,15 @@
 
 
 
-                        <uni-forms-item label="我方领导" name="leader" required
+                        <uni-forms-item label="我方领导" name="leader"
                             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-easyinput v-model="formData.leader" placeholder="请输入我方领导" />-->
-
                         </uni-forms-item>
 
 
@@ -118,19 +119,10 @@ const formData = ref({
 // 我方人员
 let chooseMyLeaderList = reactive([0]);
 const changeValue2 = (item, value) => {
-    console.log("我方领导", item, value);
     chooseMyLeaderList = item;
     formData.value.leader = chooseMyLeaderList
 };
 
-// 验证规则
-const rules = {
-    leader: {
-        rules: [
-            { required: true, errorMessage: '我方领导不能为空' }
-        ]
-    }
-};
 
 // 修改日期
 let changeDate = (e) => {
@@ -142,7 +134,6 @@ let saveVisistReportForm = reactive({});
 const submitForm = async () => {
     try {
         // 验证表单
-        console.log(formRef.value, '表单验证数据')
         await formRef.value.validate();
         // 验证通过后的操作
         uni.showToast({
@@ -150,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
@@ -217,7 +210,6 @@ onUnmounted(() => {
 const handleCustomerSelected = (data) => {
     formData.value.cusName = data.cusName
     formData.value.cusId = data.cusId
-    console.log("收到客户数据的值：", customerUser)
 }
 
 //查询签到记录
@@ -262,9 +254,10 @@ function chooseRecord(e) {
 
 .form-con {
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 100px)
+    height: calc(100vh - 95px) !important;
     /* #endif */
     /* #ifndef APP-PLUS */
+    height:calc(100vh - 68px) !important;
     /* #endif */
 }
 

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'
 		})
 	}
 	//定义数据接收的值
@@ -174,6 +174,11 @@
 				title: '提交成功',
 				icon: 'success'
 			})
+			  uni.$emit('refreshMarketList');
+			  setTimeout(() => {
+			        uni.navigateBack(1);
+			      }, 1500);
+			      
 			console.log('表单数据:', formData.value)
 		} catch (err) {
 			console.log('表单验证失败:', err)

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'
 		})
 	}
 	//定义数据接收的值
@@ -179,8 +179,10 @@
 				title: '提交成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}
@@ -216,8 +218,10 @@ onMounted(() => {
 				title: '删除成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}

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

@@ -327,23 +327,20 @@ const dynamicPlaceholder = computed(() => {
 	// 当前选中的信息类型
 	const competitorLevelOneIndex = ref(0)
 	const competitorLevelOne = ref('基本信息')
-	
+	const competitorLevelTwo = ref('资质情况')
 	// 当前选中的具体分类索引
 	const competitorLevelTwoIndex = ref(0)
 	
 	// 当前显示的具体分类选项数组（动态切换 array2 / array3）
 	const currentCompetitorLevelTwoArray = ref(array2.value)
 
-	// 当前选中的具体分类名称
-	const competitorLevelTwo = ref('')
-
 	// 表单引用 & 客户选择器引用
 	const formRef = ref(null)
 	const customHeaderRef = ref(null)
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
@@ -374,6 +371,11 @@ const dynamicPlaceholder = computed(() => {
 				title: '提交成功',
 				icon: 'success'
 			})
+			  uni.$emit('refreshMarketList');
+			  setTimeout(() => {
+			        uni.navigateBack(1);
+			      }, 1500);
+			      
 			console.log('表单数据:', formData.value)
 		} catch (err) {
 			console.log('表单验证失败:', err)

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'
 		})
 	}
 	//定义数据接收的值
@@ -379,8 +379,10 @@ const dynamicPlaceholder = computed(() => {
 				title: '提交成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}
@@ -448,8 +450,10 @@ const dynamicPlaceholder = computed(() => {
 				title: '删除成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}

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

@@ -0,0 +1,483 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="!searchShow?'市场信息查看':'搜索'" 
+			    :leftFlag="true" 
+			    :rightFlag="true"  
+			    @back="handleBack" :searchType="searchShow?1:undefined"
+			>
+			<!--    <template #right  v-if="!searchShow">
+			        <view class="head-right" @click="handleRead">
+			            <img :src="'static/images/icon-clean@2x.png'" />清除未读
+			        </view>
+			    </template> -->
+			</customHeader>
+			
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 搜索处理 -->
+			<customSearch v-if="searchShow" :searchKeywords="searchText" :searchType="searchTypeObj"
+				:checkTypeObj="notictTypeCheck" :searchTypeList="noticeTypeList" @confirm="handleSearchConfirm">
+			</customSearch>
+			<view class="search" v-else @click="handleSearchFocus">
+				<view class="search-bg">
+					<view class="search-left">{{ notictTypeCheck.name?notictTypeCheck.name:'全部' }}</view>
+					<view class="search-right">
+						<input class="uni-input" v-model="inputval" placeholder="请输入您想查询的内容或服务"
+							placeholder-class="search-color" />
+					</view>
+				</view>
+			</view>
+
+
+
+
+			<!-- 正文内容 -->
+			
+				
+				<!-- 分页部分  -->
+				<mescroll-uni  v-if="!searchShow"  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+					:up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+					class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+					<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+						@click="showDetail(item)">
+						<view>
+							<view class="report-list">
+								<view class="title">信息类型:{{ item.informationType }}</view>
+
+
+								<view class="r-list">
+									<view class="r-name" v-if="item.cusName!=null">公司名称:{{ item.cusName }}</view>
+									<view class="r-right btn-gray flex-auto"
+										:class="item.myselfBrowsing==0?'btn-blue':'btn-green'" size="mini">
+										{{item.myselfBrowsing==0?'未读':'已读'}}</view>
+
+								</view>
+								<view class="border-bottom"></view>
+
+								<view class="border-bottom"></view>
+								<view class="r-list">
+									<view class="r-left">报告人</view>
+									<view class="r-right">{{ item.createName }}</view>
+								</view>
+								<view class="border-bottom"></view>
+								<view class="r-list">
+									<view class="r-left">报告日期</view>
+									<view class="r-right">{{ item.createTime }}</view>
+								</view>
+
+							</view>
+						</view>
+					</view>
+				</mescroll-uni>
+			
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		watch
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import customSearch from '@/components/customSearch.vue'
+	import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+	import {
+		getNavBarPaddingTop
+	} from '@/utils/system.js'
+	import {
+		visitorReportList
+	} from '@/api/business.js'
+	import {
+		viewingMarketInfForAllMembers
+	} from '@/api/crm/api_ys.js';
+	import {
+		onLoad,
+		onShow,
+		onUnload,
+		onHide
+	} from '@dcloudio/uni-app'
+	// 获取导航栏高度用于内容区域padding
+	const navBarPaddingTop = ref(0);
+	onMounted(() => {
+		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+		uni.$on('updateStatus', markVisited)
+	})
+	// 搜索处理
+	let searchShow = ref(false);
+	let searchText = ref(undefined);
+	let searchTypeObj = ref({
+		typeId: 3,
+		typeName: '消息类型'
+	});
+	let noticeTypeList = ref([{
+			id: 1,
+			name: '市场机会'
+		},
+		{
+			id: 2,
+			name: '重大事项信息'
+		},
+		{
+			id: 3,
+			name: '竞争对手信息'
+		},
+		{
+			id: 4,
+			name: '人员变化信息'
+		},
+		{
+			id: 5,
+			name: '重点型号任务信息'
+		},
+		{
+			id: 6,
+			name: '通用信息'
+		}
+	]);
+	let notictTypeCheck = ref({}); //选中类型
+
+	// 查询列表
+	let list = ref([]);
+// 新增状态变量存储搜索条件
+const selValue = ref(''); // 搜索类型名称
+const inputval = ref(''); // 搜索内容
+	let searchValue = ref(null)
+	//监视查询的内容的变化
+	watch(searchValue, (newValue, oldValue) => {
+		//变化了之后，重新查询内容
+		var data = {
+			pageNum: 1,
+			pageSize: 10,
+		};
+		viewingMarketInfForAllMembers(data).then(res => {
+			if (res.code == 200) {
+				//设置列表数据
+				list.value = res.rows;
+			}
+		})
+	})
+	onHide(()=>{
+	    searchShow.value=false;
+	})
+	
+	const index = ref(0)
+	const categories = ref([{
+		categoryId: 1,
+		categoryName: '市场机会'
+	}, {
+		categoryId: 2,
+		categoryName: '重大事项信息'
+	}, {
+		categoryId: 3,
+		categoryName: '竞争对手信息'
+	}, {
+		categoryId: 4,
+		categoryName: '人员变化信息'
+	}, {
+		categoryId: 5,
+		categoryName: '重点型号任务信息'
+	}, {
+		categoryId: 6,
+		categoryName: '通用信息'
+	}])
+	const selCategory = ref({
+		id: 1,
+		val: ''
+	})
+	// 搜索返回操作
+	const handleBack=()=>{
+	    searchShow.value=false;
+	}
+	// 获取input 焦点跳转
+	const handleSearchFocus=()=>{
+	    searchShow.value = true;
+	}
+	// 搜索完返回处理
+	const handleSearchConfirm = (param1,param2)=>{
+	    // console.log(param1,param2)
+	    notictTypeCheck.value=param1.value;
+	    inputval.value=param2.value || '';
+		selValue.value = param1.value.name || '';
+		searchValue.value = param2.value;
+		console.log("selValue"+selValue.value)
+		console.log("inputval"+inputval.value)
+// 重置mescroll触发刷新
+    if (mescrollRef.value) {
+        mescrollRef.value.resetUpScroll();
+    }
+    searchShow.value = false;
+	}
+	// 查询搜索跳转
+	let handleSearch = () => {
+		var data = {
+			pageNum: 1,
+			pageSize: 10,
+			
+		};
+		viewingMarketInfForAllMembers(data).then(res => {
+			if (res.code == 200) {
+				//设置列表数据
+				list.value = res.rows;
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: "请求失败",
+				});
+				list.value = null;
+			}
+
+		})
+		console.log(searchValue.value)
+	}
+
+	const mescrollRef = ref(null);
+	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: '刷新中...'
+	});
+
+	let cssFlag = ref(false); //控制样式
+	const mescrollInit = (mescroll) => {
+		cssFlag.value = true;
+		mescrollRef.value = mescroll;
+	};
+
+	// 下拉刷新
+	const downCallback = async (mescroll) => {
+		try {
+			setTimeout(async () => {
+				const res = await getViewingMarketInfForAllMembers(1, upOption.value.page.size);
+				cssFlag.value = false;
+				list.value = res.list;
+				mescroll.resetUpScroll();
+			}, 500);
+		} catch (error) {
+			mescroll.endErr();
+		} finally {
+			setTimeout(async () => {
+				mescroll.endSuccess();
+			}, 500);
+		}
+	}
+	// 上拉加载更多
+	const upCallback = async (mescroll) => {
+		try {
+			setTimeout(async () => {
+				const res = await getViewingMarketInfForAllMembers(mescroll.num, mescroll.size,selValue.value, 
+                inputval.value);
+				if (mescroll.num === 1) {
+					list.value = res.list;
+				} else {
+					list.value.push(...res.list);
+				}
+				mescroll.endBySize(res.list.length, res.total);
+			}, 500);
+		} catch (error) {
+			mescroll.endErr();
+		}
+	}
+
+	// 获取数据列表
+	const getViewingMarketInfForAllMembers = (pageNum, pageSize) => {
+		return new Promise(async (resolve) => {
+			let param = {
+				pageNum,
+				pageSize,
+				// 添加搜索条件参数
+				            selValue: selValue.value,
+				            inputval: inputval.value
+			}
+			let res = await viewingMarketInfForAllMembers(param);
+			resolve({
+				list: res.rows,
+				total: res.total
+			});
+		});
+	}
+	let Loop = ref(0)
+	let now
+	const visistId = ref();
+	const cusName = ref();
+	const cusId = ref();
+	const status = ref()
+
+	function showDetail(item) {
+		uni.navigateTo({
+			url: "/pages/business/CRM/marketInformation/informationDetail?informationId=" + item.informationId +
+				'&selValue=' + item.selValue + '&inputval=' + item.inputval
+		})
+	}
+
+	onUnload(() => {
+		uni.$off('updateStatus')
+	})
+
+	const markVisited = (informationId) => {
+		const newList = [...list.value].map(item => {
+			if (item.informationId == informationId) {
+				return {
+					...item,
+					myselfBrowsing: 1
+				};
+			}
+			return item;
+		});
+		list.value = newList;
+
+	};
+</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;
+	}
+
+	.search_center {
+		display: flex;
+		align-items: center;
+		border: none;
+		flex: 1;
+		height: 70rpx;
+		margin-left: 20rpx;
+		padding-left: 20rpx;
+		border-radius: 32.5rpx;
+		background-color: #f5f5f5;
+
+		.search_icon {
+			width: 30rpx;
+			height: 30rpx;
+			margin-right: 22rpx;
+		}
+
+		.category {
+			display: flex;
+			align-items: center;
+			margin-right: 16rpx;
+			padding-right: 16rpx;
+			border-right: 2rpx solid #D4D4D4;
+			position: relative;
+
+			text {
+				font-size: 13px;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+			}
+
+			image {
+				margin-top: 4rpx;
+				width: 20rpx;
+				height: 11rpx;
+
+			}
+
+			.pop {
+				position: absolute;
+				top: 50rpx;
+				background: #FFFFFF;
+				box-shadow: 0px 0px 40rpx 0px rgba(59, 59, 59, 0.2);
+				border-radius: 12rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				padding: 20rpx;
+				z-index: 100;
+				max-height: 566rpx;
+				overflow-y: auto;
+
+				text {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					white-space: nowrap;
+					margin: 10rpx 0;
+					line-height: 56rpx;
+				}
+			}
+
+			.pop_arrow {
+				position: absolute;
+				top: 48rpx;
+				z-index: 999;
+
+				&::after {
+					position: absolute;
+					content: "";
+					left: 68rpx;
+					top: -26rpx;
+					border: 14rpx solid #fff;
+					border-color: transparent transparent #fff transparent;
+				}
+			}
+		}
+	}
+</style>

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

@@ -0,0 +1,288 @@
+<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="report-list">
+					<view class="title">{{ detailList.informationType }}</view>
+					<view class="r-list">
+						<view class="r-name">{{ detailList.cusName }}</view>
+					</view>
+					<view class="border-bottom b-width"></view>
+					<view class="r-list">
+						<view class="r-left">报告人</view>
+						<view class="r-right">{{ detailList.createName }}</view>
+					</view>
+					<view class="border-bottom b-width"></view>
+					<view class="r-list">
+						<view class="r-left">创建日期</view>
+						<view class="r-right">{{ detailList.createTime }}</view>
+					</view>
+					<view class="border-bottom b-width" v-if="detailList.createTime != null"></view>
+					<view class="r-list" v-if="detailList.createTime != null">
+						<view class="r-left">创建时间</view>
+						<view class="r-right">{{ detailList.createTime }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.opportunityType != null"></view>
+					<view class="r-list" v-if="detailList.opportunityType != null">
+						<view class="r-left">机会类型</view>
+						<view class="r-right">{{ detailList.opportunityType }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.understandTheWay != null"></view>
+					<view class="r-list" v-if="detailList.understandTheWay != null">
+						<view class="r-left">了解途径</view>
+						<view class="r-right">{{ detailList.understandTheWay }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.opportunityDescription != null"></view>
+					<view class="r-list" v-if="detailList.opportunityDescription != null">
+						<view class="r-left">机会描述</view>
+						<view class="r-right">{{ detailList.opportunityDescription }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.opportunityStatus != null"></view>
+					<view class="r-list" v-if="detailList.opportunityStatus != null">
+						<view class="r-left">机会所处状态</view>
+						<view class="r-right">{{ detailList.opportunityStatus }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.predictedAmount != null"></view>
+					<view class="r-list" v-if="detailList.predictedAmount != null">
+						<view class="r-left">预测金额或情况</view>
+						<view class="r-right">{{ detailList.predictedAmount }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.competitionSituation != null"></view>
+					<view class="r-list" v-if="detailList.competitionSituation != null">
+						<view class="r-left">竞争情况</view>
+						<view class="r-right">{{ detailList.competitionSituation }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.majorTypesOfMatters != null"></view>
+					<view class="r-list" v-if="detailList.majorTypesOfMatters != null">
+						<view class="r-left">重大事项类型</view>
+						<view class="r-right">{{ detailList.majorTypesOfMatters }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.theImpactGenerated != null"></view>
+					<view class="r-list" v-if="detailList.theImpactGenerated != null">
+						<view class="r-left">产生的影响</view>
+						<view class="r-right">{{ detailList.theImpactGenerated }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.companyResponseStrategy != null"></view>
+					<view class="r-list" v-if="detailList.companyResponseStrategy != null">
+						<view class="r-left">公司应对策略</view>
+						<view class="r-right">{{ detailList.companyResponseStrategy }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.competitiveUnits != null"></view>
+					<view class="r-list" v-if="detailList.competitiveUnits != null">
+						<view class="r-left">竞争单位</view>
+						<view class="r-right">{{ detailList.competitiveUnits }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.competitorLevelOne != null"></view>
+					<view class="r-list" v-if="detailList.competitorLevelOne != null">
+						<view class="r-left">信息类型</view>
+						<view class="r-right">{{ detailList.competitorLevelOne }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.competitorLevelTwo != null"></view>
+					<view class="r-list" v-if="detailList.competitorLevelTwo != null">
+						<view class="r-left">具体分类</view>
+						<view class="r-right">{{ detailList.competitorLevelTwo }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.specificMatters != null"></view>
+					<view class="r-list" v-if="detailList.specificMatters != null">
+						<view class="r-left">具体事情</view>
+						<view class="r-right">{{ detailList.specificMatters }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.originalPosition != null"></view>
+					<view class="r-list" v-if="detailList.originalPosition != null">
+						<view class="r-left">原职务</view>
+						<view class="r-right">{{ detailList.originalPosition }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.currentPosition != null"></view>
+					<view class="r-list" v-if="detailList.currentPosition != null">
+						<view class="r-left">现职务</view>
+						<view class="r-right">{{ detailList.currentPosition }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.positionOfOurCompany != null"></view>
+					<view class="r-list" v-if="detailList.positionOfOurCompany != null">
+						<view class="r-left">现职务是否与我公司业务相关</view>
+						<view class="r-right">{{ detailList.positionOfOurCompany }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.developmentEfforts != null"></view>
+					<view class="r-list" v-if="detailList.developmentEfforts != null">
+						<view class="r-left">攻关力度</view>
+						<view class="r-right">{{ detailList.developmentEfforts }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.successor != null"></view>
+					<view class="r-list" v-if="detailList.successor != null">
+						<view class="r-left">继任者</view>
+						<view class="r-right">{{ detailList.successor }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.keyModels != null"></view>
+					<view class="r-list" v-if="detailList.keyModels != null">
+						<view class="r-left">重点型号</view>
+						<view class="r-right">{{ detailList.keyModels }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.currentStatus != null"></view>
+					<view class="r-list" v-if="detailList.currentStatus != null">
+						<view class="r-left">目前状态</view>
+						<view class="r-right">{{ detailList.currentStatus }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.batchProductionPlan != null"></view>
+					<view class="r-list" v-if="detailList.batchProductionPlan != null">
+						<view class="r-left">批产计划</view>
+						<view class="r-right">{{ detailList.batchProductionPlan }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.situation != null"></view>
+					<view class="r-list" v-if="detailList.situation != null">
+						<view class="r-left">外协、外包、上级单位情况</view>
+						<view class="r-right">{{ detailList.situation }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.subordinateSupportingUnits != null"></view>
+					<view class="r-list" v-if="detailList.subordinateSupportingUnits != null">
+						<view class="r-left">下级配套单位</view>
+						<view class="r-right">{{ detailList.subordinateSupportingUnits }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.generalFormType != null"></view>
+					<view class="r-list" v-if="detailList.generalFormType != null">
+						<view class="r-left">通用表单类型</view>
+						<view class="r-right">{{ detailList.generalFormType }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.informationContent != null"></view>
+					<view class="r-list" v-if="detailList.informationContent != null">
+						<view class="r-left">信息内容</view>
+						<view class="r-right">{{ detailList.informationContent }}</view>
+					</view>
+					<view class="border-bottom b-width" v-if="detailList.remark != null"></view>
+					<view class="r-list" v-if="detailList.remark != null">
+						<view class="r-left">备注</view>
+						<view class="r-right">{{ detailList.remark }}</view>
+					</view>
+
+
+
+					<view class="border-bottom b-width"></view>
+				</view>
+			</view>
+
+
+
+
+			<!-- 底部加高度来避免tabbar遮挡 -->
+			<view class="bottom-height"></view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app'
+	import customHeader from '@/components/customHeader.vue'
+	import customTabs from '@/components/customTabs.vue';
+	import {
+		viewingMarketInfgetDetail
+	} from '@/api/crm/api_ys.js';
+
+
+	let informationId = ref(0)
+	// 加载后调用
+	let id = ref(null)
+	onLoad((options) => {
+		informationId.value = options.informationId
+		getVisitorReportDetail();
+	})
+	// 查询详情
+	let item = ref({});
+	//明细List
+	let detailList = ref({})
+	const getVisitorReportDetail = async () => {
+		let param = {
+			informationId: informationId.value
+		}
+		let detailRes = await viewingMarketInfgetDetail(param);
+		detailList.value = detailRes.rows[0];
+		uni.$emit('updateStatus',informationId.value);
+	}
+</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;
+	}
+</style>

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'
 		})
 	}
 	//定义数据接收的值
@@ -178,6 +178,11 @@
 				title: '提交成功',
 				icon: 'success'
 			})
+			  uni.$emit('refreshMarketList');
+			  setTimeout(() => {
+			        uni.navigateBack(1);
+			      }, 1500);
+			      
 			console.log('表单数据:', formData.value)
 		} catch (err) {
 			console.log('表单验证失败:', err)
@@ -198,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'
 		})
 	}
 	//定义数据接收的值
@@ -183,8 +183,10 @@
 				title: '提交成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}
@@ -217,8 +219,10 @@
 				title: '删除成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}

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'
 		})
 	}
 	//定义数据接收的值
@@ -203,6 +203,11 @@
 				title: '提交成功',
 				icon: 'success'
 			})
+			  uni.$emit('refreshMarketList');
+			  setTimeout(() => {
+			        uni.navigateBack(1);
+			      }, 1500);
+			      
 			console.log('表单数据:', formData.value)
 		} catch (err) {
 			console.log('表单验证失败:', err)

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'
 		})
 	}
 	//定义数据接收的值
@@ -210,8 +210,10 @@
 				title: '提交成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}
@@ -250,8 +252,10 @@
 				title: '删除成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}

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

@@ -31,8 +31,8 @@
 							<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="itemView(item)">{{ item.state }}</view>
+										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
 									<view class="font-bold" style="padding-bottom:10rpx">机会类型:{{item.opportunityType}}
@@ -50,14 +50,14 @@
 							<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">{{ item.state }}</view>
+										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
 									<view class="font-bold" style="padding-bottom:10rpx">
 										产生的影响:{{item.theImpactGenerated}}</view>
 									<view class="font-bold" style="padding-bottom:10rpx">
-										重大事项类型:{{item.majorTypesOfMatters}}</view>
+										重大事项类型:{{item.opportunityType}}</view>
 									<!-- <view class="font-gray">{{ item.desc }}</view> -->
 								</view>
 							</view>
@@ -69,8 +69,8 @@
 							<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">{{ item.state }}</view>
+										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
 									<view class="font-bold" style="padding-bottom:10rpx">
@@ -88,8 +88,8 @@
 							<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">{{ item.state }}</view>
+										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
 									<view class="font-bold" style="padding-bottom:10rpx">客户人员名称:{{item.cusUserName}}
@@ -109,8 +109,8 @@
 							<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">{{ item.state }}</view>
+										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
 									<view class="font-bold" style="padding-bottom:10rpx">重点型号:{{item.keyModels}}</view>
@@ -127,8 +127,8 @@
 							<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">{{ item.state }}</view>
+										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
 									<view class="font-bold" style="padding-bottom:10rpx">标签:{{item.generalFormType}}
@@ -148,7 +148,8 @@
 <script setup>
 	import {
 		ref,
-		onMounted
+		onMounted,
+		onUnmounted
 	} from 'vue'
 	import customHeader from '@/components/customHeader.vue'
 	import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
@@ -166,7 +167,12 @@
 	const navBarPaddingTop = ref(0);
 	onMounted(() => {
 		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+		uni.$on('refreshMarketList', handleRefreshList);
 	})
+	onUnmounted(() => {
+	  // 移除事件监听
+	  uni.$off('refreshMarketList', handleRefreshList);
+	});
 	const mescrollInstance = ref(null);
 	const activeTab = ref(0); // 默认市场机会
 	const tabList = ['市场机会', '重大事项信息', '竞争对手信息', '人员变化信息', '重点型号任务信息', '通用表单'];
@@ -230,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: '刷新中...'
@@ -297,7 +304,6 @@
 		};
 
 		const res = await CrmMarketInformationList(param);
-
 		return {
 			list: res.rows,
 			total: res.total
@@ -322,13 +328,14 @@
 									title: '提交成功',
 									duration: 2000
 								})
+								handleRefreshList();
 							} else {
 								uni.showToast({
 									title: res.msg || '操作失败',
 									icon: 'none'
 								})
 							}
-							reload()
+							
 						} catch {
 							uni.showToast({
 								title: '提交失败，请重试',
@@ -344,13 +351,14 @@
 									title: '提交成功',
 									duration: 2000
 								})
+								handleRefreshList();
 							} else {
 								uni.showToast({
 									title: res.msg || '操作失败',
 									icon: 'none'
 								})
 							}
-							reload()
+							
 						} catch {
 							uni.showToast({
 								title: '提交失败，请重试',
@@ -405,6 +413,13 @@
 		// console.log(item)
 		// uni.navigateTo({ url: '/pages/business/CRM/visitorReportAdd' })
 	}
+	const handleRefreshList = () => {
+	  if (mescrollInstance.value) {
+	    mescrollInstance.value.triggerDownScroll();
+	  }
+	};
+	
+	
 </script>
 
 <style scoped>
@@ -417,7 +432,6 @@
 		top: 100rpx;
 		height: calc(100vh - 48px);
 		/* #endif */
-
 	}
 
 	/*.market-con{
@@ -479,4 +493,8 @@
 	.report-list .title {
 		display: flex;
 	}
+	.btn-blue {
+	  background-color: #3384DF; /* 蓝色背景 */
+	  color: #ffffff;
+	}
 </style>

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

@@ -0,0 +1,252 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'市场信息审核'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+         
+        </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" />
+          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+        </view> -->
+
+        <!-- 分页部分  -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="touchstart(item)">
+            <view>
+              <view class="report-list">
+                <view class="title">信息类型：{{ item.informationType }}</view>
+                <view class="r-list">
+                  <view class="r-name">公司名称：{{ item.cusName }}</view>
+
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">创建人</view>
+                  <view class="r-right">{{ item.createName }}</view>
+                </view>
+                <view class="r-list">
+                  <view class="r-left">创建时间</view>
+                  <view class="r-right">{{ item.createTime }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">是否为商业航天类型</view>
+                  <view class="r-name">{{ item.commercialAerospace }}</view>
+                </view>
+                
+             
+
+              </view>
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, onMounted, watch,onUnmounted } 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 { approvalMarketInfget } from '@/api/crm/api_ys.js';
+import { onShow  } from '@dcloudio/uni-app'
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 查询列表
+let list = ref([]);
+
+let searchValue = ref(null)
+
+//监视查询的内容的变化
+watch(searchValue, (newValue, oldValue) => {
+  //变化了之后，重新查询内容
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+    searchContent: searchValue.value
+  };
+  getYsVisistList(data).then(res => {
+    if (res.code == 200) {
+      //设置列表数据
+      list.value = res.rows;
+    }
+  })
+})
+
+// 新增
+let handleAdd = () => {
+  uni.navigateTo({url: '/pages/business/CRM/paymentCollection/addPaymentCollection'})
+}
+
+
+const mescrollRef = ref(null);
+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: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await ApprovalMarketInfget(1, upOption.value.page.size);
+      cssFlag.value = false;
+      list.value = res.list;
+      mescroll.resetUpScroll();
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  } finally {
+    setTimeout(async () => {
+      mescroll.endSuccess();
+    }, 500);
+  }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await ApprovalMarketInfget(mescroll.num, mescroll.size);
+      if (mescroll.num === 1) {
+        list.value = res.list;
+      } else {
+        list.value.push(...res.list);
+      }
+      mescroll.endBySize(res.list.length, res.total);
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  }
+}
+
+// 获取数据列表
+const ApprovalMarketInfget = (pageNum, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum,
+      pageSize
+    }
+    let res = await approvalMarketInfget(param);
+    resolve({
+      list: res.rows,
+      total: res.total
+    });
+  });
+}
+let Loop = ref(0)
+
+function touchstart(item) {
+    uni.navigateTo({
+      url: "/pages/business/CRM/marketInformation/marketInformationReviewDetail?informationId=" + item.informationId
+    })
+}
+// 生命周期钩子
+onShow(() => {
+  // 监听刷新事件
+  
+  uni.$on('refreshList', ApprovalMarketInfget(1,10))
+  
+  // 页面显示时也加载一次数据
+  ApprovalMarketInfget(1,10)
+})
+onUnmounted(() => {
+  // 移除监听（避免重复触发）
+  uni.$off('refreshList')
+})
+onMounted(() => {
+  ApprovalMarketInfget()
+})
+</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;
+}
+</style>

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

@@ -0,0 +1,385 @@
+<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="report-list">
+					<view class="title">{{ detailList.informationType }}</view>
+					<view class="r-list">
+						<view class="r-name">{{ detailList.cusName }}</view>
+					</view>
+					<view class="border-bottom b-width"></view>
+					<view class="r-list">
+						<view class="r-left">报告人</view>
+						<view class="r-right">{{ detailList.createName }}</view>
+					</view>
+					<view class="border-bottom b-width"></view>
+					<view class="r-list">
+						<view class="r-left">创建日期</view>
+						<view class="r-right">{{ detailList.createTime }}</view>
+					</view>
+
+
+					<view class="border-bottom b-width" v-if="detailList.opportunityType != null"></view>
+					<view class="r-list" v-if="detailList.opportunityType != null">
+						<view class="r-left">机会类型</view>
+						<view class="r-right">{{ detailList.opportunityType }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.understandTheWay != null"></view>
+					<view class="r-list" v-if="detailList.understandTheWay != null">
+						<view class="r-left">了解途径</view>
+						<view class="r-right">{{ detailList.understandTheWay }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.opportunityDescription != null"></view>
+					<view class="r-list" v-if="detailList.opportunityDescription != null">
+						<view class="r-left">机会描述</view>
+						<view class="r-right">{{ detailList.opportunityDescription }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.opportunityStatus != null"></view>
+					<view class="r-list" v-if="detailList.opportunityStatus != null">
+						<view class="r-left">机会所处状态</view>
+						<view class="r-right">{{ detailList.opportunityStatus }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.predictedAmount != null"></view>
+					<view class="r-list" v-if="detailList.predictedAmount != null">
+						<view class="r-left">预测金额或情况</view>
+						<view class="r-right">{{ detailList.predictedAmount }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.competitionSituation != null"></view>
+					<view class="r-list" v-if="detailList.competitionSituation != null">
+						<view class="r-left">竞争情况</view>
+						<view class="r-right">{{ detailList.competitionSituation }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.majorTypesOfMatters != null"></view>
+					<view class="r-list" v-if="detailList.majorTypesOfMatters != null">
+						<view class="r-left">重大事项类型</view>
+						<view class="r-right">{{ detailList.majorTypesOfMatters }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.theImpactGenerated != null"></view>
+					<view class="r-list" v-if="detailList.theImpactGenerated != null">
+						<view class="r-left">产生的影响</view>
+						<view class="r-right">{{ detailList.theImpactGenerated }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.companyResponseStrategy != null"></view>
+					<view class="r-list" v-if="detailList.companyResponseStrategy != null">
+						<view class="r-left">公司应对策略</view>
+						<view class="r-right">{{ detailList.companyResponseStrategy }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.competitiveUnits != null"></view>
+					<view class="r-list" v-if="detailList.competitiveUnits != null">
+						<view class="r-left">竞争单位</view>
+						<view class="r-right">{{ detailList.competitiveUnits }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.competitorLevelOne != null"></view>
+					<view class="r-list" v-if="detailList.competitorLevelOne != null">
+						<view class="r-left">信息类型</view>
+						<view class="r-right">{{ detailList.competitorLevelOne }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.competitorLevelTwo != null"></view>
+					<view class="r-list" v-if="detailList.competitorLevelTwo != null">
+						<view class="r-left">具体分类</view>
+						<view class="r-right">{{ detailList.competitorLevelTwo }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.specificMatters != null"></view>
+					<view class="r-list" v-if="detailList.specificMatters != null">
+						<view class="r-left">具体事情</view>
+						<view class="r-right">{{ detailList.specificMatters }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.originalPosition != null"></view>
+					<view class="r-list" v-if="detailList.originalPosition != null">
+						<view class="r-left">原职务</view>
+						<view class="r-right">{{ detailList.originalPosition }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.currentPosition != null"></view>
+					<view class="r-list" v-if="detailList.currentPosition != null">
+						<view class="r-left">现职务</view>
+						<view class="r-right">{{ detailList.currentPosition }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.positionOfOurCompany != null"></view>
+					<view class="r-list" v-if="detailList.positionOfOurCompany != null">
+						<view class="r-left">现职务是否与我公司业务相关</view>
+						<view class="r-right">{{ detailList.positionOfOurCompany }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.developmentEfforts != null"></view>
+					<view class="r-list" v-if="detailList.developmentEfforts != null">
+						<view class="r-left">攻关力度</view>
+						<view class="r-right">{{ detailList.developmentEfforts }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.successor != null"></view>
+					<view class="r-list" v-if="detailList.successor != null">
+						<view class="r-left">继任者</view>
+						<view class="r-right">{{ detailList.successor }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.keyModels != null"></view>
+					<view class="r-list" v-if="detailList.keyModels != null">
+						<view class="r-left">重点型号</view>
+						<view class="r-right">{{ detailList.keyModels }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.currentStatus != null"></view>
+					<view class="r-list" v-if="detailList.currentStatus != null">
+						<view class="r-left">目前状态</view>
+						<view class="r-right">{{ detailList.currentStatus }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.batchProductionPlan != null"></view>
+					<view class="r-list" v-if="detailList.batchProductionPlan != null">
+						<view class="r-left">批产计划</view>
+						<view class="r-right">{{ detailList.batchProductionPlan }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.situation != null"></view>
+					<view class="r-list" v-if="detailList.situation != null">
+						<view class="r-left">外协、外包、上级单位情况</view>
+						<view class="r-right">{{ detailList.situation }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.subordinateSupportingUnits != null"></view>
+					<view class="r-list" v-if="detailList.subordinateSupportingUnits != null">
+						<view class="r-left">下级配套单位</view>
+						<view class="r-right">{{ detailList.subordinateSupportingUnits }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.generalFormType != null"></view>
+					<view class="r-list" v-if="detailList.generalFormType != null">
+						<view class="r-left">通用表单类型</view>
+						<view class="r-right">{{ detailList.generalFormType }}</view>
+					</view>
+
+					<view class="border-bottom b-width" v-if="detailList.informationContent != null"></view>
+					<view class="r-list" v-if="detailList.informationContent != null">
+						<view class="r-left">信息内容</view>
+						<view class="r-right">{{ detailList.informationContent }}</view>
+					</view>
+					<view class="border-bottom b-width" v-if="detailList.remark != null"></view>
+					<view class="r-list" v-if="detailList.remark != null">
+						<view class="r-left">备注</view>
+						<view class="r-right">{{ detailList.remark }}</view>
+					</view>
+
+
+
+					<view class="border-bottom b-width"></view>
+
+				</view>
+
+			</view>
+
+			<!-- 底部加高度来避免tabbar遮挡 -->
+			<!-- <view class="bottom-height"></view> -->
+			<view class="tipsPopBtn">
+				<view class="btnCancal" @click="refuse">驳回</view>
+				<!-- <view class="btnComfire" @click="refusePass">通过不得分</view> -->
+				<view class="btnComfire" @click="adopt">通过</view>
+
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app'
+	import customHeader from '@/components/customHeader.vue'
+	import customTabs from '@/components/customTabs.vue';
+	import {
+		viewingMarketInfgetDetail,
+		crmMarketInformationApprovalSuccess,
+		crmMarketInformationApprovalUnSuccess
+	} from '@/api/crm/api_ys.js';
+
+
+	let informationId = ref(0)
+	// 加载后调用
+	let id = ref(null)
+	onLoad((options) => {
+		informationId.value = options.informationId
+		getVisitorReportDetail();
+	})
+	// 查询详情
+	let item = ref({});
+	//明细List
+	let detailList = ref({})
+	const getVisitorReportDetail = async () => {
+		let param = {
+			informationId: informationId.value
+		}
+		let detailRes = await viewingMarketInfgetDetail(param);
+		detailList.value = detailRes.rows[0];
+	}
+	//通过审批
+	const adopt = async () => {
+		try {
+			const param = {
+				informationId: informationId.value
+			}
+			const res = await crmMarketInformationApprovalSuccess(param);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			});
+			// 操作完成后返回
+			setTimeout(() => {
+				uni.navigateBack(1);
+			}, 1500);
+		} catch (err) {
+			console.log('提交失败:', err);
+			uni.showToast({
+				title: '提交失败',
+				icon: 'error'
+			});
+		}
+	}
+
+// 修正后的驳回方法
+const refuse = async () => {
+  uni.showModal({
+    title: '驳回原因',
+    content: '',
+    editable: true,
+    success: async function (modalRes) { // 使用modalRes避免重名
+      if (modalRes.confirm) {
+        try {
+          const param = {
+            informationId: informationId.value,
+            opinion: modalRes.content // 用户输入的驳回原因
+          };
+          const apiRes = await crmMarketInformationApprovalUnSuccess(param); // 避免与modalRes重名
+          console.log('驳回成功:', apiRes);
+          uni.showToast({
+            title: '驳回成功',
+            icon: 'success'
+          });
+          // 操作完成后返回
+          setTimeout(() => {
+            uni.navigateBack(1);
+          }, 1500);
+        } catch (err) {
+          console.log('驳回失败:', err);
+          uni.showToast({
+            title: '驳回失败',
+            icon: 'error'
+          });
+        }
+      }
+    }
+  });
+}
+</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;
+	}
+
+	.tipsPopBtn {
+		width: 300px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 50px auto 56px auto;
+		bottom: 0;
+		left: 0;
+	}
+
+	.btnCancal {
+		width: 100px;
+		height: 60px;
+		border: 2px solid #29abe2;
+		border-radius: 40px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #29abe2;
+		font-size: 15px;
+
+	}
+
+	.btnComfire {
+		width: 100px;
+		height: 60px;
+		background-color: #29abe2;
+		border-radius: 40px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #FFF;
+		font-size: 15px;
+	}
+
+	: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;
+	}
+</style>

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

@@ -87,9 +87,6 @@
 	let customerUser = reactive({})
 	// 客户相关
 	const guestList = ref([])
-	const guestArr = ref([])
-	const guestIndex = ref(0)
-
 	// 表单数据
 	const formData = ref({
 		cusId: null,
@@ -186,7 +183,7 @@
 	const form = ref({
 		cusId: null,
 		cusName: null,
-		opportunityType: "", // 机会类型
+		opportunityType: array.value[0].name, // 机会类型
 		understandTheWay: "", // 了解途径
 		opportunityDescription: "", // 机会描述
 		opportunityStatus: "", // 机会所处状态
@@ -235,7 +232,8 @@
 	// 选择客户页面跳转
 	function chooseCustomer(){
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
+			
 		})  
 	} 
 	//定义数据接收的值
@@ -243,7 +241,12 @@
 	
 	//监听时间
 	onMounted(() => {
-	    uni.$on('onCustomerSelected', handleCustomerSelected)
+		 // 设置机会类型的默认值
+		    formData.value.opportunityType = array.value[0].name;
+		    opportunityTypeIndex.value = 0;
+		
+		    // 原有的监听客户选择事件
+		    uni.$on('onCustomerSelected', handleCustomerSelected);
 	})
 	//取消监听
 	onUnmounted(() => {
@@ -272,11 +275,12 @@
 				title: '提交成功',
 				icon: 'success'
 			})
+			  uni.$emit('refreshMarketList');
+			  setTimeout(() => {
+			        uni.navigateBack(1);
+			      }, 1500);
+			      
 			console.log('表单数据:', formData.value)
-
-			// TODO: 在这里添加提交到后端的逻辑，比如调用 api.CrmMarketInformationAdd(formData.value)
-			// 暂时只做校验提示
-
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}
@@ -308,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'
 		})  
 	} 
 	//定义数据接收的值
@@ -293,8 +293,10 @@ onMounted(() => {
 				title: '提交成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 
 		} catch (err) {
 			console.log('表单验证失败:', err)
@@ -309,7 +311,10 @@ onMounted(() => {
 				title: '删除成功',
 				icon: 'success'
 			})
-			uni.navigateBack(1)
+			uni.$emit('refreshMarketList');
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}
@@ -332,11 +337,12 @@ onMounted(() => {
 
 	.form-con {
 		/* #ifdef APP-PLUS */
-		height: calc(120vh - 100px)
+		height: calc(100vh - 95px) !important;
 		/* #endif */
 		/* #ifndef APP-PLUS */
-			height:calc(120vh - 80px)
+		height:calc(100vh - 68px) !important;
 		/* #endif */
+		overflow-y: auto;
 	}
 
 	:deep(.uni-date-x) {

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

@@ -81,7 +81,10 @@
 	} from 'vue'
 	import customHeader from '@/components/customHeader.vue'
 	import cache from '@/utils/cache'
-	import { onShow, onUnload } from '@dcloudio/uni-app';
+	import {
+		onShow,
+		onUnload
+	} from '@dcloudio/uni-app';
 	import {
 		getGuestList
 	} from '@/api/business.js'
@@ -198,7 +201,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/chooseCus'
+			url: '/pages/business/CRM/marketActivity/chooseCus'
 		})
 	}
 	//定义数据接收的值
@@ -227,23 +230,23 @@
 			url: '/pages/business/CRM/customerUserList?cusName=' + formData.value.cusName
 		})
 	}
-//页面渲染完成后，查询catch的get
+	//页面渲染完成后，查询catch的get
-onShow(() => {
+	onShow(() => {
 
 		if (cache.get('checkedRCClientList') != null && cache.get('checkedRCClientList') != []) {
 			formData.value.cusUserName = cache.get('checkedRCClientList')
 		}
 
-})
+	})
-//页面卸载之后，删除缓存信息
+	//页面卸载之后，删除缓存信息
-onUnload(() => {
+	onUnload(() => {
 		handleDeleteLocal()
-})
+	})
 
-//删除缓存
+	//删除缓存
-let handleDeleteLocal = () => {
+	let handleDeleteLocal = () => {
 		cache.remove('checkedRCClientList');
-}
+	}
 
 	// 提交表单
 	const submitForm = async () => {
@@ -259,10 +262,10 @@ let handleDeleteLocal = () => {
 				title: '提交成功',
 				icon: 'success'
 			})
-			console.log('表单数据:', formData.value)
+			uni.$emit('refreshMarketList');
-
+			setTimeout(() => {
-			// TODO: 在这里添加提交到后端的逻辑，比如调用 api.CrmMarketInformationAdd(formData.value)
+				uni.navigateBack(1);
-			// 暂时只做校验提示
+			}, 1500);
 
 		} catch (err) {
 			console.log('表单验证失败:', err)

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'
 		})
 	}
 	//定义数据接收的值
@@ -263,8 +263,10 @@ let handleDeleteLocal = () => {
 				title: '提交成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 
 			// TODO: 在这里添加提交到后端的逻辑，比如调用 api.CrmMarketInformationAdd(formData.value)
 			// 暂时只做校验提示
@@ -318,8 +320,10 @@ let handleDeleteLocal = () => {
 				title: '删除成功',
 				icon: 'success'
 			})
-			uni.$emit('refreshMarketOpportunityList')
+			uni.$emit('refreshMarketList');
-			uni.navigateBack(1)
+			setTimeout(() => {
+			      uni.navigateBack(1);
+			    }, 1500);
 		} catch (err) {
 			console.log('表单验证失败:', err)
 		}

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

@@ -0,0 +1,182 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'回款计划新增'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="计划回款金额" name="targetAmount" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.targetAmount" placeholder="请输入计划回款金额"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		addPaymentCollection
+	} from '@/api/crm/api_ys.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		promiseCode: null,
+		cusName: null,
+		targetAmount: null
+
+
+	})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		targetAmount: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入回款计划金额'
+			},
+			{
+			      format: 'number',
+			      errorMessage: '必须输入数字（可包含小数点）'
+			},
+			]
+		}
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/marketActivity/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await addPaymentCollection(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			   uni.$emit('refreshList');
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>

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

@@ -0,0 +1,262 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'全员信息查看统计表'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view>
+				<!-- 搜索 -->
+				<view class="search">
+					<picker :value="index1" @change="handlePlace1" :range="monthArray" :range-key="'name'"
+						class="picker-bg">
+						<view class="picker">
+							<uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+								size="18"></uni-icons>
+							<view>{{ monthArray[index1]?.name || '选择月份' }}</view>
+							<uni-icons type="down" size="18"></uni-icons>
+						</view>
+					</picker>
+					<picker @change="handlePlace" :value="index2" :range="palceArray" class="picker-bg"
+						:range-key="'name'">
+						<view class="picker">
+							<uni-icons type="person" size="18"></uni-icons>
+							<view>{{palceArray[index2]?.name || '选择区域' }}</view>
+							<uni-icons type="down" size="18"></uni-icons>
+						</view>
+					</picker>
+					<button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+				</view>
+
+				<!-- 回款信息查询 -->
+				<view class="white-bg">
+					<view class="table-title">回款信息查询</view>
+					<view v-if="loading" class="loading-container">
+											<uni-load-more status="loading" contentText="加载中..."></uni-load-more>
+										</view>
+										<!-- 添加空数据提示 -->
+										<view v-else-if="tableData.length === 0" class="empty-tip">
+											暂无数据
+										</view>
+					
+					
+					<table v-else  class="my-table">
+						<tr>
+							<th class="tab-width100">业务员姓名</th>
+							<!-- <th class="tab-width160">客户名称</th> -->
+							<th>目标回款</th>
+							<th>实际回款</th>
+							<th>完成度</th>
+						</tr>
+						<tr v-for="(item, index) in tableData" :key="index">
+							<td>{{ item.userName }}</td>
+							<!-- <td class="txtLeft">{{ item.guestName }}</td> -->
+							<td>{{ item.targetAmount }}</td>
+							<td>{{ item.backMoneyRatio }}</td>
+							<td>{{ item.jisuan }}</td>
+						</tr>
+					</table>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getDate
+	} from '@/utils/datetime.js'
+	import {
+		getFullStaffStatisticsViewingTable
+	} from '@/api/crm/api_ys.js' 
+const loading = ref(false) // 加载状态
+	const index1 = ref(0)
+	const index2 = ref(0)
+	let peopleIndex = ref(0);
+	// 选择列表
+	let bindPickerChange = (e) => {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		peopleIndex.value = e.detail.value
+	}
+
+	let searchValue = ref(null)
+	// 查询搜索跳转
+	let handleSearch = () => {
+		getCrmMarketInformationList();
+	}
+	// 表单数据
+	const formData = ref({
+		month: "1",
+		region: "北京大区",
+	})
+	const tableData  = ref([])
+	const palceArray = ref([{
+		id: 1,
+		name: '北京大区'
+	}, {
+		id: 2,
+		name: '市场三部'
+	}, {
+		id: 3,
+		name: '市场二部'
+	}, {
+		id: 4,
+		name: '南方大区'
+	}, {
+		id: 5,
+		name: '北方大区'
+	}, {
+		id: 6,
+		name: '西部大区'
+	}])
+	const monthArray = ref([
+	  { id: 1, name: '1月' },
+	  { id: 2, name: '2月' },
+	  { id: 3, name: '3月' },
+	  { id: 4, name: '4月' },
+	  { id: 5, name: '5月' },
+	  { id: 6, name: '6月' },
+	  { id: 7, name: '7月' },
+	  { id: 8, name: '8月' },
+	  { id: 9, name: '9月' },
+	  { id: 10, name: '10月' },
+	  { id: 11, name: '11月' },
+	  { id: 12, name: '12月' }
+	])
+			const handlePlace1 = (e) => {
+				index1.value = e.detail.value
+				console.log('index1:', monthArray.value[e.detail.value]?.name)
+				formData.value.month = monthArray.value[e.detail.value]?.id || ''
+			}
+			const handlePlace = (e) => {
+				index2.value = e.detail.value
+				console.log('index2:', palceArray.value[e.detail.value]?.name)
+				formData.value.region = palceArray.value[e.detail.value]?.name || ''
+			}
+			
+			// 获取数据列表
+			const getCrmMarketInformationList = async () => {
+				loading.value = true
+				try {
+					const res = await getFullStaffStatisticsViewingTable(formData.value);
+					// 直接赋值给响应式变量
+					tableData.value = res.rows || []
+					console.log('获取到的数据:', tableData.value)
+				} catch (error) {
+					console.error('获取数据失败:', error)
+					uni.showToast({
+						title: '获取数据失败',
+						icon: 'error'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+			// 获取数据列表（无参数）
+			const getCrmMarketInformationListNoPo = async () => {
+				loading.value = true
+				try {
+					const res = await getFullStaffStatisticsViewingTable();
+					// 直接赋值给响应式变量
+					tableData.value = res.rows || []
+					console.log('获取到的数据:', tableData.value)
+				} catch (error) {
+					console.error('获取数据失败:', error)
+					uni.showToast({
+						title: '获取数据失败',
+						icon: 'error'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+				onMounted(() => {
+					getCrmMarketInformationListNoPo()
+				})
+			
+</script>
+
+<style scoped>
+	.search {
+		display: flex;
+		padding: 0 30rpx;
+	}
+
+	.search .btn-search {
+		border: none;
+		background: none;
+		line-height: normal;
+		color: #fff;
+		line-height: 56rpx !important;
+		padding: 10rpx 0 0;
+		text-align: left;
+		cursor: pointer;
+	}
+
+	.search .btn-search::after {
+		display: none;
+	}
+
+	.search .picker-bg {
+		display: flex;
+		background-color: #6FA2F8;
+		border-radius: 25px;
+		color: #fff;
+		font-size: 28rpx;
+		padding: 0rpx 20rpx;
+		/* #ifndef APP-PLUS */
+		padding: 10rpx 20rpx 0 20rpx;
+		/* #endif */
+		margin-right: 20rpx;
+	}
+
+	.search .picker-bg .picker {
+		display: flex;
+		align-items: center;
+		/* #ifndef APP-PLUS */
+		padding-top: 2rpx;
+		/* #endif */
+	}
+
+	.search .picker-bg .picker .uni-icons {
+		color: #fff !important;
+	}
+
+	.search .picker-bg .picker .uni-icons:first-child {
+		margin-right: 10rpx;
+	}
+
+	.search .picker-bg .picker .uniui-down {
+		margin-left: 20rpx;
+	}
+
+	.white-bg {
+		width: 750rpx;
+		margin: 0;
+		border-radius: 8px 8px 0 0;
+		padding: 20rpx 0rpx;
+		margin-top: 20rpx;
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 135px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		height: calc(100vh - 112px);
+		/* #endif */
+	}
+
+	.table-title {
+		text-align: center;
+		font-weight: bold;
+		border-bottom: 2px solid #E7E7E7;
+		padding-bottom: 20rpx;
+	}
+</style>

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

@@ -0,0 +1,257 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'个人回款信息查看'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="handleAdd">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>新增
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view 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"
+                      class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="touchstart(item)">
+            <view>
+              <view class="report-list">
+                <view class="title">客户：{{ item.cusName }}</view>
+                <view class="r-list">
+                  <!-- <view class="r-name">{{ item.visistCode }}</view> -->
+
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">计划年份</view>
+                  <view class="r-right">{{ item.year }}</view>
+                </view>
+                <view class="r-list">
+                  <view class="r-left">计划月份</view>
+                  <view class="r-right">{{ item.month }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">创建时间</view>
+                  <view class="r-right">{{ item.createTime }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">计划汇款金额</view>
+                  <view class="r-right"  style="color: red;">{{ item.targetAmount }}</view>
+                </view>
+
+              </view>
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, onMounted, watch,onUnmounted } 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 { getPaymentList } from '@/api/crm/api_ys.js';
+import { onShow  } from '@dcloudio/uni-app'
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 查询列表
+let list = ref([]);
+
+let searchValue = ref(null)
+
+//监视查询的内容的变化
+watch(searchValue, (newValue, oldValue) => {
+  //变化了之后，重新查询内容
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+    searchContent: searchValue.value
+  };
+  getYsVisistList(data).then(res => {
+    if (res.code == 200) {
+      //设置列表数据
+      list.value = res.rows;
+    }
+  })
+})
+
+// 新增
+let handleAdd = () => {
+  uni.navigateTo({url: '/pages/business/CRM/paymentCollection/addPaymentCollection'})
+}
+
+
+const mescrollRef = ref(null);
+const upOption = ref({
+  page: {num: 0, size: 10},
+  noMoreSize: 5,
+  empty: { 
+      tip: '~ 空空如也 ~',
+      icon: "../../../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: false,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await GetPaymentList(1, upOption.value.page.size);
+      cssFlag.value = false;
+      list.value = res.list;
+      mescroll.resetUpScroll();
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  } finally {
+    setTimeout(async () => {
+      mescroll.endSuccess();
+    }, 500);
+  }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await GetPaymentList(mescroll.num, mescroll.size);
+      if (mescroll.num === 1) {
+        list.value = res.list;
+      } else {
+        list.value.push(...res.list);
+      }
+      mescroll.endBySize(res.list.length, res.total);
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  }
+}
+
+// 获取数据列表
+const GetPaymentList = (pageNum, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum,
+      pageSize
+    }
+    let res = await getPaymentList(param);
+    resolve({
+      list: res.rows,
+      total: res.total
+    });
+  });
+}
+let Loop = ref(0)
+
+function touchstart(item) {
+    uni.navigateTo({
+      url: "/pages/business/CRM/paymentCollection/paymentDetail?collectionId=" + item.collectionId + '&cusId=' + item.cusId + '&targetAmount=' + item.targetAmount + '&cusName=' + item.cusName
+    })
+}
+// 生命周期钩子
+onShow(() => {
+  // 监听刷新事件
+  
+  uni.$on('refreshList', GetPaymentList(1,10))
+  
+  // 页面显示时也加载一次数据
+  GetPaymentList(1,10)
+})
+onUnmounted(() => {
+  // 移除监听（避免重复触发）
+  uni.$off('refreshList')
+})
+onMounted(() => {
+  GetPaymentList()
+})
+</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;
+}
+</style>

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

@@ -0,0 +1,106 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'回款计划查看'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<!-- <view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view> -->
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="全员统计查看" name="cusName" class="f-c-right" >
+							<view @click="DiligenceStatistics" class="form-item-container">
+								<text class="name">{{'点击跳转'}}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="个人详细查看" name="cusName" class="f-c-right">
+							<view @click="MarketActivity" class="form-item-container">
+								<text class="name">{{'点击跳转'}}</text>
+							</view>
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+		import { onLoad } from '@dcloudio/uni-app'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+
+	
+	// 选择客户页面跳转
+	function DiligenceStatistics() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable'
+		})
+	}
+	// 选择客户页面跳转
+	function MarketActivity() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/paymentCollection/personalPaymentCollectionTable'
+		})
+	}
+	
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>

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

@@ -0,0 +1,213 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'回款任务单修改'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="计划回款金额" name="targetAmount" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.targetAmount"
+								placeholder="请输入计划回款金额" class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+					<view class="footer-con">
+					    <button class="btn-default" type="default" @click="handleDelete" size="mini">删 除</button>
+					    <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		updatePaymentDetail,deletePaymentDetail
+	} from '@/api/crm/api_ys.js'
+		import { onLoad } from '@dcloudio/uni-app'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+				cusId: null,
+				promiseCode: null,
+				cusName:null,
+				targetAmount:null,
+					collectionId:null
+				})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		targetAmount: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入回款计划金额'
+			},
+			{
+			      format: 'number',
+			      errorMessage: '必须输入数字（可包含小数点）'
+			},
+			]
+		}
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/marketActivity/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await updatePaymentDetail(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+	
+	//定义查询参数
+	const queryParams = ref({
+	    informationId: 0
+	})
+		onLoad(options => {
+		    formData.value.cusName = options.cusName
+		    formData.value.cusId = options.cusId
+		    formData.value.collectionId = options.collectionId
+		    formData.value.targetAmount = options.targetAmount;
+		})
+		
+	// 根据ID删除表单
+	const handleDelete = async () => {
+		try {
+	
+	        const res = await deletePaymentDetail(formData.value);
+			uni.showToast({
+				title: '删除成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>

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

@@ -0,0 +1,294 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'个人详情查看统计表'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view>
+				<!-- 搜索 -->
+				<view class="search">
+					<picker :value="index1" @change="handlePlace1" :range="monthArray" :range-key="'name'"
+						class="picker-bg">
+						<view class="picker">
+							<uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+								size="18"></uni-icons>
+							<view>{{ monthArray[index1]?.name || '选择月份' }}</view>
+							<uni-icons type="down" size="18"></uni-icons>
+						</view>
+					</picker>
+					<!-- <picker @change="handlePlace" :value="index2" :range="palceArray" class="picker-bg"
+						:range-key="'name'">
+						<view class="picker">
+							<uni-icons type="person" size="18"></uni-icons>
+							<view>{{palceArray[index2]?.name || '选择区域' }}</view>
+							<uni-icons type="down" size="18"></uni-icons>
+						</view>
+					</picker> -->
+					<view class="picker-bg">
+					            <view class="picker">
+					              <uni-icons type="person" size="18" color="#ffffff"></uni-icons>
+					              <input 
+					                class="search-input"
+					                v-model="formData.bandResult" 
+					                placeholder="输入业务员"
+					                placeholder-style="color:#ffffff;font-size:28rpx"
+					              />
+					            </view>
+					          </view>
+					<button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+				</view>
+
+				<!-- 回款信息查询 -->
+				<view class="white-bg">
+					<view class="table-title">回款信息查询</view>
+					<view v-if="loading" class="loading-container">
+											<uni-load-more status="loading" contentText="加载中..."></uni-load-more>
+										</view>
+										<!-- 添加空数据提示 -->
+										<view v-else-if="tableData.length === 0" class="empty-tip">
+											暂无数据
+										</view>
+					
+					
+					<table v-else  class="my-table">
+						<tr>
+							<th class="tab-width100">业务员姓名</th>
+							<th class="tab-width160">客户名称</th>
+							<th>目标回款</th>
+							<th>实际回款</th>
+							<th>完成度</th>
+						</tr>
+						<tr v-for="(item, index) in tableData" :key="index">
+							<td>{{ item.userName }}</td>
+							<td class="txtLeft">{{ item.cusName }}</td>
+							<td>{{ item.targetAmount }}</td>
+							<td>{{ item.backNum }}</td>
+							<td>{{ item.jisuan }}</td>
+						</tr>
+					</table>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getDate
+	} from '@/utils/datetime.js'
+	import {
+		getPersonalPaymentCollectionTable
+	} from '@/api/crm/api_ys.js' 
+const loading = ref(false) // 加载状态
+	const index1 = ref(0)
+	const index2 = ref(0)
+	let peopleIndex = ref(0);
+	// 选择列表
+	let bindPickerChange = (e) => {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		peopleIndex.value = e.detail.value
+	}
+
+	let searchValue = ref(null)
+	// 查询搜索跳转
+	let handleSearch = () => {
+		getCrmMarketInformationList();
+	}
+	// 表单数据
+	const formData = ref({
+		month: "1",
+		bandResult: '',
+	})
+	const tableData  = ref([])
+	const palceArray = ref([{
+		id: 1,
+		name: '北京大区'
+	}, {
+		id: 2,
+		name: '市场三部'
+	}, {
+		id: 3,
+		name: '市场二部'
+	}, {
+		id: 4,
+		name: '南方大区'
+	}, {
+		id: 5,
+		name: '北方大区'
+	}, {
+		id: 6,
+		name: '西部大区'
+	}])
+	const monthArray = ref([
+	  { id: 1, name: '1月' },
+	  { id: 2, name: '2月' },
+	  { id: 3, name: '3月' },
+	  { id: 4, name: '4月' },
+	  { id: 5, name: '5月' },
+	  { id: 6, name: '6月' },
+	  { id: 7, name: '7月' },
+	  { id: 8, name: '8月' },
+	  { id: 9, name: '9月' },
+	  { id: 10, name: '10月' },
+	  { id: 11, name: '11月' },
+	  { id: 12, name: '12月' }
+	])
+			const handlePlace1 = (e) => {
+				index1.value = e.detail.value
+				console.log('index1:', monthArray.value[e.detail.value]?.name)
+				formData.value.month = monthArray.value[e.detail.value]?.id || ''
+			}
+			const handlePlace = (e) => {
+				index2.value = e.detail.value
+				console.log('index2:', palceArray.value[e.detail.value]?.name)
+				formData.value.region = palceArray.value[e.detail.value]?.name || ''
+			}
+			
+			// 获取数据列表
+			const getCrmMarketInformationList = async () => {
+				loading.value = true
+				try {
+					const res = await getPersonalPaymentCollectionTable(formData.value);
+					// 直接赋值给响应式变量
+					tableData.value = res.rows || []
+					console.log('获取到的数据:', tableData.value)
+				} catch (error) {
+					console.error('获取数据失败:', error)
+					uni.showToast({
+						title: '获取数据失败',
+						icon: 'error'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+			// 获取数据列表（无参数）
+			const getPersonalPaymentCollectionTableNoPo = async () => {
+				loading.value = true
+				try {
+					const res = await getPersonalPaymentCollectionTable();
+					// 直接赋值给响应式变量
+					tableData.value = res.rows || []
+					console.log('获取到的数据:', tableData.value)
+				} catch (error) {
+					console.error('获取数据失败:', error)
+					uni.showToast({
+						title: '获取数据失败',
+						icon: 'error'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+				onMounted(() => {
+					getPersonalPaymentCollectionTableNoPo()
+				})
+			
+</script>
+
+<style scoped>
+  /* 新增搜索输入框样式 */
+  .search-input {
+    flex: 1;
+    height: 100%;
+    color: #ffffff;
+    font-size: 28rpx;
+    background: transparent;
+    border: none;
+    outline: none;
+    padding: 0 10rpx;
+    line-height: 1;
+  }
+
+  .search-input::placeholder {
+    color: rgba(255, 255, 255, 0.7);
+  }
+  
+  /* 保持原有样式 */
+  .search {
+    display: flex;
+    padding: 0 30rpx;
+  }
+
+  .search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+  }
+
+  .search .btn-search::after {
+    display: none;
+  }
+
+  .search .picker-bg {
+    /* display: flex; */
+    background-color: #6FA2F8;
+    border-radius: 25px;
+    color: #fff;
+    font-size: 28rpx;
+    padding: 0rpx 20rpx;
+    /* #ifndef APP-PLUS */
+    padding: 10rpx 20rpx 0 20rpx;
+    /* #endif */
+    margin-right: 20rpx;
+    /* 设置固定宽度确保布局一致 */
+    width: 102.72px;
+  }
+
+  .search .picker-bg .picker {
+    display: flex;
+    align-items: center;
+    width: 100%; /* 确保picker占据全部宽度 */
+    /* #ifndef APP-PLUS */
+    padding-top: 2rpx;
+    /* #endif */
+  }
+
+  .search .picker-bg .picker .uni-icons {
+    color: #fff !important;
+  }
+
+  .search .picker-bg .picker .uni-icons:first-child {
+    margin-right: 10rpx;
+  }
+
+  .search .picker-bg .picker .uniui-down {
+    margin-left: 20rpx;
+  }
+
+  .white-bg {
+    width: 750rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+    padding: 20rpx 0rpx;
+    margin-top: 20rpx;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 135px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 112px);
+    /* #endif */
+  }
+
+  .table-title {
+    text-align: center;
+    font-weight: bold;
+    border-bottom: 2px solid #E7E7E7;
+    padding-bottom: 20rpx;
+  }
+</style>

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

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

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

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

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

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

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

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

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

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

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

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

@@ -89,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/visitorReportEnter.vue

@@ -88,7 +88,6 @@ let handleExpand = () => {
 // 客户人员
 let monIndex1= reactive([0]);
 const changeValue1 = (item, value) => {
-    console.log("客户人员", item, value);
     monIndex1 = value;
 };
 const guestList1 = [
@@ -102,7 +101,6 @@ const guestList1 = [
 // 我方人员
 let monIndex2= reactive([0]);
 const changeValue2 = (item, value) => {
-    console.log("我方人员", item, value);
     monIndex2 = value;
 };
 const guestList2 = [
@@ -116,7 +114,6 @@ const guestList2 = [
 // 活动内容
 let monIndex3= reactive([0]);
 const changeValue3 = (item, value) => {
-    console.log("活动内容", item, value);
     monIndex2 = value;
 };
 const guestList3 = [

src/pages/business/CRM/vistorCheckin.vue

@@ -43,12 +43,10 @@ import customHeader from '@/components/customHeader.vue'
 let checkFlag = ref(false);
 // 签到
 let handleCheckIn = () => {
-    console.log("签到")
     checkFlag.value = true;
 }
 // 打卡
 let handleClockIn = () => {
-    console.log("打卡")
     checkFlag.value = true;
 }
 // 取消

src/pages/business/CRM/weekPlanUpdate.vue

@@ -79,7 +79,6 @@ const rules = {
 
 // 选择工作类型
 const changeValue = (e) => {
-    console.log("工作类型",  e.detail.value);
     workIndex =  e.detail.value;
     formData.value.workType = workList[workIndex]
 };

src/pages/business/business.vue

@@ -1,25 +1,34 @@
 <template>
-<view class="con-body">
+    <view class="con-body">
         <view class="con-bg">
             <!-- 头部 -->
-        <customHeader ref="customHeaderRef" :title="'业务中心'" 
+            <customHeader ref="customHeaderRef" :title="!searchShow?'业务中心':'搜索'"
-            :leftFlag="false" :rightFlag="false" 
+                :leftFlag="!searchShow?false:true" 
+                :rightFlag="false"
+                @back="handleBack" 
+                :searchType="searchShow?1:undefined"
             ></customHeader>
             <!-- 高度来避免头部遮挡 -->
             <view class="top-height"></view>
 
-         <!-- 搜索 -->
+            <!-- 搜索  @confirm="handleSearch"  -->
-         <view class="search">
+            <customSearch v-if="searchShow"   
+                :searchKeywords="searchText" 
+                :searchType="searchTypeObj" 
+                @confirm="handleSearchConfirm"
+            ></customSearch>
+            <view class="search"  v-else>
                 <uni-search-bar class="custom-search" radius="28" 
-                placeholder="请输入您想查询的内容或服务"
+                    placeholder="请输入搜索条件"
                     clearButton="auto" cancelButton="none" 
                     bgColor="#6FA2F8" textColor="#ffffff"
-                @confirm="handleSearch"  
+                    @focus="handleSearchFocus"
+                    v-model="searchText"
                 />
             </view>
 
             <!-- 下拉刷新 -->
-        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
                 :down="downOption"  @down="downCallback"
                 :fixed="false" class="scroll-h"
             >
@@ -27,64 +36,56 @@
                 <view class="white-bg">
                     <view class="w-b-title">
                         首页日常服务
-                    <view type="primary" @click="handleEdit" class="btn-edit">编 辑</view>
+                        <view type="primary" @click="handleJump('/pages/business/editDaily')" class="btn-edit">编 辑</view>
                     </view>
                 </view>
 
-            <!-- 企业日常 -->
+                <!-- 业务列表 -->
-            <view class="white-bg">
+                <view class="white-bg" v-for="(item,index) in list" :key="index">
-                <view class="w-b-title" @click="handleExpand">企业日常
+                    <view class="w-b-title" @click="handleExpand(item)">{{ item.bizName }}
-                    <text>{{expandFlag?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!expandFlag,'icon-down':expandFlag}"></i></text>
+                        <text>{{item.expandFlag?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!item.expandFlag,'icon-down':item.expandFlag}"></i></text>
                     </view>
-                <view class="logo-list" v-if="!expandFlag">
+                    <block  v-if="!item.expandFlag">
-                    <view  v-for="(item,index) in list1" class="l-l-item" :key="index">
+                        <view class="logo-list" v-if="item.children&&item.children.length>0">
-                        <img :src="item.imgSrc" />
+                            <block v-for="(item2,index2) in item.children">
-                        <text class="font-gray">{{ item.name }}</text>
+                                <view  class="l-l-item"
+                                    @click="handleJump(item2.bizUrl)">
+                                    <img :src="'static/images/business/'+item2.icon+'.png'" />
+                                    <text class="font-gray">{{ item2.bizName }}</text>
                                 </view>
+                            </block>
                         </view>
-            </view>
+                    </block>
-
-            <!-- CRM系统 -->
-            <view class="white-bg">
-                <view class="w-b-title" @click="handleExpand2">CRM系统
-                    <text>{{expandFlag2?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!expandFlag2,'icon-down':expandFlag2}"></i></text>
-                </view>
-                <view class="logo-list" v-if="!expandFlag2">
-                    <view  v-for="(item,index) in list2" class="l-l-item" :key="index" @click="handleJump(item.url)">
-                        <uni-badge :text="item.badgeCount" size="small"></uni-badge>
-                        <img :src="item.imgSrc" />
-                        <text class="font-gray">{{ item.name }}</text>
-                    </view>
-                </view>
-            </view>
-
-            <!-- 供应链采纳 -->
-            <view class="white-bg">
-                <view class="w-b-title">供应链采纳
-                    <text>展开<i :class="{iconfont:true,'icon-down':true}"></i></text>
-                </view>
-            </view>
-
-            <!-- PLM系统 -->
-            <view class="white-bg">
-                <view class="w-b-title">PLM系统
-                    <text>展开<i :class="{iconfont:true,'icon-down':true}"></i></text>
-                </view>
                 </view>
 
                 <!-- 底部加高度来避免tabbar遮挡 -->
                 <view class="bottom-height"></view>
             </mescroll-uni>
         </view>
-</view>
+    </view>
 </template>
 
 <script setup>
 import { ref,onMounted } from 'vue'
-import customHeader from '@/components/customHeader.vue'
+import { onLoad,onHide } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import customSearch from '@/components/customSearch.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop} from '@/utils/system.js'
-import { businessDaily,businessCRMList } from '@/api/business.js';
+import { businessList } from '@/api/business.js';
+import {showLoading,hideLoading} from '@/utils/message.js'
+import { initTree } from '@/utils/common.js';
+
+onLoad(async(opt) => {
+    // uni.setStorageSync('page_cache',true);
+    try {
+        showLoading("加载中...")
+        getList();
+        hideLoading();
+    } catch (error) {
+        hideLoading();
+    }
+})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -92,9 +93,47 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
 
-// 查询搜索跳转
+// 搜索处理
-let handleSearch = ()=>{
+let searchShow = ref(false);
+let searchText = ref(undefined);
+let searchTypeObj = ref({typeId:2});
 
+onHide(()=>{
+    searchShow.value=false;
+})
+
+// 搜索返回操作
+const handleBack=()=>{
+    searchShow.value=false;
+}
+// 获取input 焦点跳转
+const handleSearchFocus=()=>{
+    searchShow.value = true;
+}
+
+// 搜索完返回处理
+const handleSearchConfirm = (param1,param2)=>{
+    // console.log(param1,param2)
+    searchText.value=param2.value;;
+    searchShow.value=false;
+}
+
+// 查询列表
+let list = ref([]);
+let getList = async()=>{
+    let searchValue = searchText.value?searchText.value:undefined;
+    let res = await businessList({searchValue});//查询所有业务
+    let arr = res || [];
+    let bizList = initTree(arr,0,'bizId');//递归获取数组处理
+    bizList.forEach(item => {
+        item.expandFlag = false;
+    });
+    list.value = bizList;
+}
+
+// 右侧展开
+let handleExpand = (item)=>{
+    item.expandFlag = !item.expandFlag;
 }
 
 // 下拉刷新
@@ -112,9 +151,10 @@ const downOption = ref({
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        setTimeout(async ()=>{
+        getList();
-            // mescroll.resetUpScroll();
+        // setTimeout(async ()=>{
-        },500);
+        //     // mescroll.resetUpScroll();
+        // },500);
     } catch (error) {
         mescroll.endErr();
     } finally {
@@ -124,41 +164,8 @@ const downCallback = async (mescroll) => {
     }
 }
 
-// 日常服务编辑
-let handleEdit=()=>{
-
-}
-
-// 图标查询处理
-// 1.企业日常
-let list1 = ref([])
-let getBusinessDailyList= async ()=>{
-    let busRes = await businessDaily({});
-    list1.value = busRes.list || [];
-}
-getBusinessDailyList();
-// 企业日常-右侧展开
-let expandFlag=ref(false);
-let handleExpand = ()=>{
-    expandFlag.value = !expandFlag.value;
-}
-
-// 2.CRM系统
-let list2 = ref([])
-let getBusinessCRMList= async ()=>{
-    let busRes = await businessCRMList({});
-    list2.value = busRes.list || [];
-}
-getBusinessCRMList();
-// 企业日常-右侧展开
-let expandFlag2=ref(false);
-let handleExpand2 = ()=>{
-    expandFlag2.value = !expandFlag2.value;
-}
-
 // 跳转
 let handleJump=(url)=>{
-    console.log(url)
     if(url){
         uni.navigateTo({ url })
     }
@@ -169,7 +176,7 @@ let handleJump=(url)=>{
 <style scope>
 .scroll-h{
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 120px) !important;
+    height: calc(100vh - 130px) !important;
     /* #endif */
     /* #ifndef APP-PLUS */
     height: calc(100vh - 140px) !important;

src/pages/business/editDaily.vue

@@ -0,0 +1,247 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" :title="'常用服务'" 
+            :leftFlag="true" :rightFlag="false" 
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view v-for="(item,index) in list" :key="index">
+                    <view class="bus-title">{{ item.bizName }}</view>
+                    <view class="bus-list">
+                        <view class="bus-tips" :class="{'bus-blue':item2.isDaily}" 
+                            v-for="(item2,index2) in item.children" :key="index2" 
+                            @click="handleCheck(item2)"
+                        >
+                            {{ item2.bizName }}
+                            <view class="bus-icon" v-if="item2.isDaily">
+                                <uni-icons type="checkmarkempty" size="12" color="#fff"></uni-icons>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="bottom-height"></view>
+            </view>
+        </mescroll-uni>
+
+        <!-- 提交按钮 -->
+        <view class="bus-btn-con">
+            <view class="bus-btn" @click="handleSubmit">提 交（{{count}}）</view>
+        </view>
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted } from 'vue'
+import { onLoad } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop} from '@/utils/system.js'
+import { businessList,bizFavoriteSetting } from '@/api/business.js';
+import { getUserFavorite } from '@/api/home.js';
+import {showLoading,hideLoading,showAlert} from '@/utils/message.js'
+import { initTree } from '@/utils/common.js'
+
+// 初始化加载
+onLoad(async(opt) => {
+    uni.setStorageSync('page_cache',true);
+    try {
+        showLoading("加载中...")
+        getList();
+        hideLoading();
+    } catch (error) {
+        hideLoading();
+    }
+})
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop()*2;
+})
+
+// 查询列表
+let list = ref([]);
+let count = ref(0);
+let bizIds = ref([]);//常用服务列表
+let getList = async()=>{
+    let arrNew = [];
+    bizIds.value = [];
+    let res = await businessList({});//查询所有业务
+    let arr = res || [];
+
+    let res2 = await getUserFavorite({});//查询当前用户的常用服务
+    let arr2 = res2 || [];
+    count.value = arr2.length;
+    arr2.forEach(item=>{
+        bizIds.value.push(item.bizId)
+    });
+   
+    arr.forEach(item=>{
+        item.isDaily=false;
+        arr2.forEach(item2=>{
+            if(item2.bizId==item.bizId){
+                item.isDaily=true;
+            }
+        })
+        arrNew.push(item)
+    })
+
+    let bizList = initTree(arrNew,0,'bizId');//递归获取数组处理
+    bizList.forEach(item => {
+        item.expandFlag = false;
+    });
+    list.value = bizList;
+    // console.log("list=>",list.value)
+}
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        setTimeout(async ()=>{
+            // mescroll.resetUpScroll();
+        },500);
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
+    }
+}
+
+
+// 选择常用
+const handleCheck=(item)=>{
+    item.isDaily = !item.isDaily;
+    if(item.isDaily){
+        count.value++;
+        bizIds.value.push(item.bizId);
+    }else{
+        count.value--;
+        const index = bizIds.value.findIndex(item2 => item2 == item.bizId);
+        if (index !== -1) {
+            bizIds.value.splice(index, 1);
+        }
+    }
+
+    // console.log("handleCheck=>bizIds=>",bizIds.value)
+}
+
+// 提交
+const handleSubmit= async()=>{
+    try {
+        showLoading("加载中...")
+        console.log("bizIds=>",bizIds.value)
+        await bizFavoriteSetting({bizIds:bizIds.value.join(",")});
+        showAlert("操作成功")
+        hideLoading();
+        uni.navigateBack();
+    } catch (error) {
+        hideLoading();
+    }
+}
+</script>
+
+<style scoped>
+.scroll-h{
+   height: 100vh;
+}
+
+.white-bg{
+    width: 690rpx;
+    margin-bottom:0;
+    border-radius: 8px 8px 0 0;
+    min-height: calc(100vh - 100px);
+}
+
+:deep(.mescroll-upwarp){
+  display:none
+}
+
+.bus-title{
+    font-weight: bold;
+    margin:0rpx 0 30rpx;
+}
+
+.bus-list{
+    display: flex;
+    align-items: center;
+    flex-flow:row wrap;
+    margin:-10rpx;
+    margin-bottom:40rpx;
+}
+.bus-list .bus-tips{
+    /* width:210rpx; */
+    min-width: calc(100% / 3 - 30px); 
+    height:60rpx;
+    line-height: 60rpx;
+    font-size:28rpx;
+    border-radius: 5px;
+    text-align: center;
+    padding:0 10px;
+    background-color: #fff;
+    color:#333333;
+    border:1px solid #E8E8E8;
+    margin-left:8rpx;
+    margin-right:8rpx;
+    margin-bottom:20rpx;
+}
+
+.bus-list .bus-blue{
+    border:1px solid #05A3F4;
+    background-color: #05A3F4;
+    color:#fff;
+    position: relative;
+}
+.bus-list .bus-blue .bus-icon{
+    position:absolute;
+    right:-10rpx;
+    top:-10rpx;
+    background-color: #02C74C;
+    width:32rpx;
+    height:32rpx;
+    line-height: 32rpx;
+    border-radius: 50%;
+    text-align: center;
+}
+
+.bus-btn-con{
+    position: fixed;
+    bottom:0;
+    background-color: #fff;
+    width:100%;
+    padding:70rpx 0;
+}
+.bus-btn-con .bus-btn{
+    background-color: #05A3F4;
+    color:#fff;
+    text-align: center;
+    width:360rpx;
+    height:80rpx;
+    line-height: 80rpx;
+    margin:0 auto;
+    border-radius: 40rpx;
+}
+</style>

src/pages/deviceAuth/deviceAuth.vue

@@ -0,0 +1,593 @@
+<template>
+<view>
+    <view class="container">
+		<view class="bg"></view>
+        <view class="bg-con">
+            <view class="bg-h">
+
+                <view :style="{height: navBarPaddingTop + 'px'}"></view>
+                <view class="auth-title">
+                    <image src="@/static/images/icon-lock@2x.png"/>
+                    <text>{{networkEnv==1?'内网':''}}设备授权</text>
+                </view>
+                <view class="login-con">
+                    <!-- 登录 -->
+                    <block v-if="!bindStatus">
+                        <view class="login-form" :class="{network1:networkEnv==1}">
+                            <uni-forms ref="form2" :model="formData2" :rules="rules2" label-position="top">
+                                <!-- networkEnv -->
+                                <uni-forms-item label="设备标识" required name="uniqCode" v-if="networkEnv==1">
+                                    <view class="code-con code-device">
+                                        <uni-easyinput prefixIcon="person" :inputBorder="false" 
+                                            v-model="formData2.uniqCode" placeholder="请输入设备标识" 
+                                        >
+                                            <!-- <template #prefixIcon> -->
+                                                <!-- <image src="@/static/images/login-biaoshi.png" style="width: 20px; height: 20px;" /> -->
+                                            <!-- </template> -->
+                                            
+                                        </uni-easyinput>
+                                    </view>
+                                </uni-forms-item>
+                                <uni-forms-item label="用户名" required name="username">
+                                    <view class="code-con">
+                                        <uni-easyinput prefixIcon="person" :inputBorder="false" 
+                                            v-model="formData2.username" placeholder="请输入用户名" 
+                                        />
+                                    </view>
+                                </uni-forms-item>
+                                <uni-forms-item label="密码" required name="password" class="password">
+                                    <view class="code-con">
+                                        <uni-easyinput prefixIcon="locked" type="password" :inputBorder="false"
+                                            v-model="formData2.password" placeholder="请输入登录密码"
+                                        />
+                                    </view>
+                                </uni-forms-item>
+                            </uni-forms>
+                        </view>
+                        <button type="primary" class="btn-submit" @click="submitForm" :loading="btnLoading" :disabled="btnLoading">设备授权申请</button>
+                    </block>
+
+                    <!-- 等待页面（定时任务查询 10秒查询一次） -->
+                    <view v-if="bindStatus==2" class="login-form approval">
+                        <view class="approval-title">审核中，请等待...</view>
+                        <button type="primary" class="btn-refresh" @click="handleRefresh">刷新</button>
+                    </view>
+                    <!-- bindStatus=5-----显示授权失败，联系管理员 -->
+                    <view v-if="bindStatus==5" class="login-form approval-red-con">
+                        <view class="approval-red">显示授权失败，联系管理员</view>
+                    </view>
+                    <!-- bindStatus=3-----输入授权码页面 -->
+                    <block v-if="bindStatus==3">
+                        <view class="login-form approval" style="padding:110rpx 55rpx 150rpx;">
+                            <view class="approval-title">审核通过，请输入授权码</view>
+                            <view class="auth-code">
+                                <input v-for="(item, index) in codes" 
+                                    password
+                                    :key="index"
+                                    v-model="codes[index]"
+                                    type="number"
+                                    maxlength="1"
+                                    :ref="el => { if (el) inputRefs[index] = el }"
+                                    @input="handleInput(index, $event)"
+                                    @keydown.delete="handleDelete(index, $event)"
+                                    :focus="activeIndex==index"
+                                    @blur="handleBlur(index,codes[index])"
+                                />
+                            </view>
+                        </view>
+                        <button type="primary" class="btn-submit" @click="handleSubmit" :loading="subLoading" :disabled="subLoading">提交</button>
+                    </block>
+                </view>
+
+            </view>
+        </view>
+
+        <!-- <view class="bottom-pic">
+            <image src="@/static/images/PicLogo@2x.png" class="pic-logo" /> 
+            <view class="bottom-bg"></view>
+        </view> -->
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref,nextTick,onMounted,onUnmounted,getCurrentInstance } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { v4 as uuidv4 } from 'uuid'
+import { getNavBarPaddingTop} from '@/utils/system.js';
+import { getBindStatus,authDeviceApply,authInputCode } from '@/api/auth.js';
+import {showToast,showAlert} from '@/utils/message.js'
+import encryptObj from '@/utils/encrypt.js'
+import { requestAndroidPermissionAsync } from '@/utils/common.js'
+
+const { proxy } = getCurrentInstance();
+import { useUserStore } from '@/stores/user';
+const userStore = useUserStore();
+
+// #ifdef APP-PLUS
+// 获取 存储手机的module 
+const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
+// #endif
+let systemInfo = {};
+let deviceId = ref(undefined);
+let clientId = `${proxy.$CLIENT_ID || 2}`;
+let networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
+onLoad(async(opt) => {
+    console.log("deviceAuth=>onLoad",clientId,networkEnv.value);
+    uni.setStorageSync('page_cache',true);
+    // uni.preloadPage({url: "/pages/login/login"});
+    // uni.preloadPage({url: "/pages/home/home"});
+
+    systemInfo = uni.getSystemInfoSync()
+    // #ifdef APP-PLUS
+    try {
+        safeSave.getSafeFile({ "key": "app_device_id" }, res2 => {
+            if (res2.code == 1) {
+                let deviceId = res2.data;
+                console.log("读取成功=>",deviceId)
+                deviceId.value = deviceId; // 本地设备ID
+                selectBindStatus(deviceId);
+                if(bindStatus.value==2){
+                    // bindStatus=2-----到等待页面（定时任务查询 10秒查询一次）
+                    timer = setInterval(()=>{  
+                        refreshBindStatus() 
+                    },1000*10)//10秒刷新一次
+                }
+            } else {
+                // showAlert('读取失败:'+res2.msg)
+            }
+        })
+       
+    } catch (error) {
+        console.error('权限请求出错:', error);
+        // showAlert('权限请求出错:', error)
+    }
+    // #endif
+})
+
+// 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
+let bindStatus = ref(undefined);
+let timer = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(async () => {
+    navBarPaddingTop.value = getNavBarPaddingTop();
+})
+
+// 组件卸载时清除定时器
+onUnmounted(() => {
+    if (timer) clearInterval(timer)
+})
+
+// 根据设备ID查询设备状态
+let selectBindStatus = async (uniqCode)=>{
+    if(uniqCode){
+        let res = await getBindStatus({uniqCode})
+        bindStatus.value = res.bindStatus;
+        //bindStatus=4-----已绑定成功，跳转用户登录页面
+        if(bindStatus.value==4){
+            if (userStore.isLogin) {
+                uni.reLaunch({
+                    url: '/pages/home/home',
+                });
+            }else{
+                uni.reLaunch({
+                    url: '/pages/login/login',
+                });
+            }
+        }
+    }
+}
+
+// 刷新定时任务
+let refreshBindStatus = async ()=>{
+    let res = await getBindStatus({uniqCode:deviceId.value})
+    bindStatus.value = res.bindStatus;
+    if(bindStatus.value==2){
+
+    }else{
+        if(bindStatus.value==4){
+            if (userStore.isLogin) {
+                uni.reLaunch({
+                    url: '/pages/home/home',
+                });
+            }else{
+                uni.reLaunch({
+                    url: '/pages/login/login',
+                });
+            }
+        }
+        if (timer) clearInterval(timer)
+    }
+}
+
+// 账号登录
+const form2 = ref(null);
+const formData2 = ref({
+    uniqCode:'',
+    username: '',
+    password: ''
+});
+
+const rules2 = {
+    uniqCode:{
+        rules: [
+            { required: true, errorMessage: '请输入设备标识' },
+        ]
+    },
+    username: {
+        rules: [
+            { required: true, errorMessage: '请输入用户名' },
+            // { minLength: 3, maxLength: 10, errorMessage: '用户名长度在3到10个字符之间' }
+        ]
+    },
+    password: {
+        rules: [
+            { required: true, errorMessage: '请输入密码' },
+            // { pattern: /^[a-zA-Z0-9]{6,12}$/, errorMessage: '密码必须是6-12位字母或数字' }
+        ]
+    }
+};
+const btnLoading=ref(false)
+// 登录提交
+const submitForm = async() => {
+    // 用户名和密码登录
+    form2.value.validate().then(async param => {
+        btnLoading.value = true;
+        //1-内网，2-外网
+        if(networkEnv.value==1){
+            deviceId.value = param.uniqCode;
+        }else{
+            deviceId.value = uuidv4(); //2-外网 生成的设备唯一标识
+        }
+        
+        let password = encryptObj.Encrypt(param.username + clientId + "," + param.password);
+        let params = {
+            username:param.username,
+            password,
+            networkEnv:networkEnv.value,//1-内网，2-外网
+            uniqCode:deviceId.value,
+            ...systemInfo,//设备信息
+            // #ifdef APP-PLUS
+            verId:systemInfo.appWgtVersion,//当前版本号
+            // #endif
+            // #ifdef H5
+            verId : systemInfo.appVersion,
+            // #endif
+            osAndroidApiLevel:systemInfo.osAndroidAPILevel
+        }
+        let res = await authDeviceApply(params);
+        btnLoading.value = false;
+
+        try {
+            // 存储设备id
+            safeSave.saveSafeFile({ "key": "app_device_id","value": deviceId.value}, res3 => {
+                // showAlert("保存成功=>"+JSON.stringify(res3));
+                if (res3.code == 1) {
+                    console.log('保存成功:'+res3.msg)
+                    // showAlert("保存成功=>"+res3.msg);
+                    // uni.setStorageSync('app_device_id', deviceId.value)
+                    bindStatus.value = res.bindStatus;//默认为 2-等待审核
+                    // 刷新状态
+                    refreshBindStatus();
+                    timer = setInterval(()=>{ 
+                        refreshBindStatus() 
+                    },1000*10)//10秒刷新一次
+                } else {
+                    console.log("保存失败=>",res3.msg)
+                    // showAlert('保存失败:'+res3.msg)
+                }
+            })
+           
+        } catch (error) {
+            console.log("saveSafeFile=>",error)
+            // showAlert('设备处理异常:'+error)
+        }
+        
+    }).catch(err => {
+        console.log('表单错误11:', err);
+        btnLoading.value = false;
+    });
+};
+
+// 刷新
+const handleRefresh = ()=>{
+    selectBindStatus(deviceId.value);
+}
+
+const codes = ref(Array(6).fill(''))
+const inputRefs = ref([]);
+const activeIndex = ref(0);//初始化焦点
+let authCode = ref('')
+const handleInput = (index, event) => {
+    activeIndex.value = index;
+    // 只允许数字输入
+    const value = event.detail.value.replace(/\D/g, '')
+    codes.value[index] = value
+    
+    // 自动跳转到下一个输入框
+    if (value && index < 5) {
+        nextTick(() => {
+            activeIndex.value = index+1;
+        })
+    }
+
+    // 输入最后一个框时获取值
+    // if (index === 5 && value) {
+    //     authCode.value =  codes.value.join('')
+    //     console.log('输入完成:', authCode.value)
+    // }
+}
+
+// 鼠标离开
+const handleBlur = (index,value)=>{
+    codes.value[index] = value;
+    authCode.value =  codes.value.join('');
+    // console.log('鼠标离开:', authCode.value)
+}
+
+const handleDelete = (index, event) => {
+    // 如果当前框为空且按下删除键，跳转到上一个输入框
+    if (!codes.value[index] && index > 0) {
+        event.preventDefault() // 阻止默认删除行为
+        nextTick(() => {
+            activeIndex.value = index-1;
+        })
+    }
+}
+
+// 执行设备绑定
+let subLoading = ref(false)
+const handleSubmit=()=>{
+    console.log("authCode=>",authCode.value)
+    if(!authCode.value){
+        showToast("请输入验证码")
+        return;
+    }
+    if(authCode.value.length!=6){
+        showToast("请正确输入验证码")
+        return;
+    }
+    
+    let uniqCode = deviceId.value;
+    let param={
+        uniqCode,
+        authCode:authCode.value
+    }
+    subLoading.value=true;
+    console.log("param=>",param)
+    authInputCode(param).then(res=>{
+        console.log("authInputCode=>",res)
+        uni.reLaunch({ url: '/pages/login/login' })
+    }).finally(()=>{
+        subLoading.value = false;
+    })
+}
+</script>
+
+<style scoped>
+.container {
+	background:#307AF5 !important;
+	height:100vh !important;
+	position: relative;
+}
+.container .bg{
+    background:url('@/static/images/bg@2x.png') no-repeat;
+    background-size:750rpx 663rpx;
+    width: 750rpx;
+    height: 663rpx;
+    margin:0 auto;
+}
+
+.container .bg-con{
+    position: absolute;
+    top:200rpx;
+    width:100%;
+}
+
+.container .bg-con .auth-title{
+    color:#fff;
+    margin:0 auto;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.container .bg-con .auth-title image{
+    width:52rpx;
+    height:64rpx;
+    margin-right: 30rpx;
+}
+.container .bg-con .auth-title text{
+    color:#fff;
+    font-size:56rpx;
+    font-weight: bold;
+}
+
+.container .bg-h{
+    background:url('@/static/images/PicLogoTxt2@2x.png') center bottom 10rpx no-repeat;
+    background-size:487rpx 214rpx;
+    /* #ifdef APP-PLUS */
+    width: 100vw;
+    /* #endif */
+    height: calc(100vh - 110px) ;
+    margin:0 auto;
+}
+
+.container .login-con{
+    width:610rpx;
+    margin:70rpx auto;
+}
+
+
+
+:deep(uni-button:after){
+    border:none;
+}
+
+.container .login-form{
+    background: #fff;
+    border-radius: 30rpx;
+    padding:30rpx 55rpx 15rpx;
+    /* width:610rpx; */
+    width:500rpx;
+    margin:70rpx auto;
+}
+.container .login-form .code-con{
+    padding:0 0 10rpx;
+    margin:0 auto;
+    display: flex;
+    align-items: center;
+    color:#919191;
+    border-bottom: 1px solid #E7E7E7;
+}
+
+
+:deep(.uni-forms-item__label){
+    color:#239FDF;
+    font-weight: bold;
+    font-size:28rpx;
+    padding:0 !important;
+}
+:deep(.uni-easyinput__content){
+    color:#333;
+    font-weight: bold;
+    font-size:32rpx;
+    
+}
+:deep(.uni-easyinput__content) .uni-icons{
+    font-weight: normal;
+    font-size:40rpx !important;
+    color:#239FDF !important;
+}
+
+:deep(.uni-input-placeholder){
+    background:none;
+    font-weight:normal;
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+:deep(.uni-forms-item__error){
+    padding-left:60rpx;
+}
+:deep(.uni-forms-item .is-required){
+    display: none;
+}
+
+/* 使用深度选择器 */
+:deep(.uni-easyinput__content .uni-icons.uniui-clear) {
+  color: #BFBFBF !important;
+  font-weight: normal !important;
+  font-size:40rpx !important;
+}
+:deep(.uni-easyinput__content .uni-icons.uniui-clear::before){
+    content: "\e66c" !important;
+}
+
+/* 加设备ID样式 */
+.container .login-form.network1{
+    padding-bottom:50rpx;
+}
+.container .login-form.network1 .code-con{
+    padding:0 0 3rpx;
+}
+.container .login-form.network1 :deep(.uni-forms-item){
+    margin-bottom:10px !important
+}
+.container .login-form.network1 :deep(.uni-easyinput__content-input){
+    height: 30px !important;
+}
+
+.container .login-form .code-con.code-device :deep(.uni-easyinput__content .uniui-person){
+    background: url('@/static/images/login-biaoshi.png') 15rpx no-repeat;
+    background-size:25rpx 30rpx;
+    width: 25rpx;
+    height: 30rpx;
+    margin-right:10rpx;
+}
+.container .login-form .code-con.code-device :deep(.uniui-person:before){
+    display: none;
+}
+
+.btn-submit{
+    width:496rpx;
+    height:88rpx;
+    line-height: 88rpx;
+    background-color:#09BC48 !important;
+    margin:90rpx auto 0;
+    font-size:36rpx;
+    border-radius: 44rpx;
+}
+.btn-submit::after{
+    border:none;
+}
+
+.container .bottom-pic{
+    position: absolute;
+    bottom:48rpx;
+    width: 488rpx;
+    left:50%;
+    margin-left:-244rpx;
+    text-align: center;
+}
+
+.container .bottom-pic .pic-logo{
+    width:156rpx;
+    height:130rpx;
+    margin:0 auto 40rpx;
+}
+.container .bottom-pic .bottom-bg{
+    background:url('@/static/images/PicLogoTxt@2x.png') no-repeat;
+    background-size:488rpx 64rpx;
+    width: 488rpx;
+    height: 64rpx;
+}
+
+.container .login-con .approval{
+    padding:120rpx 55rpx;
+}
+.container .login-con .approval-red-con{
+    width:510rpx;
+    padding:120rpx 50rpx;
+}
+.container .login-con .approval-red{
+    color:#FF2B44;
+    font-size: 42rpx;
+    text-align: center;
+    font-weight: bold;
+}
+.container .login-con .approval-title{
+    color:#0395E0;
+    font-size: 42rpx;
+    text-align: center;
+    font-weight: bold;
+}
+.container .login-con .btn-refresh{
+    width:300rpx;
+    height:80rpx;
+    line-height: 80rpx;
+    background-color:#05A3F4 !important;
+    margin:90rpx auto 0;
+    font-size:36rpx;
+    border-radius: 44rpx;
+}
+.container .login-con .auth-code{
+    display: flex;
+    margin-top:50rpx;
+    justify-content: center;
+}
+.container .login-con .auth-code uni-input{
+    background:#E6E6E6;
+    margin-right:20rpx;
+    width:70rpx;
+    height:80rpx;
+    min-height: 80rpx;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 70rpx;
+    font-weight: bold;
+}
+.container .login-con .auth-code uni-input:last-child{
+    margin-right: 0;
+}
+</style>

src/pages/h5-webview/h5-webview.vue

@@ -0,0 +1,74 @@
+<template>
+<view id="test">
+    <!-- #ifdef H5 -->
+    <web-view :src="url"></web-view>
+    <!-- #endif -->
+</view>
+</template>
+
+<script setup>
+import { ref,getCurrentInstance } from 'vue';
+import { onLoad,onBackPress } from '@dcloudio/uni-app';
+
+let url = ref('');
+let title = ref('');
+onLoad(async(opt) => {
+    // console.log(opt)
+    url.value = opt.url ;
+    title.value = opt.title;
+    // #ifdef APP-PLUS
+    titleNViewWebview(url.value,title.value);
+    // #endif
+})
+
+onBackPress((e)=> {//响应返回事件
+    console.log("onBackPress=>",e)
+    if (e.from === 'navigateBack') {  //这个地方必须要有的，否则会死循环
+        return false;  
+    } 
+    console.log('点击返回....');
+    let pages = getCurrentPages()
+    let page = pages[pages.length - 1];
+    let currentPages = page.$getAppWebview()
+    currentPages.close()
+    uni.navigateBack({delta:2})
+    return true;
+})
+
+// 带标题栏控件的Webview窗口
+let webview = null;
+function titleNViewWebview(url,title) {
+    console.log("titleNViewWebview=>",url,title)
+
+    let nwating = plus.nativeUI.showWaiting("加载中...",{
+        width:'110px',
+        padding:'10px'
+    })
+
+    webview = plus.webview.create(url, 'test',	{
+        titleNView: {
+            backgroundColor: '#307AF5',
+            titleText: title,
+            titleColor: '#ffffff',
+            autoBackButton: true,
+            backgroundImage:'./../../static/images/bg-Blue-header.png',
+        }
+    });
+
+    webview.addEventListener('loaded', function() {
+        nwating.close();
+        webview.show();
+    }, false);
+
+    webview.addEventListener('close', function(){
+        console.log("close=>")
+        webview=null;
+        uni.navigateBack();
+    });
+}
+
+</script>
+
+<style scoped>
+
+</style>

src/pages/home/home.vue

@@ -1,32 +1,31 @@
 <template>
   <view class="con-body">
     <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'首页'" 
+          :leftFlag="false" :rightFlag="false"
+      ></customHeader>
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height"></view>
       <!-- 下拉刷新 -->
       <mescroll-uni ref="mescrollRef" @init="mescrollInit"
             :down="downOption"  @down="downCallback"
-            :fixed="false" class="scroll-h" :style="{ paddingTop: navBarPaddingTop + 'px' }"
+            :fixed="false" class="scroll-h" 
         >
-          <!-- #ifdef H5 -->
+          <!-- #ifdef APP-PLUS -->
-          <view style="height:50rpx"></view>
+          <!-- 删除设备ID--测试用 -->
+          <!-- <view class="del-cache" @click="handleDelete">
+            <uni-icons type="minus" size="30" color="#ffffff"></uni-icons>
+          </view> -->
           <!-- #endif -->
-          <!-- 搜索 -->
-          <view class="search search-sao" >
-              <uni-search-bar class="custom-search" radius="28" 
-                  placeholder="请输入您想查询的内容或服务"
-                  clearButton="auto" cancelButton="none" 
-                  bgColor="#6FA2F8" textColor="#ffffff"
-                  @confirm="handleSearch"  
-              />
-              <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phonesaoyisao" size="20"></uni-icons>
-          </view>
 
           <!-- 待办内容 -->
           <view class="backlog-bg">
-            <view class="backlog-b-item">
+            <view class="backlog-b-item" @click="handleJump('/pages/notice/notice',1)">
               <view class="font-number">{{ backBlogObj.count1 }}</view>
               <view class="font-title">待办</view>
             </view>
-            <view class="backlog-b-item">
+            <view class="backlog-b-item" @click="handleJump('/pages/notice/waitApprove')">
               <view class="font-number">{{ backBlogObj.count2 }}</view>
               <view class="font-title">待审查</view>
             </view>
@@ -105,12 +104,12 @@
           </view>
 
           <!-- 常用服务 -->
-          <view class="white-bg">
+          <view class="white-bg" v-if="commonServiceList.length>0">
               <view class="w-b-title">常用服务</view>
               <view class="logo-list">
-                  <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index">
+                  <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index"  @click="handleJump(item.bizUrl)">
-                      <img :src="item.imgSrc" />
+                      <img :src="'static/images/business/'+item.icon+'.png'" />
-                      <text class="font-gray">{{ item.name }}</text>
+                      <text class="font-gray">{{ item.bizName }}</text>
                   </view>
                   <!-- <view  class="l-l-item" @click="handleAddCommonSercice">
                     <img :src="'static/images/business/icon-add.png'">
@@ -142,13 +141,70 @@
 </template>
 
 <script setup>
-import { ref,onMounted,computed } from 'vue'
+import { ref,onMounted } from 'vue';
+import { onLoad,onShow } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import customSteps from '@/components/customSteps.vue'
+// import customSearch from '@/components/customSearch.vue'
 import { getNavBarPaddingTop} from '@/utils/system.js'
-import { backBlogCount,swiperList,stepData,salesTask,commonServices,newsQueryList } from '@/api/home.js';
+// ,swiperList,stepData,salesTask,commonServices,newsQueryList 
+import { messageNotifyCount,messageFlowCount,getUserFavorite} from '@/api/home.js';
 import { getWeekStr,formatTimestamp } from '@/utils/datetime.js'
 import { formatMoney } from '@/utils/formatter.js'
+import {showLoading,hideLoading} from '@/utils/message.js'
+
+// #ifdef APP-PLUS
+// 获取 存储手机的module 
+const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
+const handleDelete=()=>{
+  uni.showModal({
+        title: '提示',
+        content: "是否确认删除设备ID？删除之后需重新绑定设备，谨慎操作！！！",
+        cancelText: '取消',
+        confirmText: '确定',
+        success: function (res) {
+            if (res.confirm) {
+              safeSave.delSafeFile({"key": "app_device_id"}, (res) => {
+                if (res.code == 1) {
+                  uni.showModal({title: "提示",content:"删除成功"})
+                } else {
+                  uni.showModal({title: "删除失败",content: res.msg})
+                }
+              })
+            } else if (res.cancel) {
+             
+            }
+        }
+    })
+}
+// #endif
+
+
+onLoad(async(opt) => {
+  uni.setStorageSync('page_cache',true);
+  // initLoad();
+})
+onShow(()=>{
+  initLoad();
+})
+
+// 初始化调用方法
+const initLoad =()=>{
+  try {
+    showLoading("加载中...");
+    getBackBlogCount();
+    getSwiperList();
+    getStepData();
+    getSalesTask();
+    getCommonServices();
+    getNewsList();
+    hideLoading();
+  } catch (error) {
+    hideLoading();
+  }
+}
+
 // 下拉刷新
 const mescrollRef = ref(null);
 const mescrollInit = (mescroll) => {
@@ -161,13 +217,13 @@ const downOption = ref({
     textLoading: '刷新中...'
 });
 
-
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        setTimeout(async ()=>{
+        // setTimeout(async ()=>{
-            // mescroll.resetUpScroll();
+        //     // mescroll.resetUpScroll();
-        },500);
+        // },500);
+        initLoad();
     } catch (error) {
         mescroll.endErr();
     } finally {
@@ -182,44 +238,57 @@ const navBarPaddingTop = ref(0);
 onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
-// 查询搜索跳转
-let handleSearch = ()=>{
 
-}
+let backBlogObj = ref({
-
+  count1:0,
-// tabar 增加消息数量
+  count2:0,
-try {
+  count3:0,
+  count4: 0
+})
+// 获取待办数据
+const getBackBlogCount = async () =>{
+  let res = await messageNotifyCount();
+  let res2 = await messageFlowCount();
+  backBlogObj.value.count1= res.todoCount || 0//消息待阅
+  backBlogObj.value.count2= res2.todoCount || 0//审核待办
+  // tabar 增加消息数量
+  try {
+    if(backBlogObj.value.count1>0){
       wx.setTabBarBadge({
         index: 2, // TabBar的索引，从0开始计数
-        text: '3' // 徽章的文本
+        text: res.todoCount+'' // 徽章的文本
       });
-} catch (error) {
+    }
+  } catch (error) {
       console.error('设置TabBar Badge失败:', error);
+  }
 }
 
-let backBlogObj = ref({})
-// 获取待办数据
-let getBackBlogCount = async () =>{
-  backBlogObj.value = await backBlogCount();
-}
-getBackBlogCount();
 
 // 跑马灯处理
 let extendedList = ref([]);// ;
 const getSwiperList = async () => {
-  extendedList.value = await swiperList(); 
+  // extendedList.value = await swiperList(); 
+  extendedList.value = ["祝贺“友晟夏季封装外壳发布会”圆满成功","祝贺“友晟科技发布会”圆满成功","祝贺“友晟夏季封装外壳发布会”圆满成功"]
 }
-getSwiperList();
+
 
 // 日程提醒
 let weekStr = ref(null) //'2025-09-19  星期三'
 let stepList = ref([]);
 const getStepData = async ()=>{
-  let res = await stepData({});
+  // let res = await stepData({});
+  let res={
+        date:new Date().getTime(),
+        list:[
+            { 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'}, 
+        ]
+    }
   weekStr.value = getWeekStr(res.date);
   stepList.value = res.list;
 }
-getStepData();
+
 
 // 销售任务完成情况
 let salesList = ref([]);
@@ -240,21 +309,37 @@ let percentNum = ref(0);
 let totalSales = ref(0)
 let targetSales = ref(0)
 const getSalesTask = async ()=>{
-  let res = await salesTask({});
+  // let res = await salesTask({});
+  let res = {
+      salesList:['2025-3季度', '2025-2季度', '2025-1季度'],
+      percentNum:82,
+      totalSales:62075000,
+      targetSales:75000000
+  }
   salesList.value = res.salesList;
   percentNum.value = res.percentNum;
   totalSales.value = formatMoney(res.totalSales);
   targetSales.value = formatMoney(res.targetSales);
 }
-getSalesTask();
+
 
 // 常用服务
 let commonServiceList = ref([]) 
 const getCommonServices = async ()=>{
-  let res = await commonServices({});
+  let data = await getUserFavorite({});
-  commonServiceList.value = res.list
+  commonServiceList.value = data || []
 }
-getCommonServices();
+// 跳转 type:1-tabbar
+let handleJump=(url,type)=>{
+    if(url){
+      if(type==1){
+        uni.switchTab({url});
+      }else{
+        uni.navigateTo({ url })
+      }
+    }
+}
+
 // 添加常用服务
 const handleAddCommonSercice = ()=>{
 
@@ -263,22 +348,45 @@ const handleAddCommonSercice = ()=>{
 // 新闻公告
 let newsList = ref([])
 const getNewsList = async()=>{
-  let res = await newsQueryList({});
+  // let res = await newsQueryList({});
+  let res = {
+      list:[
+          {id:1,date:'2025-06-29',name:'友晟亮相2025慕尼黑上海电子展',imgSrc:'https://img2.baidu.com/it/u=363858033,1221485415&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1067'},
+          {id:2,date:'2025-06-26',name:'孜孜不倦，谱写公司发展新篇章',imgSrc:'https://img0.baidu.com/it/u=2830423559,3962669886&fm=253&app=138&f=JPEG?w=570&h=760'},
+          {id:3,date:'2025-03-29 08:10:00',name:'质量管理体系提升助力实现质的飞跃',imgSrc:''},
+      ],
+  }
   newsList.value = res.list;
 }
-getNewsList();
+
 const formatDateStr =(times)=>{
   return formatTimestamp(times)
 }
 </script>
 
 <style scope>
+.del-cache{
+  position: fixed;
+  right:30rpx;
+  bottom:30%;
+  width:60rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  border-radius: 50%;
+  background:#579FF9;
+  font-size:12px;
+  padding:5rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .scroll-h{
   /* #ifdef APP-PLUS */
-  height:calc(100vh - 30px) !important;
+  height:calc(100vh - 78px) !important;
   /* #endif */
   /* #ifndef APP-PLUS */
-  height: calc(100vh - 30px) !important;
+  height: calc(100vh - 80px) !important;
   /* #endif */
 }
 :deep(.mescroll-upwarp){
@@ -412,19 +520,23 @@ const formatDateStr =(times)=>{
   margin-top:10rpx;
 }
 
-.white-bg .logo-list{
+/* .white-bg .logo-list{
-  gap:50rpx; 
+  margin-left:-25rpx;
+  margin-right:-25rpx;
   padding:0 20rpx;
-  /* margin-bottom: -50rpx;  */
 }
 
 .white-bg .logo-list .l-l-item{
   width:160rpx;
   margin-bottom:0rpx;
+  margin-left:25rpx;
+  margin-right:25rpx;
+  margin-bottom: 25rpx;
 }
 
+
 .white-bg .logo-list .l-l-item img{
   width:110rpx;
   height:110rpx;
-}
+} */
 </style>

src/pages/loading/loading.vue

@@ -1,71 +1,230 @@
 <template>
-<view>
+<view class="container" :style="{ height: `100vh` }">
-    <view class="container" :style="{ height: `100vh` }">
+    <view class="bg">
-		<view class="bg"></view>
+        <view class="env-txt" v-if="networkEnv==1">企业内网</view>
-        <view class="version">Version {{ version }}</view>
+    </view>
-        <view class="bottom-bg"></view>
+    <view class="version">Version {{ appVersion }}</view>
+    <!-- <view class="bottom-bg"></view> -->
+
+    <!-- 检查版本弹窗 -->
+    <view class="version-con" v-if="versionVisible">
+        <view class="v-bg">
+            <view class="v-title">发现新版本</view>
+            <uni-icons custom-prefix="iconfont" color="#28B6FF" type="icon-phonefilled" size="40"></uni-icons>
+            <view class="v-version">最新版本 Version {{ newVersion }}</view>
+            <view class="v-update">立刻更新吗？</view>
+            <view class="version-btn" @click="handleDown">更 新</view>
+            <view class="version-sub" @click="handleClose" v-if="btnVisible">暂不处理</view>
+        </view>
     </view>
 </view>
+
 </template>
 
 <script setup>
+import { ref,getCurrentInstance } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
+import { versionCheck,getBindStatus } from '@/api/auth.js';
+import { formatIOS } from '@/utils/status.js'
+import { requestAndroidPermissionAsync,requestAndroidPermission } from '@/utils/common.js'
+import {showAlert} from '@/utils/message.js'
 import { useUserStore } from '@/stores/user';
-const userStore = useUserStore()
+const userStore = useUserStore();
+const { proxy } = getCurrentInstance();
+const networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
 
-const version="1.0.0"
+// #ifdef APP-PLUS
+// 获取 存储手机的module 
+const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
+// #endif
 
-onLoad((opt) => {
+let systemInfo={};
+let appVersion = ref("1.0.0");//当前版本号
+let newVersion = ref('1.0.0');//最新版本号
+let versionVisible=ref(false);//版本弹窗
+let btnVisible = ref(true);// 暂不处理 按钮是否显示
+let downloadURL = ref(''); //下载地址
+let versionData = ref({}); //版本参数
+// 初始load页面
+onLoad(async(opt) => {
     console.log("onLoad");
-    // 检查是否已登录 并 获取用户信息
+
-    if (userStore.isLogin) {
+    // uni.preloadPage({url: "/pages/login/login"});
-        // userStore.getUser()
+    // uni.preloadPage({url: "/pages/deviceAuth/deviceAuth"});
-        // TODO 未登录会在拦截器中处理跳转登录页， 请在 xxx 配置登录页路径
+    // uni.preloadPage({url: "/pages/home/home"});
-       // #ifdef H5
-        window.setTimeout(()=>{
-            uni.reLaunch({
-                url: '/pages/home/home',
-            });
-        },1000)
-        // #endif
 
     // #ifdef APP-PLUS
-        uni.reLaunch({
+    // 查询版本接口
-            url: '/pages/home/home',
+    await getOSVesion();
-        });
-        // #endif
-    }else{
-        // #ifdef H5
-        window.setTimeout(()=>{
-            uni.reLaunch({
-                url: '/pages/login/login',
-            });
-        },1000)
-        // #endif
     
-        // #ifdef APP-PLUS
+    // 不更新版本 执行设备ID查询和绑定操作
-            uni.reLaunch({
+    if(!versionVisible.value){
-                url: '/pages/login/login',
+        try {
-            });
+            // 授权设备存储
-        // #endif
+            // let granted =  requestAndroidPermission(systemInfo);
+            // if(granted){
+                // showAlert("22授权成功！")
+                // setTimeout(()=>{
+                    selectDeviceId();
+                // },500)
+            // }
+        } catch (error) {
+            console.error('权限请求出错:', error);
+            // showAlert(JSON.stringify(error))
         }
+    }
+    // #endif
+
+    // #ifdef H5
+    // setTimeout(()=>{
+        if(userStore.isLogin){
+            uni.reLaunch({
+                url: '/pages/home/home',
+            });
+        }else{
+            uni.reLaunch({
+                url: '/pages/login/login',
+            });
+        }
+    // },1000)
+    // #endif
 
 });
 
+// 检查版本是否是最新的s
+const getOSVesion = async()=>{
+    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
+    systemInfo = uni.getSystemInfoSync();
+    let param = {
+        runEnv:networkEnv,
+        // #ifdef APP-PLUS
+        verNumber:systemInfo.appWgtVersion,//当前版本号
+        // #endif
+        // #ifdef H5
+        verNumber : systemInfo.appVersion,
+        // #endif
+        os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
+    }
+    // 当前手机版本
+    appVersion.value = param.verNumber;
+    // console.log("appVersion=>",appVersion)
+    versionData.value = param;
+    let data = await versionCheck(param);
+    newVersion.value = data.verNumber;
+    downloadURL.value = data.downloadUrl || '';
+
+    // isForceUpdate 是否强制更新 1-是 2-否
+    let isForceUpdate = data.isForceUpdate;
+    if(isForceUpdate==1){
+        btnVisible.value = false;
+    }else{
+        btnVisible.value = true;
+    }
+    // 是否为当前最新版本(是=1，否=2)
+    let isCurrent = data.isCurrent;
+    if(isCurrent == 1){
+        versionVisible.value=false;
+    }else{
+        versionVisible.value=true;
+    }
+}
+
+// 查询设备ID
+const selectDeviceId = async()=>{
+    // 查询本地缓存的设备状态是否绑定过
+    // let deviceId = uni.getStorageSync('app_device_id');// 本地设备ID
+    try {
+        // showAlert("safeSave=>"+safeSave)
+        safeSave.getSafeFile({ "key": "app_device_id" }, res2 => {
+            // showAlert(JSON.stringify(res2));
+            if (res2.code == 1) {
+                let deviceId = res2.data;
+                // showAlert("读取成功=>"+deviceId);
+                if(deviceId!=""){
+                    getBindStatus({uniqCode:deviceId}).then(res=>{
+                        let bindStatus = res.bindStatus
+                        // setTimeout(()=>{
+                            // 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
+                            if(bindStatus == 4){
+                                // 检查是否已登录 并 获取用户信息
+                                if (userStore.isLogin) {
+                                    uni.reLaunch({
+                                        url: '/pages/home/home',
+                                    });
+                                
+                                }else{
+                                    uni.reLaunch({
+                                        url: '/pages/login/login',
+                                    });
+                                }
+                            }else{
+                                uni.reLaunch({
+                                    url: '/pages/deviceAuth/deviceAuth',
+                                });
+                            }
+                        // },1000)
+                    });
+                }else{
+                    uni.reLaunch({
+                        url: '/pages/deviceAuth/deviceAuth',
+                    });
+                }
+            
+            } else {
+                uni.reLaunch({
+                    url: '/pages/deviceAuth/deviceAuth',
+                });
+            }
+        })
+    } catch (error) {
+        console.log("getSafeFile=>",error)
+        // showAlert("getSafeFile=>"+error)
+    }
+}
+// 下载最新版本
+const handleDown = ()=>{
+    // 跳转到应用商店或下载最新版本的页面
+    plus.runtime.openURL(downloadURL.value);			
+    if (versionData.value.os == 'ios'){
+        plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+    } else if (versionData.value.os == 'android'){
+        plus.runtime.quit();
+    }
+}
+
+//版本更新关闭
+const handleClose=()=>{
+    versionVisible.value = false;
+    // 不更新版本 执行设备ID查询和绑定操作
+    if(!versionVisible.value){
+        selectDeviceId()
+    }
+}
 </script>
 
 <style>
 .container {
 	background:#307AF5 !important;
-	height:100vh !important;
+	height: calc(100vh - 100px) !important;
 	position: relative;
+    padding-top:100px;
 }
+
 .container .bg{
     background:url('@/static/images/loading-logo.png') no-repeat;
     background-size:700rpx 800rpx;
     width: 700rpx;
     height: 800rpx;
     margin:0 auto;
+    position: relative;
+}
+.container .bg .env-txt{
+    position: absolute;
+    right: 35rpx;
+    top:10rpx;
+    color:#fff;
+    font-size: 36rpx;
+    font-weight: bold;
 }
 .container .version{
     color:#A8D4FF;
@@ -83,4 +242,62 @@ onLoad((opt) => {
     left:50%;
     margin-left:-328rpx;
 }
+
+.container .version-con{
+    width:100%;
+    position: fixed;
+    top:0;
+    left:0;
+    height: 100vh;
+    background: rgba(0, 0, 0, 0.4);
+}
+.version-con .v-bg{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    /* width:620rpx; */
+    width:540rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    padding:40rpx;
+    margin-left:-310rpx;
+    margin-top:-45%;
+    text-align: center;
+}
+.version-con .v-bg .v-title{
+    font-size: 36rpx;
+    font-weight: bold;
+    text-align: center;
+    margin-bottom:30rpx;
+}
+.version-con .v-bg .v-icon{
+    font-size:70rpx;
+    color:#28B6FF;
+   
+}
+.version-con .v-bg .v-version{
+    color:#0395E0;
+    font-size:42rpx;
+    font-weight: bold;
+    margin:20rpx 0 30rpx;
+}
+.version-con .v-bg .v-update{
+    font-size:32rpx;
+    margin-bottom:70rpx;
+}
+.version-con .v-bg .version-btn{
+    background-color: #05A3F4;
+    text-align: center;
+    width:360rpx;
+    height:80rpx;
+    line-height: 80rpx;
+    border-radius: 40rpx;
+    margin:0 auto;
+    color:#fff;
+}
+.version-con .v-bg .version-sub{
+    color:#05A3F4;
+    font-size:32rpx;
+    margin:40rpx 0 30rpx;
+}
 </style>