外反APP-必填优化

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

.env.development

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

.env.production

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

.gitignore

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

.hbuilderx/launch.json

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

nativeplugins/Tm-TmSafeSaveFileModule/package.json

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

package.json

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

server/index.js

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

src/App.vue

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

src/api/auth.js

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

src/api/business.js

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

src/api/crm/activity/activity.js

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

src/api/crm/activity/map.js

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

src/api/crm/api_ys.js

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

src/api/crm/customer/getCustomer.js

@@ -3,7 +3,7 @@ import request from "@/utils/request"
 // 查询客户人员列表
 export function getCustomerList(params){
     return request.get({
-        url: '/app/appCustomerIfno/pageList',
+        url: '/crm/app/appCustomerIfno/pageList',
         data: params
     },{isTransformResponse: false})
 }
@@ -11,35 +11,35 @@ export function getCustomerList(params){
 // 查询系统推荐等级
 export function getCustomerLevel(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/queryCustomerLevel',
+        url: '/crm/app/appCrmCusUserNewController/queryCustomerLevel',
         data: params
     },{isTransformResponse: false})
 }
 // 客户人员新增
 export function saveappCrmCusUserNew(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/add',
+        url: '/crm/app/appCrmCusUserNewController/add',
         data: params
     },{isTransformResponse: false})
 }
 // 查询业务员名下所有的客户
 export function SearchForAllCustomersSalesperson(params){
     return request.get({
-        url: 'app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
         data: params
     },{isTransformResponse: false})
 }
 // 客户人员归属审核详情
 export function getCusUserApprovalListDetail(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/getCusUserApprovalListDetail',
+        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalListDetail',
         data: params
     },{isTransformResponse: false})
 }
 // 查询主归属人列表
 export function SearchForAllPerson(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/SearchForAllPerson',
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllPerson',
         data: params
     },{isTransformResponse: false})
 }
@@ -47,7 +47,7 @@ export function SearchForAllPerson(params){
 // 客户人员新增审核列表
 export　function　getCusUserApprovalList(params) {
     return request.get({
-        url: '/app/appCrmCusUserNewController/getCusUserApprovalList',
+        url: '/crm/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: '/app/appVisistReport/remove',
+        url: '/crm/app/appVisistReport/remove',
         data: params
     },{isTransformResponse: false})
 }
 // 更新客户人员
 export function upadateappCrmCusUserNew (data){
     return request.post({
-        url: '/app/appCrmCusUserNewController/update',
+        url: '/crm/app/appCrmCusUserNewController/update',
         data
     },{isTransformResponse: false})
 }
 // 客户人员审核通过
 export function clientPersonnelsApproval(data) {
     return request.get({
-        url: '/app/appCrmCusUserNewController/clientPersonnelsApproval',
+        url: '/crm/app/appCrmCusUserNewController/clientPersonnelsApproval',
         data
     }, {isTransformResponse: false});
 }
 //客户人员驳回
 export function customerPersonnelsRejectio(data) {
     return request.get({
-        url: '/app/appCrmCusUserNewController/customerPersonnelsRejectio',
+        url: '/crm/app/appCrmCusUserNewController/customerPersonnelsRejectio',
         data
     }, {isTransformResponse: false});
 }
 //主归属人变更提交
 export function submissionOfChangeOfMainOwner (data){
     return request.get({
-        url: '/app/appCrmCusUserNewController/submissionOfChangeOfMainOwner',
+        url: '/crm/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: '/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership',
+        url: '/crm/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership',
         data: params
     },{isTransformResponse: false})
 }
@@ -12,7 +12,7 @@ export function queryViewMainOwnerList(params){
 //主归属人变更信息查看（详情）
 export function queryViewMainOwnerDetail(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList',
+        url: '/crm/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList',
         data: params
     },{isTransformResponse: false})
 }
@@ -20,7 +20,7 @@ export function queryViewMainOwnerDetail(params){
 //查询主归属人变更人员的列表数据
 export function personnelAwaitingReviewForChange(params){
     return request.get({
-        url: '/app/appCrmCusUserNewController/personnelAwaitingReviewForChange',
+        url: '/crm/app/appCrmCusUserNewController/personnelAwaitingReviewForChange',
         data: params
     },{isTransformResponse: false})
 }
@@ -28,14 +28,14 @@ export function personnelAwaitingReviewForChange(params){
 //主归属人变更驳回
 export function changeOfPrimaryOwnershipNoApproved(params) {
     return request.get({
-        url:'/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved',
+        url:'/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved',
         data: params
     }, {isTransformResponse: false});
 }
 //主归属人变更通过
 export function changeOfPrimaryOwnershipApproved (params) {
     return request.get({
-        url: '/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved',
+        url: '/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved',
         data: params
     }, {isTransformResponse: false});
 }

src/api/crm/plan/getPlan.js

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

src/api/crm/plan/updatePlan.js

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

src/api/eqf/qualityFeedback.js

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

src/api/home.js

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

src/api/notice.js

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

src/components/closeableModal.vue

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

src/components/customHeader.vue

@@ -51,22 +51,20 @@ const handleBack = () => {
 
 <style scoped>
 .custom-navbar {
-    width: 750rpx;
+    width: 100%;
     position: fixed;
     top: 0;
-    left: 50%;
-    margin-left:-375rpx;
     z-index: 999;
     /* #ifdef APP-PLUS */
-    /* background: url('@/static/images/bg-Blue-header.png') no-repeat;
+    background: #307AF5 url('@/static/images/bg-Blue-header.png') no-repeat;
-    background-size:750rpx 160rpx;
+    background-size:100% 160rpx;
-    height:160rpx; */
+    height:160rpx;
     /* #endif */
 
     /* #ifndef APP-PLUS */
-    /* background: url('@/static/images/bg-Blue-header2.png') no-repeat;
+    background: #307AF5 url('@/static/images/bg-Blue-header2.png') no-repeat;
-    background-size:750rpx 116rpx;
+    background-size:100% 116rpx;
-    height:116rpx; */
+    height:116rpx;
     /* #endif */
    
 }

src/components/customSearch.vue

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

src/components/customShowModal.vue

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

src/components/multipleSelect.vue

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

src/constants/mapApiConstants.js

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

src/enums/cacheEnums.js

@@ -1,2 +1,8 @@
 export const TOKEN_KEY = 'token';
-export const AGREEWELCOME_KEY="agreewelcome"
+export const AGREEWELCOME_KEY="agreewelcome";
+
+// clientId 默认写2 
+export const CLIENT_ID="2";
+// #区分内外网 //1-内网，2-外网
+export const NETWORK_ENV=2;
+

src/enums/requestEnums.js

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

src/main.js

@@ -1,15 +1,27 @@
 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)
 

src/manifest.json

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

src/pages.json

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

src/pages/business/CRM/chooseCus.vue

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

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

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

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

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

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

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

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

@@ -21,7 +21,7 @@
 
       <!-- 正文内容 -->
       <view class="white-bg">
-        <view class="form-con">
+        <view class="form-con" @click="handleBlur">
           <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="40%">
             <!-- 选择客户 -->
             <uni-forms-item label="客户名称" name="cusName" required class="f-c-right">
@@ -178,7 +178,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 :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
                               @change="handleHobbyChange" :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
@@ -271,7 +271,7 @@
 </template>
 
 <script setup>
-import {ref, onMounted, computed, reactive} from 'vue'
+import {ref, reactive} from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import multipleSelect from '@/components/multipleSelect.vue'
 import {
@@ -284,7 +284,8 @@ import {
 } from "./dataMap";
 import city from "@/utils/area";
 import {getCustomerLevel, saveappCrmCusUserNew} from "@/api/crm/customer/getCustomer";
-
+// 对 multipleSelect 组件的引用
+const hobbySelectRef = ref(null);
 // 表单引用
 const formRef = ref({});
 // 表单数据
@@ -412,7 +413,7 @@ let handleCustomerClick = () => {
         let {
           cusName, // 公司名称
           cusEstate, // 等级
-            cusId,
+          cusId,
         } = data;
         customerUser.value.cusName = cusName;
         if (!cusEstate) customerUser.value.sysThinkLevel = "该客户暂无等级信息，无法进行系统推荐"
@@ -448,20 +449,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })
+    })*/
-    if (!res.systemRecommendationLevel) {
+    try{
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      if(res.data.systemRecommendationLevel){
-      console.log(formData.value.systemThinkLevel + "???")
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -489,9 +499,9 @@ let handleUserTypeChange = (e) => {
 }
 
 // 选择日期
-function handleTenureTimeChange(e) {
+function handleTenureTimeChange(val) {
-  let {value} = e.detail;
+  console.log(val)
-  formData.value.tenureTime = value;
+  formData.value.tenureTime = val;
 }
 
 // 需求层次索引
@@ -513,18 +523,20 @@ let handleDevelopChange = e => {
 }
 
 // 选择生日
-function handleBirthdayChange(e) {
+function handleBirthdayChange(val) {
-  let{value} = e.detail
+  formData.value.birthday = val;
-  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
+const handleHobbyChange = (items, ids) => {
-  // console.log("爱好", item, value);
+  console.log('选择爱好', items, ids);
-  hobbyIndex = value;
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
+
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -546,16 +558,93 @@ let handleWorkingStatusChange = e => {
   workingStatusIndex.value = 0;
   formData.value.workingStatus = workingStatusList[value].name;
 }
-
+// 多选组件失去焦点关闭
-let submitForm = async () => {
+let handleBlur = () => {
-  let hobbyTags = hobbyIndex.map(it => {
+  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
-    let {name} = hobbyList[it];
+}
+// 提取爱好标签处理逻辑
+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 = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+};
+
+// 提取表单验证逻辑
+const validateForm = async () => {
+  formData.value.cusName = customerUser.value.cusName;
+  await formRef.value.validate();
+  console.log(formData.value, "提交表单数据");
+};
+
+// 提取API调用逻辑
+const saveCustomerUser = async () => {
+  uni.showLoading();
+  try {
+    const res = await saveappCrmCusUserNew(formData.value);
+    if(res.code === 200){
+      uni.showToast({
+        title: "保存成功"
+      });
+    } else {
+      uni.showToast({
+        title: "操作失败",
+        icon: "error"
+      });
+    }
+    setTimeout(() => uni.navigateBack(), 1500);
+  } catch(err) {
+    uni.showToast({
+      icon: 'none',
+      title: "保存失败"
+    });
+  }
+  finally{
+    uni.hideLoading()
+  }
+};
+
+// 简化后的 submitForm 方法
+let submitForm = async () => {
+  console.log(formData.value);
+  try {
+    if(formData.value.iphone){
+      formData.value.mobilePhone = formData.value.iphone;
+    }
+    // 处理爱好标签
+    processHobbyTags();
+
+    // 表单验证
+    await validateForm();
+
+    // 保存客户人员信息
+    await saveCustomerUser();
+  } catch (err) {
+    uni.showToast({
+      icon: 'none',
+      title: '请检查并完善信息'
+    });
+    console.warn(err);
+  }
+};
+
+/*let submitForm = async () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
+    return name;
+  })
+  const hobbyTagString = hobbyTags.join('，');
+  console.log(hobbyTagString);
+  if (hobbyTagString || formData.value.hobby) {
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+  if(formData.value.iphone){
+    formData.value.mobilePhone = formData.value.iphone;
   }
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
@@ -565,19 +654,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(err=>{
+    }).catch(() => {
       uni.showToast({
         icon: 'none',
         title: "保存失败"
@@ -593,7 +682,7 @@ let submitForm = async () => {
     })
     console.warn(err);
   }
-}
+}*/
 
 
 </script>

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

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

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

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

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

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

src/pages/business/CRM/customerUserList.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,109 +1,183 @@
 <template>
-    <view class="con-body">
+  <view class="con-body">
-        <view class="con-bg">
+    <view class="con-bg">
-            <!-- 头部 -->
+      <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
+      <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
 
-            <!-- 高度来避免头部遮挡 -->
+      <!-- 高度来避免头部遮挡 -->
-            <view class="top-height"></view>
+      <view class="top-height"></view>
 
-            <!-- 正文内容 -->
+      <!-- 正文内容 -->
-            <view class="white-bg">
+      <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"/>-->
-                <view class="check-desc">
+        <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClick"/>
-                    业务人员可通过<text class="font-orange">签到</text>或<text
+        <view class="check-desc">
-                        class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
+          业务人员可通过
-                </view>
+          <text class="font-orange">签到</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">
+        <view class="check-in">
+            <view class="check-tip">打卡</view>
+            <view class="check-title">确定要在此处打卡吗？</view>
+            <view class="check-location">
+                <uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
+            </view>
+            <view class="check-address">北京市朝阳区天辰东路1号院</view>
+            <view class="check-footer">
+                <button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
+                <button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
             </view>
         </view>
+    </view> -->
 
-        <!-- 打卡遮罩层 -->
+  </view>
-        <!-- <view class="check-con" v-if="checkFlag">
-            <view class="check-in">
-                <view class="check-tip">打卡</view>
-                <view class="check-title">确定要在此处打卡吗？</view>
-                <view class="check-location">
-                    <uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
-                </view>
-                <view class="check-address">北京市朝阳区天辰东路1号院</view>
-                <view class="check-footer">
-                    <button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
-                    <button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
-                </view>
-            </view>
-        </view> -->
-
-    </view>
 </template>
 
 <script setup>
-import { ref, onMounted, reactive } from 'vue'
+import {ref, onMounted, reactive} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import { addStartMapForClockIn } from '../../../../api/crm/activity/map';
+import {addStartMapForClockIn, businessTripClockIn} from '../../../../api/crm/activity/map';
+import CloseableModal from "@/components/closeableModal.vue";
+import {MapApiConfig} from "../../../../constants/mapApiConstants";
 
 let form = reactive({
-    addressForStart: null,
+  addressForStart: null,
-    addressForEnd: null,
+  addressForEnd: null,
-    createId: null,
+  createId: null,
-    staffName: null,
+  staffName: null,
-    visistCode: null,
+  visistCode: null,
-    visistId: null,
+  visistId: null,
-    mapId: null
+  remark: null,
+  mapId: null
 })
 // 签到
 let handleCheckIn = () => {
-    uni.navigateTo({
+  uni.navigateTo({
-        url: './addRearkSignIn'
+    url: './addRearkSignIn'
-    })
+  })
 }
 // 打卡
-let handleClockIn = () => {
+// let handleClockIn = () => {
-    uni.getLocation({
+//   uni.getLocation({
-        type: 'wgs84',
+//     type: 'wgs84',
-        success: (res) => {
+//     success: (res) => {
-            const latiude = res.latitude;
+//       const latiude = res.latitude;
-            const longitude = res.longitude;
+//       const longitude = res.longitude;
-            //进行解析
+//       //进行解析
-            inverseGeocoding(latiude, longitude);
+//       inverseGeocoding(latiude, longitude);
-        },
+//     },
-        fail: function (err) {
+//     fail: function (err) {
-            console.log("获取地址失败" + err)
+//       console.log("获取地址失败" + err)
-        }
+//     }
+//   })
+// }
+let modalVisible = ref(false);
+let handleClick = () => {
+  uni.getLocation({
+    type: 'wgs84',
+    success: (res) => {
+      const latitude = res.latitude;
+      const longitude = res.longitude;
+      console.log('纬度:',latitude,'，经度:', longitude);
+      inverseGeocoding(latitude, 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);
+  const distance = haversineDistance(centerLat, centerLon, lat, lon);
-    return distance <= rangeKm;
+  return distance <= rangeKm;
 }
+
 function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
-    const dLat = degToRad(lat2 - lat1);
+  const dLat = degToRad(lat2 - lat1);
-    const dLon = degToRad(lon2 - lon1);
+  const dLon = degToRad(lon2 - lon1);
-    const a =
+  const a =
-        Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+      Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-        Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
+      Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
-        Math.sin(dLon / 2) * Math.sin(dLon / 2);
+      Math.sin(dLon / 2) * Math.sin(dLon / 2);
-    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-    return radius * c; // 距离，单位：公里
+  return radius * c; // 距离，单位：公里
 }
+
+// 角度转弧度
 function degToRad(deg) {
-    return deg * (Math.PI / 180);
+  return deg * (Math.PI / 180);
 }
 
 //解析地址
-function inverseGeocoding(latiude, longitude) {
+function inverseGeocoding(latitude, longitude) {
-    let points = longitude + ',' + latiude
+  uni.showLoading();
-    const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
+    const apiURL = MapApiConfig.URL;
     const params = {
-        lat: latiude,
+        lat: latitude,
         lng: longitude,
         radius: 1000,
         pageSize: 1,
         currentPage: 1,
         //classify: 220100
     };
-    const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
+    const token = MapApiConfig.token;
     uni.request({
         url: apiURL,
         method: 'GET',
@@ -112,124 +186,31 @@ function inverseGeocoding(latiude, longitude) {
             'Authorization': 'Bearer ' + token
         },
         success: (res) => {
-            console.log(res, "----")
+          modalVisible.value=true;
-            if (res.statusCode == 200 && res.data.status == 200) {
+            console.log(res, "经纬度解析成功")
+            if (res.statusCode === 200 && res.data.status === 200) {
                 let resdata = res.data.data.rows[0].address
                 if (resdata == null) {
                     console.log(resdata.srcLat)
-                    const latiude1 = 34.1360;
+                    if (isWithinRange(latitude1, longitude1, latiude, longitude, 1)) {
-                    const longitude1 = 108.9126;
+                        form.addressForStart = MapApiConfig.XI_AN_BAN.typeName;
-                    if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
+                        form.path = MapApiConfig.XI_AN_BAN.longitude + ',' + MapApiConfig.XI_AN_BAN.latitude ;
-                        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 {
+                }
+                else {
                     form.addressForStart = resdata;
-                    uni.showModal({
+                    form.path = longitude + ',' + latitude; // 经度，纬度
-                        title: '确定要在此处打卡吗',
-                        content: form.addressForStart,
-                        success: function (res) {
-                            if (res.confirm) {
-                                var data = {
-                                    mapId: form.mapId,
-                                    addressForStart: form.addressForStart,
-                                    cusName: form.cusName,
-                                    cusId: form.cusId,
-                                    path: points
-                                }
-                                addStartMapForClockIn(data).then(res => {
-                                    if (res.code == 200) {
-                                        uni.showToast({
-                                            icon: 'success',
-                                            title: res.msg,
-                                            duration: 1500,
-                                        });
-                                    } else {
-                                        uni.showToast({
-                                            icon: 'none',
-                                            title: res.msg,
-                                        });
-                                    }
-                                })
-                            } else if (res.cancel) {
-                                console.log('用户点击取消');
-                            }
-                        }
-                    });
                 }
             } else {
-                form.addressForStart = "第三方维护打卡"
+                form.addressForStart = MapApiConfig.OTHER.typeName;
-                uni.showModal({
+                form.path = longitude + ',' + latitude; // 经度，纬度
-                    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('用户点击取消');
-                        }
-                    }
-                });
             }
-
+            uni.hideLoading();
         },
         fail(e) {
             console.log("获取位置失败", e)
-        }
+          uni.hideLoading();
+        },
     })
 
 
@@ -239,125 +220,125 @@ function inverseGeocoding(latiude, longitude) {
 
 <style scoped>
 .white-bg {
-    width: 650rpx;
+  width: 650rpx;
-    margin: 0;
+  margin: 0;
-    border-radius: 8px 8px 0 0;
+  border-radius: 8px 8px 0 0;
-    padding: 50rpx;
+  padding: 50rpx;
-    /* #ifdef APP-PLUS */
+  /* #ifdef APP-PLUS */
-    height: calc(100vh - 125px);
+  height: calc(100vh - 125px);
-    /* #endif */
+  /* #endif */
-    /* #ifndef APP-PLUS */
+  /* #ifndef APP-PLUS */
-    height: calc(100vh - 98px);
+  height: calc(100vh - 98px);
-    /* #endif */
+  /* #endif */
 
 
 }
 
 .btn-image {
-    width: 340rpx;
+  width: 340rpx;
-    height: 340rpx;
+  height: 340rpx;
-    margin: 30rpx auto 60rpx;
+  margin: 30rpx auto 60rpx;
-    display: block;
+  display: block;
 }
 
 .check-desc {
-    background-color: #F5F5F5;
+  background-color: #F5F5F5;
-    padding: 40rpx 50rpx;
+  padding: 40rpx 50rpx;
-    font-size: 28rpx;
+  font-size: 28rpx;
-    border-radius: 10px;
+  border-radius: 10px;
-    margin-top: 100rpx;
+  margin-top: 100rpx;
 }
 
 .check-desc .font-orange {
-    color: #F5813A;
+  color: #F5813A;
-    font-size: 32rpx;
+  font-size: 32rpx;
-    font-weight: bold;
+  font-weight: bold;
 }
 
 .check-desc .font-blue {
-    color: #2CBAEF;
+  color: #2CBAEF;
-    font-size: 32rpx;
+  font-size: 32rpx;
-    font-weight: bold;
+  font-weight: bold;
 }
 
 /* 弹窗处理 */
 .check-con {
-    position: fixed;
+  position: fixed;
-    top: 0;
+  top: 0;
-    left: 0;
+  left: 0;
-    right: 0;
+  right: 0;
-    bottom: 0;
+  bottom: 0;
-    background-color: rgba(0, 0, 0, 0.4);
+  background-color: rgba(0, 0, 0, 0.4);
-    display: flex;
+  display: flex;
-    justify-content: center;
+  justify-content: center;
-    align-items: center;
+  align-items: center;
-    z-index: 999;
+  z-index: 999;
 }
 
 /* 遮罩层内容样式 */
 .check-in {
-    background-color: #fff;
+  background-color: #fff;
-    padding: 40rpx 30rpx 60rpx;
+  padding: 40rpx 30rpx 60rpx;
-    border-radius: 10px;
+  border-radius: 10px;
-    /* width: 620rpx; */
+  /* width: 620rpx; */
-    width: 560rpx;
+  width: 560rpx;
-    position: absolute;
+  position: absolute;
-    top: 48%;
+  top: 48%;
-    left: 50%;
+  left: 50%;
-    transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
-    text-align: center;
+  text-align: center;
 }
 
 .check-in .check-tip {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 .check-in .check-title {
-    font-size: 32rpx;
+  font-size: 32rpx;
-    padding: 20rpx 0;
+  padding: 20rpx 0;
 }
 
 .check-in .check-location {
-    color: #0395E0;
+  color: #0395E0;
-    font-size: 42rpx;
+  font-size: 42rpx;
-    font-weight: bold;
+  font-weight: bold;
-    display: flex;
+  display: flex;
-    align-items: center;
+  align-items: center;
-    justify-content: center;
+  justify-content: center;
-    margin: 30rpx 0;
+  margin: 30rpx 0;
 }
 
 .check-in .check-location .uniui-location-filled {
-    font-weight: normal;
+  font-weight: normal;
-    margin-right: 20rpx;
+  margin-right: 20rpx;
 }
 
 .check-in .check-address {
-    color: #919191;
+  color: #919191;
-    font-size: 32rpx;
+  font-size: 32rpx;
-    margin-bottom: 80rpx;
+  margin-bottom: 80rpx;
 }
 
 .check-in .check-footer {
-    display: flex;
+  display: flex;
 }
 
 .check-in .check-footer .btn-default,
 .check-in .check-footer .btn-primary {
-    background-color: #fff;
+  background-color: #fff;
-    border: 1px solid #05A3F4;
+  border: 1px solid #05A3F4;
-    color: #05A3F4;
+  color: #05A3F4;
-    border-radius: 25px;
+  border-radius: 25px;
-    padding: 0rpx 80rpx;
+  padding: 0rpx 80rpx;
-    font-size: 34rpx;
+  font-size: 34rpx;
-    /* margin-left: 0;
+  /* margin-left: 0;
-    margin-right: 20rpx; */
+  margin-right: 20rpx; */
 }
 
 .check-in .check-footer .btn-primary {
-    background-color: #05A3F4;
+  background-color: #05A3F4;
-    border: 1px solid #05A3F4;
+  border: 1px solid #05A3F4;
-    color: #fff;
+  color: #fff;
-    /* padding: 0rpx 60rpx; */
+  /* padding: 0rpx 60rpx; */
 }
 </style>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/pages/business/CRM/marketInformation.vue

@@ -73,7 +73,7 @@ let handleNav = (index)=>{
 
 // 新增
 let handleAdd = () => {
-    // uni.navigateTo({ url: '/pages/business/crm/visitorReportAdd' })
+    // uni.navigateTo({ url: '/pages/business/CRM/visitorReportAdd' })
 }
 
 // 查询列表
@@ -82,7 +82,10 @@ const mescrollRef = ref(null);
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { tip: '~ 空空如也 ~' },
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../static/images/mescroll-empty.png"
+    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });
@@ -163,7 +166,7 @@ const getMattersList = (pageIndex, pageSize) => {
     top:100rpx;
     height: calc(100vh - 48px);
     /* #endif */
-
+   
 }
 /*.market-con{
 
@@ -221,4 +224,4 @@ const getMattersList = (pageIndex, pageSize) => {
 .report-list .title{
     display: flex;
 }
-</style>
+</style>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/pages/business/CRM/paymentCollection.vue

@@ -28,7 +28,7 @@
                     </picker>
                     <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
                 </view>
-
+            
                 <!-- 回款信息查询 -->
                 <view class="white-bg">
                     <view class="table-title">回款信息查询</view>
@@ -81,6 +81,7 @@ let bindPickerChange = (e)=>{
 let searchValue = ref(null)
 // 查询搜索跳转
 let handleSearch = () => {
+    console.log(searchValue.value)
 }
 
 const tableData = [
@@ -92,7 +93,7 @@ const tableData = [
   { name: '张志钢',guestName:'其他',tragetReturnMoney:558703.02,returnMoney:558703.02,completRate:'100%'},
   { name: '张志钢',guestName:'武汉航空仪表有限责任公司',tragetReturnMoney:'9807328.00',returnMoney:8692300.93,completRate:'88.6%'},
   { name: '张志钢',guestName:'武汉永力科技股份有限公司',tragetReturnMoney:539087.21,returnMoney:539087.21,completRate:'100%'},
-
+  
 ]
 </script>
 
@@ -165,4 +166,4 @@ const tableData = [
     border-bottom:2px solid #E7E7E7;
     padding-bottom:20rpx;
 }
-</style>
+</style>

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

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

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

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

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

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

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

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

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

@@ -8,7 +8,7 @@
       <!-- #endif -->
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="top-height"></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>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
         <view v-if="weekNum">
           {{ yearMonth }}
           <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,36 +28,44 @@
       </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"
+              v-for="(item,index) in allPlans" :key="index"
-                    @click="handleNav(index)"
+              @click="handleNav(index)"
         >{{ getTapLabel(item) }}
         </view>
       </view>
-
+      <uni-transition :duration="300"
-      <block v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="item">
+                      :mode-class="['fade','slide-bottom']"
-        <!-- 计划详情 -->
+                      :styles="{'width':'100%', 'background-color':'#f0f0f0','border-top-left-radius': '8px', 'border-top-right-radius': '8px'}"
-        <view class="white-bg white-bg-2" :class="index == 0 ? 'white-bg-r' : ''">
+                      :show="showTrans">
-          <view class="report-list">
+        <view v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="index">
-            <view class="w-b-title">
+          <!-- 计划详情 -->
-              <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
+          <view class="white-bg white-bg-2" :class="{'white-bg-r':index === 0}">
-              <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
+            <view class="report-list">
-            </view>
+              <view class="w-b-title">
-            <view class="r-list">
+                <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
-              <view class="r-left">工作类型</view>
+                <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
-              <view class="r-right">{{ getWorkType(index) || '' }}</view>
+              </view>
-            </view>
+              <view class="r-list">
-            <view class="border-bottom b-width"></view>
+                <view class="r-left">工作类型</view>
-            <view class="r-list">
+                <view class="r-right">{{ getWorkType(index) || '' }}</view>
-              <view class="r-left">内容</view>
+              </view>
-              <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
+              <view class="border-bottom b-width"></view>
+              <view class="r-list">
+                <view class="r-left">内容</view>
+                <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
+              </view>
             </view>
           </view>
+          <view class='bottom-spliter'></view>
         </view>
-      </block>
 
+        <view v-else style="text-align: center; margin-top: 50%; color: white">
+          暂无数据
+        </view>
+      </uni-transition>
       <!-- 底部加高度来避免tabbar遮挡 -->
-      <view class="bottom-height"></view>
+      <!-- <view class="bottom-height bg-gray"></view> -->
     </view>
 
 
@@ -66,13 +74,12 @@
 
 <script setup>
 
-import {onMounted, ref, reactive, computed} from "vue";
+import {onMounted, ref, computed, watch} from "vue";
 import {useRoute} from "vue-router"
 import customHeader from '@/components/customHeader.vue'
 import {WeekCN, WorkType, WorkEvent, OrdinalDate} from "./dataMap";
 import {getCurrentWeekNum} from "./dateTimeUtils";
-import {getUserInfo, getWeeklyPlanList} from "@/api/crm/plan/getPlan";
+import {getWeeklyPlanList} from "@/api/crm/plan/getPlan";
-import {useMessage} from "@/utils/message";
 import {judgeThisWeek} from "@/api/crm/plan/updatePlan";
 
 const userInfo = ref(null)
@@ -91,8 +98,6 @@ const yearMonth = ref(null);
 const weekNum = ref(0);
 const allPlans = ref([]);
 const onShowPlan = ref(null);
-const message = useMessage();
-
 let getWorkDate = (index) => {
   return onShowPlan.value ? onShowPlan.value[OrdinalDate[index]] : '';
 };
@@ -104,14 +109,15 @@ let getWorkEvent = (index) => {
 };
 // 刷新计划列表
 const refreshPlanList = () => {
-  message.showLoading();
+  showTrans.value = false;
+  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;
@@ -121,12 +127,12 @@ const refreshPlanList = () => {
       weekNum.value = rows[0].date;
       yearMonth.value = rows[0].firstDayOfTheWeek.substring(0, 7);
     }
-    console.log(route.path, "：用户周计划列表获取成功");
+    console.log(route.path, "用户周计划列表获取成功");
   }).catch(err => {
-    console.warn(err, "用户周计划列表获取失败");
+    console.log(err, "周计划列表获取失败")
-    message.error("周计划获取失败");
   }).finally(() => {
-    message.hideLoading();
+    uni.hideLoading();
+    setTimeout(() => showTrans.value = true, 20);
   })
 }
 
@@ -136,7 +142,7 @@ onMounted(() => {
 
 // 判断计划是否为本周
 let isThisWeek = computed(() => {
-  let theYear = onShowPlan.value.year || onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
+  let theYear = onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
   weekNum.value = onShowPlan.value.date; // 当目前展示的计划列表变化时，更新weekNum.value
   yearMonth.value = onShowPlan.value.firstDayOfTheWeek.substring(0, 7); // 获取年月
   return date.getFullYear() === parseInt(theYear) &&
@@ -180,11 +186,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{ // 创建下周计划
       // }
@@ -201,6 +207,19 @@ function getTapLabel(row) {
   return row.firstDayOfTheWeek.substring(0, 4) + '年' + row.month + '月 第' + row.date + '周';
 }
 
+// 展示动画
+const showTrans = ref(false);
+// 监听 activeTab 变化，触发动画
+watch(activeTab, (newVal, oldVal) => {
+  if (oldVal !== newVal) { // 确保不是初始化时的触发
+    showTrans.value = false; // 先隐藏
+    setTimeout(() => {
+      onShowPlan.value = allPlans.value[newVal]; // 更新计划列表视图
+      showTrans.value = true; // 再显示，触发动画
+    }, 20);
+  }
+});
+
 // 选中计划时间段
 function handleNav(index) {
   console.log(index, "tab更换时间段");
@@ -234,7 +253,7 @@ function handleEdit(index) {
   // console.log(JSON.stringify(formData))
   console.log(route.path, formData, "前往修改页面");
   const editFields = [OrdinalDate[index], WorkType[index], WorkEvent[index]];
-  let userName = userInfo.value.nickName || userInfo.value.userName;
+  let userName = null; // userInfo.value.userName || userInfo.value.nickName;
   handlePlanEdit({userName, formData, editFields}, false);
 }
 
@@ -244,7 +263,7 @@ function handleEdit(index) {
 <style scoped>
 .week-plan-title {
   color: #fff;
-  padding: 0 30rpx 30rpx;
+  padding: 0 30rpx;
   display: flex;
   justify-content: space-between;
 }
@@ -268,7 +287,15 @@ 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 {
@@ -276,18 +303,19 @@ function handleEdit(index) {
 }
 
 .con-bg {
-  height: 445rpx;
+  /*height: 100%;*/
+  /*  overflow-y: auto;*/
 }
 
 .nav-list {
-/*  display: flex;*/
+  /*  display: flex;*/
-/*  width: 690rpx;*/
+  /*  width: 690rpx;*/
-  overflow-x: auto;   /* 允许横向滚动 */
+  overflow-x: auto; /* 允许横向滚动 */
   /*overflow-y: hidden;  隐藏垂直滚动 */
   /*-ms-overflow-style: none;   IE 隐藏滚动条 */
- /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
+  /* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */
   /* 添加高度以确保有足够的空间 */
-/*  height: 80rpx;*/
+  /*  height: 80rpx;*/
   white-space: nowrap; /* 保持子元素在同一行显示 */
   /* 添加这些属性确保滚动正常工作 */
   scroll-behavior: smooth;
@@ -298,13 +326,15 @@ 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;
@@ -326,5 +356,4 @@ 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" v-if="userInfo.nickName || userInfo.userName">
+          <view class="head-right" @click="submitForm">
             <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
                        color="#B7D2FF"></uni-icons>
             保存
@@ -16,11 +16,11 @@
 
       <!-- 正文内容 -->
       <view class="week-plan-title">
-        <view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+<!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
         <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
       </view>
       <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">
-        <block v-for="(item, index) in OrdinalDate">
+        <view v-for="(item, index) in OrdinalDate">
           <view class="white-bg" :class="index==0?'white-bg-2':'white-bg-3'">
             <view class="w-b-title" @click="handleExpand(index)">
               {{ weekPlanFormData[item] }} {{ WeekCN[index] }}
@@ -29,7 +29,8 @@
               </text>
             </view>
 
-            <view v-show="expandFlag[index]" class="form-con">
+            <!--v-show="expandFlag[index]"-->
+            <view class="form-con" :class="{'show': expandFlag[index], 'hidden': !expandFlag[index]}">
               <uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays">
                 <view class="form-picker">
                   <picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)">
@@ -41,13 +42,13 @@
                 </view>
               </uni-forms-item>
               <uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays">
-                <uni-easyinput type="textarea" autoHeight v-model="weekPlanFormData[getEventField(index)]"
+                <uni-easyinput type="textarea" v-model="weekPlanFormData[getEventField(index)]"
                                placeholder="请输入" class="form-texarea"/>
               </uni-forms-item>
             </view>
 
           </view>
-        </block>
+        </view>
       </uni-forms>
 
     </view>
@@ -62,7 +63,6 @@ import {useRoute} from "vue-router"
 import {useMessage} from "@/utils/message";
 import {onLoad} from "@dcloudio/uni-app";
 import {updateWeekPlanList, addPlan} from "@/api/crm/plan/updatePlan";
-import {getUserInfo} from "@/api/crm/plan/getPlan";
 import {getDate} from "@/utils/datetime";
 import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils";
 
@@ -127,17 +127,10 @@ const workDays = 5;
 // const instance = getCurrentInstance().proxy;
 let instance = null;
 // 初始化创建任务
-let initCreate = (params)=>{
+let initCreate = (params) => {
   const {itemList, selectIndex} = params;
-  // 获取用户信息
+  console.log(route.path, `：创建${itemList[selectIndex]}计划`);
-  getUserInfo().then(res => {
+  title.value = "创建周计划";
-    userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
-    console.warn(err, "用户信息获取失败")
-  });
-  console.log(route.path,`：创建${itemList[selectIndex]}计划`);
-  title.value="创建周计划";
   currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月
   currentEditDate.value.weekNum = getCurrentWeekNum() + selectIndex; // 取巧做法，当期周则selectIndex为0，下周则selectIndex为1，用加法处理
   const week = getWeek2(itemList[selectIndex]); // 获取本周/下周一周日期
@@ -147,11 +140,11 @@ let initCreate = (params)=>{
   const {year, month} = week;
   weekPlanFormData.value.year = year;
   weekPlanFormData.value.month = month;
-  for(let index in OrdinalDate){
+  for (let index in OrdinalDate) {
     let dateField = getDateField(index);
     weekPlanFormData.value[dateField] = week[dateField];
     // console.log(week[dateField]);
-    if(index>=workDays){
+    if (index >= workDays) {
       let typeField = getTypeField(index);
       weekPlanFormData.value[typeField] = "法定假日"; // TODO: 换成更规范代码
       workTypeIndex.value[typeField] = WORK_TYPE.indexOf("法定假日");
@@ -180,7 +173,7 @@ onLoad((options) => {
         expandFlag.value[index] = editFields.includes(getTypeField(index)) || editFields.includes(getEventField(index));
         // console.log(index, expandFlag.value[index], "展开状态");
       }
-    }else{
+    } else {
       initCreate(data.param);
     }
 
@@ -203,7 +196,7 @@ function getEventField(index) {
 }
 
 // 初始化校验规则
-(function bindRules(){
+(function bindRules() {
   for (let i in WorkType) {
     if (i < workDays) {
       rules[getTypeField(i)] = {
@@ -253,25 +246,25 @@ const submitForm = async () => {
     // console.log('表单数据:', weekPlanFormData.value);
 
     // 这里可以添加提交到服务器的代码
-    if(!isAdd.value){ // 请求修改
+    if (!isAdd.value) { // 请求修改
-      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err=>{
+      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err => {
         message.error('操作失败!');
         console.warn(err, "更新周计划失败");
       })
       message.success('修改成功!');
-      setTimeout(()=>{
+      setTimeout(() => {
         const eventChannel = instance.getOpenerEventChannel();
         eventChannel.emit('refreshData');
         uni.navigateBack()
       }, 500);
-    }else{ // 请求新增
+    } else { // 请求新增
-      console.log(weekPlanFormData.value,"新增计划");
+      console.log(weekPlanFormData.value, "新增计划");
-      let res = await addPlan(weekPlanFormData.value).catch(err=>{
+      let res = await addPlan(weekPlanFormData.value).catch(err => {
         message.error('操作失败!');
         console.error(err, "周计划新增失败");
       })
       message.success('保存成功!');
-      setTimeout(()=>{
+      setTimeout(() => {
         const eventChannel = instance.getOpenerEventChannel();
         eventChannel.emit('refreshData');
         uni.navigateBack()
@@ -279,8 +272,8 @@ const submitForm = async () => {
     }
   } catch (err) {
     uni.showToast({
-      icon:'none',
+      icon: 'none',
-      title:"请完善内容",
+      title: "请完善内容",
       duration: 1500
     })
     console.log('表单验证失败:', err);
@@ -301,6 +294,7 @@ const submitForm = async () => {
 .white-bg {
   width: 690rpx;
   margin: 0;
+  padding-bottom: 0;
   border-radius: 8px 8px 0 0;
 }
 
@@ -309,7 +303,7 @@ const submitForm = async () => {
 }
 
 .white-bg.white-bg-3 {
-  border-top:  1rpx solid #E5E5E5;
+  border-top: 1rpx solid #E5E5E5;
   border-radius: 0
 }
 
@@ -320,10 +314,17 @@ const submitForm = async () => {
 
 .form-con {
   padding: 30rpx 0 0;
+  height: 500rpx;
+  overflow: hidden;
+  transition: height 0.3s;
 }
 
 :deep(.form-con .uni-forms-item) {
   margin-bottom: 22px !important;
 }
 
+.hidden{
+  height: 0;
+}
+
 </style>

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

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

src/pages/business/CRM/visitorReport.vue

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

src/pages/business/CRM/visitorReportAdd.vue

@@ -63,6 +63,7 @@ selectGuestList();
 
 // 选择客户列表
 let bindPickerChange = (e)=>{
+    console.log('picker发送选择改变，携带值为', e.detail.value)
     guestIndex.value = e.detail.value
 }
 
@@ -82,11 +83,12 @@ const rules = {
             { required: true, errorMessage: '我方领导不能为空' }
         ]
     }
-
+   
 };
 
 // 修改日期
 let changeDate = (e)=>{
+    console.log('changeDate:', e);
 };
 
 // 保存走访报告
@@ -145,4 +147,4 @@ const submitForm = async () => {
     padding-left:20rpx;
     color:#919191;
 }
-</style>
+</style>

src/pages/business/CRM/visitorReportEnter.vue

@@ -209,4 +209,4 @@ const submitForm = async () => {
     margin-bottom:22px !important;
 }
 
-</style>
+</style>

src/pages/business/CRM/vistorCheckin.vue

@@ -180,4 +180,4 @@ let handleSubmit = () => {
     color: #fff;
     /* padding: 0rpx 60rpx; */
 }
-</style>
+</style>

src/pages/business/CRM/weekPlanUpdate.vue

@@ -32,7 +32,7 @@
                                     <view class="flex">
                                         {{workList[workIndex]}}
                                         <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
-                                    </view>
+                                    </view> 
                                 </picker>
                             </view>
                         </uni-forms-item>
@@ -40,12 +40,12 @@
                             <uni-easyinput  type="textarea" autoHeight v-model="formData.content" placeholder="请输入" class="form-texarea" />
                         </uni-forms-item>
                     </uni-forms>
-
+                   
                 </view>
 
             </view>
 
-
+           
         </view>
     </view>
 </template>
@@ -138,4 +138,4 @@ const submitForm = async () => {
     margin-bottom:22px !important;
 }
 
-</style>
+</style>

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

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

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

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

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

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

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

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

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

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

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