feat: 客户人员审核

style: 对page.json代码缩进对齐

.env.development

@@ -1,16 +1,2 @@
-
+# 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,16 +1 @@
-
+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,7 +8,6 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-.hbuilderx
 .DS_Store
 dist
 *.local

.hbuilderx/launch.json

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

nativeplugins/Tm-TmSafeSaveFileModule/package.json

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

server/index.js

@@ -107,60 +107,19 @@ app.post('/api/search', (req,res) => {
     }))
 });
 
-// 查询业务列表
-app.post('/api/businessList', (req,res) => {
-    res.json(Mock.mock({
-        code: 0,
-        data: {
-            list:[
-                {bizId:1,bizName:'企业日常',children:[
-                    {bizId:11,bizName:'任务计划',icon:'static/images/business/icon-rwjh.png',status:1,isDaily:true},
-                    {bizId:12,bizName:'日报',icon:'static/images/business/icon-rb.png',status:1,isDaily:true},
-                    {bizId:13,bizName:'设备管理',icon:'static/images/business/icon-sbgl.png',status:1},
-                    {bizId:14,bizName:'绩效管理',icon:'static/images/business/icon-jxgl.png',status:1},
-                    {bizId:15,bizName:'公章申请',icon:'static/images/business/icon-gzsq.png',status:1,isDaily:true},
-                    {bizId:16,bizName:'会议室预约',icon:'static/images/business/icon-hysyy.png',status:1,isDaily:true},
-                    {bizId:17,bizName:'报修',icon:'static/images/business/icon-bx.png',status:1}
-                ]},
-                {bizId:2,bizName:'CRM系统',children:[
-                    {bizId:21,bizName:'走访报告',icon:'static/images/business/demo.png',bizUrl:'/pages/business/CRM/visitorReport',status:true},
-                    {bizId:101,bizName:'走访报告',icon:'static/images/business/icon-zfbg.png',status:1},
-                    {bizId:102,bizName:'走访查看',icon:'static/images/business/icon-zfck.png',status:1,isDaily:true},
-                    {bizId:103,bizName:'走访审批',icon:'static/images/business/icon-zfsp.png',status:1},
-                    {bizId:104,bizName:'计划查看',icon:'static/images/business/icon-jhck.png',status:1},
-                    {bizId:105,bizName:'签到打卡',icon:'static/images/business/icon-qddk.png',status:1},
-                    {bizId:106,bizName:'打卡信息',icon:'static/images/business/icon-dkxx.png',status:1},
-                    {bizId:107,bizName:'打卡统计',icon:'static/images/business/icon-dktj.png',status:1},
-                    {bizId:108,bizName:'人员新增',icon:'static/images/business/icon-ryxz.png',status:1},
-                    {bizId:109,bizName:'信息查看',icon:'static/images/business/icon-xxck.png',status:1,isDaily:true},
-                    {bizId:1010,bizName:'信息审核',icon:'static/images/business/xxsh.png',badgeCount:5,status:1,isDaily:true},
-                    {bizId:1011,bizName:'信息统计',icon:'static/images/business/icon-xxtj.png',status:1},
-                    {bizId:1012,bizName:'回款查看',icon:'static/images/business/icon-hkck.png',status:1},
-                    {bizId:1013,bizName:'客户人员审核',icon:'static/images/business/icon-khrysh.png',badgeCount:3,status:true},
-                    {bizId:1014,bizName:'客户人员所属',icon:'static/images/business/icon-khryss.png',status:1},
-                    {bizId:1015,bizName:'客户人员归属人变更',icon:'static/images/business/icon-khrybg.png',status:1},
-                    {bizId:1016,bizName:'市场活动',icon:'static/images/business/icon-schd.png',status:1}
-                ]},
-                {bizId:3,bizName:'供应链采纳',children:[]},
-                {bizId:4,bizName:'PLM系统',children:[]}
-            ]
-        }
-    }))
-});
-
 // 查询企业日常 Daily business
 app.post('/api/businessDaily', (req,res) => {
     res.json(Mock.mock({
         code: 0,
         data: {
             list:[
-                {id:11,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
+                {id:1,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
-                {id:12,name:'日报',imgSrc:'static/images/business/icon-rb.png'},
+                {id:2,name:'日报',imgSrc:'static/images/business/icon-rb.png'},
-                {id:13,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
+                {id:3,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
-                {id:14,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'},
+                {id:4,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'},
-                {id:15,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'},
+                {id:5,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'},
-                {id:16,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'},
+                {id:6,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'},
-                {id:17,name:'报修',imgSrc:'static/images/business/icon-bx.png'}
+                {id:7,name:'报修',imgSrc:'static/images/business/icon-bx.png'}
             ]
         }
     }))
@@ -169,18 +128,18 @@ app.post('/api/businessDaily', (req,res) => {
 // 查询CRM系统 Daily business
 app.post('/api/businessCRMList', (req,res) => {
     res.json(Mock.mock({
-        code: 0,
+        code: 200,
         data: {
             list:[
-                {id:21,name:'走访报告',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReport'},
+                {id:1,name:'走访报告',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReport'},
-                {id:22,name:'走访报告添加',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportAdd'},
+                {id:2,name:'走访报告添加',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportAdd'},
-                {id:23,name:'走访报告详情',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportDetail'},
+                {id:3,name:'走访报告详情',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportDetail'},
-                {id:24,name:'走访报告内容录入',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportEnter'},
+                {id:4,name:'走访报告内容录入',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportEnter'},
-                {id:25,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation'},
+                {id:5,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation/marketInformation'},
-                {id:26,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'},
+                {id:6,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'},
-                {id:27,name:'签到打卡',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/vistorCheckin'},
+                {id:7,name:'签到打卡',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/vistorCheckin'},
-                {id:28,name:'打卡统计',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/checkinStatistics'},
+                {id:8,name:'打卡统计',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/checkinStatistics'},
-                {id:29,name:'回款查看',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/paymentCollection'},
+                {id:9,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'},
@@ -205,7 +164,7 @@ app.post('/api/businessCRMList', (req,res) => {
 // 首页待办数据
 app.post('/api/backBlogCount', (req,res) => {
     res.json(Mock.mock({
-        code: 0,
+        code: 200,
         data: {
             count1:3,
             count2:7,
@@ -231,7 +190,7 @@ app.post('/api/stepData', (req,res) => {
         data: {
             date:new Date().getTime(),
             list:[
-                { id:1,desc: '2025秋季产品发布前期准备会，在科研楼0317会议室召开。', title: '13:30 — 15:30',beginTime:'13:30',endTime:'15:30'}, 
+                { id:1,desc: '2025秋季产品发布前期准备会1s，在科研楼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'}, 
             ]
         }
@@ -519,32 +478,6 @@ 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,50 +4,14 @@
 
 
 <script setup>
-import {showAlert} from '@/utils/message.js'
 import { onLaunch } from '@dcloudio/uni-app';
 onLaunch((opt) => {
-	//     uni.preloadPage({ url: "/pages/login/login" });
+    console.log("onLaunch")
-	//     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,38 +1,13 @@
 import request from "@/utils/request"
 
-// 获取客户端版本
+
-export function versionCheck(data) {
+// 获取图片
-    return request.post({
+export function getCaptchaImage() {
-        url: '/acc/auth/version',
+    return request.get({
-        data
+        url: '/api/captchaImage',
     })
 }
 
-// 获取设备绑定状态
-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({
@@ -44,31 +19,19 @@ export function getVerifyCode(data) {
 // 登录
 export function login(data) {
     return request.post({
-        url: '/acc/auth/login',
+        url: '/api/user/login',
         data
     })
 }
 
-// 登出
-export function logout(data) {
-    return request.post({
-        url: '/acc/auth/logout',
-        data
-    })
-}
 
 // 获取用户信息
 export function getUserInfo(data) {
-    return request.get({
+    return request.post({
-        url: '/acc/profile/userInfo',
+        url: '/api/getUserInfo',
         data
     })
 }
 
-// 查询当前用户常用功能
+
-export function getUserFavorite(data) {
+
-    return request.post({
-        url: '/acc/profile/favorite',
-        data
-    })
-}

src/api/business.js

@@ -8,23 +8,15 @@ export function search(data) {
     })
 }
 
-// 查询当前用户业务列表
+// 企业日常
-export function businessList(data) {
+export function businessDaily(data) {
     return request.post({
-        url: '/acc/profile/bizList',
+        url: '/api/businessDaily',
         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',
@@ -32,15 +24,17 @@ export function businessCRMList(data) {
     })
 }
 
-// CRM 查询走访报告列表
+// crm 查询走访报告列表
 export function visitorReportList(data) {
-    return request.post({
+    return request.get({
-        url: '/api/visitorReportList',
+        url: '/app/appVisistReport/list',
         data
+    },{
+        isTransformResponse:false
     })
 }
 
-// CRM 客户列表
+// crm 客户列表
 export function getGuestList(data) {
     return request.post({
         url: '/api/guestList',
@@ -48,7 +42,7 @@ export function getGuestList(data) {
     })
 }
 
-// CRM 查询走访报告详情
+// crm 查询走访报告详情
 export function visitorReportDetail(data) {
     return request.post({
         url: '/api/visitorReportDetail',
@@ -56,7 +50,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: "/crm/app/appCrmCusUserNewController/crmCustomerUser",
+    url: "/app/appCrmCusUserNewController/crmCustomerUser",
     data,
   },{
     isTransformResponse:false
@@ -13,7 +13,7 @@ export function crmCustomerUser(data) {
 //获取我公司人员信息
 export function myUserNameList(data) {
   return request.get({
-    url: "/crm/app/appVisistDetail/getCompanyPersonnerlName",
+    url: "/app/appVisistDetail/getCompanyPersonnerlName",
     data,
   },{
     isTransformResponse:false
@@ -23,7 +23,7 @@ export function myUserNameList(data) {
 //保存走访报告明细
 export function addVisistDetail(data) {
   return request.post({
-    url: "/crm/app/appVisistDetail/addVisistDetail",
+    url: "/app/appVisistDetail/addVisistDetail",
     data,
   },{
     isTransformResponse:false
@@ -33,7 +33,7 @@ export function addVisistDetail(data) {
 //删除走访报告中的某一项（日常走访，业务招待）
 export function deleVisistDetailItem(data) {
   return request.get({
-    url: "/crm/app/appVisistDetail/deleVisistDetailItem",
+    url: "/app/appVisistDetail/deleVisistDetailItem",
     data,
   },{
     isTransformResponse:false
@@ -43,7 +43,7 @@ export function deleVisistDetailItem(data) {
 //走访明细查询
 export function getVisistDetailItem(data) {
   return request.get({
-    url: "/crm/app/appVisistDetail/queryList",
+    url: "/app/appVisistDetail/queryList",
     data,
   },{
     isTransformResponse:false
@@ -53,7 +53,7 @@ export function getVisistDetailItem(data) {
 //删除整体的报告
 export function removeVisist(data) {
   return request.get({
-    url: "/crm/app/appVisistReport/remove",
+    url: "/app/appVisistReport/remove",
     data,
   },{
     isTransformResponse:false
@@ -63,7 +63,7 @@ export function removeVisist(data) {
 //走访报告列表查询
 export function getYsVisistList(data) {
   return request.get({
-    url: "/crm/app/appVisistReport/list",
+    url: "/app/appVisistReport/list",
     data
   },{
     isTransformResponse:false
@@ -73,7 +73,7 @@ export function getYsVisistList(data) {
 //更新一个报告的状态
 export function updateStatus(data) {
   return request.post({
-    url: "/crm/app/appVisistReport/updateStatus",
+    url: "/app/appVisistReport/updateStatus",
     data,
   },{
     isTransformResponse:false
@@ -83,7 +83,7 @@ export function updateStatus(data) {
 //获取客户信息列表
 export function getYsCustomerList(data) {
   return request.get({
-    url: "/crm/app/appCustomerIfno/pageList",
+    url: "/app/appCustomerIfno/pageList",
     data,
   },{
     isTransformResponse:false
@@ -93,7 +93,7 @@ export function getYsCustomerList(data) {
 //新增走访报告
 export function addVisist(data) {
   return request.post({
-    url: "/crm/app/appVisistReport/add",
+    url: "/app/appVisistReport/add",
     data,
   },{
     isTransformResponse:false
@@ -103,7 +103,7 @@ export function addVisist(data) {
 //走访报告查询
 export function getQueryVisistList(data) {
   return request.get({
-    url: "/crm/app/appVisistReport/queryList",
+    url: "/app/appVisistReport/queryList",
     data,
   },{
     isTransformResponse:false
@@ -113,7 +113,7 @@ export function getQueryVisistList(data) {
 //走访报告详细信息
 export function getYsVisistInfo(data) {
   return request.get({
-    url: "/crm/app/appVisistReport/getDetail",
+    url: "/app/appVisistReport/getDetail",
     data,
   },{
     isTransformResponse:false
@@ -123,7 +123,7 @@ export function getYsVisistInfo(data) {
 //一个走访报告下面关联的日常走访，业务招待等具体信息
 export function getVisistDetailList(data) {
   return request.get({
-    url: "/crm/app/appVisistDetail/list",
+    url: "/app/appVisistDetail/list",
     data,
   },{
     isTransformResponse:false
@@ -133,7 +133,7 @@ export function getVisistDetailList(data) {
 //新增点赞
 export function insertUserLike(data) {
   return request.post({
-    url: "/crm/app/appUserLike/addVisistDetail",
+    url: "/app/appUserLike/addVisistDetail",
     data,
   },{
     isTransformResponse:false
@@ -143,7 +143,7 @@ export function insertUserLike(data) {
 //查询是否已经点过赞
 export function getUserLike(data) {
   return request.get({
-    url: "/crm/app/appUserLike/queryUserLikeStatus/" + data,
+    url: "/app/appUserLike/queryUserLikeStatus/" + data,
   },{
     isTransformResponse:false
   });
@@ -152,7 +152,7 @@ export function getUserLike(data) {
 //获取当前人的信息
 export function getUserInfo(data) {
   return request.get({
-    url: "/crm/app/user/getUserInfo",
+    url: "/app/user/getUserInfo",
     data,
   },{
     isTransformResponse:false
@@ -162,7 +162,7 @@ export function getUserInfo(data) {
 //查询没有经过信息管理员审批的单子
 export function getApprovalList(data) {
   return request.get({
-    url: "/crm/app/appVisistReport/approvalList",
+    url: "/app/appVisistReport/approvalList",
     data,
   },{
     isTransformResponse:false
@@ -172,7 +172,7 @@ export function getApprovalList(data) {
 //打开详情页设置成为已读
 export function getUpdateApprovalForRead(data) {
   return request.post({
-    url: "/crm/app/appVisistReport/updateApprovalForRead",
+    url: "/app/appVisistReport/updateApprovalForRead",
     data,
   },{
     isTransformResponse:false
@@ -182,7 +182,7 @@ export function getUpdateApprovalForRead(data) {
 //提交通过活动报告
 export function auditActivityReport(data) {
   return request.post({
-    url: "/crm/app/activity/auditActivityReport",
+    url: "/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: "/crm/app/appVisistReport/updaterejectReason",
+    url: "/app/appVisistReport/updaterejectReason",
     data,
   },{
     isTransformResponse:false
@@ -205,7 +205,7 @@ export function getRejectReason(data) {
 //查询签到打卡信息集合为了报告
 export function addMapForReport(data) {
   return request.get({
-    url: "/crm/app/appVisistReport/addMapList",
+    url: "/app/appVisistReport/addMapList",
     data,
   },{
     isTransformResponse:false

src/api/crm/activity/map.js

@@ -3,25 +3,17 @@ import request from "@/utils/request";
 //新增地图开始签到接口
 export function addStartMap(data) {
   return request.post({
-    url: "/crm/app/appVisistMap/Startadd",
+    url: "/app/appVisistMap/Startadd",
     data,
   },{
     isTransformResponse:false
   });
 }
 
-//出差打卡接口
-export function businessTripClockIn(data) {
-  return request.post({
-    url: '/crm/app/appVisistMap/businessTripClockIn',
-    data
-  },{isTransformResponse:false});
-}
-
 //新增地图开始打卡接口
 export function addStartMapForClockIn(data) {
   return request.post({
-    url: "/crm/app/appVisistMap/StartaddForClockIn",
+    url: "/app/appVisistMap/StartaddForClockIn",
     data,
   },{
     isTransformResponse:false
@@ -31,7 +23,7 @@ export function addStartMapForClockIn(data) {
 //打卡信息查看
 export function CheckInInformationViewing(data) {
   return request.get({
-    url: "/crm/app/appVisistMap/DKList",
+    url: "/app/appVisistMap/DKList",
     data
   },{
     isTransformResponse:false
@@ -41,7 +33,7 @@ export function CheckInInformationViewing(data) {
 //签到统计
 export function getSigninList(data) {
   return request.get({
-    url: "/crm/app/appVisistMap/QueryBased",
+    url: "/app/appVisistMap/QueryBased",
     data
   },{
     isTransformResponse:false
@@ -51,7 +43,7 @@ export function getSigninList(data) {
 //不签到统计
 export function getNoSigninList(data) {
   return request.get({
-    url: "/crm/app/appVisistMap/QueryBasedIsNull",
+    url: "/app/appVisistMap/QueryBasedIsNull",
     data
   },{
     isTransformResponse:false

src/api/crm/api_ys.js

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

src/api/crm/customer/getCustomer.js

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

src/api/crm/customer/updateCustomer.js

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

src/api/crm/mainOwner/mainOwner.js

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

src/api/crm/plan/getPlan.js

@@ -1,29 +1,36 @@
 import request from "@/utils/request"
-// 获取用户信息
+
+export function getPersonalPlanList(params) {
+    return request.post({
+        url: '/getPersonalPlanList',
+        params
+    })
+}
+
 export function getUserInfo(data) {
     return request.get({
-        url: '/crm/app/user/getUserInfo',
+        url: '/app/user/getUserInfo',
         data
     }, {isTransformResponse: false})
 }
 //获取所有人周计划列表
 export function getAllWeekPlanList(params){
     return request.get({
-        url: '/crm/app/appWeeklyPlan/list',
+        url: '/app/appWeeklyPlan/list',
         data: params
     },{isTransformResponse: false})
 }
 //获取个人周计划列表
 export function getWeeklyPlanList(data) {
     return request.get({
-        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
+        url: '/app/appWeeklyPlan/getWeeklyListByUser',
         data
     }, {isTransformResponse: false})
 }
 // 组合查询计划列表
 export function getWeekPlanListByDate(params){
     return request.get({
-        url: '/crm/app/appWeeklyPlan/weeklyListByDate',
+        url: '/app/appWeeklyPlan/weeklyListByDate',
         data: params
     },{isTransformResponse: false})
 }

src/api/crm/plan/updatePlan.js

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

src/api/eqf/qualityFeedback.js

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

src/api/home.js

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

src/api/notice.js

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

src/components/closeableModal.vue

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

src/components/customHeader.vue

@@ -25,7 +25,6 @@ const props = defineProps({
     title: String,
     leftFlag:true,//默认左侧显示 false-不显示
     rightFlag:false,//默认右侧不显示
-    searchType:{default:0}//搜索返回为1，其他暂时不处理
 })
 
 const emit = defineEmits(['back'])
@@ -36,7 +35,7 @@ let navbarHeight = ref(0)
 let navHeight = ref(0)
 
 onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop();
+    navBarPaddingTop.value = getNavBarPaddingTop();console.log(navBarPaddingTop.value)
     statusBarHeight.value = getStatusBarHeight();
     navbarHeight.value = getNavBarHeight();
     navHeight.value = navbarHeight.value - statusBarHeight.value
@@ -44,26 +43,27 @@ onMounted(() => {
 
 const handleBack = () => {
     emit('back')
-    if(!props.searchType)
     uni.navigateBack()
 }
 </script>
 
 <style scoped>
 .custom-navbar {
-    width: 100%;
+    width: 750rpx;
     position: fixed;
     top: 0;
+    left: 50%;
+    margin-left:-375rpx;
     z-index: 999;
     /* #ifdef APP-PLUS */
-    background: #307AF5 url('@/static/images/bg-Blue-header.png') no-repeat;
+    background: url('@/static/images/bg-Blue-header.png') no-repeat;
-    background-size:100% 160rpx;
+    background-size:750rpx 160rpx;
     height:160rpx;
     /* #endif */
 
     /* #ifndef APP-PLUS */
-    background: #307AF5 url('@/static/images/bg-Blue-header2.png') no-repeat;
+    background: url('@/static/images/bg-Blue-header2.png') no-repeat;
-    background-size:100% 116rpx;
+    background-size:750rpx 116rpx;
     height:116rpx;
     /* #endif */
    

src/components/customSearch.vue

@@ -1,306 +1,84 @@
 <template>
     <view>
         <!-- 搜索框 -->
-        <view class="search search-sao">
+        <uni-search-bar v-model="searchText" @confirm="handleSearch" />
-            <!--   @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 class="search-section" v-if="searchTypeList.length>0">
+            <view 
-                <view class="section-header">
+                v-for="(item, index) in suggestions" 
-                    <text class="section-title">{{ searchType.typeName }}</text>
+                :key="index"
-                </view>
+                class="suggestion-item"
-                <view class="tag-container">
+                @click="selectSuggestion(item)"
-                    <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>
 
         <!-- 搜索结果 -->
-            <!-- <view class="search-result" v-if="searchResult.length > 0">
+        <search-results :list="results" />
-                <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,watch } from 'vue'
+import { ref, computed } from 'vue'
 
-const props = defineProps({
+// const suggestions = ref([])
-    searchKeywords:{//搜索文本
+// const showSuggestions = ref(false)
-        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
+//   }
   
-const searchText = ref('');// 搜索文本
+//   try {
-const searchCheckObj = ref({});//选中的类型对象
+//     const res = await getSuggestions(searchText.value)
+//     suggestions.value = res
+//     showSuggestions.value = true
+//   } catch (error) {
+//     console.error('获取搜索建议失败:', error)
+//   }
+// }, 300)
 
-const showCancel = ref(false)// 是否显示取消按钮
+const searchText = ref('')
-const historyList = ref([])// 历史记录列表
+const category = ref(0)
+const sort = ref(0)
 
-const searchResult = ref([])// 搜索结果
+const categoryOptions = ['全部类别', '电子产品', '服装', '食品']
+const sortOptions = ['默认排序', '价格从低到高', '价格从高到低', '销量最高']
 
-// 搜索文本内容
+const categoryText = computed(() => categoryOptions[category.value])
-watch(() => props.searchKeywords, (newVal, oldVal) => {
+const sortText = computed(() => sortOptions[sort.value])
-    searchText.value = newVal
-},{
-    deep:true, // 深度监听
-    immediate:true // 立即执行
-});
 
-// 选中类型对象
+const handleSearch = async () => {
-watch(() => props.checkTypeObj, (newVal, oldVal) => {
+    const params = {
-    searchCheckObj.value = newVal
+        keyword: searchText.value,
-},{
+        category: category.value,
-    deep:true, // 深度监听
+        sort: sort.value
-    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
-    // searchResult.value = [
+    const res = await searchAPI(params)
-    //     { id: 1, name: `${searchText.value} 结果1` },
+    results.value = res.data
-    //     { id: 2, name: `${searchText.value} 结果2` },
-    //     { id: 3, name: `${searchText.value} 结果3` }
-    // ]
-
-
-    // 传给父组件
-    emit('confirm',searchCheckObj,searchText);
 }
 
-// 处理输入
+const handleCategoryChange = (e) => {
-const handleInput = () => {
+    category.value = e.detail.value
-    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) => {
-const handleNoticeClick = (item) => {
+    sort.value = e.detail.value
-    // 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

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

src/constants/mapApiConstants.js

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

src/enums/cacheEnums.js

@@ -1,8 +1,2 @@
 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: -1, // 失败
+    FAILED: 500, // 失败
-    TOKEN_INVALID: 401 // TOKEN失效未登录
+    TOKEN_INVALID: 10003 // TOKEN失效未登录
 };
 
 export const RequestErrMsgEnum = {

src/main.js

@@ -1,28 +1,16 @@
 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" : "718友晟",
+    "name" : "app",
-    "appid" : "__UNI__4C459F4",
+    // "appid" : "",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -16,14 +16,12 @@
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
-            "waiting" : false, // 是否显示等待界面
+            "waiting" : true,
             "autoclose" : true,
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {
+        "modules" : {},
-            "Push" : {}
-        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -43,72 +41,21 @@
                     "<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/images/icon.png",
+                        "hdpi" : "static/icons/72x72.png",
-                        "xhdpi" : "/static/images/icon.png",
+                        "xhdpi" : "static/icons/96x96.png",
-                        "xxhdpi" : "/static/images/icon.png",
+                        "xxhdpi" : "static/icons/144x144.png",
-                        "xxxhdpi" : "/static/images/icon.png"
+                        "xxxhdpi" : "static/icons/192x192.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" : {}
-                }
-            }
         }
     },
     /* 快应用特有相关 */
@@ -137,8 +84,8 @@
     "h5" : {
         "router" : {
             "base" : ""
-        },
             /*,"mode": "history"   仅对 H5 平台生效 */
+        },
         "template" : "index.html"
     }
 }

src/pages.json

@@ -12,12 +12,6 @@
         "navigationBarTitleText": ""
       }
     },
-		{
-			"path": "pages/deviceAuth/deviceAuth",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
     {
       "path": "pages/login/login",
       "style": {
@@ -27,79 +21,11 @@
     {
       "path": "pages/home/home",
       "style": {
-				"navigationBarTitleText": "",
+        "navigationBarTitleText": ""
-				"renderer": "native",
-				"hardwareAccelerated": true
       }
     },
     {
       "path": "pages/business/business",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/business/editDaily",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/notice/notice",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/noticeDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/waitApprove",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/waitApproveDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/userinfo/userinfo",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/userinfo/version",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/search/search",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/h5-webview/h5-webview",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketInformation", //市场信息管理
       "style": {
         "navigationBarTitleText": ""
       }
@@ -223,6 +149,13 @@
         "navigationBarTitleText": "通用信息更新"
       }
     },
+    //选择客户（已更新）
+    {
+      "path": "pages/business/CRM/chooseCus",
+      "style": {
+        "navigationBarTitleText": "客户选择"
+      }
+    },
     //选择客户人员（已更新）
     {
       "path": "pages/business/CRM/customerUserList",
@@ -331,8 +264,7 @@
       "path": "pages/business/CRM/plan/planView",
       //周计划查看
       "style": {
-				"navigationBarTitleText": "",
+        "navigationBarTitleText": ""
-				"enablePullDownRefresh": true
       }
     },
     {
@@ -384,20 +316,6 @@
         "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",
       //客户人员详情编辑
@@ -547,65 +465,23 @@
         "navigationBarTitleText": ""
       }
     },
+    //===================================活动报告====================
     {
-			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackIndex",
+      "path": "pages/notice/notice",
-			//质量反馈
       "style": {
-				"navigationBarTitleText": ""
+        "navigationBarTitleText": "",
+        "app-plus": {
+          "bounce": "none"
+          // 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+        },
+        "mp-alipay": {
+          "allowsBounceVertical": "NO"
+        }
+        // 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
       }
     },
     {
-			"path" : "pages/business/EQF/qualityFeedback/qualityFeedbackAdd",
+      "path": "pages/userinfo/userinfo",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/chooseCus",
-			//选择客户单位
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackEnter",
-			//明细录入
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/qualityFeedbackDetailComponent",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/customerOrder",
-			//选择合同
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/gkCustomerOrder",
-			//选择合同
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter",
-			//明细录入
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/gkQualityFeedbackDetailComponent",
-			
       "style": {
         "navigationBarTitleText": ""
       }

src/pages/business/CRM/chooseCus.vue

@@ -0,0 +1,170 @@
+<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

@@ -23,17 +23,14 @@
           />
         </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" v-for="(item, index) in list" :key="index"
-            <view class="white-bg margin-bottom20"
                 @touchstart="handleTouchStart(item)"
-                  @touchend="handleTouchEnd"
+                @touchend="handleTouchEnd">
-                  v-if="item && item.auditStatus !== '办事处审核通过'"
-            >
             <view class="report-list">
               <view class="w-b-title title" @dblclick.stop="handleDetail(item)">
                 {{ item.cusName }}
@@ -68,14 +65,13 @@
                 <view class="r-right">{{ item.salesmanThinkLevel }}</view>
               </view>
 
-                <!--<view v-if="item.systemThinkLevel" class="r-list">
+<!--              <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>
@@ -117,7 +113,7 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
   handleSearch()
 })
-let clearSearchValue = () => {
+let clearSearchValue = ()=>{
   searchValue.value = '';
 }
 // 查询列表
@@ -126,10 +122,7 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {
+  empty: {tip: '~ 空空如也 ~'},
-    tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -149,19 +142,27 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
+  try {
     uni.showLoading();
     cssFlag.value = true;
     setTimeout(async () => {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
-    cssFlag.value = false;
       list.value = res.list;
+      cssFlag.value = false;
       // 正确传递 total 参数
-    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
+      uni.hideLoading();
+
     }, 500);
+  } catch (error) {
+    console.log(error)
+    mescroll.endErr();
+  }
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
+  try {
     uni.showLoading();
     setTimeout(async () => {
       // 使用 mescroll 提供的页码和大小参数
@@ -172,8 +173,13 @@ const upCallback = async (mescroll) => {
         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);
+      uni.hideLoading();
     }, 500);
+  } catch (error) {
+    console.log(error)
+    mescroll.endErr();
+  }
 }
 
 // 获取数据列表
@@ -184,17 +190,12 @@ const getList = (pageIndex, pageSize) => {
       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();
-    }
   });
 }
 
@@ -202,8 +203,10 @@ const getList = (pageIndex, pageSize) => {
 let handleDetail = (item) => {
   uni.navigateTo({
     url: "/pages/business/CRM/customer/components/customerUserEdit",
-    events: {},
+    events: {
-    success(res) {
+
+    },
+    success(res){
       res.eventChannel.emit('editCusData', {param: item, isAdd: false})
     }
   })
@@ -213,8 +216,8 @@ let handleDetail = (item) => {
 let touchTimerId = null;
 
 // 开始触摸
-let handleTouchStart = (item) => {
+let handleTouchStart = (item)=>{
-  touchTimerId = setTimeout(() => {
+  touchTimerId = setTimeout(()=>{
     // console.log(item, "长按客户人员项")
     handleChange(item)
 
@@ -223,39 +226,39 @@ let handleTouchStart = (item) => {
 }
 
 // 结束触摸
-let handleTouchEnd = () => {
+let handleTouchEnd = ()=>{
-  if (touchTimerId !== null) {
+  if(touchTimerId !== null){
     clearTimeout(touchTimerId);
   }
 }
 
 // 变更主归属人
-let handleChange = (item) => {
+let handleChange = (item)=>{
 
   uni.showModal({
     title: '是否将该客户人员主的归属人变更为自己？',
     editable: true,
     placeholderText: '请输入变更理由',
-    success(res) {
+    success(res){
-      if (res.confirm) {
+      if(res.confirm){
-        if (res.content) {
+        if(res.content){
           submissionOfChangeOfMainOwner({
             userId: item.userId,
             userName: item.userName,
             reasonForChange: res.content
-          }).then(res => {
+          }).then(res=>{
-            if (res.code === 200) {
+            if(res.code===200){
               uni.showToast({
                 title: '操作成功'
               })
-            } else {
+            }else{
               uni.showToast({
                 title: '操作失败',
                 icon: 'error'
               })
             }
           })
-        } else {
+        }else{
           uni.showToast({
             title: '操作失败！变更原因不能为空',
             icon: 'none'
@@ -267,9 +270,9 @@ let handleChange = (item) => {
 }
 
 // 复制信息
-let handleCopyInfo = (item) => {
+let handleCopyInfo=(item)=>{
   const {cusName, userName, sex, iphone, mobilePhone, jobTelphone, userDept, salesmanThinkLevel} = item;
-  /*  item = JSON.stringify({
+/*  item = JSON.stringify({
     '客户名称':item.cusName,
     '客户人员名称': item.userName,
     '性别': item.sex,
@@ -281,7 +284,7 @@ let handleCopyInfo = (item) => {
   uni.setClipboardData({
     data: `客户名称：${cusName}
 客户人员名称：${userName}
-性别：${iphone || mobilePhone || jobTelphone}
+性别：${iphone||mobilePhone||jobTelphone}
 部门：${userDept}
 业务员认定等级：${salesmanThinkLevel}`,
     success: function () {
@@ -298,25 +301,49 @@ let handleCopyInfo = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
 
+
+
+.search .btn-search {
+  border: none;
+  background: none;
+  line-height: normal;
+  color: #fff;
+  line-height: 56rpx !important;
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search .btn-search::after {
+  display: none;
+}
+
 .scroll-h {
-  height: 100%;
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
 }
 
 .white-bg {
   padding-bottom: 10rpx;
-
+  .w-b-title{
-  .w-b-title {
     align-items: flex-start;
   }
 }
 
+.btn-edit{
+  white-space: nowrap;
+}
 </style>

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

@@ -168,7 +168,7 @@
             <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"
+              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
                               @change="handleHobbyChange"  :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
@@ -467,29 +467,20 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate) {
+  if (formData.value.cusEstate && formData.value.functionalRequirements) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param)
+    let res = await getCustomerLevel(param).catch(err => {
-    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })*/
+    })
-    try{
+    if (!res.systemRecommendationLevel) {
-      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 = "客户无等级信息，暂无法进行等级推荐"
+      console.log(formData.value.systemThinkLevel + "???")
     }
-    }
+    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -518,7 +509,8 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  formData.value.tenureTime = e;
+  let {value} = e.detail;
+  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -541,16 +533,16 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  formData.value.birthday = e;
+  let{value} = e.detail
+  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIds = ref([]);
+let hobbyIndex = reactive([]);
-let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (items, ids) => {
+const handleHobbyChange = (item, value) => {
-  hobbyIds.value = [];
+  // console.log("爱好", item, value);
-  hobbies.value = items;
+  hobbyIndex = value;
 };
 // 选择
 const handleNativeChange = (e) => {

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

@@ -1,8 +1,3 @@
-<!--
- * @author wangzhuo
- * @date 2025年9月1日
- * @description 编辑客户人员信息
--->
 <template>
   <view class="con-body">
     <view class="con-bg">
@@ -22,7 +17,7 @@
 
       <!-- 正文内容 -->
       <view class="white-bg">
-        <view class="form-con" @click="handleBlur">
+        <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">
@@ -173,7 +168,7 @@
             <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"
+              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
                               @change="handleHobbyChange"  :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
@@ -473,29 +468,20 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate) {
+  if (formData.value.cusEstate && formData.value.functionalRequirements) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param)
+    let res = await getCustomerLevel(param).catch(err => {
-    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })*/
+    })
-    try{
+    if (!res.systemRecommendationLevel) {
-      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 = "客户无等级信息，暂无法进行等级推荐"
+      console.log(formData.value.systemThinkLevel + "???")
     }
-    }
+    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -524,7 +510,8 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  formData.value.tenureTime = e;
+  let {value} = e.detail;
+  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -547,19 +534,17 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  formData.value.birthday = e;
+  let{value} = e.detail
+  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIds = ref([]);
+let hobbyIndex = reactive([]);
-let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (items, ids) => {
+const handleHobbyChange = (item, value) => {
-  console.log('选择爱好', items, ids);
+  // console.log("爱好", item, value);
-  hobbyIds.value = [];
+  hobbyIndex = value;
-  hobbies.value = items;
 };
-
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -582,22 +567,17 @@ let handleWorkingStatusChange = e => {
   formData.value.workingStatus = workingStatusList[value].name;
 }
 
-const hobbySelectRef = ref(null);
-// 多选组件失去焦点关闭
-let handleBlur = () => {
-  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
-}
 let submitForm = async () => {
-  let hobbyTags = hobbies.value.map(it => {
+  let hobbyTags = hobbyIndex.map(it => {
-    let {name} = it;
+    let {name} = hobbyList[it];
     return name;
   })
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   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.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
   }
-  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
   formData.value.cusName = customerUser.value.cusName;
@@ -612,11 +592,12 @@ let submitForm = async () => {
         uni.showToast({
           title: "更新成功"
         })
-        const eventChannel = instance.getOpenerEventChannel();
-        eventChannel.emit("refreshCusUserList");
         setTimeout(()=>{
           uni.navigateBack();
+          const eventChannel = instance.getOpenerEventChannel();
+          eventChannel.emit("refreshCusUserList");
         },1000);
+
       }else{
         uni.showToast({
           title: "操作失败",

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

@@ -21,7 +21,7 @@
 
       <!-- 正文内容 -->
       <view class="white-bg">
-        <view class="form-con" @click="handleBlur">
+        <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">
@@ -178,8 +178,8 @@
             <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"
+              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
-                              @change="handleHobbyChange" :slabel="'name'"
+                              @change="handleHobbyChange" :key="Math.round()" :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
             </uni-forms-item>
@@ -271,7 +271,7 @@
 </template>
 
 <script setup>
-import {ref, reactive} from 'vue'
+import {ref, onMounted, computed, reactive} from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import multipleSelect from '@/components/multipleSelect.vue'
 import {
@@ -284,8 +284,7 @@ import {
 } from "./dataMap";
 import city from "@/utils/area";
 import {getCustomerLevel, saveappCrmCusUserNew} from "@/api/crm/customer/getCustomer";
-// 对 multipleSelect 组件的引用
+
-const hobbySelectRef = ref(null);
 // 表单引用
 const formRef = ref({});
 // 表单数据
@@ -436,7 +435,6 @@ let handleFunctionChange = (e) => {
   console.log(e.detail.value, '职能索引');
   const {name} = functionalRequirementList[e.detail.value];
   formData.value.functionalRequirements = name;
-  formData.value.function = name;
   getRecommendLevel();
 }
 
@@ -449,29 +447,20 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate) {
+  if (formData.value.cusEstate && formData.value.functionalRequirements) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param)
+    let res = await getCustomerLevel(param).catch(err => {
-    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })*/
+    })
-    try{
+    if (!res.systemRecommendationLevel) {
-      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 = "客户无等级信息，暂无法进行等级推荐"
+      console.log(formData.value.systemThinkLevel + "???")
     }
-    }
+    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -499,9 +488,9 @@ let handleUserTypeChange = (e) => {
 }
 
 // 选择日期
-function handleTenureTimeChange(val) {
+function handleTenureTimeChange(e) {
-  console.log(val)
+  let {value} = e.detail;
-  formData.value.tenureTime = val;
+  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -523,20 +512,18 @@ let handleDevelopChange = e => {
 }
 
 // 选择生日
-function handleBirthdayChange(val) {
+function handleBirthdayChange(e) {
-  formData.value.birthday = val;
+  let{value} = e.detail
+  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIds = ref([]);
+let hobbyIndex = reactive([]);
-let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (items, ids) => {
+const handleHobbyChange = (item, value) => {
-  console.log('选择爱好', items, ids);
+  // console.log("爱好", item, value);
-  hobbyIds.value = [];
+  hobbyIndex = value;
-  hobbies.value = items;
 };
-
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -558,93 +545,16 @@ let handleWorkingStatusChange = e => {
   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);
+  let hobbyTags = hobbyIndex.map(it => {
-  try {
+    let {name} = hobbyList[it];
-    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;
+    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
-  }
-  if(formData.value.iphone){
-    formData.value.mobilePhone = formData.value.iphone;
   }
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
@@ -654,19 +564,19 @@ let submitForm = async () => {
     console.log(formData.value, "提交表单数据")
     // 请求保存
     uni.showLoading()
-    saveappCrmCusUserNew(formData.value).then(res => {
+    saveappCrmCusUserNew(formData.value).then(res=>{
       uni.hideLoading();
-      if (res.code === 200) {
+      if(res.code === 200){
         uni.showToast({
           title: "保存成功"
         })
-      } else {
+      }else{
         uni.showToast({
           title: "操作失败"
         })
       }
-      setTimeout(() => uni.navigateBack(), 1500);
+      setTimeout(()=>uni.navigateBack(), 1500);
-    }).catch(() => {
+    }).catch(err=>{
       uni.showToast({
         icon: 'none',
         title: "保存失败"
@@ -682,7 +592,7 @@ let submitForm = async () => {
     })
     console.warn(err);
   }
-}*/
+}
 
 
 </script>

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

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

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

@@ -17,7 +17,7 @@
       <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"
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
                           cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
                           @clear="clearSearchValue"
                           v-model="searchValue"
@@ -32,8 +32,8 @@
           <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)"
+              <view class="w-b-title title" @touchstart.prevent="handleTouchStart(item)"
-                    @touchend="handleTouchEnd">
+                    @touchend.prevent="handleTouchEnd">
                 {{ item.cusName }}
                 <view v-if="item.nodeCode" class="r-right btn-edit" :class="statusColorMap[item.nodeCode]">
                   {{ item.nodeCode }}
@@ -132,10 +132,7 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {
+  empty: {tip: '~ 空空如也 ~'},
-    tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -155,27 +152,27 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
+  try {
     cssFlag.value = true;
     uni.showLoading();
     setTimeout(async () => {
-    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
+      cssFlag.value = false;
       list.value = res.list;
       // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-    } catch (error) {
+      uni.hideLoading();
-      mescroll.endErr();
-    } finally {
-      cssFlag.value = false;
-    }
     }, 500);
-
+  } catch (error) {
+    console.log(error)
+    mescroll.endErr();
+  }
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  setTimeout(async () => {
   try {
+    setTimeout(async () => {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -184,12 +181,12 @@ const upCallback = async (mescroll) => {
         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);
-      // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
+    }, 500);
   } catch (error) {
+    console.log(error)
     mescroll.endErr();
   }
-  }, 500);
 }
 
 // 获取数据列表
@@ -200,18 +197,12 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-    try {
+
     let res = await SearchForAllCustomersSalesperson(param);
     resolve({
       list: res.rows,
       total: res.total
     });
-    } catch (e) {
-      console.log(e, "获取所有客户人员所属失败");
-    } finally {
-      uni.hideLoading();
-    }
-
   });
 }
 
@@ -222,7 +213,6 @@ let handleDetail = (item) => {
       url: "/pages/business/CRM/customer/components/customerUserEdit",
       events: {
         refreshCusUserList() {
-          console.log('refreshCusUserList',"响应刷新")
           handleSearch();
         }
       },
@@ -230,7 +220,7 @@ let handleDetail = (item) => {
         res.eventChannel.emit('editCusData', {param: item, isAdd: false})
       }
     })
-  } else {
+  }else{
     uni.showToast({
       title: '已完成审核，不可修改',
       icon: 'none'
@@ -284,15 +274,16 @@ let handleDelete = async (item) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
 
+
 .search .btn-search {
   border: none;
   background: none;

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

@@ -33,9 +33,10 @@
           <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' : ''"
+                     :class="index==selectIndex?'checked':''"
-                     :checked="index === selectIndex"
+                     :checked="index==selectIndex?true:false"
-                     :value="index+''">
+                     :value="item"
+                     :data-index="index">
               </radio>
 
               <view class="report-list">
@@ -80,10 +81,7 @@ let cssFlag=ref(false);//控制样式
 const upOption = ref({
   page: { num: 0, size: 10 },
   noMoreSize: 5,
-  empty: {
+  empty: { tip: '~ 空空如也 ~' },
-    tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -120,6 +118,7 @@ let timerId = null;
 watch(searchValue, (newValue, oldValue) => {
   // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
   if(timerId) clearTimeout(timerId);
+  cssFlag.value = true;
   timerId = setTimeout(async ()=>{
      handleSearch();
      clearTimeout(timerId);
@@ -131,6 +130,7 @@ watch(searchValue, (newValue, oldValue) => {
 const downCallback = async (mescroll) => {
   try {
     const res = await getList(1, upOption.value.page.size);
+    cssFlag.value = false;
     list.value = res.list;
     // 正确结束下拉刷新状态
     mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
@@ -163,11 +163,9 @@ const upCallback = async (mescroll) => {
 let handleSearch = async () => {
   // 触发下拉刷新以重新加载数据
   if (mescrollRef.value) {
-    cssFlag.value = true;
     uni.showLoading()
     await downCallback(mescrollRef.value.mescroll);
     uni.hideLoading()
-    cssFlag.value = false;
   }
 }
 // 获取数据列表
@@ -183,10 +181,12 @@ const getList = async (pageIndex, pageSize) => {
 // 选中项的索引号
 const selectIndex = ref(null);
 const radioChange = (e) => {
-  let {value} = e.detail; // index
+  let {value} = e.detail;
+  let {index} = e.target.dataset;
   // console.log(value);
+  // console.log(e.target.dataset);
   const eventChannel = instance.getOpenerEventChannel();
-  eventChannel.emit('cuSelected', list.value[value]);
+  eventChannel.emit('cuSelected', value);
   uni.navigateBack()
 }
 
@@ -195,14 +195,15 @@ const radioChange = (e) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
+
 .search .btn-search {
   border: none;
   background: none;

src/pages/business/CRM/customerUserList.vue

@@ -11,7 +11,8 @@
             </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>
+                        <checkbox class='checkBoxClass' :value="item.userName" 
+                            v-model="item.userName"></checkbox>
                         <view class="clientClass">
                             <text class="blue-text">{{ item.userName }}</text>
                             {{ " | " }}

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

@@ -168,7 +168,7 @@
             <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"
+              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
                               @change="handleHobbyChange"  :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
@@ -439,29 +439,20 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate) {
+  if (formData.value.cusEstate && formData.value.functionalRequirements) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param)
+    let res = await getCustomerLevel(param).catch(err => {
-    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })*/
+    })
-    try{
+    if (!res.systemRecommendationLevel) {
-      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 = "客户无等级信息，暂无法进行等级推荐"
+      console.log(formData.value.systemThinkLevel + "???")
     }
-    }
+    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -490,7 +481,8 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  formData.value.tenureTime = e;
+  let {value} = e.detail;
+  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -513,19 +505,17 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  formData.value.birthday = e;
+  let{value} = e.detail
+  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIds = ref([]);
+let hobbyIndex = reactive([]);
-let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (items, ids) => {
+const handleHobbyChange = (item, value) => {
-  console.log('选择爱好', items, ids);
+  // console.log("爱好", item, value);
-  hobbyIds.value = [];
+  hobbyIndex = value;
-  hobbies.value = items;
 };
-
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -549,18 +539,16 @@ let handleWorkingStatusChange = e => {
 }
 
 let submitForm = async () => {
-  let hobbyTags = hobbies.value.map(it => {
+  let hobbyTags = hobbyIndex.map(it => {
-    let {name} = it;
+    let {name} = hobbyList[it];
     return name;
   })
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   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.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
   }
-
-  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
-
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
   formData.value.cusName = customerUser.value.cusName;
@@ -602,11 +590,11 @@ let handleReject = () => {
     async success(res){
       if(res.confirm){
         if(res.content){
-          let response = await changeOfPrimaryOwnershipNoApproved({
+          let res = await changeOfPrimaryOwnershipNoApproved({
             opinionOwn: res.content,
             userId: formData.value.userId
           })
-          if(response.code===200){
+          if(res.code==200){
             uni.showToast({
               title: '操作成功',
               success(){

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

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

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

@@ -1,17 +1,19 @@
-<!--
- * @description 查看主归属人变更
- * @update date 2025/9/17 21:45
--->
 <template>
   <view class="con-body">
     <view class="con-bg">
       <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true"
+      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true" :rightFlag="false"></customHeader>
-                    :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"
@@ -20,17 +22,25 @@
                 @click="showDetail(item)">
             <view>
               <view class="report-list">
-                <view class="r-list title">{{ item.cusName }}
+                <view class="title">客户：{{ item.cusName }}</view>
+                <view class="r-list">
                   <view class="r-name">{{ item.visistCode }}</view>
-                  <view class="r-right btn-blue no-wrap"> 查看 </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 class="r-right">{{ item.userName}}</view>
                 </view>
-                <view class="r-list">
+                <view class="r-list" >
                   <view class="r-left">目前业务员</view>
                   <view class="r-right">{{ item.belonger }}</view>
                 </view>
@@ -58,7 +68,7 @@
 
 <script setup>
 import customHeader from "../../../../../components/customHeader.vue";
-import {onMounted, ref} from 'vue';
+import { onMounted, ref } from 'vue';
 
 import {getNavBarPaddingTop} from "../../../../../utils/system";
 import MescrollUni from "mescroll-uni/mescroll-uni.vue";
@@ -78,15 +88,14 @@ let queryParams = ref({
 onMounted(() => {
   navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
-onShow(() => {
+onShow(()=>{
   getList(queryParams)
 })
 
 
 let list = ref([])
-
 //获取列表信息
-function getList(queryParams) {
+function getList(queryParams){
   queryViewMainOwnerList(queryParams.value).then(res => {
       list.value = res.rows
   })
@@ -144,12 +153,9 @@ const upCallback = async (mescroll) => {
 }
 
 const upOption = ref({
-  page: {num: 0, size: 10},
+  page: { num: 0, size: 10 },
   noMoreSize: 5,
-  empty: {
+  empty: { tip: '~ 空空如也 ~' },
-    tip: '~ 空空如也 ~',
-    icon: "../../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -171,43 +177,57 @@ function showDetail(item) {
 
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
 
-.scroll-h{
+.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 */
-  top: 160rpx;
+  height: calc(100vh - 120px);
-  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  height: calc(100vh - 110px);
-  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
 .white-bg {
   padding-bottom: 10rpx;
 }
-
-.title {
-  align-items: baseline
-}
-
-.no-wrap {
-  white-space: nowrap;
-}
-
-.btn-blue {
-  border-radius: 10rpx;
-}
 </style>

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

@@ -1,6 +1,6 @@
 <template>
   <view class="con-body">
-    <view class="con-bg">
+    <view >
       <!-- 头部 -->
       <customHeader ref="customHeaderRef" :title="'查看主归属人变更详细信息'" :leftFlag="true"
                     :rightFlag="false"></customHeader>
@@ -8,9 +8,6 @@
       <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>
@@ -19,12 +16,10 @@
               <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>
@@ -36,14 +31,12 @@
             </view>
             <view class="border-bottom"></view>
             <view class="r-list">
-                <view class="r-left title">业务员认定等级</view>
+              <view class="r-left">业务员认定等级</view>
-                <view class="r-right title">{{ detailInfo.salesmanThinkLevel }}</view>
+              <view class="r-right">{{ detailInfo.salesmanThinkLevel }}</view>
-              </view>
-            </view>
-          </view>
             </view>
 
-
+          </view>
+        </view>
 
         <view class="tezt">
           <qianjue-step :list="list"></qianjue-step>
@@ -133,21 +126,52 @@ function getCrmCusUserNewChangeOwnerList() {
 </script>
 
 <style scoped>
-.con-bg{
-  background: white;
-/*  min-height: 100vh; */
-}
-
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  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 */
-  overflow-y: auto;
 }
 
 .white-bg {

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

@@ -22,8 +22,8 @@
 <script setup>
 import customHeader from '@/components/customHeader.vue'
 import { onMounted, reactive, ref } from 'vue';
-import { addStartMap } from '@/api/crm/activity/map';
+import { addStartMap } from '../../../../api/crm/activity/map';
-import { parseTime } from '@/utils/datetime.js';
+import { dateFormat } from '../../../../utils/formatter';
 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 = parseTime(date, '{y}-{m}-{d}');
+	form.craeteTime = dateFormat("YYYY-mm-dd", date)
 })
 
 function addInsertMapClockIn() {

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

@@ -10,26 +10,25 @@
             <!-- 正文内容 -->
             <view>
                 <!-- 搜索 -->
-        <!--                <view class="search">-->
+                <view class="search">
-        <!--                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"-->
+                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
-        <!--                        class="picker-bg">-->
+                        class="picker-bg">
-        <!--                        <view class="picker">-->
+                        <view class="picker">
-        <!--                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"-->
+                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
-        <!--                                size="18"></uni-icons>-->
+                                size="18"></uni-icons>
-        <!--                            <view>{{ defaultDate }}</view>-->
+                            <view>{{ defaultDate }}</view>
-        <!--                            <uni-icons type="down" size="18"></uni-icons>-->
+                            <uni-icons type="down" size="18"></uni-icons>
-        <!--                        </view>-->
+                        </view>
-        <!--                    </picker>-->
+                    </picker>
-        <!--                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
-        <!--                </view>-->
+                </view>
 
                 <!-- 分页部分  -->
                 <view class="white-bg margin-bottom20" v-for="(item, index) in list">
-          <view class="report-list">
+                    <view class="report-list" >
                             <view class="title"
-                  :style="{color: MapType[item.mapType].color}"
+                            :style="{color: item.mapType == 1 ? '#F5813A' : '#1989FA'}"
-            >类型：{{ MapType[item.mapType].label }}
+                            >类型：{{ item.mapType == 1 ? '签到' : '打卡' }}</view>
-            </view><!--item.mapType == 1 ? '#F5813A' : '#1989FA'}-->
                             <view class="r-list">
                                 <view class="r-left">开始签到时间</view>
                                 <view class="r-right">{{ item.goVisistStartTime }}</view>
@@ -62,12 +61,11 @@
 
 <script setup>
 import customHeader from '@/components/customHeader.vue'
-import {getNavBarPaddingTop} from '@/utils/system.js'
+import { getNavBarPaddingTop } from '@/utils/system.js'
-import {onMounted, ref} from 'vue';
+import { onMounted, ref } from 'vue';
-import {getDate} from '@/utils/datetime.js'
+import { getDate } from '@/utils/datetime.js'
-import {CheckInInformationViewing} from '../../../../api/crm/activity/map';
+import { CheckInInformationViewing } from '../../../../api/crm/activity/map';
-import {onLoad} from '@dcloudio/uni-app';
+import { onLoad } from '@dcloudio/uni-app';
-import {MapType} from "./dataMap";
 
 const navBarPaddingTop = ref(0);
 onMounted(() => {
@@ -78,14 +76,13 @@ onMounted(() => {
 let startDate = getDate('start');
 // 结束时间，间隔10年
 let endDate = getDate('end');
-let defaultDate = getDate({format: true})
+let defaultDate = getDate({ format: true })
 let bindDateChange = (e) => {
     defaultDate = e.detail.value
 }
 
 //获取list集合信息
 let list = ref([])
-
 function getList() {
     CheckInInformationViewing().then(res => {
         list.value = res.rows
@@ -96,17 +93,13 @@ onLoad(() => {
     getList()
 })
 
+
+
+
+
 </script>
 
 <style scoped>
-.r-left {
-  min-width: 6em;
-}
-
-.con-bg {
-  overflow-y: auto;
-}
-
 .search {
     display: flex;
     margin-bottom: 30rpx;

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

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

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

@@ -9,29 +9,14 @@
 
             <!-- 正文内容 -->
             <view class="white-bg">
-        <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn"/>
+                <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn" />
-<!--        <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn"/>-->
+                <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn" />
-        <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClick"/>
                 <view class="check-desc">
-          业务人员可通过
+                    业务人员可通过<text class="font-orange">签到</text>或<text
-          <text class="font-orange">签到</text>
+                        class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
-          或
-          <text
-              class="font-blue">打卡
-          </text>
-          进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
                 </view>
             </view>
         </view>
-    <closeable-modal v-model="modalVisible"
-                     title="确认在此处打卡？"
-                     :content="form.addressForStart"
-                     closeTip="轻触空白处关闭"
-                     cancelText="出差"
-                     confirmText="打卡"
-                     contentAlign="center"
-                     @confirm="handleConfirm"
-                     @cancel="handleCancel"/>
 
         <!-- 打卡遮罩层 -->
         <!-- <view class="check-con" v-if="checkFlag">
@@ -53,11 +38,9 @@
 </template>
 
 <script setup>
-import {ref, onMounted, reactive} from 'vue'
+import { ref, onMounted, reactive } from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import {addStartMapForClockIn, businessTripClockIn} from '../../../../api/crm/activity/map';
+import { addStartMapForClockIn } from '../../../../api/crm/activity/map';
-import CloseableModal from "@/components/closeableModal.vue";
-import {MapApiConfig} from "../../../../constants/mapApiConstants";
 
 let form = reactive({
     addressForStart: null,
@@ -66,7 +49,6 @@ let form = reactive({
     staffName: null,
     visistCode: null,
     visistId: null,
-  remark: null,
     mapId: null
 })
 // 签到
@@ -76,79 +58,25 @@ let handleCheckIn = () => {
     })
 }
 // 打卡
-// let handleClockIn = () => {
+let handleClockIn = () => {
-//   uni.getLocation({
-//     type: 'wgs84',
-//     success: (res) => {
-//       const latiude = res.latitude;
-//       const longitude = res.longitude;
-//       //进行解析
-//       inverseGeocoding(latiude, longitude);
-//     },
-//     fail: function (err) {
-//       console.log("获取地址失败" + err)
-//     }
-//   })
-// }
-let modalVisible = ref(false);
-let handleClick = () => {
     uni.getLocation({
         type: 'wgs84',
         success: (res) => {
-      const latitude = res.latitude;
+            const latiude = res.latitude;
             const longitude = res.longitude;
-      console.log('纬度:',latitude,'，经度:', longitude);
+            //进行解析
-      inverseGeocoding(latitude, longitude);
+            inverseGeocoding(latiude, longitude);
         },
         fail: function (err) {
             console.log("获取地址失败" + err)
         }
     })
-
-
-}
-// 反馈提示
-const feedback = (res, callback)=>{
-  if(res.code===200){
-    if(callback) callback();
-    uni.showToast({
-      title: MapApiConfig.OTHER.typeName === form.addressForStart ? MapApiConfig.OTHER.typeName : res.msg,
-      icon: 'success'
-    })
-    setTimeout(()=>{
-      uni.navigateBack(1);
-    }, 500)
-  }
-  else{
-    uni.showToast({
-      icon: 'none',
-      title: res.msg
-    })
-  }
-}
-// 出差
-const handleCancel = () => {
-  businessTripClockIn(form).then(res=>{
-   feedback(res,()=>console.log('出差打卡成功'));
-  }).catch(e=>{
-    console.log(e);
-  })
-}
-// 打卡
-let handleConfirm = () => {
-  addStartMapForClockIn(form).then(res=>{
-   feedback(res, ()=>console.log('打卡成功'));
-  }).catch(e=>{
-    console.log(e)
-  })
 }
 
-// 判定是否在范围内
 function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
     const distance = haversineDistance(centerLat, centerLon, lat, lon);
     return distance <= rangeKm;
 }
-
 function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
     const dLat = degToRad(lat2 - lat1);
     const dLon = degToRad(lon2 - lon1);
@@ -159,25 +87,23 @@ function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
     const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
     return radius * c; // 距离，单位：公里
 }
-
-// 角度转弧度
 function degToRad(deg) {
     return deg * (Math.PI / 180);
 }
 
 //解析地址
-function inverseGeocoding(latitude, longitude) {
+function inverseGeocoding(latiude, longitude) {
-  uni.showLoading();
+    let points = longitude + ',' + latiude
-    const apiURL = MapApiConfig.URL;
+    const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
     const params = {
-        lat: latitude,
+        lat: latiude,
         lng: longitude,
         radius: 1000,
         pageSize: 1,
         currentPage: 1,
         //classify: 220100
     };
-    const token = MapApiConfig.token;
+    const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
     uni.request({
         url: apiURL,
         method: 'GET',
@@ -186,31 +112,124 @@ function inverseGeocoding(latitude, longitude) {
             'Authorization': 'Bearer ' + token
         },
         success: (res) => {
-          modalVisible.value=true;
+            console.log(res, "----")
-            console.log(res, "经纬度解析成功")
+            if (res.statusCode == 200 && res.data.status == 200) {
-            if (res.statusCode === 200 && res.data.status === 200) {
                 let resdata = res.data.data.rows[0].address
                 if (resdata == null) {
                     console.log(resdata.srcLat)
-                    if (isWithinRange(latitude1, longitude1, latiude, longitude, 1)) {
+                    const latiude1 = 34.1360;
-                        form.addressForStart = MapApiConfig.XI_AN_BAN.typeName;
+                    const longitude1 = 108.9126;
-                        form.path = MapApiConfig.XI_AN_BAN.longitude + ',' + MapApiConfig.XI_AN_BAN.latitude ;
+                    if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
+                        form.addressForStart = "西安办事处位置打卡"
+                        uni.showModal({
+                            title: '确定要在此处打卡吗',
+                            content: form.addressForStart,
+                            success: function (res) {
+                                if (res.confirm) {
+                                    var data = {
+                                        mapId: form.mapId,
+                                        addressForStart: form.addressForStart,
+                                        cusName: form.cusName,
+                                        cusId: form.cusId,
+                                        remark: form.remark,
+                                        path: longitude1 + "," + latiude1
+                                    }
+                                    addStartMapForClockIn(data).then(res => {
+                                        if (res.code == 200) {
+                                            uni.showToast({
+                                                icon: 'success',
+                                                title: res.msg,
+                                                duration: 1500,
+                                            });
+                                            setTimeout(() => {
+                                                uni.navigateBack(1)
+                                            }, 500)
+                                        } else {
+                                            uni.showToast({
+                                                icon: 'none',
+                                                title: res.msg,
+                                            });
+                                        }
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('用户点击取消');
                                 }
                             }
-                else {
+                        });
-                    form.addressForStart = resdata;
-                    form.path = longitude + ',' + latitude; // 经度，纬度
                     }
                 } else {
-                form.addressForStart = MapApiConfig.OTHER.typeName;
+                    form.addressForStart = resdata;
-                form.path = longitude + ',' + latitude; // 经度，纬度
+                    uni.showModal({
+                        title: '确定要在此处打卡吗',
+                        content: form.addressForStart,
+                        success: function (res) {
+                            if (res.confirm) {
+                                var data = {
+                                    mapId: form.mapId,
+                                    addressForStart: form.addressForStart,
+                                    cusName: form.cusName,
+                                    cusId: form.cusId,
+                                    path: points
                                 }
-            uni.hideLoading();
+                                addStartMapForClockIn(data).then(res => {
+                                    if (res.code == 200) {
+                                        uni.showToast({
+                                            icon: 'success',
+                                            title: res.msg,
+                                            duration: 1500,
+                                        });
+                                    } else {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: res.msg,
+                                        });
+                                    }
+                                })
+                            } else if (res.cancel) {
+                                console.log('用户点击取消');
+                            }
+                        }
+                    });
+                }
+            } else {
+                form.addressForStart = "第三方维护打卡"
+                uni.showModal({
+                    title: '确定要在此处打卡吗',
+                    content: form.addressForStart,
+                    success: function (res) {
+                        if (res.confirm) {
+                            var data = {
+                                mapId: form.mapId,
+                                addressForStart: form.addressForStart,
+                                cusName: form.cusName,
+                                cusId: form.cusId,
+                                path: points
+                            }
+                            addStartMapForClockIn(data).then(res => {
+                                if (res.code == 200) {
+                                    uni.showToast({
+                                        icon: 'success',
+                                        title: '第三方维护打卡',
+                                        duration: 1500,
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        icon: 'none',
+                                        title: res.msg,
+                                    });
+                                }
+                            })
+                        } else if (res.cancel) {
+                            console.log('用户点击取消');
+                        }
+                    }
+                });
+            }
+
         },
         fail(e) {
             console.log("获取位置失败", e)
-          uni.hideLoading();
+        }
-        },
     })
 
 

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

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

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

@@ -1,257 +1,170 @@
 <template>
     <view class="con-body">
-    <view class="con-bg">
+        <view >
             <!-- 头部 -->
-      <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" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+            <view class="top-height"></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">
-        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+			<view class="list-cont">
-                      :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)">
+					<view class="item"   v-for="(item, index) in dataList">
-              <radio class='radio'
+						<radio class='radio' :value="index" ></radio>
-                     :class="index === selectIndex ? 'checked' : ''"
+						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
-                     :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 MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getYsCustomerList } from '../../../../api/crm/activity/activity'
-import {getNavBarPaddingTop} from '@/utils/system.js'
+import { onMounted,  reactive, ref, watch } from 'vue'
-import {onLoad} from "@dcloudio/uni-app";
+import { onLoad } from '@dcloudio/uni-app'
-import {getCustomerList} from "@/api/crm/customer/getCustomer";
+import { useMessage } from '../../../../utils/message'
 
-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({
+const message = useMessage();
-  page: { num: 0, size: 10 },
-  noMoreSize: 5,
-  empty: {
-    tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
-  },
-  textLoading: '加载中...',
-  textNoMore: '已经到底了'
-});
 
-const downOption = ref({
+//点击查询客户人员
-  auto: true,
+const queryParams = ref({
-  textInOffset: '下拉刷新',
+    cusName: '',
-  textOutOffset: '释放更新',
+    nickName:'',
-  textLoading: '刷新中...'
+    pageNum: 1,
-});
+    pageSize: 10
-
-const mescrollInit = (mescroll) => {
-  cssFlag.value = true;
-  mescrollRef.value = mescroll;
-};
-
-onMounted(() => {
-  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
 
-onLoad((options)=>{
+onMounted(() => {
-  instance = getCurrentInstance().proxy;
+
-  const eventChannel = instance.getOpenerEventChannel();
+})
-  eventChannel.on('requestCusList', async (res) => {
+
-    let {cusName} = res.data;
+onLoad(options => {
-    // console.log(cusName, "客户选择页读取到参数");
+    queryParams.value.cusName = options.cusName
-    searchValue.value = cusName;
+})
+const dataList = ref([])
+
+
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+let queryCusForm = reactive({})
+watch(searchContent,(newValue,oldValue)=>{
+    queryCusForm.cusName = searchContent.value
+    getYsCustomerList(queryCusForm).then(res=>{
+        dataList.value = res.rows
     })
 })
 
-let timerId = null;
+function radioChange(event) {
-// 搜索
+     const selectedIndex = event.detail.value
-watch(searchValue, (newValue, oldValue) => {
+    let test = dataList.value[selectedIndex]
-  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
+    // 发送全局事件
-  if(timerId) clearTimeout(timerId);
+    uni.$emit('onCustomerSelected', test)
-  timerId = setTimeout(async ()=>{
+    let cusName = test.cusName;//客户名称
-    handleSearch();
+    let cusId = test.cusId;//客户ID
-    clearTimeout(timerId);
+    uni.navigateBack()//返回上一页
-    timerId = null;
-  }, 500);
-});
-
-// 下拉刷新
-const downCallback = async (mescroll) => {
-  try {
-    const res = await getList(1, upOption.value.page.size);
-    list.value = res.list;
-    // 正确结束下拉刷新状态
-    mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
-  } catch (error) {
-    console.log(error)
-    // 发生错误时结束下拉刷新
-    mescroll.endErr();
-  }
 }
 
-// 上拉加载更多
-const upCallback = async (mescroll) => {
-  try {
-    const res = await getList(mescroll.num, mescroll.size);
-    if (mescroll.num === 1) {
-      list.value = res.list;
-    } else {
-      list.value.push(...res.list);
-    }
-    // 正确结束上拉加载状态
-    mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
-  } catch (error) {
-    console.log(error)
-    // 发生错误时结束上拉加载
-    mescroll.endErr();
-  }
-}
-
-// 查询搜索跳转
-let handleSearch = async () => {
-  // 触发下拉刷新以重新加载数据
-  if (mescrollRef.value) {
-    cssFlag.value = true;
-    uni.showLoading()
-    await downCallback(mescrollRef.value.mescroll);
-    uni.hideLoading()
-    cssFlag.value = false;
-  }
-}
-// 获取数据列表
-const getList = async (pageIndex, pageSize) => {
-  let param = {
-    pageNum: pageIndex,
-    pageSize,
-    cusName: searchValue.value
-  }
-  let { rows, total  } = await getCustomerList(param)
-  return {list: rows, total};
-}
-// 选中项的索引号
-const selectIndex = ref(null);
-const radioChange = (e) => {
-  const selectedIndex = e.detail.value;
-  //发送全局事件
-  uni.$emit('onCustomerSelected',list.value[selectedIndex])
-  uni.navigateBack()
-}
 
 
 
 </script>
 
-<style lang="scss" scoped>
+<style scoped lang="scss">
-.all-body {
+
-  /* #ifdef APP-PLUS */
+.con-body{
-  top: 150rpx;
+    background: white;
-  height: calc(100vh - 75px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
-  /* #endif */
 }
 
-.search .btn-search {
+
-  border: none;
+/* Container for the checkbox group */
-  background: none;
+.checkbox-group.block {
-  line-height: normal;
+    width: 100%;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
 }
 
-.search .btn-search::after {
+/* Each item row */
-  display: none;
+.itemClass {
-}
-
-.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 {
-  padding-right: 20rpx;
+  margin-right: 12px;
+  transform: scale(0.9);
 }
 
-.title {
+.name {
-  font-size: 32rpx;
+  flex: 1;
-  line-height: 48rpx;
+  font-size: 16px;
+  color: #333;
 }
 
-.report-list {
+.checked {
-  width: calc(100% - 70rpx);
+  color: #007AFF; /* 选中状态的颜色 */
-  //background-color: pink;
-}
-
-.border-bottom {
-  margin-top: 6rpx;
 }
 </style>

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

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

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

@@ -95,12 +95,7 @@ import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import customHeader from '@/components/customHeader.vue'
 import customTabs from '@/components/customTabs.vue';
-import {
+import { auditActivityReport, getVisistDetailList, getYsVisistInfo } from '../../../../api/crm/activity/activity';
-  auditActivityReport,
-  getRejectReason,
-  getVisistDetailList,
-  getYsVisistInfo
-} from '../../../../api/crm/activity/activity';
 
 
 let visistId = ref(0)
@@ -132,38 +127,10 @@ const activeTab = ref(0);//默认报告明细
 const tabList = ['报告明细'];
 
 //点击驳回
-// 修正后的驳回方法
+function refuse() {
-const refuse = async () => {
+    uni.navigateTo({
-  uni.showModal({
+        url: './auditReject?visistId=' + visistId.value
-    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'
-          });
-        }
-      }
-    }
-  });
 }
 
 //点击通过
@@ -178,7 +145,7 @@ function adopt(item) {
                     reportStaffName: item.staffName,
                 }).then(res => {
                     if (res.code == 200) {
-                        mescroll.resetUpScroll()
+                        // that.mescroll.resetUpScroll()
                     } else {
                         uni.showToast({
                             icon: 'none',
@@ -186,10 +153,6 @@ function adopt(item) {
                         });
                     }
                 })
-
-              uni.navigateBack({
-              })
-
             }
         }
 

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

@@ -11,7 +11,8 @@
             </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>
+                        <checkbox class='checkBoxClass' :value="item.nickName"
+                            v-model="item.nickName"></checkbox>
                         <view class="clientClass">
                             <text class="blue-text">{{ item.nickName }}</text>
                         </view>

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

@@ -27,17 +27,14 @@
                       :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"
-                @longpress="touchstart(item)"
+                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
-                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
+                  <view @touchstart.stop="handleStatusTouchStart"
-                        @click.stop="chooseStatus(item)">
+                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
                     <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
                       {{ item.status == '驳回' ? '再次提交' : item.status }}
                     </view>
@@ -81,6 +78,7 @@ 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
@@ -143,10 +141,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {
+  empty: {tip: '~ 空空如也 ~'},
-      tip: '~ 空空如也 ~',
-      icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -205,7 +200,7 @@ const getVisitorReportList = (pageNum, pageSize) => {
       pageNum,
       pageSize
     }
-    let res = await getYsVisistList(param);
+    let res = await visitorReportList(param);
     resolve({
       list: res.rows,
       total: res.total
@@ -214,6 +209,8 @@ const getVisitorReportList = (pageNum, pageSize) => {
 }
 
 
+let Loop = ref(0)
+let now
 const visistId = ref();
 const cusName = ref();
 const cusId = ref();
@@ -224,6 +221,9 @@ function touchstart(item) {
   cusName.value = item.cusName
   cusId.value = item.cusId
   status.value = item.status
+  now = new Date();
+  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
+  Loop.value = setTimeout(() => {
     uni.showModal({
       title: '删除',
       content: '请问要删除本条消息吗？',
@@ -255,29 +255,21 @@ function touchstart(item) {
         }
       }
     });
+  }, 750);
 
 }
-let isLongPressed = ref(false);
+
-function touchend(item) {
+function touchend() {
-  visistId.value = item.visistId
+  let endDate = new Date();
-  cusName.value = item.cusName
+  console.log('结束时间', endDate)
-  cusId.value = item.cusId
+  let cha = endDate.getTime() - now.getTime();
-  status.value = item.status
+  console.log(cha, 'casd')
-  // 如果未触发长按，则执行点击逻辑
+  if (cha < 750) {
-  if (!isLongPressed.value) {
     uni.navigateTo({
-      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId="
+      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value
-          + visistId.value
-          + '&cusName='
-          + cusName.value
-          + '&cusId='
-          + cusId.value
-          + '&status='
-          + status.value
     })
   }
-  // 重置状态（避免影响下次事件）
+  clearInterval(Loop.value);
-  isLongPressed.value = false;
 }
 
 //点击状态按钮

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

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

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

@@ -69,10 +69,7 @@
                             class="uni-forms-item is-direction-top is-top">
 
                             <multipleSelect :multiple="true" :value="chooseMyLeaderList" downInner
-                                :options="myLeaderList" 
+                                :options="myLeaderList" @change="changeValue2" :key="Math.round()" :slabel="'text'">
-                                @change="changeValue2" :key="Math.round()" 
-                                :slabel="'text'"
-                            >
                             </multipleSelect>
                         </uni-forms-item>
 
@@ -141,9 +138,7 @@ const submitForm = async () => {
             icon: 'success'
         });
         saveVisistReportForm.cusId = formData.value.cusId
-        if (Array.isArray(formData.value.leader)) {
+        saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
-          saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',');
-        }
         saveVisistReportForm.visistDate = formData.value.visitDate
         saveVisistReportForm.visistType = 'I类活动（走访）'
         saveVisistReportForm.mapId = mapId.value
@@ -254,10 +249,9 @@ function chooseRecord(e) {
 
 .form-con {
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 95px) !important;
+    height: calc(100vh - 100px)
         /* #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,10 +82,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { 
+    empty: { tip: '~ 空空如也 ~' },
-        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/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

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

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

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

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

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

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

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

@@ -2,57 +2,55 @@
 	<view class="con-body">
 		<view class="con-bg">
 			<!-- 头部 -->
-			<customHeader ref="customHeaderRef" :title="!searchShow?'市场信息查看':'搜索'" 
+			<customHeader ref="customHeaderRef" :title="'市场信息查看'" :leftFlag="true" :rightFlag="true">
-			    :leftFlag="true" 
+				<template #right>
-			    :rightFlag="true"  
+				</template>
-			    @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>
+			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></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>
-
-
-
 
 			<!-- 正文内容 -->
-			
+			<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> -->
+				<view class="search_center">
+					<view class="category">
+						<view class="flex_row_center_center" @click="showCate">
+							<text>{{selCategory.val||'全部'}}</text>
+							<image src="@/static/images/icon-notice@2x.png" mode=""></image>
+						</view>
+						<view class="pop_arrow" v-if="maskShow"></view>
+						<view class="pop" v-if="maskShow">
+							<text v-for="(item,index) in categories" :key="index"
+								@click="toList(item.categoryId,item.categoryName)">{{item.categoryName}}</text>
+						</view>
+					</view>
+					<image class="search_icon" src="@/static/images/icon-notice@2x.png"></image>
+					<input class='sea_input' :focus="inputFocus" type='text' :value="inputval" placeholder="请输入搜索条件"
+						@input="inputChange" @confirm='search' maxlength="50" placeholder-class="placeClass"></input>
+					<image class='clear_content' v-show="inputval" @click="clearInputVal"
+						src="@/static/images/icon-notice@2x.png" />
+				</view>
+				<text class='sea_btn' @click="btnSearch(1)">{{'搜索'}}</text>
 				<!-- 分页部分  -->
-				<mescroll-uni  v-if="!searchShow"  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+				<mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 					:up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
 					class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
-					<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+					<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"  @click="showDetail(item)">
-						@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-name"v-if="item.cusName!=null">公司名称:{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto"
+									<view class="r-right btn-gray flex-auto" :class="item.myselfBrowsing==0?'btn-blue':'btn-green'"
-										:class="item.myselfBrowsing==0?'btn-blue':'btn-green'" size="mini">
+										size="mini">{{item.myselfBrowsing==0?'未读':'已读'}}</view>
-										{{item.myselfBrowsing==0?'未读':'已读'}}</view>
 
 								</view>
 								<view class="border-bottom"></view>
@@ -72,7 +70,7 @@
 						</view>
 					</view>
 				</mescroll-uni>
-			
+			</view>
 		</view>
 	</view>
 </template>
@@ -84,7 +82,6 @@
 		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
@@ -98,8 +95,7 @@
 	import {
 		onLoad,
 		onShow,
-		onUnload,
+		onUnload
-		onHide
 	} from '@dcloudio/uni-app'
 	// 获取导航栏高度用于内容区域padding
 	const navBarPaddingTop = ref(0);
@@ -107,45 +103,10 @@
 		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) => {
@@ -153,6 +114,7 @@ const inputval = ref(''); // 搜索内容
 		var data = {
 			pageNum: 1,
 			pageSize: 10,
+			searchContent: searchValue.value
 		};
 		viewingMarketInfForAllMembers(data).then(res => {
 			if (res.code == 200) {
@@ -161,10 +123,6 @@ const inputval = ref(''); // 搜索内容
 			}
 		})
 	})
-	onHide(()=>{
-	    searchShow.value=false;
-	})
-	
 	const index = ref(0)
 	const categories = ref([{
 		categoryId: 1,
@@ -185,39 +143,16 @@ const inputval = ref(''); // 搜索内容
 		categoryId: 6,
 		categoryName: '通用信息'
 	}])
-	const selCategory = ref({
+	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,
-			
+			searchContent: searchValue.value
 		};
 		viewingMarketInfForAllMembers(data).then(res => {
 			if (res.code == 200) {
@@ -243,8 +178,7 @@ const inputval = ref(''); // 搜索内容
 		},
 		noMoreSize: 5,
 		empty: {
-			tip: '~ 空空如也 ~',
+			tip: '~ 空空如也 ~'
-			icon: "../../../../static/images/mescroll-empty.png"
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'
@@ -284,8 +218,7 @@ const inputval = ref(''); // 搜索内容
 	const upCallback = async (mescroll) => {
 		try {
 			setTimeout(async () => {
-				const res = await getViewingMarketInfForAllMembers(mescroll.num, mescroll.size,selValue.value, 
+				const res = await getViewingMarketInfForAllMembers(mescroll.num, mescroll.size);
-                inputval.value);
 				if (mescroll.num === 1) {
 					list.value = res.list;
 				} else {
@@ -303,10 +236,7 @@ const inputval = ref(''); // 搜索内容
 		return new Promise(async (resolve) => {
 			let param = {
 				pageNum,
-				pageSize,
+				pageSize
-				// 添加搜索条件参数
-				            selValue: selValue.value,
-				            inputval: inputval.value
 			}
 			let res = await viewingMarketInfForAllMembers(param);
 			resolve({
@@ -315,6 +245,7 @@ const inputval = ref(''); // 搜索内容
 			});
 		});
 	}
+
 	let Loop = ref(0)
 	let now
 	const visistId = ref();
@@ -324,8 +255,7 @@ const inputval = ref(''); // 搜索内容
 
 	function showDetail(item) {
 		uni.navigateTo({
-			url: "/pages/business/CRM/marketInformation/informationDetail?informationId=" + item.informationId +
+		  url: "/pages/business/CRM/marketInformation/informationDetail?informationId=" + item.informationId + '&selValue=' + item.selValue+ '&inputval=' + item.inputval
-				'&selValue=' + item.selValue + '&inputval=' + item.inputval
 		})
 		}
 		
@@ -336,16 +266,14 @@ const inputval = ref(''); // 搜索内容
 	const markVisited = (informationId) => {
 	    const newList = [...list.value].map(item => {
 	        if (item.informationId == informationId) { 
-				return {
+	            return { ...item, myselfBrowsing: 1 };
-					...item,
-					myselfBrowsing: 1
-				};
 	        }
 	        return item;
 	    });
 	    list.value = newList;
 	    
 	};
+		
 </script>
 
 <style scoped>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/pages/business/CRM/paymentCollection.vue

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

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

@@ -1,182 +0,0 @@
-<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

@@ -1,262 +0,0 @@
-<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

@@ -1,257 +0,0 @@
-<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

@@ -1,106 +0,0 @@
-<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

@@ -1,213 +0,0 @@
-<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

@@ -1,294 +0,0 @@
-<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

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

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

@@ -8,7 +8,7 @@
       <!-- #endif -->
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height"></view>
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
       <view class="white-bg">
         <navigator url="/pages/business/CRM/plan/myPlan">

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

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

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

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

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

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

src/pages/business/CRM/visitorReport.vue

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

src/pages/business/CRM/visitorReportAdd.vue

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

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

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

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

@@ -1,297 +0,0 @@
-<template>
-  <view class="con-body">
-    <view class="con-bg">
-      <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'客户订单列表'" :leftFlag="true" :rightFlag="true">
-        <template #right>
-          <view class="head-right" @click="handleConfirm">
-            确定
-          </view>
-        </template>
-      </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="cusCode" @clear="cusCode=''"></uni-search-bar>
-        </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}"
-        >
-          <checkbox-group class="block">
-            <view class="white-bg" v-for="(item, index) in list" :key="index">
-              <checkbox class='checkbox' 
-                     :checked="selectedItems.includes(index)"
-                     @click.stop="toggleItem(index)"
-              ></checkbox>
-
-              <view class="report-list">
-                <view class="title">批号：{{ item.tokenCode }}</view>
-                <view class="title">数量：{{ item.amount }}</view>
-                <view class="title">合同号：{{ item.orderCoode }}</view>
-                <view class="title">母批：{{ item.texing }}</view>
-                <view class="title">产品大类：{{ item.code }}</view>
-                <view class="title">规格型号：{{ item.name }}</view>
-                <view class="title">产品ID：{{ item.materialId }}</view>
-                <view class="border-bottom"></view>
-              </view>
-            </view>
-          </checkbox-group>
-        </mescroll-uni>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-
-import {ref, onMounted, getCurrentInstance, watch} from 'vue'
-import customHeader from '@/components/customHeader.vue'
-import {getNavBarPaddingTop} from '@/utils/system.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {getCustomerOrderList} from "@/api/eqf/qualityFeedback.js";
-
-let instance = null;
-// 获取导航栏高度用于内容区域padding
-const navBarPaddingTop = ref(0);
-// 查询列表
-let list = ref([]);
-const mescrollRef = ref(null);
-let cusCode = 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;
-    cusCode.value = cusName;
-  })
-})
-
-let timerId = null;
-// 搜索
-watch(cusCode, (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;
-    // 清空选中状态
-    selectedItems.value = [];
-    // 正确结束下拉刷新状态
-    if (mescroll && typeof mescroll.endSuccess === 'function') {
-      mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
-    }
-  } catch (error) {
-    // 发生错误时结束下拉刷新，添加空值检查
-    if (mescroll && typeof mescroll.endErr === 'function') {
-      mescroll.endErr();
-    } else {
-      console.error('mescroll 对象不存在或 endErr 方法未定义', error);
-    }
-  }
-}
-
-// 上拉加载更多
-const upCallback = async (mescroll) => {
-  try {
-    const res = await getList(mescroll.num, mescroll.size);
-    if (mescroll.num === 1) {
-      list.value = res.list;
-      // 清空选中状态
-      selectedItems.value = [];
-    } else {
-      list.value.push(...res.list);
-    }
-    // 正确结束上拉加载状态
-    if (mescroll && typeof mescroll.endSuccess === 'function') {
-      mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
-    }
-  } catch (error) {
-    // 发生错误时结束上拉加载，添加空值检查
-    if (mescroll && typeof mescroll.endErr === 'function') {
-      mescroll.endErr();
-    } else {
-      console.error('mescroll 对象不存在或 endErr 方法未定义', error);
-    }
-  }
-}
-
-// 查询搜索跳转
-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) => {
-  const param = {
-    pageNum: pageIndex,
-    pageSize,
-    cusCode: cusCode.value
-  }
-  let { rows, total } = await getCustomerOrderList(param)
-  return {list: rows, total};
-}
-
-// 存储选中项的索引数组
-const selectedItems = ref([]);
-
-// 切换单项选中状态
-const toggleItem = (index) => {
-  if (selectedItems.value.includes(index)) {
-    // 取消选中
-    selectedItems.value = selectedItems.value.filter(item => item !== index);
-  } else {
-    // 选中
-    selectedItems.value.push(index);
-  }
-  console.log('当前选中的索引:', selectedItems.value);
-}
-
-// 不再需要checkboxChange函数，因为已经通过toggleItem处理了所有选择逻辑
-
-// 确认选择并返回
-const handleConfirm = () => {
-  // 确保list.value和selectedItems.value有效
-  if (!list.value || !selectedItems.value || selectedItems.value.length === 0) {
-    uni.showToast({ title: '请选择数据', icon: 'none' });
-    return;
-  }
-  
-  // 获取选中的实际数据项，添加安全检查
-  const selectedData = selectedItems.value
-    .filter(index => index >= 0 && index < list.value.length) // 确保索引有效
-    .map(index => list.value[index]);  
-  
-  console.log('所有选中的数据:', selectedData);
-  
-  // 发送全局事件，传递选中的数据和逗号分隔的字符串
-  uni.$emit('onCustomerSelected', {
-    originalData: selectedData,
-  });
-  
-  // 设置标记，表示从选择页面返回
-  uni.setStorageSync('isFromCustomerOrderPage', true);
-  
-  // 返回上一页
-  uni.navigateBack();
-}
-
-</script>
-
-<style lang="scss" scoped>
-.all-body {
-  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
-  /* #endif */
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
-}
-
-.white-bg {
-  //padding-bottom:10rpx;
-  margin-bottom: 0;
-  overflow: hidden;
-  display: flex;
-  align-items: center;
-}
-
-.checkbox {
-  padding-right: 20rpx;
-  transform: scale(0.8); // 调整复选框大小以匹配UI
-}
-
-.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/EQF/components/gkCustomerOrder.vue

@@ -1,300 +0,0 @@
-<template>
-  <view class="con-body">
-    <view class="con-bg">
-      <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'管壳订单列表'" :leftFlag="true" :rightFlag="true">
-        <template #right>
-          <view class="head-right" @click="handleConfirm">
-            确定
-          </view>
-        </template>
-      </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="gkOrder" @clear="gkOrder=''"></uni-search-bar>
-        </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}"
-        >
-          <checkbox-group class="block">
-            <view class="white-bg" v-for="(item, index) in list" :key="index">
-              <checkbox class='checkbox' 
-                     :checked="selectedItems.includes(index)"
-                     @click.stop="toggleItem(index)"
-              ></checkbox>
-
-              <view class="report-list">
-                <view class="title">合同号：{{ item.gkOrder }}</view>
-                <view class="title">客户名称：{{ item.gkCustomerName }}</view>
-                <view class="title">产品名称：{{ item.gkCpName }}</view>
-                <view class="title">产品型号：{{ item.gkProductSpec }}</view>
-                <view class="title">数量：{{ item.gkAmount }}</view>
-                <view class="title">批号：{{ item.gkTokenCode }}</view>
-                <view class="title">母令：{{ item.gkMotherorderCode }}</view>
-                <view class="title">图纸编号：{{ item.gkDrawingNumber }}</view>
-                <view class="title">技术负责人：{{ item.gkTechnicalDirector }}</view>
-                <view class="title">产品ID：{{ item.gkProductId }}</view>
-                <view class="border-bottom"></view>
-              </view>
-            </view>
-          </checkbox-group>
-        </mescroll-uni>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-
-import {ref, onMounted, getCurrentInstance, watch} from 'vue'
-import customHeader from '@/components/customHeader.vue'
-import {getNavBarPaddingTop} from '@/utils/system.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {getGkCustomerOrderList} from "@/api/eqf/qualityFeedback.js";
-
-let instance = null;
-// 获取导航栏高度用于内容区域padding
-const navBarPaddingTop = ref(0);
-// 查询列表
-let list = ref([]);
-const mescrollRef = ref(null);
-let gkOrder = 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;
-    gkOrder.value = cusName;
-  })
-})
-
-let timerId = null;
-// 搜索
-watch(gkOrder, (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;
-    // 清空选中状态
-    selectedItems.value = [];
-    // 正确结束下拉刷新状态
-    if (mescroll && typeof mescroll.endSuccess === 'function') {
-      mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
-    }
-  } catch (error) {
-    // 发生错误时结束下拉刷新，添加空值检查
-    if (mescroll && typeof mescroll.endErr === 'function') {
-      mescroll.endErr();
-    } else {
-      console.error('mescroll 对象不存在或 endErr 方法未定义', error);
-    }
-  }
-}
-
-// 上拉加载更多
-const upCallback = async (mescroll) => {
-  try {
-    const res = await getList(mescroll.num, mescroll.size);
-    if (mescroll.num === 1) {
-      list.value = res.list;
-      // 清空选中状态
-      selectedItems.value = [];
-    } else {
-      list.value.push(...res.list);
-    }
-    // 正确结束上拉加载状态
-    if (mescroll && typeof mescroll.endSuccess === 'function') {
-      mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
-    }
-  } catch (error) {
-    // 发生错误时结束上拉加载，添加空值检查
-    if (mescroll && typeof mescroll.endErr === 'function') {
-      mescroll.endErr();
-    } else {
-      console.error('mescroll 对象不存在或 endErr 方法未定义', error);
-    }
-  }
-}
-
-// 查询搜索跳转
-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) => {
-  const param = {
-    pageNum: pageIndex,
-    pageSize,
-    gkOrder: gkOrder.value
-  }
-  let { rows, total } = await getGkCustomerOrderList(param)
-  return {list: rows, total};
-}
-
-// 存储选中项的索引数组
-const selectedItems = ref([]);
-
-// 切换单项选中状态
-const toggleItem = (index) => {
-  if (selectedItems.value.includes(index)) {
-    // 取消选中
-    selectedItems.value = selectedItems.value.filter(item => item !== index);
-  } else {
-    // 选中
-    selectedItems.value.push(index);
-  }
-  console.log('当前选中的索引:', selectedItems.value);
-}
-
-// 不再需要checkboxChange函数，因为已经通过toggleItem处理了所有选择逻辑
-
-// 确认选择并返回
-const handleConfirm = () => {
-  // 确保list.value和selectedItems.value有效
-  if (!list.value || !selectedItems.value || selectedItems.value.length === 0) {
-    uni.showToast({ title: '请选择数据', icon: 'none' });
-    return;
-  }
-  
-  // 获取选中的实际数据项，添加安全检查
-  const selectedData = selectedItems.value
-    .filter(index => index >= 0 && index < list.value.length) // 确保索引有效
-    .map(index => list.value[index]);  
-  
-  console.log('所有选中的数据:', selectedData);
-  
-  // 发送全局事件，传递选中的数据和逗号分隔的字符串
-  uni.$emit('onCustomerSelected', {
-    originalData: selectedData,
-  });
-  
-  // 设置标记，表示从选择页面返回
-  uni.setStorageSync('isFromCustomerOrderPage', true);
-  
-  // 返回上一页
-  uni.navigateBack();
-}
-
-</script>
-
-<style lang="scss" scoped>
-.all-body {
-  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
-  /* #endif */
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
-}
-
-.white-bg {
-  //padding-bottom:10rpx;
-  margin-bottom: 0;
-  overflow: hidden;
-  display: flex;
-  align-items: center;
-}
-
-.checkbox {
-  padding-right: 20rpx;
-  transform: scale(0.8); // 调整复选框大小以匹配UI
-}
-
-.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/EQF/components/gkQualityFeedbackDetailComponent.vue

@@ -1,388 +0,0 @@
-<template>
-    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px" label-position="top">
-        <uni-forms-item label="合同号" name="cusName" class="f-c-right">
-            <view @click="chooseCustomer" class="form-item-container">
-                <text class="name">{{ formData.gkOrder || '点击选择合同数据' }}</text>
-            </view>
-        </uni-forms-item>	
-        <uni-forms-item label="合同号" name="gkOrder" class="f-c-right">
-            <uni-easyinput v-model="formData.gkOrder" placeholder="请输入合同号" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-         <uni-forms-item label="产品规格型号" name="gkProductSpec" class="f-c-right">
-            <uni-easyinput v-model="formData.gkProductSpec" placeholder="请输入产品规格型号" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        <uni-forms-item label="数量" name="gkAmount" class="f-c-right">
-            <uni-easyinput v-model="formData.gkAmount" type="text" placeholder="请输入供货数量" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        <uni-forms-item label="批号" name="gkTokenCode" class="f-c-right">
-            <uni-easyinput v-model="formData.gkTokenCode" placeholder="请输入批号" name="input" :disabled="isDisabled" />
-        </uni-forms-item>
-        <uni-forms-item label="母批号" name="gkMotherorderCode" class="f-c-right">
-            <uni-easyinput v-model="formData.gkMotherorderCode" placeholder="请输入母批号" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        <uni-forms-item label="图纸编号" name="gkDrawingNumber" class="f-c-right">
-            <uni-easyinput v-model="formData.gkDrawingNumber" placeholder="请输入图纸编号" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        <uni-forms-item label="技术负责人" name="gkTechnicalDirector" class="f-c-right">
-            <uni-easyinput v-model="formData.gkTechnicalDirector" placeholder="请输入技术负责人" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        <uni-forms-item label="产品ID" name="gkProductId" class="f-c-right">
-            <uni-easyinput v-model="formData.gkProductId" placeholder="请输入产品ID" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-    </uni-forms>
-    <view class="footer-con">
-        <button class="btn-default" type="default" @click="handleDeleteDetailItem" size="mini" v-if="false">删除</button>
-        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存</button>
-    </view>
-</template>
-
-<script setup name="gkQualityFeedbackDetailComponent">
-import { ref, reactive } from 'vue'
-import cache from '../../../../utils/cache'
-import { onShow,onLoad, onUnload } from '@dcloudio/uni-app';
-import {
-        qualityFeedbackGkDetailAdd
-	} from '@/api/eqf/qualityFeedback.js'
-
-let isDisabled = ref(false)
-const props = defineProps({
-    cusName: String, //客户单位名称
-    cusId: Number, //客户ID
-    feedbackId: Number, //质量反馈ID
-    status: String //状态
-})
-
-// 表单数据
-const formData = ref({
-    customerCode: '',
-    batchNumber: '',
-    supplyQuantity: '',
-    specificationModel: '',
-    motherBatch: '',
-    materialId: '',
-    eqfId: '',
-    drawingNumber:'',
-    technicalDirector:'',
-});
-
-// 验证规则
-const rules = {
-    contractNumber: {
-        rules: [
-            { required: true, errorMessage: '请输入合同号' }
-        ]
-    },
-    batchNumber: {
-        rules: [
-            { required: true, errorMessage: '请输入批号' }
-        ]
-    },
-    supplyQuantity: {
-        rules: [
-            { required: true, errorMessage: '请输入供货数量' },
-            { type: 'number', errorMessage: '请输入数字' }
-        ]
-    },
-    specificationModel: {
-        rules: [
-            { required: true, errorMessage: '请输入产品规格型号' }
-        ]
-    }
-};
-
-// 表单ref
-const formRef = ref(null);
-
-
-onLoad((options) => {
-    //清空表单
-    clearForm()
-    // 然后设置eqfId
-    if (options && options.id) {
-        formData.value.eqfId = options.id;
-    }
-    // 清除相关缓存，确保首次加载时没有旧数据干扰
-    cache.remove(`qualityFeedbackDetail_${options?.id || ''}`);
-})
-
-//获取当前外反的明细
-const detailList = ref([])
-const getQualityFeedbackDetail = async () => {
-    let param = {
-        eqfId: formData.value.eqfId
-    }
-    let detailRes = await qualityFeedbackDetailAdd(param);
-    detailList.value = detailRes.rows[0];
-}
-
-//删除明细项的内容
-function handleDeleteDetailItem() {
-    // 使用本地存储或其他方式暂存删除操作
-    uni.showToast({
-        title: '删除成功',
-        duration: 2000
-    });
-    //清空表单
-    clearForm()
-}
-
-// 清空表单
-function clearForm() {
-    formData.value.gkOrder = ''
-    formData.value.gkProductSpec = ''
-    formData.value.gkAmount = ''
-    formData.value.gkTokenCode = ''
-    formData.value.gkMotherorderCode = ''
-    formData.value.gkDrawingNumber = ''
-    formData.value.gkTechnicalDirector = ''
-    formData.value.gkProductId = ''
-}
-
-// 选择合同页面跳转
-function chooseCustomer() {
-    uni.navigateTo({
-        url: '/pages/business/EQF/components/gkCustomerOrder'
-    })
-}
-
-// 提交表单
-const submitForm = async () => {
-    try {
-        // 表单校验
-        await formRef.value.validate()
-        console.log(formData,"5555")
-        const res = await qualityFeedbackGkDetailAdd(formData.value);
-        uni.showToast({
-            title: '提交成功',
-            icon: 'success'
-        })
-            // 发送刷新列表事件，同时支持两种事件名称以兼容现有代码
-            uni.$emit('refreshMarketList');
-            uni.$emit('refreshFeedbackList');
-            setTimeout(() => {
-                uni.navigateBack(1);
-            }, 1500);
-                
-        console.log('表单数据:', formData.value)
-    } catch (err) {
-        console.log('表单验证失败:', err)
-    }
-}
-
-
-//页面渲染完成后，查询详情
-onShow(() => {
-    // Try to load from cache if available
-    const cachedData = cache.get(`qualityFeedbackDetail_${props.feedbackId}`);
-    if (cachedData) {
-        formData.value = {
-            ...formData.value,
-            ...cachedData
-        };
-    }
-    
-    if (props.status == '完成') {
-        isDisabled.value = true
-    } else {
-        isDisabled.value = false
-    }
-    
-    // 监听客户订单选择事件
-    uni.$on('onCustomerSelected', handleCustomerSelected);
-});
-
-// 处理客户订单选择结果
-function handleCustomerSelected(data) {
-    // 确保数据存在
-    if (!data || typeof data !== 'object') {
-        console.error('无效的数据:', data);
-        return;
-    }
-    
-    // 如果返回的是对象
-    let selectedItems = [];
-    
-    console.log('接收到的数据:', data);
-    
-    // 兼容新格式
-    selectedItems = data.originalData || [];
-    
-    if (selectedItems && selectedItems.length > 0) {
-        // 清空表单
-        clearForm();
-        
-        console.log('选中的项目数量:', selectedItems.length);
-        console.log('选中的项目详情:', selectedItems);
-        
-        // 循环拼接所有选中项目的字段
-        const gkOrder = selectedItems.map(item => item.gkOrder || '').filter(Boolean);
-        const gkProductSpec = selectedItems.map(item => item.gkProductSpec || '').filter(Boolean);
-        const gkAmount = selectedItems.map(item => item.gkAmount || '').filter(Boolean);
-        const gkTokenCode = selectedItems.map(item => item.gkTokenCode || '').filter(Boolean);
-        const gkMotherorderCode = selectedItems.map(item => item.gkMotherorderCode || '').filter(Boolean);
-        const gkDrawingNumber = selectedItems.map(item => item.gkDrawingNumber || '').filter(Boolean);
-        const gkTechnicalDirector = selectedItems.map(item => item.gkTechnicalDirector || '').filter(Boolean);
-        const gkProductId = selectedItems.map(item => item.gkProductId || '').filter(Boolean);
-
-
-        console.log('拼接前的合同号:', gkOrder);
-        
-        // 使用nextTick确保DOM更新
-        setTimeout(() => {
-            formData.value.gkOrder = gkOrder.join(',');
-            formData.value.gkProductSpec = gkProductSpec.join(',');
-            formData.value.gkAmount = gkAmount.join(',');
-            formData.value.gkTokenCode = gkTokenCode.join(',');
-            formData.value.gkMotherorderCode = gkMotherorderCode.join(',');
-            formData.value.gkDrawingNumber = gkDrawingNumber.join(',');
-            formData.value.gkTechnicalDirector = gkTechnicalDirector.join(',');
-            formData.value.gkProductId = gkProductId.join(',');
-            
-            console.log('设置后的表单数据:', formData.value);
-        }, 0);
-        
-        // 显示提示信息
-        uni.showToast({
-            title: `已选择${selectedItems.length}个批次`,
-            icon: 'none',
-            duration: 2000
-        });
-        
-        // 保存到缓存
-        cache.set(`qualityFeedbackDetail_${props.feedbackId || ''}`, formData.value);
-    }
-};
-
-// 页面卸载时移除事件监听
-onUnload(() => {
-    uni.$off('onCustomerSelected', handleCustomerSelected);
-});
-
-// 处理批号变化，自动查询数据
-const handleBatchNumberChange = async (value) => {
-    const trimmedValue = value?.trim() || '';
-    // 防止空值查询
-    if (!trimmedValue) {
-        console.log('批号为空，不执行查询');
-        return;
-    }
-    
-    try {
-        // 显示加载提示
-        uni.showLoading({
-            title: '查询中...',
-        });
-        const  param = { batchNumber: value };
-        console.log('查询参数:', param);
-        // 尝试从缓存获取数据，减少重复请求
-        const cacheKey = `batchInfo_${trimmedValue}`;
-        let batchInfo = cache.get(cacheKey);
-        console.log('缓存数据:', batchInfo);
-
-        if (1==1) {
-            // 调用API获取数据
-            console.log('准备调用API...');
-			let apiData 
-            try {
-                const res = await getMockBatchData(param);
-                console.log('API响应原始数据:', res);
-				// 根据isTransformResponse=false的设置，正确处理响应数据
-				// 修复4: 处理可能的嵌套数据结构
-				apiData = res;
-				// 检查是否有data字段，适应不同的响应结构
-				if (res.data !== undefined) {
-				    apiData = res.data;
-				}
-            } catch (apiError) {
-                console.error('API调用直接失败:', apiError);
-                // 重新抛出错误，让外层catch处理
-                throw new Error(`API调用失败: ${apiError?.message || '未知错误'}`);
-            }
-
-            console.log('处理后的数据:', apiData);
-            
-            if (typeof apiData === 'object' && apiData !== null) {
-                // 提取并格式化有用的数据
-                batchInfo = {
-                    supplyQuantity: apiData.supplyQuantity || '',
-                    specificationModel: apiData.specificationModel || '',
-                    motherBatch: apiData.motherBatch || '',
-                    materialId: apiData.materialId || '',
-                    batchNumber: trimmedValue // 确保不会覆盖用户已输入的批号
-                };
-                
-                // 保存到缓存，过期时间设置为1小时
-                cache.set(cacheKey, batchInfo, 3600000);
-                
-                // 安全更新表单数据，避免覆盖整个formData对象
-                formData.value.batchNumber = trimmedValue;
-                formData.value.supplyQuantity = apiData.rows[0].amount || '';
-                formData.value.specificationModel = apiData.rows[0].itemName || '';
-                formData.value.motherBatch = apiData.rows[0].texing || '';
-                formData.value.materialId = apiData.rows[0].materialId || '';
-                formData.value.customerCode = apiData.rows[0].orderCode || '';
-
-                console.log('apiData:', apiData.rows[0]);
-                console.log('更新后的formData:', formData.value);
-                
-                // 显示查询成功提示
-                uni.showToast({
-                    title: '查询成功',
-                    duration: 2000
-                });
-            } else {
-                // 没有数据时的处理
-                console.log('未查询到相关数据');
-                uni.showToast({
-                    title: '未查询到相关数据',
-                    icon: 'none',
-                    duration: 2000
-                });
-            }
-        } else {
-            // 使用缓存数据更新表单
-            formData.value = {
-                ...formData.value,
-                ...batchInfo,
-                // 确保不会覆盖用户正在输入的批号
-                batchNumber: trimmedValue
-            };
-        }
-    } catch (error) {
-        console.error('查询批号数据失败:', error);
-        uni.showToast({
-            title: '查询失败，请重试',
-            icon: 'none',
-            duration: 2000
-        });
-    } finally {
-        // 隐藏加载提示
-        uni.hideLoading();
-    }
-};
-
-
-// 明确暴露给父组件的方法
-defineExpose({
-    clearForm
-})
-</script>
-
-<style scoped>
-.footer-con {
-    display: flex;
-    justify-content: flex-end;
-    padding: 20rpx;
-    gap: 20rpx;
-}
-
-.btn-default {
-    background-color: #f0f0f0;
-    color: #333;
-}
-
-.btn-primary {
-    background-color: #6FA2F8;
-    color: #fff;
-}
-</style>

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

@@ -1,379 +0,0 @@
-<template>
-    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px" label-position="top">
-        <uni-forms-item label="合同号" name="cusName" class="f-c-right">
-            <view @click="chooseCustomer" class="form-item-container">
-                <text class="name">{{ formData.customerCode || '点击选择合同数据' }}</text>
-            </view>
-        </uni-forms-item>	
-        <uni-forms-item label="合同号" name="customerCode" class="f-c-right">
-            <uni-easyinput v-model="formData.customerCode" placeholder="请输入合同号" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        
-        <uni-forms-item label="批号" name="batchNumber" class="f-c-right">
-            <uni-easyinput v-model="formData.batchNumber" placeholder="请输入批号" name="input" :disabled="isDisabled" @input="handleBatchNumberChange"/>
-        </uni-forms-item>
-        
-        <uni-forms-item label="供货数量" name="supplyQuantity" class="f-c-right">
-            <uni-easyinput v-model="formData.supplyQuantity" type="text" placeholder="请输入供货数量" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        
-        <uni-forms-item label="产品规格型号" name="specificationModel" class="f-c-right">
-            <uni-easyinput v-model="formData.specificationModel" placeholder="请输入产品规格型号" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        
-        <uni-forms-item label="母批号" name="motherBatch" class="f-c-right">
-            <uni-easyinput v-model="formData.motherBatch" placeholder="请输入母批号" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-        
-        <uni-forms-item label="产品ID" name="materialId" class="f-c-right">
-            <uni-easyinput v-model="formData.materialId" placeholder="请输入产品ID" name="input" :disabled="isDisabled"/>
-        </uni-forms-item>
-    </uni-forms>
-    <view class="footer-con">
-        <button class="btn-default" type="default" @click="handleDeleteDetailItem" size="mini" v-if="false">删除</button>
-        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存</button>
-    </view>
-</template>
-
-<script setup name="qualityFeedbackDetailComponent">
-import { ref, reactive } from 'vue'
-import cache from '../../../../utils/cache'
-import { onShow,onLoad, onUnload } from '@dcloudio/uni-app';
-import {
-		getMockBatchData,
-        qualityFeedbackDetailAdd
-	} from '@/api/eqf/qualityFeedback.js'
-
-let isDisabled = ref(false)
-const props = defineProps({
-    cusName: String, //客户单位名称
-    cusId: Number, //客户ID
-    feedbackId: Number, //质量反馈ID
-    status: String //状态
-})
-
-// 表单数据
-const formData = ref({
-    customerCode: '',
-    batchNumber: '',
-    supplyQuantity: '',
-    specificationModel: '',
-    motherBatch: '',
-    materialId: '',
-    eqfId: '',
-});
-
-// 验证规则
-const rules = {
-    contractNumber: {
-        rules: [
-            { required: true, errorMessage: '请输入合同号' }
-        ]
-    },
-    batchNumber: {
-        rules: [
-            { required: true, errorMessage: '请输入批号' }
-        ]
-    },
-    supplyQuantity: {
-        rules: [
-            { required: true, errorMessage: '请输入供货数量' },
-            { type: 'number', errorMessage: '请输入数字' }
-        ]
-    },
-    specificationModel: {
-        rules: [
-            { required: true, errorMessage: '请输入产品规格型号' }
-        ]
-    }
-};
-
-// 表单ref
-const formRef = ref(null);
-
-
-onLoad((options) => {
-    //清空表单
-    clearForm()
-    // 然后设置eqfId
-    if (options && options.id) {
-        formData.value.eqfId = options.id;
-    }
-    // 清除相关缓存，确保首次加载时没有旧数据干扰
-    cache.remove(`qualityFeedbackDetail_${options?.id || ''}`);
-})
-
-//获取当前外反的明细
-const detailList = ref([])
-const getQualityFeedbackDetail = async () => {
-    let param = {
-        eqfId: formData.value.eqfId
-    }
-    let detailRes = await qualityFeedbackDetailAdd(param);
-    detailList.value = detailRes.rows[0];
-}
-
-//删除明细项的内容
-function handleDeleteDetailItem() {
-    // 使用本地存储或其他方式暂存删除操作
-    uni.showToast({
-        title: '删除成功',
-        duration: 2000
-    });
-    //清空表单
-    clearForm()
-}
-
-// 清空表单
-function clearForm() {
-    formData.value.customerCode = ''
-    formData.value.batchNumber = ''
-    formData.value.supplyQuantity = ''
-    formData.value.specificationModel = ''
-    formData.value.motherBatch = ''
-    formData.value.materialId = ''
-}
-
-// 选择合同页面跳转
-function chooseCustomer() {
-    uni.navigateTo({
-        url: '/pages/business/EQF/components/customerOrder'
-    })
-}
-
-// 提交表单
-const submitForm = async () => {
-    try {
-        // 表单校验
-        await formRef.value.validate()
-        console.log(formData,"5555")
-        const res = await qualityFeedbackDetailAdd(formData.value);
-        uni.showToast({
-            title: '提交成功',
-            icon: 'success'
-        })
-            // 发送刷新列表事件，同时支持两种事件名称以兼容现有代码
-            uni.$emit('refreshMarketList');
-            uni.$emit('refreshFeedbackList');
-            setTimeout(() => {
-                uni.navigateBack(1);
-                }, 1500);
-                
-        console.log('表单数据:', formData.value)
-    } catch (err) {
-        console.log('表单验证失败:', err)
-    }
-}
-
-
-//页面渲染完成后，查询详情
-onShow(() => {
-    // Try to load from cache if available
-    const cachedData = cache.get(`qualityFeedbackDetail_${props.feedbackId}`);
-    if (cachedData) {
-        formData.value = {
-            ...formData.value,
-            ...cachedData
-        };
-    }
-    
-    if (props.status == '完成') {
-        isDisabled.value = true
-    } else {
-        isDisabled.value = false
-    }
-    
-    // 监听客户订单选择事件
-    uni.$on('onCustomerSelected', handleCustomerSelected);
-});
-
-// 处理客户订单选择结果
-function handleCustomerSelected(data) {
-    // 确保数据存在
-    if (!data || typeof data !== 'object') {
-        console.error('无效的数据:', data);
-        return;
-    }
-    
-    // 如果返回的是对象
-    let selectedItems = [];
-    
-    console.log('接收到的数据:', data);
-    
-    // 兼容新格式
-    selectedItems = data.originalData || [];
-    
-    if (selectedItems && selectedItems.length > 0) {
-        // 清空表单
-        clearForm();
-        
-        console.log('选中的项目数量:', selectedItems.length);
-        console.log('选中的项目详情:', selectedItems);
-        
-        // 循环拼接所有选中项目的字段
-        const customerCodes = selectedItems.map(item => item.orderCoode || '').filter(Boolean);
-        const supplyQuantities = selectedItems.map(item => item.amount || '').filter(Boolean);
-        const specificationModels = selectedItems.map(item => item.name || '').filter(Boolean);
-        const motherBatches = selectedItems.map(item => item.texing || '').filter(Boolean);
-        const materialIds = selectedItems.map(item => item.materialId || '').filter(Boolean);
-        const batchNumbers = selectedItems.map(item => item.tokenCode || '').filter(Boolean);
-
-        console.log('拼接前的合同号:', customerCodes);
-        
-        // 使用nextTick确保DOM更新
-        setTimeout(() => {
-            formData.value.customerCode = customerCodes.join(',');
-            formData.value.supplyQuantity = supplyQuantities.join(',');
-            formData.value.specificationModel = specificationModels.join(',');
-            formData.value.motherBatch = motherBatches.join(',');
-            formData.value.materialId = materialIds.join(',');
-            formData.value.batchNumber = batchNumbers.join(',');
-            
-            console.log('设置后的表单数据:', formData.value);
-        }, 0);
-        
-        // 显示提示信息
-        uni.showToast({
-            title: `已选择${selectedItems.length}个批次`,
-            icon: 'none',
-            duration: 2000
-        });
-        
-        // 保存到缓存
-        cache.set(`qualityFeedbackDetail_${props.feedbackId || ''}`, formData.value);
-    }
-};
-
-// 页面卸载时移除事件监听
-onUnload(() => {
-    uni.$off('onCustomerSelected', handleCustomerSelected);
-});
-
-// 处理批号变化，自动查询数据
-const handleBatchNumberChange = async (value) => {
-    const trimmedValue = value?.trim() || '';
-    // 防止空值查询
-    if (!trimmedValue) {
-        console.log('批号为空，不执行查询');
-        return;
-    }
-    
-    try {
-        // 显示加载提示
-        uni.showLoading({
-            title: '查询中...',
-        });
-        const  param = { batchNumber: value };
-        console.log('查询参数:', param);
-        // 尝试从缓存获取数据，减少重复请求
-        const cacheKey = `batchInfo_${trimmedValue}`;
-        let batchInfo = cache.get(cacheKey);
-        console.log('缓存数据:', batchInfo);
-
-        if (1==1) {
-            // 调用API获取数据
-            console.log('准备调用API...');
-			let apiData 
-            try {
-                const res = await getMockBatchData(param);
-                console.log('API响应原始数据:', res);
-				// 根据isTransformResponse=false的设置，正确处理响应数据
-				// 修复4: 处理可能的嵌套数据结构
-				apiData = res;
-				// 检查是否有data字段，适应不同的响应结构
-				if (res.data !== undefined) {
-				    apiData = res.data;
-				}
-            } catch (apiError) {
-                console.error('API调用直接失败:', apiError);
-                // 重新抛出错误，让外层catch处理
-                throw new Error(`API调用失败: ${apiError?.message || '未知错误'}`);
-            }
-
-            console.log('处理后的数据:', apiData);
-            
-            if (typeof apiData === 'object' && apiData !== null) {
-                // 提取并格式化有用的数据
-                batchInfo = {
-                    supplyQuantity: apiData.supplyQuantity || '',
-                    specificationModel: apiData.specificationModel || '',
-                    motherBatch: apiData.motherBatch || '',
-                    materialId: apiData.materialId || '',
-                    batchNumber: trimmedValue // 确保不会覆盖用户已输入的批号
-                };
-                
-                // 保存到缓存，过期时间设置为1小时
-                cache.set(cacheKey, batchInfo, 3600000);
-                
-                // 安全更新表单数据，避免覆盖整个formData对象
-                formData.value.batchNumber = trimmedValue;
-                formData.value.supplyQuantity = apiData.rows[0].amount || '';
-                formData.value.specificationModel = apiData.rows[0].itemName || '';
-                formData.value.motherBatch = apiData.rows[0].texing || '';
-                formData.value.materialId = apiData.rows[0].materialId || '';
-                formData.value.customerCode = apiData.rows[0].orderCode || '';
-
-                console.log('apiData:', apiData.rows[0]);
-                console.log('更新后的formData:', formData.value);
-                
-                // 显示查询成功提示
-                uni.showToast({
-                    title: '查询成功',
-                    duration: 2000
-                });
-            } else {
-                // 没有数据时的处理
-                console.log('未查询到相关数据');
-                uni.showToast({
-                    title: '未查询到相关数据',
-                    icon: 'none',
-                    duration: 2000
-                });
-            }
-        } else {
-            // 使用缓存数据更新表单
-            formData.value = {
-                ...formData.value,
-                ...batchInfo,
-                // 确保不会覆盖用户正在输入的批号
-                batchNumber: trimmedValue
-            };
-        }
-    } catch (error) {
-        console.error('查询批号数据失败:', error);
-        uni.showToast({
-            title: '查询失败，请重试',
-            icon: 'none',
-            duration: 2000
-        });
-    } finally {
-        // 隐藏加载提示
-        uni.hideLoading();
-    }
-};
-
-
-// 明确暴露给父组件的方法
-defineExpose({
-    clearForm
-})
-</script>
-
-<style scoped>
-.footer-con {
-    display: flex;
-    justify-content: flex-end;
-    padding: 20rpx;
-    gap: 20rpx;
-}
-
-.btn-default {
-    background-color: #f0f0f0;
-    color: #333;
-}
-
-.btn-primary {
-    background-color: #6FA2F8;
-    color: #fff;
-}
-</style>

src/pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter.vue

@@ -1,82 +0,0 @@
-<script setup>
-import { ref, reactive, onUnmounted } from 'vue'
-import { onLoad } from '@dcloudio/uni-app';
-import cache from '../../../../utils/cache';
-import customHeader from '../../../../components/customHeader.vue';
-import gkQualityFeedbackDetailComponent from '../components/gkQualityFeedbackDetailComponent.vue';
-
-const cusName = ref()
-const cusId = ref()
-const visistId = ref()
-const status = ref()
-
-// 质量反馈明细组件引用
-const qualityFeedbackDetailComponentRef = ref(null)
-// 展开/收起标志
-let expandFlagRC = ref(true);
-
-onLoad(options => {
-    cusName.value = options.cusName
-    cusId.value = options.cusId
-    visistId.value = options.visistId
-    status.value = options.status
-    // 首次加载时，如果组件已挂载，立即清空明细数据
-    setTimeout(() => {
-        if (qualityFeedbackDetailComponentRef.value) {
-            qualityFeedbackDetailComponentRef.value.clearForm();
-        }
-    }, 100);
-})
-
-// 质量反馈明细
-// 处理展开/收起明细区域
-let handleExpandRC = () => {
-    expandFlagRC.value = !expandFlagRC.value;
-    if (expandFlagRC.value) {
-        // 展开时清空明细数据，确保每次展开都是空表单
-        if (qualityFeedbackDetailComponentRef.value) {
-            qualityFeedbackDetailComponentRef.value.clearForm();
-        }
-    }
-};
-
-// 返回上一页功能
-const handleBack = () => {
-    navigateBack({
-        delta: 1
-    });
-};
-
-// ... 其他现有代码
-</script>
-
-<template>
-    <view class="con-body">
-        <view class="con-bg">
-            <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'外反明细录入'" :leftFlag="true" :rightFlag="false" @back="handleBack"></customHeader>
-            <!-- 高度来避免头部遮挡 -->
-            <view class="top-height"></view>
-
-            <!-- 质量反馈明细录入 -->
-            <view class="white-bg white-bg-2">
-                <view class="w-b-title" @click="handleExpandRC">明细录入
-                    <text>
-                        {{ expandFlagRC ? '收起' : '展开' }}
-                        <i :class="{ iconfont: true, 'icon-up': expandFlagRC, 'icon-down': !expandFlagRC }"></i>
-                    </text>
-                </view>
-                <view v-show="expandFlagRC" class="form-con">
-                    <gkQualityFeedbackDetailComponent 
-                        :cusName="cusName" 
-                        :cusId="cusId" 
-                        :feedbackId="visistId" 
-                        :status="status" 
-                        ref="qualityFeedbackDetailComponentRef"
-                    ></gkQualityFeedbackDetailComponent>
-                </view>
-            </view>
-
-        </view>
-    </view>
-</template>

src/pages/business/EQF/qualityFeedback/qualityFeedbackAdd.vue

@@ -1,502 +0,0 @@
-<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="120px">
-						<uni-forms-item label="客户名称" name="cusName" class="f-c-right" required>
-							<view @click="chooseCustomer" class="form-item-container">
-								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
-							</view>
-						</uni-forms-item>						
-						<uni-forms-item label="产品类型" name="productType" class="f-c-right">
-							<uni-data-select v-model="formData.productType" :localdata="productTypeList"
-							placeholder="请选择产品类型"/>
-						</uni-forms-item>
-						<uni-forms-item label="产品类别" class="f-c-right" name="productCategory" v-if="formData.productType == '电阻器'" required>
-							<uni-data-select v-model="formData.productCategory" :localdata="productCategoryList" 
-								placeholder="请选择产品类别" />
-						</uni-forms-item>
-						<uni-forms-item label="产品大类" class="f-c-right" name="productCategories" v-if="formData.productType == '管壳'">
-							<uni-data-select v-model="formData.productCategories" :localdata="productCategoriesList" 
-								placeholder="请选择产品大类" />
-						</uni-forms-item>
-						<uni-forms-item label="产品分类" class="f-c-right" name="classification" v-if="formData.productType == '管壳'">
-							<uni-data-select v-model="formData.classification" :localdata="classificationList" 
-								placeholder="请选择产品分类" />
-						</uni-forms-item>
-						<uni-forms-item label="问题现象" name="ppNameLabel" class="f-c-right">
-							<uni-data-select v-model="formData.ppNameLabel" :localdata="problemPhenomenonList" 
-								placeholder="请选择问题现象" />
-						</uni-forms-item>
-						<uni-forms-item label="问题现象描述" name="ppNameDescribe" class="f-c-right">
-							<uni-easyinput v-model="formData.ppNameDescribe" type="textarea" placeholder="请详细描述问题现象" />
-						</uni-forms-item>
-						<uni-forms-item label="使用数量" name="employQuantity" class="f-c-right">
-							<uni-easyinput v-model.number="formData.employQuantity" type="number" placeholder="请输入使用数量" />
-						</uni-forms-item>
-						<uni-forms-item label="问题数量" name="problemQuantity" class="f-c-right">
-							<uni-easyinput v-model.number="formData.problemQuantity" type="number" placeholder="请输入问题数量" />
-						</uni-forms-item>
-						<uni-forms-item label="使用方法" name="employMethod" class="f-c-right">
-							<uni-easyinput v-model="formData.employMethod" placeholder="请输入使用方法" />
-						</uni-forms-item>
-						<uni-forms-item label="问题发生阶段" name="posName" class="f-c-right" required>
-							<uni-data-select v-model="formData.posName" :localdata="problemStageList" 
-								placeholder="请选择问题发生阶段" />
-						</uni-forms-item>
-						<uni-forms-item label="用户诉求标签" name="customerAppealLabels" class="f-c-right" required>
-							<uni-data-select v-model="formData.customerAppealLabels" :multiple="true"  :localdata="customerAppealLabelList" 
-								placeholder="请选择用户诉求标签" />
-						</uni-forms-item>
-						<uni-forms-item label="用户诉求" name="customerAppeal" class="f-c-right" required>
-							<uni-easyinput v-model="formData.customerAppeal" type="textarea" placeholder="请输入用户诉求" />
-						</uni-forms-item>
-						<uni-forms-item label="是否返厂" name="isReturnfactory" class="f-c-right">
-							<uni-data-select v-model="formData.isReturnfactory" :localdata="isReturnfactoryYesNoList" 
-								placeholder="请选择是否返厂" />
-						</uni-forms-item>
-						<uni-forms-item label="是否需要归零" name="isReturnzero" class="f-c-right" required>
-							<uni-data-select v-model="formData.isReturnzero" :localdata="isReturnzeroYesNoList" 
-								placeholder="请选择是否需要归零" />
-						</uni-forms-item>
-						<uni-forms-item label="业务员" name="salesman" class="f-c-right">
-							<uni-easyinput v-model="formData.salesman" placeholder="请输入业务员" />
-						</uni-forms-item>
-						<uni-forms-item label="联系方式" name="salesmanPhone" class="f-c-right">
-							<uni-easyinput v-model="formData.salesmanPhone" placeholder="请输入联系方式" />
-						</uni-forms-item>
-						<uni-forms-item label="答复日期" name="replyTime" class="uni-forms-item is-direction-top is-top">
-							<uni-datetime-picker type="date" :clear-icon="false" v-model="formData.replyTime" @change="changeDate" />
-						</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 {
-		listgetResistorTypeList,
-		listgetProductCategoriesList,
-		listgetClassificationList,
-		listgetProblemPhenomenonList,
-		listgetProblemStageList,
-		listgetCustomerAppealLabelList,
-		qualityFeedbackAdd,
-	} from '@/api/eqf/qualityFeedback.js'
-
-
-	let customerUser = reactive({})
-	// 客户相关
-	const guestList = ref([])
-	const guestArr = ref([])
-	const guestIndex = ref(0)
-
-	/// 正确的数据绑定示例
-const formData = ref({
-  leader: '',          // 我方领导
-  userDemand: '',      // 用户诉求
-  isReturnFactory: '否', // 是否返厂
-  isNeedReset: '否',     // 是否需要归零
-  salesman: '',        // 业务员
-  contact: '',         // 联系方式
-  productCategory: '', // 产品分类
-  productType: '电阻器',     // 产品类型
-  problemPhenomenon: '', // 问题现象
-  problemDescription: '', // 问题现象描述
-  usageQuantity: '',   // 使用数量
-  problemQuantity: '', // 问题数量
-  usageMethod: '',      // 使用方法
-  cusName: '',
-  customerId: '',
-  ppNameLabel: '',
-  ppNameDescribe: '',
-  employQuantity: '',
-  problemQuantity: '', // 问题数量
-  employMethod: '',
-  posName: '',
-  customerAppealLabels: [],
-  customerAppeal: '',
-  isReturnfactory: '',
-  isReturnzero:	'',
-  salesman: '',
-  salesmanPhone: '',
-  replyTime: '',
-});
-
-// 添加表单验证规则
-const rules = {
-  cusName: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择客户'
-      }
-    ]
-  },
-  productType: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择产品类型'
-      }
-    ]
-  },
-  productCategory: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择产品类别',
-        validateFunction: (rule, value, data, callback) => {
-          // 只有当产品类型为电阻器时才验证
-          if (data.productType === '电阻器' && !value) {
-            callback('请选择产品类别');
-          } else {
-            callback();
-          }
-        }
-      }
-    ]
-  },
-  productCategories: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择产品大类',
-        validateFunction: (rule, value, data, callback) => {
-          // 只有当产品类型为管壳时才验证
-          if (data.productType === '管壳' && !value) {
-            callback('请选择产品大类');
-          } else {
-            callback();
-          }
-        }
-      }
-    ]
-  },
-  classification: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择产品分类',
-        validateFunction: (rule, value, data, callback) => {
-          // 只有当产品类型为管壳时才验证
-          if (data.productType === '管壳' && !value) {
-            callback('请选择产品分类');
-          } else {
-            callback();
-          }
-        }
-      }
-    ]
-  },
-  posName: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择问题发生阶段'
-      }
-    ]
-  },
-  customerAppealLabels: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择用户诉求标签',
-        validateFunction: (rule, value, data, callback) => {
-          if (!value || value.length === 0) {
-            callback('请选择用户诉求标签');
-          } else {
-            callback();
-          }
-        }
-      }
-    ]
-  },
-  customerAppeal: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请输入用户诉求'
-      }
-    ]
-  },
-  isReturnzero: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择是否需要归零'
-      }
-    ]
-  }
-}
-// 定义产品分类列表
-const productTypeList =[
-	{ text: '电阻器', value: '电阻器' },
-	{ text: '管壳', value: '管壳' },
-  	// 其他产品类型...
-]
-// 是/否选项
-const isReturnfactoryYesNoList = [
-	{ text: '是', value: '是' },
-	{ text: '否', value: '否' },
-	{ text: '在途', value: '在途' }
-]
-// 是/否选项
-const isReturnzeroYesNoList = [
-	{ text: '是', value: '是' },
-	{ text: '否', value: '否' },
-]
-
-//产品类别
-const productCategoryList = ref([]);
-//产品大类
-const productCategoriesList = ref([]);
-//	产品分类
-const classificationList = ref([]);
-//问题现象
-const problemPhenomenonList = ref([]);
-//问题发生阶段
-const problemStageList = ref([]);
-//用户诉求标签
-const customerAppealLabelList = ref([]);
-
-
-// 初始化产品类别数据
-const initProductCategoryData = async () => {
-  try {
-    // 这里需要根据实际的API接口进行调用，以下为示例
-    // 加载产品类别数据
-    // 使用listgetResistorTypeList接口获取电阻器类型数据
-	const resistorTypeRes = await listgetResistorTypeList();
-	productCategoryList.value = resistorTypeRes.rows.map(item => ({
-		text: item.resistorTypeText,  // 显示文本
-		value: item.resistorTypeValue  // 对应的值
-	}));
-    
-    // 加载产品大类数据
-	const productCategories = await listgetProductCategoriesList();
-	console.log(productCategories)
-    productCategoriesList.value = productCategories.rows.map(item => ({
-		text: item.productCategoriesText,  // 显示文本
-		value: item.productCategoriesValue  // 对应的值
-	}));
-    
-    // 加载产品分类数据
-	const classification = await listgetClassificationList();
-    classificationList.value = classification.rows.map(item => ({
-		text: item.classificationText,  // 显示文本
-		value: item.classificationValue  // 对应的值
-	}));
-
-	//问题现象
-	const problemPhenomenon = await listgetProblemPhenomenonList();
-	console.log(problemPhenomenon)
-	problemPhenomenonList.value = problemPhenomenon.rows.map(item => ({
-		text: item.problemPhenomenonText,  // 显示文本
-		value: item.problemPhenomenonValue  // 对应的值
-	}));
-
-	//问题发生阶段
-	const problemStage = await listgetProblemStageList();
-	problemStageList.value = problemStage.rows.map(item => ({
-		text: item.problemStageText,  // 显示文本
-		value: item.problemStageValue  // 对应的值
-	}));
-	
-	//用户诉求标签
-	const customerAppealLabel = await listgetCustomerAppealLabelList();
-	customerAppealLabelList.value = customerAppealLabel.rows.map(item => ({
-		text: item.customerAppealLabelText,  // 显示文本
-		value: item.customerAppealLabelValue  // 对应的值
-	}));
-  } catch (error) {
-    console.error('加载产品类别数据失败:', error);
-    uni.showToast({ title: '加载产品类别数据失败', icon: 'none' });
-  }
-};
-
-
-	// 表单引用 & 客户选择器引用
-	const formRef = ref(null)
-	const customHeaderRef = ref(null)
-	// 选择客户页面跳转
-	function chooseCustomer() {
-		uni.navigateTo({
-			url: '/pages/business/EQF/components/chooseCus'
-		})
-	}
-	//定义数据接收的值
-	let selectedCustomer = reactive(null)
-
-	//监听时间
-	onMounted(() => {
-		uni.$on('onCustomerSelected', handleCustomerSelected)
-		initProductCategoryData();
-	})
-	//取消监听
-	onUnmounted(() => {
-		uni.$off('onCustomerSelected', handleCustomerSelected)
-	})
-
-	//处理 接收数据
-	const handleCustomerSelected = (data) => {
-		formData.value.cusName = data.cusName
-		formData.value.customerId = data.cusId
-	}
-	// 提交表单
-	const submitForm = async () => {
-		try {
-			// 表单校验
-			await formRef.value.validate()
-			console.log(formData,"5555")
-			const res = await qualityFeedbackAdd(formData.value);
-			uni.showToast({
-				title: '提交成功',
-				icon: 'success'
-			})
-			  uni.$emit('refreshMarketList');
-			  setTimeout(() => {
-			        uni.navigateBack(1);
-			      }, 1500);
-			      
-			console.log('表单数据:', formData.value)
-		} catch (err) {
-			console.log('表单验证失败:', err)
-		}
-	}
-
-</script>
-
-<style scoped>
-/* 基本布局样式 */
-.con-body {
-  background-color: #F8F8F8;
-}
-
-.con-bg {
-  padding-bottom: 20rpx;
-}
-
-/* 顶部占位高度，避免内容被头部遮挡 */
-.top-height {
-  height: 80rpx;
-}
-
-/* 表单区域背景 */
-.white-bg {
-  padding: 20rpx;
-  background-color: #FFFFFF;
-}
-
-/* 表单容器 */
-.form-con {
-  margin-top: 20rpx;
-}
-
-/* 表单项目对齐方式 */
-.f-c-right {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 10rpx 0;
-}
-
-/* 加载遮罩 */
-.loading-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.3);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  z-index: 9999;
-}
-
-/* ======== 表单组件样式优化 ======== */
-
-/* 基础表单样式 */
-:deep(.uni-forms) {
-  width: 100%;
-}
-
-:deep(.uni-forms-item) {
-  margin-bottom: 20rpx;
-  position: relative; /* 为伪元素定位做准备 */
-}
-
-/* 日期选择器样式 */
-:deep(.uni-date-x .uni-date__x-input) {
-  padding-left: 20rpx;
-  color: #919191;
-}
-
-/* ======== 强制显示必填项红色标识 ======== */
-
-/* 方案1: 使用伪元素在标签前添加红色星号 */
-:deep(.uni-forms-item--required)::before {
-  content: '*';
-  color: #ff4d4f !important;
-  position: absolute;
-  left: -16rpx;
-  top: 50%;
-  transform: translateY(-50%);
-  font-size: 28rpx !important;
-  font-weight: bold !important;
-  z-index: 10;
-}
-
-/* 调整标签内边距，避免文本与星号重叠 */
-:deep(.uni-forms-item__label) {
-  padding-left: 16rpx !important;
-}
-
-/* 方案2: 增强内置必填项标识的样式（备用方案） */
-:deep(.uni-forms-item--required .uni-forms-item__required) {
-  display: inline !important;
-  color: #ff4d4f !important;
-  margin-right: 8rpx !important;
-  font-size: 28rpx !important;
-  font-weight: bold !important;
-}
-
-/* 方案3: 直接在标签文本中显示星号（最可靠的后备方案） */
-:deep(.uni-forms-item--required .uni-forms-item__label::before) {
-  content: '*';
-  color: #ff4d4f !important;
-  margin-right: 4rpx;
-}
-</style>

src/pages/business/EQF/qualityFeedback/qualityFeedbackEnter.vue

@@ -1,82 +0,0 @@
-<script setup>
-import { ref, reactive, onUnmounted } from 'vue'
-import { onLoad } from '@dcloudio/uni-app';
-import cache from '../../../../utils/cache';
-import customHeader from '../../../../components/customHeader.vue';
-import QualityFeedbackDetailComponent from '../components/qualityFeedbackDetailComponent.vue';
-
-const cusName = ref()
-const cusId = ref()
-const visistId = ref()
-const status = ref()
-
-// 质量反馈明细组件引用
-const qualityFeedbackDetailComponentRef = ref(null)
-// 展开/收起标志
-let expandFlagRC = ref(true);
-
-onLoad(options => {
-    cusName.value = options.cusName
-    cusId.value = options.cusId
-    visistId.value = options.visistId
-    status.value = options.status
-    // 首次加载时，如果组件已挂载，立即清空明细数据
-    setTimeout(() => {
-        if (qualityFeedbackDetailComponentRef.value) {
-            qualityFeedbackDetailComponentRef.value.clearForm();
-        }
-    }, 100);
-})
-
-// 质量反馈明细
-// 处理展开/收起明细区域
-let handleExpandRC = () => {
-    expandFlagRC.value = !expandFlagRC.value;
-    if (expandFlagRC.value) {
-        // 展开时清空明细数据，确保每次展开都是空表单
-        if (qualityFeedbackDetailComponentRef.value) {
-            qualityFeedbackDetailComponentRef.value.clearForm();
-        }
-    }
-};
-
-// 返回上一页功能
-const handleBack = () => {
-    navigateBack({
-        delta: 1
-    });
-};
-
-// ... 其他现有代码
-</script>
-
-<template>
-    <view class="con-body">
-        <view class="con-bg">
-            <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'外反明细录入'" :leftFlag="true" :rightFlag="false" @back="handleBack"></customHeader>
-            <!-- 高度来避免头部遮挡 -->
-            <view class="top-height"></view>
-
-            <!-- 质量反馈明细录入 -->
-            <view class="white-bg white-bg-2">
-                <view class="w-b-title" @click="handleExpandRC">明细录入
-                    <text>
-                        {{ expandFlagRC ? '收起' : '展开' }}
-                        <i :class="{ iconfont: true, 'icon-up': expandFlagRC, 'icon-down': !expandFlagRC }"></i>
-                    </text>
-                </view>
-                <view v-show="expandFlagRC" class="form-con">
-                    <QualityFeedbackDetailComponent 
-                        :cusName="cusName" 
-                        :cusId="cusId" 
-                        :feedbackId="visistId" 
-                        :status="status" 
-                        ref="qualityFeedbackDetailComponentRef"
-                    ></QualityFeedbackDetailComponent>
-                </view>
-            </view>
-
-        </view>
-    </view>
-</template>

src/pages/business/EQF/qualityFeedback/qualityFeedbackIndex.vue

@@ -1,534 +0,0 @@
-<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"
-                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
-            <view>
-              <view class="report-list">
-                <view class="title">客户：{{ item.customerName }}-{{ item.id }}</view>
-                <view class="r-list">
-                  <view class="r-name">{{ item.qualityCode }}</view>
-                  <view @touchstart.stop="handleStatusTouchStart"
-                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
-                    <view class="r-right btn-orange" size="mini">
-                      {{ item.status }}
-                    </view>
-                  </view>
-
-                </view>
-                <view class="border-bottom"></view>
-                <view class="r-list">
-                  <view class="r-left">外反类型</view>
-                  <view class="r-right">{{ item.productType }}</view>
-                </view>
-                <view class="border-bottom"></view>
-                <view class="r-list">
-                  <view class="r-left">问题现象描述</view>
-                  <view class="r-right">{{ item.ppNameDescribe }}</view>
-                </view>
-                <view class="border-bottom"></view>
-                <view class="r-list">
-                  <view class="r-left">问题发生阶段</view>
-                  <view class="r-right">{{ item.posName }}</view>
-                </view>
-                <view class="border-bottom"></view>
-                <view class="r-list">
-                <view class="r-left">明细信息</view>
-                  <view class="r-right detail-info" @click="showDetailInfo(item)">
-                    <view class="detail-item">
-                      <span class="detail-label">合同号：</span>
-                      <span class="detail-value">{{ formatTextWithLineBreak(item.customerCode) }}</span>
-                    </view>
-                    <view class="detail-item">
-                      <span class="detail-label">批号：</span>
-                      <span class="detail-value">{{ formatTextWithLineBreak(item.batchNumber) }}</span>
-                    </view>
-                  </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="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>
-  </view>
-</template>
-
-<script setup>
-import { ref, onMounted, watch } from 'vue'
-import { onLoad, onShow } from '@dcloudio/uni-app'
-import customHeader from '@/components/customHeader.vue'
-import { getNavBarPaddingTop } from '@/utils/system.js'
-import { listFeedback, removeQualityFeedback, updateStatus } from '@/api/eqf/qualityFeedback.js';
-
-// 获取导航栏高度用于内容区域padding
-const navBarPaddingTop = ref(0);
-onMounted(() => {
-  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
-})
-
-let informationId = ref(0);
-let id = ref(null);
-// 定义存储列表数据的响应式变量
-// 查询列表
-let list = ref([]);
-let totalCount = ref(0);
-
-onLoad((options) => {
-  informationId.value = options.informationId;
-  // 调用时传入分页参数，首次加载第一页，每页10条
-  getQualityFeedbackList(1, 10)
-    .then(data => {
-      // 将数据更新到响应式变量
-      list.value = data.list;
-      totalCount.value = data.total;
-    })
-    .catch(error => {
-      console.error('获取数据失败:', error);
-    });
-    
-  // 监听刷新列表事件
-  uni.$on('refreshFeedbackList', refreshList);
-});
-
-onShow(() => {
-  // 页面显示时重新加载数据，确保数据最新
-  getQualityFeedbackList(1, 10)
-    .then(data => {
-      list.value = data.list;
-      totalCount.value = data.total;
-    })
-    .catch(error => {
-      console.error('刷新数据失败:', error);
-    });
-});
-
-// 在页面卸载时移除事件监听，避免内存泄漏
-uni.$on('onUnload', () => {
-  uni.$off('refreshFeedbackList', refreshList);
-});
-
-// 刷新列表数据的函数
-const refreshList = () => {
-  getQualityFeedbackList(1, 10)
-    .then(data => {
-      list.value = data.list;
-      totalCount.value = data.total;
-      // 如果有滚动组件实例，重置上拉加载状态
-      if (mescrollRef.value) {
-        mescrollRef.value.resetUpScroll();
-      }
-    })
-    .catch(error => {
-      console.error('刷新列表数据失败:', error);
-    });
-};
-
-
-
-let searchValue = ref(null)
-
-//监视查询的内容的变化
-watch(searchValue, (newValue, oldValue) => {
-  //变化了之后，重新查询内容
-  var data = {
-    pageNum: 1,
-    pageSize: 10,
-  };
-  listFeedback(data).then(res => {
-    if (res.code === 200) {
-      //设置列表数据
-      list.value = res.rows;
-    }
-  })
-})
-
-// 添加显示详细信息的函数
-const showDetailInfo = (item) => {
-  uni.showModal({
-    title: '明细信息',
-    content: `合同号：${formatEmptyValue(item.customerCode)}\n批号：${formatEmptyValue(item.batchNumber)}`,
-    showCancel: false
-  });
-};
-
-// 添加数据格式化和验证的辅助函数
-const formatTextWithLineBreak = (text) => {
-  if (!text || typeof text !== 'string') return '-';
-  // 将逗号替换为换行符
-  return text.split(',').join('\n');
-};
-
-// 显示空值的默认文本
-const formatEmptyValue = (value) => {
-  if (value === null || value === undefined || value === '') {
-    return '-';
-  }
-  return value;
-};
-
-// 查询搜索跳转
-let handleSearch = () => {
-  var data = {
-    pageNum: 1,
-    pageSize: 10,
-  };
-  listFeedback(data).then(res => {
-    if (res.code == 200) {
-      //设置列表数据
-      list.value = res.rows;
-    } else {
-      uni.showToast({
-        icon: 'none',
-        title: "请求失败",
-      });
-      list.value = null;
-    }
-
-  })
-}
-
-// 新增
-let handleAdd = () => {
-  uni.navigateTo({url: '/pages/business/EQF/qualityFeedback/qualityFeedbackAdd'})
-}
-
-
-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 getQualityFeedbackList(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 getQualityFeedbackList(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 getQualityFeedbackList = (pageNum, pageSize) => {
-  return new Promise(async (resolve, reject) => {
-    try {
-      // 检查分页参数是否存在
-      if (!pageNum || !pageSize) {
-        reject(new Error('分页参数不能为空'));
-        return;
-      }
-      
-      let param = {
-        pageNum,
-        pageSize,
-        // 可能还需要传递informationId作为查询条件
-        informationId: informationId.value
-      };
-      
-      let res = await listFeedback(param);
-      
-      // 检查接口返回是否有效
-      if (!res) {
-        reject(new Error('接口返回为空'));
-        return;
-      }
-      
-      console.log('接口返回数据:', res);
-      resolve({
-        list: res.rows || [],
-        total: res.total || 0
-      });
-    } catch (error) {
-      console.error('请求过程出错:', error);
-      reject(error);
-    }
-  });
-};
-
- // 空依赖数组确保只在组件挂载时执行一次
-
-let Loop = ref(0)
-let now
-const visistId = ref();
-const cusName = ref();
-const cusId = ref();
-const status = ref();
-const productType = ref();
-
-function touchstart(item) {
-  cusName.value = item.cusName
-  cusId.value = item.cusId
-  status.value = item.status
-  id.value = item.id
-  productType.value = item.productType
-  now = new Date();
-  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
-  Loop.value = setTimeout(() => {
-    uni.showModal({
-      title: '删除',
-      content: '请问要删除本条消息吗？',
-      success: (res) => {
-        if (res.confirm) {
-          const data = {
-            num: 1,
-            pageSize: 10,
-            status: "录入"
-          };
-          const parm = {
-            id: item.id
-          };
-          removeQualityFeedback(parm).then(res => {
-            if (res.code == 500) {
-              uni.showToast({
-                icon: 'none',
-                title: "存在明细项，不能直接删除！",
-              });
-            } else {
-              uni.showToast({
-                title: "删除成功",
-                duration: 2000
-              });
-            }
-            // 刷新内容
-            upCallback()
-          });
-        }
-      }
-    });
-  }, 750);
-
-}
-
-function touchend() {
-  if(productType.value == '电阻器'){
-    uni.navigateTo({
-      url: "/pages/business/EQF/qualityFeedback/qualityFeedbackEnter?id=" + id.value + '&status=' + status.value
-    })
-  }else if(productType.value == '管壳'){
-    uni.navigateTo({
-      url: "/pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter?id=" + id.value + '&status=' + status.value
-    })
-  }
-    
-  clearInterval(Loop.value);
-}
-
-//点击状态按钮
-function chooseStatus(item) {
-  console.log(item,"item")
-  updateStatus(item).then(
-      res => {
-        if (res.code == 200) {
-          uni.showToast({
-            title: '提交成功',
-            duration: 2000
-          });
-          setTimeout(function () {
-            uni.navigateBack({
-              success: () => {
-              }
-            })
-          }, 500);
-        } else {
-          uni.showToast({
-            title: res.msg,
-            icon: 'none',
-          });
-        }
-      },
-      rej => {
-      }
-  );
-}
-
-//保留点击状态，关闭长按的冒泡
-function handleStatusTouchStart(e) {
-  // e.stopPropagation(); // 阻止冒泡
-  // e.preventDefault();  // 阻止默认行为（如滚动）
-}
-
-function handleStatusTouchEnd(e) {
-  // e.stopPropagation();
-  // e.preventDefault();
-}
-
-</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;
-}
-
-/* 新增样式：为列表行设置flex布局 */
-.r-list {
-  display: flex;
-  justify-content: space-between;
-  padding: 10rpx 0;
-}
-
-/* 新增样式：为左侧标签设置固定宽度 */
-.r-left {
-  width: 180rpx;
-  font-weight: bold;
-}
-
-/* 新增样式：为右侧内容设置自动换行 */
-.r-right {
-  flex: 1;
-  word-break: break-all;
-  text-align: right;
-  padding-left: 40rpx;
-}
-
-/* 保持边框样式 */
-.border-bottom {
-  height: 1rpx;
-  background-color: #f0f0f0;
-  margin: 0 20rpx;
-}
-
-/* 添加悬停效果 */
-.detail-info {
-  text-align: left;
-  display: flex;
-  flex-direction: column;
-  gap: 8rpx;
-  cursor: pointer;
-  transition: background-color 0.3s;
-  padding: 10rpx;
-  border-radius: 8rpx;
-}
-
-.detail-info:active {
-  background-color: rgba(111, 162, 248, 0.1);
-}
-</style>

src/pages/business/business.vue

@@ -1,34 +1,25 @@
 <template>
-    <view class="con-body">
+<view class="con-body">
     <view class="con-bg">
         <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="!searchShow?'业务中心':'搜索'"
+        <customHeader ref="customHeaderRef" :title="'业务中心'" 
-                :leftFlag="!searchShow?false:true" 
+            :leftFlag="false" :rightFlag="false" 
-                :rightFlag="false"
-                @back="handleBack" 
-                :searchType="searchShow?1:undefined"
         ></customHeader>
         <!-- 高度来避免头部遮挡 -->
         <view class="top-height"></view>
 
-            <!-- 搜索  @confirm="handleSearch"  -->
+         <!-- 搜索 -->
-            <customSearch v-if="searchShow"   
+         <view class="search">
-                :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"
-                    @focus="handleSearchFocus"
+                @confirm="handleSearch"  
-                    v-model="searchText"
             />
         </view>
 
         <!-- 下拉刷新 -->
-            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
             :down="downOption"  @down="downCallback"
             :fixed="false" class="scroll-h"
         >
@@ -36,56 +27,64 @@
             <view class="white-bg">
                 <view class="w-b-title">
                     首页日常服务
-                        <view type="primary" @click="handleJump('/pages/business/editDaily')" class="btn-edit">编 辑</view>
+                    <view type="primary" @click="handleEdit" class="btn-edit">编 辑</view>
                 </view>
             </view>
 
-                <!-- 业务列表 -->
+            <!-- 企业日常 -->
-                <view class="white-bg" v-for="(item,index) in list" :key="index">
+            <view class="white-bg">
-                    <view class="w-b-title" @click="handleExpand(item)">{{ item.bizName }}
+                <view class="w-b-title" @click="handleExpand">企业日常
-                        <text>{{item.expandFlag?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!item.expandFlag,'icon-down':item.expandFlag}"></i></text>
+                    <text>{{expandFlag?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!expandFlag,'icon-down':expandFlag}"></i></text>
                 </view>
-                    <block  v-if="!item.expandFlag">
+                <view class="logo-list" v-if="!expandFlag">
-                        <view class="logo-list" v-if="item.children&&item.children.length>0">
+                    <view  v-for="(item,index) in list1" class="l-l-item" :key="index">
-                            <block v-for="(item2,index2) in item.children">
+                        <img :src="item.imgSrc" />
-                                <view  class="l-l-item"
+                        <text class="font-gray">{{ item.name }}</text>
-                                    @click="handleJump(item2.bizUrl)">
-                                    <img :src="'static/images/business/'+item2.icon+'.png'" />
-                                    <text class="font-gray">{{ item2.bizName }}</text>
                     </view>
-                            </block>
                 </view>
-                    </block>
+            </view>
+
+            <!-- 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 { onLoad,onHide } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.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 { businessList } from '@/api/business.js';
+import { businessDaily,businessCRMList } 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);
@@ -93,47 +92,9 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
 
-// 搜索处理
+// 查询搜索跳转
-let searchShow = ref(false);
+let handleSearch = ()=>{
-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;
 }
 
 // 下拉刷新
@@ -151,10 +112,9 @@ const downOption = ref({
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        getList();
+        setTimeout(async ()=>{
-        // setTimeout(async ()=>{
+            // mescroll.resetUpScroll();
-        //     // mescroll.resetUpScroll();
+        },500);
-        // },500);
     } catch (error) {
         mescroll.endErr();
     } finally {
@@ -164,8 +124,41 @@ 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 })
     }
@@ -176,7 +169,7 @@ let handleJump=(url)=>{
 <style scope>
 .scroll-h{
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 130px) !important;
+    height: calc(100vh - 120px) !important;
     /* #endif */
     /* #ifndef APP-PLUS */
     height: calc(100vh - 140px) !important;