nfc验证修改

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

.env.development

@@ -1,6 +1,16 @@
 
 #调用后台地址
-# VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
-VITE_APP_BASE_URL = 'https://app-test.718yousheng.com'
+# 贝英斯公司
+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,6 +1,16 @@
 
 #调用后台地址
-VITE_APP_BASE_URL = 'https://app-test.718yousheng.com'
-# VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
+# 贝英斯公司
+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,8 +2,20 @@
     "version" : "1.0",
     "configurations" : [
         {
+            "customPlaygroundType" : "local",
+            "packageName" : "com.ys718.app",
             "playground" : "custom",
             "type" : "uni-app:app-android"
+        },
+        {
+            "app" : {
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "provider" : "aliyun",
+            "type" : "uniCloud"
         }
     ]
 }

package.json

@@ -59,7 +59,10 @@
     "@dcloudio/uni-ui": "^1.5.11",
     "crypto-js": "^4.2.0",
     "mescroll-uni": "^1.3.7",
+    "minio": "^8.0.6",
+    "minio-js": "^1.0.7",
     "pinia": "2.0.20",
+    "uniapp-video-player": "^1.3.0",
     "uuid": "^11.1.0",
     "vue": "3.4.21",
     "vue-i18n": "9.14.5"

src/App.vue

@@ -4,16 +4,39 @@
 
 
 <script setup>
-// import { onLaunch } from '@dcloudio/uni-app';
-// onLaunch((opt) => {
-//     console.log("onLaunch")
+import {showAlert} from '@/utils/message.js'
+import { onLaunch } from '@dcloudio/uni-app';
+onLaunch((opt) => {
+	//     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
+})
 
-//     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" });
-// })
 
 
 </script>

src/api/crm/activity/activity.js

@@ -211,3 +211,84 @@ export function addMapForReport(data) {
     isTransformResponse:false
   });
 }
+
+
+//新增请假申请
+export function addLeaveApply(data) {
+  return request.post({
+    url: "/crm/app/appLeaveApply/add",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//我的表单
+export function getLeaveApplyList(data) {
+  return request.get({
+    url: "/crm/app/appLeaveApply/list",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//可销假表单
+export function getBackList(data) {
+  return request.get({
+    url: "/crm/app/appLeaveApply/getBackList",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//我的审批
+export function getMyReviewList(data) {
+  return request.get({
+    url: "/crm/app/appLeaveApply/myReview",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//可销假表单
+export function getBackLeaveList(data) {
+  return request.get({
+    url: "/crm/app/appLeaveApply/myBackLeave",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//提交审批
+export function addReviewLeave(data) {
+  return request.post({
+    url: "/crm/app/appLeaveApply/addReview",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//新增销假申请
+export function addBackApply(data) {
+  return request.post({
+    url: "/crm/app/appLeaveApply/addBackApply",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//可销假表单
+export function getDelLeaveApply(data) {
+  return request.get({
+    url: "/crm/app/appLeaveApply/delLeaveApply",
+    data
+  },{
+    isTransformResponse:false
+  });
+}

src/api/crm/activity/map.js

@@ -10,6 +10,14 @@ export function addStartMap(data) {
   });
 }
 
+//出差打卡接口
+export function businessTripClockIn(data) {
+  return request.post({
+    url: '/crm/app/appVisistMap/businessTripClockIn',
+    data
+  },{isTransformResponse:false});
+}
+
 //新增地图开始打卡接口
 export function addStartMapForClockIn(data) {
   return request.post({

src/api/crm/api_ys.js

@@ -93,7 +93,7 @@ export function viewingMarketInfgetDetail(data) {
 //市场信审核列表接口
 export function approvalMarketInfget(data) {
 	return request.get({
-		url: 'app/informationMarketInformation/Approval',
+		url: '/crm/app/informationMarketInformation/Approval',
 		data
 	},{
 		isTransformResponse:false
@@ -173,3 +173,56 @@ export function crmMarketInformationApprovalUnSuccess(data) {
 		isTransformResponse:false
 	})
 }
+
+//任务清单
+export function SalesManTaskList(data) {
+	return request.get({
+		url: '/crm/app/schedulerTask/SalesManTaskList',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+
+//主线任务列表
+export function SalesManTaskDetailList(data) {
+	return request.get({
+		url: '/crm/app/schedulerTask/SalesManTaskDetailList',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+
+
+
+//任务计划新增
+export function taskPlanAdd(data) {
+	return request.post({
+		url: '/crm/app/schedulerTask/add',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+
+//任务计划查看
+export function TaskPlanList(data) {
+	return request.get({
+		url: '/crm/app/schedulerTask/TaskPlanList',
+		data
+	},{
+		isTransformResponse:false
+	})
+}
+
+
+//我的审批
+export function getMyReviewList(data) {
+  return request.get({
+    url: "/crm/app/schedulerTask/myReview",
+    data
+  },{
+    isTransformResponse:false
+  });
+}

src/api/crm/customer/getCustomer.js

@@ -25,7 +25,7 @@ export function saveappCrmCusUserNew(params){
 // 查询业务员名下所有的客户
 export function SearchForAllCustomersSalesperson(params){
     return request.get({
-        url: 'app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
         data: params
     },{isTransformResponse: false})
 }

src/api/crm/plan/getPlan.js

@@ -1,12 +1,5 @@
 import request from "@/utils/request"
-
-export function getPersonalPlanList(params) {
-    return request.post({
-        url: '/getPersonalPlanList',
-        params
-    })
-}
-
+// 获取用户信息
 export function getUserInfo(data) {
     return request.get({
         url: '/crm/app/user/getUserInfo',

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/polling.js

@@ -0,0 +1,181 @@
+import request from "@/utils/request"
+
+// 按日查询任务表列表
+export function taskList(data) {
+    return request.post({
+        url: '/patrol/patroltask/list',
+        data
+    })
+}
+
+// 按月查询任务表列表
+export function taskListMonth(data) {
+    return request.post({
+        url: '/patrol/patroltask/listm',
+        data
+    })
+}
+
+// 按条件搜索任务列表
+export function taskLists(data) {
+    return request.post({
+        url: '/patrol/patroltask/lists',
+        data
+    })
+}
+
+// 查询任务详情
+export function taskDetail(data) {
+    return request.post({
+        url: '/patrol/patroltask/detail',
+        data
+    })
+}
+
+// 批量提交检查点的结果
+export function submitResult(data) {
+    return request.post({
+        url: '/patrol/patroltask/submitresult',
+        data
+    })
+}
+
+// 提交任务
+export function submitTask(data) {
+    return request.post({
+        url: '/patrol/patroltask/submittask',
+        data
+    })
+}
+
+// 查询任务检查项详情
+export function taskGroupDetail(data) {
+    return request.post({
+        url: '/patrol/patroltask/taskgroup',
+        data
+    })
+}
+
+// 异常上报表管理
+export function problemDetail(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/detail',
+        data
+    })
+}
+
+// 查询异常上报表列表
+export function problemList(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/list',
+        data
+    })
+}
+
+// 添加问题上报
+export function problemAdd(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/addproblem',
+        data
+    })
+}
+// 编辑问题
+export function problemEdit(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/editproblem',
+        data
+    })
+}
+// 删除问题
+export function problemDel(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/delproblem',
+        data
+    })
+}
+// 添加追踪记录
+export function problemAddLog(data) {
+    return request.post({
+        url: '/patrol/patrolproblem/addproblemlog',
+        data
+    })
+}
+
+// 图片上传
+export function minioUpload(data) {
+    return request.uploadFile({
+        url: '/patrol/minio/upload',
+        ...data
+    })
+}
+// 获取minio参数
+export function minioParam(data) {
+    return request.post({
+        url: '/patrol/minio/param',
+        data
+    })
+}
+
+// 待检查的任务数量
+export function querytodaytasknum(data) {
+    return request.post({
+        url: '/patrol/patroltask/querytodaytasknum',
+        data
+    })
+}
+
+
+/**主动上报 begin */ 
+// 详情
+export function patrolBugDetail(data) {
+    return request.post({
+        url: '/patrol/patrolBug/detail',
+        data
+    })
+}
+
+// 查询异常上报表列表
+export function patrolBugList(data) {
+    return request.post({
+        url: '/patrol/patrolBug/list',
+        data
+    })
+}
+
+// 添加问题上报
+export function patrolBugAdd(data) {
+    return request.post({
+        url: '/patrol/patrolBug/addBug',
+        data
+    })
+}
+// 编辑问题
+export function patrolBugEdit(data) {
+    return request.post({
+        url: '/patrol/patrolBug/editBug',
+        data
+    })
+}
+// 删除问题
+export function patrolBugDel(data) {
+    return request.post({
+        url: '/patrol/patrolBug/delBug',
+        data
+    })
+}
+// 添加追踪记录
+export function patrolBugAddLog(data) {
+    return request.post({
+        url: '/patrol/patrolBug/addBuglog',
+        data
+    })
+}
+/**主动上报 end */ 
+
+// 验证NFC扫描是否正确
+export function patroltaskValidateNfc(data) {
+    return request.post({
+        url: '/patrol/patroltask/validateNfc',
+        data
+    })
+}

src/components/NFCTemplate.vue

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

src/components/calenderMonth.vue

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

src/components/calenderMonthSimple.vue

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

src/components/chooseMedia.vue

@@ -0,0 +1,221 @@
+<template>
+<!-- 自定义底部弹窗选择器 -->
+<view class="picker-model" v-if="showPicker">
+    <view class="picker-content">
+        <view class="picker-item" @click="takePhoto">
+            <text>拍照</text>
+        </view>
+        <!-- <view class="picker-item" @click="choosePhoto">
+            <text>选择照片</text>
+        </view> -->
+        <view class="picker-item" @click="takeVideo">
+            <text>拍摄视频</text>
+        </view>
+        <!-- <view class="picker-item" @click="chooseVideoFromAlbum">
+            <text>选择视频</text>
+        </view> -->
+        <view class="picker-item" @click="closePicker">
+            <text>取消</text>
+        </view>
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref, watch } from "vue";
+import {compressImageUni} from '@/utils/common.js'
+import { minioUpload } from '@/api/polling.js'
+
+let showPicker = ref(false);
+const openPicker = () => {
+    showPicker.value = true;
+}
+const closePicker = () => {
+    showPicker.value = false;
+    emit("closeMedia")
+}
+
+const takePhoto = () => {
+    captureMedia("image", "camera");
+}
+
+// const choosePhoto = () => {
+//     captureMedia("image", "album");
+// }
+
+const takeVideo = () => {
+    captureMedia("video", "camera");
+}
+
+// const chooseVideoFromAlbum = () => {
+//     captureMedia("video", "album");
+// }
+
+const captureMedia = async (type, source) => {
+    showPicker.value = false;
+    try {
+        if (type === "image") {
+            const res = await uni.chooseImage({
+                count: 1,
+                sourceType: [source],
+            });
+            processMedia(res.tempFilePaths, "image", source);
+        } else {
+            const res = await uni.chooseVideo({
+                sourceType: [source],
+                // sourceType: ['album', 'camera'], // 来源：相册和相机
+                maxDuration: 60, // 最大时长（秒）
+                camera: 'back', // 使用后置摄像头
+                compressed: true, // 压缩视频
+            });
+            processMedia([res.tempFilePath], "video", source);
+        }
+    } catch (error) {
+        emit("closeMedia")
+    }
+}
+
+// 调用父组件的方法
+const emit = defineEmits(['getMediaArr','closeMedia']);
+
+// 执行压缩并上传
+const processMedia = async(files, type, source) => {
+    let returnArr = [];
+    let res = files.map(async file=>{
+        return new Promise(async(resolve, reject) => {
+            try {
+                const info = {
+                    path: file,
+                    type: type,
+                    source: source,
+                    timestamp: Date.now(),
+                }
+                // #ifdef APP-PLUS
+                // 进行压缩图片
+                if(type=="image"){
+                    info.path = await compressImageUni(file);
+                }
+                // #endif
+
+                // 保存选择记录
+                let data = await saveSelectionRecord(info);
+                returnArr.push({
+                    fileName:data.fileName,
+                    fileType:type
+                })
+                resolve(returnArr)
+            } catch (error) {
+                reject(error)
+            }
+        });
+    })
+
+    await Promise.all(res);
+    // console.log("returnArr=>",returnArr)
+
+    showPicker.value = false;
+    emit('getMediaArr',returnArr);
+
+    // 根据来源做不同处理
+    // if (source === "camera") {
+    //     handleCameraMedia(info);
+    // } else {
+    //     handleAlbumMedia(info);
+    // }
+}
+
+// 保存到云
+const saveSelectionRecord = (info) => {
+    return new Promise(async (resolve, reject) => {
+        try {
+            // 执行上传
+            let param = {
+                filePath:  info.path,
+                name: 'file',
+                formData: {
+                    directory:'polling'
+                },
+            }
+            let res = await minioUpload(param);
+            resolve(res.data);
+        } catch (error) {
+            resolve(error);
+        }
+        // 保存到本地存储
+        // const records = uni.getStorageSync("mediaRecords") || [];
+        // records.unshift(info);
+        // uni.setStorageSync("mediaRecords", records.slice(0, 10)); // 只保留最近10条
+    })
+}
+
+const handleCameraMedia = (info) => {
+    // 从相机拍摄的媒体文件处理
+    if (info.type === "image") {
+        // 相机拍摄的照片可能有地理位置信息
+        extractImageMetadata(info.path);
+    } else {
+        // 相机拍摄的视频
+        uni.showToast({
+            title: "已保存拍摄的视频",
+            icon: "success",
+        });
+    }
+}
+
+const handleAlbumMedia = (info) => {
+    // 从相册选择的媒体文件处理
+    console.log("从相册选择:", info);
+}
+
+const extractImageMetadata = (filePath) => {
+    // 获取图片元数据（部分平台支持）
+    uni.getImageInfo({
+        src: filePath,
+        success: (res) => {
+            console.log("图片元数据:", res);
+        },
+    });
+}
+
+// 暴露方法给父组件
+defineExpose({
+    openPicker
+});
+</script>
+
+<style lang="scss" scoped>
+.picker-model{
+    position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 9999;
+    .picker-content{
+        width:100%;
+        position: absolute;
+        bottom:0;
+        left:0;
+        background-color: #fff;
+        border-radius: 10rpx 10rpx 0 0;
+        .picker-item{
+            border-bottom:1px solid #E7E7E7;
+            text-align: center;
+            height:90rpx;
+            line-height: 90rpx;
+            // #ifdef APP-PLUS
+            height:120rpx;
+            line-height: 120rpx;
+            // #endif
+            &:last-child{
+                border-bottom: none;
+            }
+            text{
+                text-align: center;
+            }
+        }
+    }
+}
+
+</style>

src/components/circleTemplate.vue

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

src/components/closeableModal.vue

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

src/components/customHeader.vue

@@ -7,7 +7,9 @@
         </view>
 
         <!-- 中间标题 -->
-        <view class="navbar-title">{{ title }}</view>
+        <view class="navbar-title">{{ title }}
+            <slot name="title"></slot>
+        </view>
 
         <!-- 右侧内容 -->
         <view class="navbar-right" v-if="rightFlag">

src/components/customSearch.vue

@@ -68,7 +68,7 @@ const props = defineProps({
     searchKeywords:{//搜索文本
         type:String
     },
-    searchType:{//哪种类型显示对象 typeId:1-首页，2-业务首页，3-消息  之后可以自动添加
+    searchType:{//哪种类型显示对象 typeId:1-首页，2-业务首页，3-消息, 4-问题,5-上报问题 之后可以自动添加
         type:Object
     },
     searchTypeList:{//类型列表

src/components/customShowModal.vue

@@ -4,7 +4,7 @@
 		<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="primary" class="btn-cancel" @click="handleCancel" v-if="btnFlag2">取消</button>
 			<button type="default" class="btn-green" @click="handleConfirm" v-if="btnFlag" :loading="loading" :disabled="loading">{{btnTxt}}</button>
 		</view>
 	</view>

src/components/mediaPreview.vue

@@ -0,0 +1,123 @@
+<template>
+  <!-- 放大后的遮罩层 -->
+  <view v-if="isEnlarged" class="image-preview-overlay">
+    <view class="image-preview-close"   @click="handleClose">
+      <uni-icons type="closeempty" size="18" color="#fff"></uni-icons>
+    </view>
+    <block v-if="getFileType(mediaUrl)=='image'">
+        <image 
+          :src="mediaUrl" 
+          mode="widthFix" 
+          class="enlarged-image" 
+        />
+    </block>
+    <view :class="videoClass"  v-else-if="getFileType(mediaUrl)=='video'">
+      <!--  object-fit="cover" -->
+      <!-- <video :src="mediaUrl" controls  @loadedmetadata="onVideoLoaded"></video> -->
+      <!-- 
+      src: '' // 视频地址
+      autoplay: false // 是否自动播放
+      loop: false // 是否循环播放
+      controls: false // 是否显示控制栏
+      muted: false // 是否静音
+      isLoading: false // Android系统加载时显示loading(为了遮挡安卓的黑色按钮)
+      objectFit: 'contain' // 视频尺寸与video区域的适应模式
+      poster: '' // 视频封面
+      -->
+      <DomVideoPlayer :src="mediaUrl" controls autoplay />
+    </view>
+  </view>
+</template>
+
+<script setup>
+import DomVideoPlayer from 'uniapp-video-player'
+import { ref,watch } from 'vue';
+import {getFileType} from '@/utils/common.js';
+const props = defineProps({
+	visible:{
+		type:Boolean
+	},
+  url:{}//图片路径
+})
+
+const isEnlarged = ref(props.visible);
+const mediaUrl = ref(props.url);
+// const mediaType = ref('');//类型
+// 显示隐藏
+watch(() => props.visible, (newVal, oldVal) => {
+  isEnlarged.value = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
+
+watch(() => props.url, (newVal, oldVal) => {
+  mediaUrl.value = newVal;
+},{
+    deep:true,
+    immediate:true
+});
+const emit = defineEmits(['close'])
+const handleClose=()=>{
+  emit('close');
+}
+
+// 获取视频的宽和高
+let videoClass = ref('enlarged-image');
+const onVideoLoaded = (e) => {
+  // 通过事件对象获取原始宽高[citation:3]
+  let w = e.detail.width;
+  let h = e.detail.height;
+  // 你也可以在这里进行后续操作，比如根据宽高比调整UI
+  // console.log(w,h)
+  if(h>w){
+    videoClass.value="enlarged-image"
+  }else{
+    videoClass.value="enlarged-image"
+  }
+};
+
+</script>
+
+<style scoped>
+.image-preview-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.9);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 10000;
+}
+.image-preview-overlay .image-preview-close{
+  position: absolute;
+  width:50rpx;
+  height:50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  border-radius: 50%;
+  right:20rpx;
+  top:20rpx;
+  /* #ifdef APP-PLUS */
+  top:44rpx;
+  /* #endif */
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 1;
+}
+
+:deep(uni-video){
+  width:100%;
+}
+
+.enlarged-image {
+  width: 100%;
+  height: auto;
+}
+.enlarged-image2 {
+  width:auto;
+  height: 100vh;
+}
+</style>

src/components/multipleSelect.vue

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

src/components/pollingShowModal.vue

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

src/components/searchDate.vue

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

src/constants/mapApiConstants.js

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

src/enums/cacheEnums.js

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

src/enums/requestEnums.js

@@ -18,4 +18,9 @@ export const RequestCodeEnum = {
 export const RequestErrMsgEnum = {
     ABORT: 'request:fail abort',
     TIMEOUT: 'request:fail timeout'
-};
+};
+
+// 特殊接口不弹默认窗口处理
+export const RequestUrlAlertEum=[
+    '/patrol/patroltask/validateNfc'
+]

src/manifest.json

@@ -1,7 +1,7 @@
 {
     "id" : "H5E705637",
     "name" : "718友晟",
-    "appid" : "__UNI__4C459F4",
+    "appid" : "__UNI__0B682E1",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -21,7 +21,12 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Push" : {},
+            "Camera" : {},
+            "Barcode" : {},
+            "VideoPlayer" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -41,17 +46,35 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\" />",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\" />",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
+                    "<uses-permission android:name=\"android.permission.GET_TASKS\" />",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_ADDED\" />",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_CHANGED\" />",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_INSTALL\" />",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_REPLACED\" />",
+                    "<uses-permission android:name=\"android.permission.RESTART_PACKAGES\" />",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
+                    "<uses-permission android:name=\"android.permission.NFC\"/>",
+                    "<uses-feature android:name=\"android.hardware.nfc\" android:required=\"true\"/>",
+                    "<uses-permission android:name=\"android.permission.POST_NOTIFICATIONS\"/>"
+			
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
-                "minSdkVersion" : 26,
+                "minSdkVersion" : 23,
                 "targetSdkVersion" : 35,
                 "icons" : {
                     "android" : {
-                        "hdpi" : "static/icons/72x72.png",
-                        "xhdpi" : "static/icons/96x96.png",
-                        "xxhdpi" : "static/icons/144x144.png",
-                        "xxxhdpi" : "static/icons/192x192.png"
+                        "hdpi" : "/static/images/icon.png",
+                        "xhdpi" : "/static/images/icon.png",
+                        "xxhdpi" : "/static/images/icon.png",
+                        "xxxhdpi" : "/static/images/icon.png"
                     }
                 }
             },
@@ -60,7 +83,30 @@
                 "dSYMs" : false
             },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : true,
+                        "icons" : {
+                            "push" : {
+                                "ldpi" : "/static/images/icon.png",
+                                "mdpi" : "/static/images/icon.png",
+                                "hdpi" : "/static/images/icon.png",
+                                "xhdpi" : "/static/images/icon.png",
+                                "xxhdpi" : "/static/images/icon.png"
+                            },
+                            "small" : {
+                                "ldpi" : "/static/images/icon_small.png",
+                                "mdpi" : "/static/images/icon_small.png",
+                                "hdpi" : "/static/images/icon_small.png",
+                                "xhdpi" : "/static/images/icon_small.png",
+                                "xxhdpi" : "/static/images/icon_small.png"
+                            }
+                        }
+                    }
+                }
+            }
         },
         "nativePlugins" : {
             "Tm-TmSafeSaveFileModule" : {
@@ -110,3 +156,5 @@
         "template" : "index.html"
     }
 }
+/* ios打包配置 */
+

src/pages.json

@@ -54,6 +54,12 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/notice/noticeDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/notice/waitApprove",
 			"style": {
@@ -217,13 +223,6 @@
 				"navigationBarTitleText": "通用信息更新"
 			}
 		},
-		//选择客户（已更新）
-		{
-			"path": "pages/business/CRM/chooseCus",
-			"style": {
-				"navigationBarTitleText": "客户选择"
-			}
-		},
 		//选择客户人员（已更新）
 		{
 			"path": "pages/business/CRM/customerUserList",
@@ -332,7 +331,8 @@
 			"path": "pages/business/CRM/plan/planView",
 			//周计划查看
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -543,11 +543,264 @@
 		{
 			"path": "pages/business/CRM/map/checkinStatistics",
 			//打卡统计
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackIndex",
+			//质量反馈
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path" : "pages/business/EQF/qualityFeedback/qualityFeedbackAdd",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/chooseCus",
+			//选择客户单位
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackEnter",
+			//明细录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/qualityFeedbackDetailComponent",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/customerOrder",
+			//选择合同
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/gkCustomerOrder",
+			//选择合同
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter",
+			//明细录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/gkQualityFeedbackDetailComponent",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/searchList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/taskDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/optionDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/taskList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemReport",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemLog",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemInitiativeList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemInitiative",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemInitiativeDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/problemInitiativeLog",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/polling/nfcTest/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//************************考勤管理请假功能
+		//请假申请
+		{
+			"path": "pages/business/CRM/leave/askLeave",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//添加请假申请
+		{
+			"path": "pages/business/CRM/leave/addApply",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//我的申请表单
+		{
+			"path": "pages/business/CRM/leave/myApply",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//我的申请表单详情
+		{
+			"path": "pages/business/CRM/leave/myApplyDetail",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//可销假列表
+		{
+			"path": "pages/business/CRM/leave/backApply",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//添加销假申请
+		{
+			"path": "pages/business/CRM/leave/addBackApply",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//请假审批
+		{
+			"path": "pages/business/CRM/leave/reviewLeave",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//审批详情
+		{
+			"path": "pages/business/CRM/leave/reviewDetail",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//************************任务板块页面
+		{
+			"path": "pages/business/CRM/scheduler/index",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/scheduler/taskPlanAdded",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/scheduler/taskListViewing",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/scheduler/taskViewingDetail",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/scheduler/taskPlanList",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/scheduler/taskPlanReview",
+			
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		}
-		//===================================活动报告====================
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

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,9 +126,9 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: { 
+  empty: {
     tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -149,44 +149,31 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    uni.showLoading();
-    cssFlag.value = true;
-    setTimeout(async () => {
-      // 重置页码为第一页
-      const res = await getList(1, mescroll.size || upOption.page.size);
-      list.value = res.list;
-      cssFlag.value = false;
-      // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      uni.hideLoading();
-
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+  uni.showLoading();
+  cssFlag.value = true;
+  setTimeout(async () => {
+    // 重置页码为第一页
+    const res = await getList(1, mescroll.size || upOption.page.size);
+    cssFlag.value = false;
+    list.value = res.list;
+    // 正确传递 total 参数
+    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+  }, 500);
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
-    uni.showLoading();
-    setTimeout(async () => {
-      // 使用 mescroll 提供的页码和大小参数
-      const res = await getList(mescroll.num, mescroll.size);
-      if (mescroll.num === 1) {
-        list.value = res.list;
-      } else {
-        list.value.push(...res.list);
-      }
-      // 正确判断是否还有更多数据
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      uni.hideLoading();
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+  uni.showLoading();
+  setTimeout(async () => {
+    // 使用 mescroll 提供的页码和大小参数
+    const res = await getList(mescroll.num, mescroll.size);
+    if (mescroll.num === 1) {
+      list.value = res.list;
+    } else {
+      list.value.push(...res.list);
+    }
+    // 正确判断是否还有更多数据
+    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+  }, 500);
 }
 
 // 获取数据列表
@@ -197,12 +184,17 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
-    let res = await SearchForAllPerson(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
+    try {
+      let res = await SearchForAllPerson(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, '数据获取失败');
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -303,41 +295,20 @@ let handleCopyInfo = (item) => {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
 .scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
+  height: 100%;
 }
 
 .white-bg {
@@ -348,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"
-                              @change="handleHobbyChange"  :slabel="'name'"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @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) {
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      console.log(formData.value.systemThinkLevel + "???")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    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 = value;
+  formData.value.tenureTime = e;
 }
 
 // 需求层次索引
@@ -533,16 +541,16 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
-  formData.value.birthday = value;
+  formData.value.birthday = e;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
-  // console.log("爱好", item, value);
-  hobbyIndex = value;
+const handleHobbyChange = (items, ids) => {
+  hobbyIds.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"
-                              @change="handleHobbyChange"  :slabel="'name'"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @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) {
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      console.log(formData.value.systemThinkLevel + "???")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    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 = value;
+  formData.value.tenureTime = e;
 }
 
 // 需求层次索引
@@ -534,17 +547,19 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
-  formData.value.birthday = value;
+  formData.value.birthday = e;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
-  // console.log("爱好", item, value);
-  hobbyIndex = value;
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  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 {name} = hobbyList[it];
+  let hobbyTags = hobbies.value.map(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) {
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      console.log(formData.value.systemThinkLevel + "???")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -489,9 +499,9 @@ let handleUserTypeChange = (e) => {
 }
 
 // 选择日期
-function handleTenureTimeChange(e) {
-  let {value} = e.detail;
-  formData.value.tenureTime = value;
+function handleTenureTimeChange(val) {
+  console.log(val)
+  formData.value.tenureTime = val;
 }
 
 // 需求层次索引
@@ -513,18 +523,20 @@ let handleDevelopChange = e => {
 }
 
 // 选择生日
-function handleBirthdayChange(e) {
-  let{value} = e.detail
-  formData.value.birthday = value;
+function handleBirthdayChange(val) {
+  formData.value.birthday = val;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
-  // console.log("爱好", item, value);
-  hobbyIndex = value;
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  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 hobbyTags = hobbyIndex.map(it => {
-    let {name} = hobbyList[it];
+// 多选组件失去焦点关闭
+let handleBlur = () => {
+  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
+}
+// 提取爱好标签处理逻辑
+const processHobbyTags = () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
     return name;
   })
   const hobbyTagString = hobbyTags.join('，');
   console.log(hobbyTagString);
   if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = 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);
-    }).catch(err=>{
+      setTimeout(() => uni.navigateBack(), 1500);
+    }).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"-->
-<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
-<!--                          v-model="searchValue"-->
-<!--          />-->
+          <!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
+          <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
+          <!--                          v-model="searchValue"-->
+          <!--          />-->
           <view class="custom-search"></view>
-          </view>
+        </view>
 
         <!-- 分页部分  -->
         <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -101,18 +107,22 @@ 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: { 
+  empty: {
     tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -133,10 +143,11 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    uni.showLoading();
-    cssFlag.value = true;
-    setTimeout(async () => {
+
+  uni.showLoading();
+  cssFlag.value = true;
+  setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
 
@@ -144,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) {
-    console.log(error)
-    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) {
@@ -165,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) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    } catch (error) {
+      mescroll.endErr();
+    }
+  }, 500);
+
 }
 
 // 获取数据列表
@@ -180,12 +195,17 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
-    let res = await getCusUserApprovalList(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
+    try {
+      let res = await getCusUserApprovalList(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, "客户人员审核任务列表获取失败");
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -210,22 +230,17 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
 .scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
+  height: 100%;
 }
 
 .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,9 +132,9 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -155,27 +155,27 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    cssFlag.value = true;
-    uni.showLoading();
-    setTimeout(async () => {
+  cssFlag.value = true;
+  uni.showLoading();
+  setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
-      cssFlag.value = false;
       list.value = res.list;
       // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-      uni.hideLoading();
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+    } catch (error) {
+      mescroll.endErr();
+    } finally {
+      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) {
@@ -184,13 +184,12 @@ const upCallback = async (mescroll) => {
         list.value.push(...res.list);
       }
       // 正确判断是否还有更多数据
-      mescroll.endBySize(res.list.length, res.total)
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
       // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    } catch (error) {
+      mescroll.endErr();
+    }
+  }, 500);
 }
 
 // 获取数据列表
@@ -201,12 +200,18 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
+    try {
+      let res = await SearchForAllCustomersSalesperson(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+      console.log(e, "获取所有客户人员所属失败");
+    } finally {
+      uni.hideLoading();
+    }
 
-    let res = await SearchForAllCustomersSalesperson(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
   });
 }
 
@@ -217,6 +222,7 @@ let handleDetail = (item) => {
       url: "/pages/business/CRM/customer/components/customerUserEdit",
       events: {
         refreshCusUserList() {
+          console.log('refreshCusUserList',"响应刷新")
           handleSearch();
         }
       },
@@ -224,7 +230,7 @@ let handleDetail = (item) => {
         res.eventChannel.emit('editCusData', {param: item, isAdd: false})
       }
     })
-  }else{
+  } else {
     uni.showToast({
       title: '已完成审核，不可修改',
       icon: 'none'
@@ -278,16 +284,15 @@ let handleDelete = async (item) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-
 .search .btn-search {
   border: none;
   background: none;

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

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

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

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

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

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

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

@@ -0,0 +1,58 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<customHeader ref="customHeaderRef" :title="'请假销假'" :leftFlag="true">
+			</customHeader>
+			<!-- #ifdef H5 -->
+			<view style="height:50rpx"></view>
+			<!-- #endif -->
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<view class="white-bg">
+				<view class="logo-list">
+					<view class="l-l-item" @click="handleJump('addApply')">
+						<img :src="'static/images/business/icon-xxck.png'" />
+						<text class="font-gray">请假申请</text>
+					</view>
+					<view class="l-l-item" @click="handleJump('backApply')">
+						<img :src="'static/images/business/icon-xxtj.png'" />
+						<text class="font-gray">销假申请</text>
+					</view>
+					<view class="l-l-item" @click="handleJump('myApply')">
+						<img :src="'static/images/business/icon-zfbg.png'" />
+						<text class="font-gray">我的表单</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getNavBarPaddingTop
+	} from '@/utils/system.js'
+	// 获取导航栏高度用于内容区域padding
+	const navBarPaddingTop = ref(0);
+	onMounted(() => {
+		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+	})
+	
+	// 跳转
+	let handleJump=(url)=>{
+	    if(url){
+	        uni.navigateTo({ url })
+	    }
+	}
+</script>
+
+<style scoped>
+	
+</style>

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

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

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

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

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

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

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

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

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

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

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

@@ -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"
-                              @change="handleHobbyChange"  :slabel="'name'"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @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) {
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      console.log(formData.value.systemThinkLevel + "???")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
     }
-    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 = value;
+  formData.value.tenureTime = e;
 }
 
 // 需求层次索引
@@ -505,17 +513,19 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
-  formData.value.birthday = value;
+  formData.value.birthday = e;
 }
 
 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
-  // console.log("爱好", item, value);
-  hobbyIndex = value;
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  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 {name} = hobbyList[it];
+  let hobbyTags = hobbies.value.map(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,9 +124,9 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -145,28 +147,28 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    cssFlag.value = true;
-    uni.showLoading();
-    setTimeout(async () => {
+  cssFlag.value = true;
+  uni.showLoading();
+  setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
-
       list.value = res.list;
-      cssFlag.value = false;
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-      uni.hideLoading();
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    } catch (error) {
+      console.log(error)
+      mescroll.endErr();
+    } finally {
+      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) {
@@ -176,11 +178,11 @@ const upCallback = async (mescroll) => {
       }
       // 正确判断是否还有更多数据
       mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
+    } catch (error) {
+      console.log(error)
+      mescroll.endErr();
+    }
+  }, 500);
 }
 
 // 获取数据列表
@@ -191,12 +193,16 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
-    let res = await personnelAwaitingReviewForChange(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
+    try {
+      let res = await personnelAwaitingReviewForChange(param);
+      resolve({
+        list: res.rows,
+        total: res.total
+      });
+    } catch (e) {
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -206,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})
     }
   })
@@ -221,60 +227,39 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-.search {
-  display: flex;
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.search .custom-search {
-  width: 80%;
-
-}
-
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
-.scroll-h {
+.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">
+                <view class="r-list title">{{ item.cusName }}
                   <view class="r-name">{{ item.visistCode }}</view>
-                  <view>
-
-                    <view
-                        class="r-right btn-blue"
-                        size="mini">
-                      查看
-                    </view>
-                  </view>
-
+                  <view class="r-right btn-blue no-wrap"> 查看 </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,11 +144,11 @@ const upCallback = async (mescroll) => {
 }
 
 const upOption = ref({
-  page: { num: 0, size: 10 },
+  page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -180,57 +171,43 @@ function showDetail(item) {
 
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-.search {
-  display: flex;
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.search .custom-search {
-  width: 80%;
-
-}
-
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
-.scroll-h {
+.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

@@ -8,12 +8,19 @@
 			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
 			<view class="inner-box">
-				<view class="cu-form-group">
-					<textarea v-model="form.remark" placeholder="请输入签到备注内容" name="input"></textarea>
-				</view>
-				<view class="btn-box">
+				<view class="cu-form-group" style="height: 200px;padding:10px;">
+					<uni-forms ref="formRef" :model="form" label-width="100px">
+						<uni-forms-item label="签到备注内容" name="understandTheWay"
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="form.remark" placeholder="请输入签到备注内容"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+
+					<view class="btn-box" style="padding-top: 50px;">
 					<button type="primary" @click="addInsertMapClockIn">签到</button>
 				</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -27,20 +34,20 @@ import { parseTime } from '@/utils/datetime.js';
 import { onLoad } from '@dcloudio/uni-app';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 let form = reactive({
-		addressForStart: null,
-		addressForEnd: null,
-		createId: null,
-		staffName: null,
-		visistCode: null,
-		visistId: null,
-		mapId: null,
-		remark: null
-	})
+	addressForStart: null,
+	addressForEnd: null,
+	createId: null,
+	staffName: null,
+	visistCode: null,
+	visistId: null,
+	mapId: null,
+	remark: null
+})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
 onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
 onLoad(option => {

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

@@ -1,164 +1,171 @@
 <template>
-    <view class="con-body">
-        <view class="con-bg">
-            <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
 
-            <!-- 高度来避免头部遮挡 -->
-            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
-            <!-- 正文内容 -->
-            <view>
-                <!-- 搜索 -->
-<!--                <view class="search">-->
-<!--                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"-->
-<!--                        class="picker-bg">-->
-<!--                        <view class="picker">-->
-<!--                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"-->
-<!--                                size="18"></uni-icons>-->
-<!--                            <view>{{ defaultDate }}</view>-->
-<!--                            <uni-icons type="down" size="18"></uni-icons>-->
-<!--                        </view>-->
-<!--                    </picker>-->
-<!--                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
-<!--                </view>-->
+      <!-- 正文内容 -->
+      <view>
+        <!-- 搜索 -->
+        <!--                <view class="search">-->
+        <!--                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"-->
+        <!--                        class="picker-bg">-->
+        <!--                        <view class="picker">-->
+        <!--                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"-->
+        <!--                                size="18"></uni-icons>-->
+        <!--                            <view>{{ defaultDate }}</view>-->
+        <!--                            <uni-icons type="down" size="18"></uni-icons>-->
+        <!--                        </view>-->
+        <!--                    </picker>-->
+        <!--                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
+        <!--                </view>-->
 
-                <!-- 分页部分  -->
-                <view class="white-bg margin-bottom20" v-for="(item, index) in list">
-                    <view class="report-list" >
-                            <view class="title"
-                            :style="{color: item.mapType == 1 ? '#F5813A' : '#1989FA'}"
-                            >类型：{{ item.mapType == 1 ? '签到' : '打卡' }}</view>
-                            <view class="r-list">
-                                <view class="r-left">开始签到时间</view>
-                                <view class="r-right">{{ item.goVisistStartTime }}</view>
-                            </view>
-                            <view class="border-bottom"></view>
-                            <view class="r-list">
-                                <view class="r-left">开始签到地点</view>
-                                <view class="r-right">{{ item.addressForStart }}</view>
-                            </view>
-                            <view class="border-bottom"></view>
-                            <view class="r-list">
-                                <view class="r-left">结束签到时间</view>
-                                <view class="r-right">{{ item.goVisistEndTime }}</view>
-                            </view>
-                            <view class="border-bottom"></view>
-                            <view class="r-list">
-                                <view class="r-left">结束签到地点</view>
-                                <view class="r-right">{{ item.addressForEnd }}</view>
-                            </view>
-                            <view class="r-list" v-if="item.remark != null">
-                                <view class="r-left">备注内容</view>
-                                <view class="r-right">{{ item.remark }}</view>
-                            </view>
-                        </view>
-                    </view>
-                </view>
+        <!-- 分页部分  -->
+        <view class="white-bg margin-bottom20" v-for="(item, index) in list">
+          <view class="report-list">
+            <view class="title"
+                  :style="{color: MapType[item.mapType].color}"
+            >类型：{{ MapType[item.mapType].label }}
+            </view><!--item.mapType == 1 ? '#F5813A' : '#1989FA'}-->
+            <view class="r-list">
+              <view class="r-left">开始签到时间</view>
+              <view class="r-right">{{ item.goVisistStartTime }}</view>
+            </view>
+            <view class="border-bottom"></view>
+            <view class="r-list">
+              <view class="r-left">开始签到地点</view>
+              <view class="r-right">{{ item.addressForStart }}</view>
+            </view>
+            <view class="border-bottom"></view>
+            <view class="r-list">
+              <view class="r-left">结束签到时间</view>
+              <view class="r-right">{{ item.goVisistEndTime }}</view>
+            </view>
+            <view class="border-bottom"></view>
+            <view class="r-list">
+              <view class="r-left">结束签到地点</view>
+              <view class="r-right">{{ item.addressForEnd }}</view>
+            </view>
+            <view class="r-list" v-if="item.remark != null">
+              <view class="r-left">备注内容</view>
+              <view class="r-right">{{ item.remark }}</view>
+            </view>
+          </view>
         </view>
+      </view>
     </view>
+  </view>
 </template>
 
 <script setup>
 import customHeader from '@/components/customHeader.vue'
-import { getNavBarPaddingTop } from '@/utils/system.js'
-import { onMounted, ref } from 'vue';
-import { getDate } from '@/utils/datetime.js'
-import { CheckInInformationViewing } from '../../../../api/crm/activity/map';
-import { onLoad } from '@dcloudio/uni-app';
+import {getNavBarPaddingTop} from '@/utils/system.js'
+import {onMounted, ref} from 'vue';
+import {getDate} from '@/utils/datetime.js'
+import {CheckInInformationViewing} from '../../../../api/crm/activity/map';
+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 => {
-        list.value = res.rows
-    })
+  CheckInInformationViewing().then(res => {
+    list.value = res.rows
+  })
 }
 
 onLoad(() => {
-    getList()
+  getList()
 })
 
-
-
-
-
 </script>
 
 <style scoped>
+.r-left {
+  min-width: 6em;
+}
+
+.con-bg {
+  overflow-y: auto;
+}
+
 .search {
-    display: flex;
-    margin-bottom: 30rpx;
-    padding: 0 30rpx;
+  display: flex;
+  margin-bottom: 30rpx;
+  padding: 0 30rpx;
 }
 
 .search .btn-search {
-    border: none;
-    background: none;
-    color: #fff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 28rpx;
-    /* 调整为更合适的字号 */
-    font-weight: normal;
-    /* 如果不需要加粗，可以去掉 bolder */
-    margin-left: 0rpx;
-    padding: 0 20rpx;
-    /* 调整 padding，去掉 padding-top */
-    height: 56rpx;
-    /* 固定高度，确保与 picker 对齐 */
-    cursor: pointer;
+  border: none;
+  background: none;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  /* 调整为更合适的字号 */
+  font-weight: normal;
+  /* 如果不需要加粗，可以去掉 bolder */
+  margin-left: 0rpx;
+  padding: 0 20rpx;
+  /* 调整 padding，去掉 padding-top */
+  height: 56rpx;
+  /* 固定高度，确保与 picker 对齐 */
+  cursor: pointer;
 }
 
 .search .btn-search::after {
-    display: none;
+  display: none;
 }
 
 .search .picker-bg {
-    display: flex;
-    background-color: #6FA2F8;
-    border-radius: 25px;
-    color: #fff;
-    font-size: 28rpx;
-    padding: 0rpx 20rpx;
-    /* #ifndef APP-PLUS */
-    padding: 10rpx 20rpx 0 20rpx;
-    /* #endif */
-    margin-right: 20rpx;
+  display: flex;
+  background-color: #6FA2F8;
+  border-radius: 25px;
+  color: #fff;
+  font-size: 28rpx;
+  padding: 0rpx 20rpx;
+  /* #ifndef APP-PLUS */
+  padding: 10rpx 20rpx 0 20rpx;
+  /* #endif */
+  margin-right: 20rpx;
 }
 
 .search .picker-bg .picker {
-    display: flex;
-    align-items: center;
-    /* #ifndef APP-PLUS */
-    padding-top: 2rpx;
-    /* #endif */
+  display: flex;
+  align-items: center;
+  /* #ifndef APP-PLUS */
+  padding-top: 2rpx;
+  /* #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-bg">
-            <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
 
-            <!-- 高度来避免头部遮挡 -->
-            <view class="top-height"></view>
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height"></view>
 
-            <!-- 正文内容 -->
-            <view class="white-bg">
-                <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" />
-                <view class="check-desc">
-                    业务人员可通过<text class="font-orange">签到</text>或<text
-                        class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
-                </view>
+      <!-- 正文内容 -->
+      <view class="white-bg">
+        <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="handleClick"/>
+        <view class="check-desc">
+          业务人员可通过
+          <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 class="check-con" v-if="checkFlag">
-            <view class="check-in">
-                <view class="check-tip">打卡</view>
-                <view class="check-title">确定要在此处打卡吗？</view>
-                <view class="check-location">
-                    <uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
-                </view>
-                <view class="check-address">北京市朝阳区天辰东路1号院</view>
-                <view class="check-footer">
-                    <button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
-                    <button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
-                </view>
-            </view>
-        </view> -->
-
-    </view>
+  </view>
 </template>
 
 <script setup>
-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,
-    addressForEnd: null,
-    createId: null,
-    staffName: null,
-    visistCode: null,
-    visistId: null,
-    mapId: null
+  addressForStart: null,
+  addressForEnd: null,
+  createId: null,
+  staffName: null,
+  visistCode: null,
+  visistId: null,
+  remark: null,
+  mapId: null
 })
 // 签到
 let handleCheckIn = () => {
-    uni.navigateTo({
-        url: './addRearkSignIn'
-    })
+  uni.navigateTo({
+    url: './addRearkSignIn'
+  })
 }
 // 打卡
-let handleClockIn = () => {
-    uni.getLocation({
-        type: 'wgs84',
-        success: (res) => {
-            const latiude = res.latitude;
-            const longitude = res.longitude;
-            //进行解析
-            inverseGeocoding(latiude, longitude);
-        },
-        fail: function (err) {
-            console.log("获取地址失败" + err)
-        }
+// let handleClockIn = () => {
+//   uni.getLocation({
+//     type: 'wgs84',
+//     success: (res) => {
+//       const latiude = res.latitude;
+//       const longitude = res.longitude;
+//       //进行解析
+//       inverseGeocoding(latiude, longitude);
+//     },
+//     fail: function (err) {
+//       console.log("获取地址失败" + err)
+//     }
+//   })
+// }
+let modalVisible = ref(false);
+let handleClick = () => {
+  uni.getLocation({
+    type: 'wgs84',
+    success: (res) => {
+      const latitude = res.latitude;
+      const 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);
-    return distance <= rangeKm;
+  const distance = haversineDistance(centerLat, centerLon, lat, lon);
+  return distance <= rangeKm;
 }
+
 function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
-    const dLat = degToRad(lat2 - lat1);
-    const dLon = degToRad(lon2 - lon1);
-    const a =
-        Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-        Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
-        Math.sin(dLon / 2) * Math.sin(dLon / 2);
-    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-    return radius * c; // 距离，单位：公里
+  const dLat = degToRad(lat2 - lat1);
+  const dLon = degToRad(lon2 - lon1);
+  const a =
+      Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+      Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
+      Math.sin(dLon / 2) * Math.sin(dLon / 2);
+  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+  return radius * c; // 距离，单位：公里
 }
+
+// 角度转弧度
 function degToRad(deg) {
-    return deg * (Math.PI / 180);
+  return deg * (Math.PI / 180);
 }
 
 //解析地址
-function inverseGeocoding(latiude, longitude) {
-    let points = longitude + ',' + latiude
-    const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
+function inverseGeocoding(latitude, longitude) {
+  uni.showLoading();
+    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, "----")
-            if (res.statusCode == 200 && res.data.status == 200) {
+          modalVisible.value=true;
+            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;
-                    const longitude1 = 108.9126;
-                    if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
-                        form.addressForStart = "西安办事处位置打卡"
-                        uni.showModal({
-                            title: '确定要在此处打卡吗',
-                            content: form.addressForStart,
-                            success: function (res) {
-                                if (res.confirm) {
-                                    var data = {
-                                        mapId: form.mapId,
-                                        addressForStart: form.addressForStart,
-                                        cusName: form.cusName,
-                                        cusId: form.cusId,
-                                        remark: form.remark,
-                                        path: longitude1 + "," + latiude1
-                                    }
-                                    addStartMapForClockIn(data).then(res => {
-                                        if (res.code == 200) {
-                                            uni.showToast({
-                                                icon: 'success',
-                                                title: res.msg,
-                                                duration: 1500,
-                                            });
-                                            setTimeout(() => {
-                                                uni.navigateBack(1)
-                                            }, 500)
-                                        } else {
-                                            uni.showToast({
-                                                icon: 'none',
-                                                title: res.msg,
-                                            });
-                                        }
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('用户点击取消');
-                                }
-                            }
-                        });
+                    if (isWithinRange(latitude1, longitude1, latiude, longitude, 1)) {
+                        form.addressForStart = MapApiConfig.XI_AN_BAN.typeName;
+                        form.path = MapApiConfig.XI_AN_BAN.longitude + ',' + MapApiConfig.XI_AN_BAN.latitude ;
                     }
-                } else {
+                }
+                else {
                     form.addressForStart = resdata;
-                    uni.showModal({
-                        title: '确定要在此处打卡吗',
-                        content: form.addressForStart,
-                        success: function (res) {
-                            if (res.confirm) {
-                                var data = {
-                                    mapId: form.mapId,
-                                    addressForStart: form.addressForStart,
-                                    cusName: form.cusName,
-                                    cusId: form.cusId,
-                                    path: points
-                                }
-                                addStartMapForClockIn(data).then(res => {
-                                    if (res.code == 200) {
-                                        uni.showToast({
-                                            icon: 'success',
-                                            title: res.msg,
-                                            duration: 1500,
-                                        });
-                                    } else {
-                                        uni.showToast({
-                                            icon: 'none',
-                                            title: res.msg,
-                                        });
-                                    }
-                                })
-                            } else if (res.cancel) {
-                                console.log('用户点击取消');
-                            }
-                        }
-                    });
+                    form.path = longitude + ',' + latitude; // 经度，纬度
                 }
             } else {
-                form.addressForStart = "第三方维护打卡"
-                uni.showModal({
-                    title: '确定要在此处打卡吗',
-                    content: form.addressForStart,
-                    success: function (res) {
-                        if (res.confirm) {
-                            var data = {
-                                mapId: form.mapId,
-                                addressForStart: form.addressForStart,
-                                cusName: form.cusName,
-                                cusId: form.cusId,
-                                path: points
-                            }
-                            addStartMapForClockIn(data).then(res => {
-                                if (res.code == 200) {
-                                    uni.showToast({
-                                        icon: 'success',
-                                        title: '第三方维护打卡',
-                                        duration: 1500,
-                                    });
-                                } else {
-                                    uni.showToast({
-                                        icon: 'none',
-                                        title: res.msg,
-                                    });
-                                }
-                            })
-                        } else if (res.cancel) {
-                            console.log('用户点击取消');
-                        }
-                    }
-                });
+                form.addressForStart = MapApiConfig.OTHER.typeName;
+                form.path = longitude + ',' + latitude; // 经度，纬度
             }
-
+            uni.hideLoading();
         },
         fail(e) {
             console.log("获取位置失败", e)
-        }
+          uni.hideLoading();
+        },
     })
 
 
@@ -239,125 +220,125 @@ function inverseGeocoding(latiude, longitude) {
 
 <style scoped>
 .white-bg {
-    width: 650rpx;
-    margin: 0;
-    border-radius: 8px 8px 0 0;
-    padding: 50rpx;
-    /* #ifdef APP-PLUS */
-    height: calc(100vh - 125px);
-    /* #endif */
-    /* #ifndef APP-PLUS */
-    height: calc(100vh - 98px);
-    /* #endif */
+  width: 650rpx;
+  margin: 0;
+  border-radius: 8px 8px 0 0;
+  padding: 50rpx;
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 125px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 98px);
+  /* #endif */
 
 
 }
 
 .btn-image {
-    width: 340rpx;
-    height: 340rpx;
-    margin: 30rpx auto 60rpx;
-    display: block;
+  width: 340rpx;
+  height: 340rpx;
+  margin: 30rpx auto 60rpx;
+  display: block;
 }
 
 .check-desc {
-    background-color: #F5F5F5;
-    padding: 40rpx 50rpx;
-    font-size: 28rpx;
-    border-radius: 10px;
-    margin-top: 100rpx;
+  background-color: #F5F5F5;
+  padding: 40rpx 50rpx;
+  font-size: 28rpx;
+  border-radius: 10px;
+  margin-top: 100rpx;
 }
 
 .check-desc .font-orange {
-    color: #F5813A;
-    font-size: 32rpx;
-    font-weight: bold;
+  color: #F5813A;
+  font-size: 32rpx;
+  font-weight: bold;
 }
 
 .check-desc .font-blue {
-    color: #2CBAEF;
-    font-size: 32rpx;
-    font-weight: bold;
+  color: #2CBAEF;
+  font-size: 32rpx;
+  font-weight: bold;
 }
 
 /* 弹窗处理 */
 .check-con {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.4);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    z-index: 999;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
 }
 
 /* 遮罩层内容样式 */
 .check-in {
-    background-color: #fff;
-    padding: 40rpx 30rpx 60rpx;
-    border-radius: 10px;
-    /* width: 620rpx; */
-    width: 560rpx;
-    position: absolute;
-    top: 48%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    text-align: center;
+  background-color: #fff;
+  padding: 40rpx 30rpx 60rpx;
+  border-radius: 10px;
+  /* width: 620rpx; */
+  width: 560rpx;
+  position: absolute;
+  top: 48%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  text-align: center;
 }
 
 .check-in .check-tip {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 .check-in .check-title {
-    font-size: 32rpx;
-    padding: 20rpx 0;
+  font-size: 32rpx;
+  padding: 20rpx 0;
 }
 
 .check-in .check-location {
-    color: #0395E0;
-    font-size: 42rpx;
-    font-weight: bold;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin: 30rpx 0;
+  color: #0395E0;
+  font-size: 42rpx;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 30rpx 0;
 }
 
 .check-in .check-location .uniui-location-filled {
-    font-weight: normal;
-    margin-right: 20rpx;
+  font-weight: normal;
+  margin-right: 20rpx;
 }
 
 .check-in .check-address {
-    color: #919191;
-    font-size: 32rpx;
-    margin-bottom: 80rpx;
+  color: #919191;
+  font-size: 32rpx;
+  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;
-    border: 1px solid #05A3F4;
-    color: #05A3F4;
-    border-radius: 25px;
-    padding: 0rpx 80rpx;
-    font-size: 34rpx;
-    /* margin-left: 0;
-    margin-right: 20rpx; */
+  background-color: #fff;
+  border: 1px solid #05A3F4;
+  color: #05A3F4;
+  border-radius: 25px;
+  padding: 0rpx 80rpx;
+  font-size: 34rpx;
+  /* margin-left: 0;
+  margin-right: 20rpx; */
 }
 
 .check-in .check-footer .btn-primary {
-    background-color: #05A3F4;
-    border: 1px solid #05A3F4;
-    color: #fff;
-    /* padding: 0rpx 60rpx; */
+  background-color: #05A3F4;
+  border: 1px solid #05A3F4;
+  color: #fff;
+  /* padding: 0rpx 60rpx; */
 }
 </style>

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

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

@@ -82,7 +82,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'

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"
-                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
+                  <view
+                        @click.stop="chooseStatus(item)">
                     <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
                       {{ item.status == '驳回' ? '再次提交' : item.status }}
                     </view>
@@ -79,7 +82,6 @@ import customHeader from '@/components/customHeader.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { getYsVisistList, removeVisist, updateStatus } from '../../../../api/crm/activity/activity';
-import {onHide, onShow} from "@dcloudio/uni-app";
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -87,10 +89,6 @@ onMounted(() => {
   navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
-onShow(()=>{
-  getList()
-})
-
 // 查询列表
 let list = ref([]);
 
@@ -147,7 +145,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
       tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+      icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -215,16 +213,7 @@ const getVisitorReportList = (pageNum, pageSize) => {
   });
 }
 
-//页面数据方法
-function getList(){
-  getYsVisistList({pageNum: 1, pageSize: 10}).then(res=>{
-    list.value=res.rows;
-  })
-}
 
-
-let Loop = ref(0)
-let now
 const visistId = ref();
 const cusName = ref();
 const cusId = ref();
@@ -235,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: '请问要删除本条消息吗？',
@@ -264,30 +250,34 @@ function touchstart(item) {
               });
             }
             // 刷新内容
-            downCallback(mescrollRef.value.mescroll);
+            upCallback()
           });
         }
       }
     });
-  }, 750);
 
 }
-
-onHide(()=>{
-  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
-})
-
-function touchend() {
-  let endDate = new Date();
-  console.log('结束时间', endDate)
-  let cha = endDate.getTime() - now.getTime();
-  console.log(cha, 'casd')
-  if (cha < 750) {
+let isLongPressed = ref(false);
+function touchend(item) {
+  visistId.value = item.visistId
+  cusName.value = item.cusName
+  cusId.value = item.cusId
+  status.value = item.status
+  // 如果未触发长按，则执行点击逻辑
+  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

@@ -1,348 +1,226 @@
 <template>
-  <view class="con-body">
-    <view class="con-bg">
-      <!-- 头部 -->
-      <customHeader
-          ref="customHeaderRef"
-          :title="!searchShow?'走访查看':'走访搜索'"
-          :leftFlag="true"
-          :rightFlag="false"
-          @back="handleBack" :searchType="searchShow?1:undefined"
-      ></customHeader>
-      <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访查看'" :leftFlag="true" :rightFlag="false"></customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
-      <!-- 正文内容 -->
-      <view class="all-body">
-        <!-- 搜索处理 -->
-        <customSearch v-if="searchShow" :searchKeywords="searchText" :searchType="searchTypeObj"
-                      :checkTypeObj="notictTypeCheck" :searchTypeList="noticeTypeList" @confirm="handleSearchConfirm">
-        </customSearch>
-        <view class="search" v-else @click="handleSearchFocus">
-          <view class="search-bg">
-            <view class="search-left">{{ notictTypeCheck.name ? notictTypeCheck.name : '全部' }}</view>
-            <view class="search-right">
-              <input class="uni-input" v-model="inputval" placeholder="请输入您想查询的内容"
-                     placeholder-class="search-color"/>
-            </view>
-          </view>
-        </view>
+            <!-- 正文内容 -->
+            <view class="all-body">
+                <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
+                <view class="search">
+                    <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+                        cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+                </view>
 
-        <!-- 分页部分  -->
-        <mescroll-uni ref="mescrollRef" v-if="!searchShow" @init="mescrollInit" @down="downCallback" @up="upCallback"
-                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
-                      class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
-          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
-                @click="showDetail(item)">
-            <view>
-              <view class="report-list">
-                <view class="title">客户：{{ item.cusName }}</view>
-                <view class="r-list">
-                  <view class="r-name">{{ item.visistCode }}</view>
-                  <view>
+                <!-- 分页部分  -->
+                <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                    :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                    class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+                    <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+                        @click="showDetail(item)">
+                        <view>
+                            <view class="report-list">
+                                <view class="title">客户：{{ item.cusName }}</view>
+                                <view class="r-list">
+                                    <view class="r-name">{{ item.visistCode }}</view>
+                                    <view>
 
-                    <view
-                        :class="item.myselfBrowsing == 0 ? 'r-right btn-orange' : 'r-right btn-blue'"
-                        size="mini">
-                      {{ item.myselfBrowsing == 0 ? '未读' : '已读' }}
+                                        <view
+                                            :class="item.myselfBrowsing == 0 ? 'r-right btn-orange' : 'r-right btn-blue'"
+                                            size="mini">
+                                            {{ item.myselfBrowsing == 0 ? '未读' : '已读' }}
+                                        </view>
+                                    </view>
+
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告类型</view>
+                                    <view class="r-right">{{ item.visistType === "业务招待" ? "Ⅱ类活动" : "走访报告" }}</view>
+                                </view>
+                                <view class="r-list" v-if="item.joinUser != null">
+                                    <view class="r-left">我方领导</view>
+                                    <view class="r-right">{{ item.joinUser }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告人</view>
+                                    <view class="r-right">{{ item.staffName }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告日期</view>
+                                    <view class="r-right">{{ item.visistDate }}</view>
+                                </view>
+
+                            </view>
+                        </view>
                     </view>
-                  </view>
-
-                </view>
-                <view class="border-bottom"></view>
-                <view class="r-list">
-                  <view class="r-left">报告类型</view>
-                  <view class="r-right">{{ item.visistType === "业务招待" ? "Ⅱ类活动" : "走访报告" }}</view>
-                </view>
-                <view class="r-list" v-if="item.joinUser != null">
-                  <view class="r-left">我方领导</view>
-                  <view class="r-right">{{ item.joinUser }}</view>
-                </view>
-                <view class="border-bottom"></view>
-                <view class="r-list">
-                  <view class="r-left">报告人</view>
-                  <view class="r-right">{{ item.staffName }}</view>
-                </view>
-                <view class="border-bottom"></view>
-                <view class="r-list">
-                  <view class="r-left">报告日期</view>
-                  <view class="r-right">{{ item.visistDate }}</view>
-                </view>
-
-              </view>
+                </mescroll-uni>
             </view>
-          </view>
-        </mescroll-uni>
-      </view>
+        </view>
     </view>
-  </view>
 </template>
 
 <script setup>
-import {ref, reactive, onMounted, watch} from 'vue'
-import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
-import {getNavBarPaddingTop} from '@/utils/system.js'
-import {getQueryVisistList} from '../../../../api/crm/activity/activity';
-import {onHide, onShow} from "@dcloudio/uni-app";
 import customHeader from '@/components/customHeader.vue'
-import customSearch from '@/components/customSearch.vue'
-// 搜索处理
-let searchShow = ref(false);
-let searchText = ref(undefined);
-let notictTypeCheck = ref({}); //选中类型
-// 新增状态变量存储搜索条件
-const selValue = ref(''); // 搜索类型名称
-const inputval = ref(''); // 搜索内容
-//点击查询方法，搜索当前报告信息
-let searchValue = ref(null)
-let noticeTypeList = ref([{
-  id: 1,
-  name: '客户全称'
-},
-  {
-    id: 2,
-    name: '客户简称'
-  },
-  {
-    id: 3,
-    name: '业务员名称'
-  },
-  {
-    id: 4,
-    name: '活动单号'
-  },
-  {
-    id: 5,
-    name: '活动内容'
-  },
-  {
-    id: 6,
-    name: '模糊搜索'
-  },
-  {
-    id: 7,
-    name: '未读内容'
-  }
-]);
-// 搜索返回操作
-const handleBack=()=>{
-  searchShow.value=false;
-}
-// 获取input 焦点跳转
-const handleSearchFocus = () => {
-  searchShow.value = true;
-}
-let searchTypeObj = ref({
-  typeId: 3,
-  typeName: '消息类型'
-});
-// 搜索完返回处理
-const handleSearchConfirm = (param1, param2) => {
-  notictTypeCheck.value = param1.value;
-  inputval.value = param2.value || '';
-  selValue.value = param1.value.name || '';
-  searchValue.value = param2.value;
-  console.log("selValue" + selValue.value)
-  console.log("inputval" + inputval.value)
-  // 重置mescroll触发刷新
-  if (mescrollRef.value) {
-    mescrollRef.value.resetUpScroll();
-  }
-  searchShow.value = false;
-}
+import { ref, reactive, onMounted } from 'vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { getQueryVisistList } from '../../../../api/crm/activity/activity';
+import {onShow} from "@dcloudio/uni-app";
 
-//监视查询的内容的变化
-// watch(searchValue, (newValue, oldValue) => {
-//   //变化了之后，重新查询内容
-//   var data = {
-//     pageNum: 1,
-//     pageSize: 10,
-//   };
-//   getQueryVisistList(data).then(res => {
-//     if (res.code == 200) {
-//       //设置列表数据
-//       list.value = res.rows;
-//     }
-//   })
-// })
-onHide(()=>{
-  searchShow.value=false;
+onShow(()=>{
+  downCallback(mescrollRef.value.mescroll)
 })
 
-//====================
-
-// onShow(() => {
-//   getList();
-// })
-
 let list = ref([])
 let queryParams = reactive({
-  selValue: ''
+    selValue: ''
 })
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
 onMounted(() => {
-  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
 let cssFlag = ref(false);//控制样式
 let mescrollRef = ref(null);
 
 const mescrollInit = (mescroll) => {
-  cssFlag.value = true;
-  mescrollRef.value = mescroll;
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
 };
 
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
-    setTimeout(async () => {
-      queryParams.pageNum = 1;
-      queryParams.pageSize = upOption.value.page.size;
-      //获取当前页的信息
-      const res = await getViewReportList(1, upOption.value.page.size)
-      cssFlag.value = false;
-      list.value = res.rows;
-    }, 500);
-  } catch (error) {
-    mescroll.endErr();
-  } finally {
-    setTimeout(async () => {
-      mescroll.endSuccess();
-    }, 500);
-  }
+    try {
+        setTimeout(async () => {
+            queryParams.pageNum = 1;
+            queryParams.pageSize = upOption.value.page.size;
+            //获取当前页的信息
+            const res = await getQueryVisistList(queryParams)
+            cssFlag.value = false;
+            list.value = res.rows;
+            mescroll.resetUpScroll();
+        }, 500);
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async () => {
+            mescroll.endSuccess();
+        }, 500);
+    }
 }
 
 
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
-    setTimeout(async () => {
-      const res = await getViewReportList(mescroll.num, mescroll.size, selValue.value,
-          inputval.value);
-      if (mescroll.num === 1) {
-        list.value = res.list;
-      } else {
-        list.value.push(...res.list);
-      }
-      mescroll.endBySize(list.value.length, res.total);
-    }, 500);
-  } catch (error) {
-    mescroll.endErr();
-  }
-}
-
-function getList() {
-  queryParams.pageNum = 1;
-  queryParams.pageSize = upOption.value.page.size;
-  getQueryVisistList(queryParams).then(res => {
-    list.value = res.rows;
-  })
-}
-
-// 获取数据列表
-const getViewReportList = (pageNum, pageSize) => {
-  return new Promise(async (resolve) => {
-    let param = {
-      pageNum,
-      pageSize,
-      // 添加搜索条件参数
-      selValue: selValue.value,
-      inputval: inputval.value
+    try {
+        setTimeout(async () => {
+          queryParams.pageNum = 1;
+          queryParams.pageSize = upOption.value.page.size;
+            const res = await getQueryVisistList(queryParams);
+            if (mescroll.num === 1) {
+                list.value = res.rows;
+            } else {
+                list.value.push(...res.rows);
+            }
+            mescroll.endBySize(res.rows.length, res.total);
+        }, 500);
+    } catch (error) {
+        mescroll.endErr();
     }
-    let res = await getQueryVisistList(param);
-    resolve({
-      list: res.rows,
-      total: res.total
-    });
-  });
 }
 
 const upOption = ref({
-  page: {num: 0, size: 10},
-  noMoreSize: 5,
-  empty: {
-    tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
-  },
-  textLoading: '加载中...',
-  textNoMore: '已经到底了'
+    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: '刷新中...'
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
 });
 
 //点击某一个进入查看明细信息
 function showDetail(item) {
-  uni.navigateTo({
-    url: './visitReportDetail?visistId=' + item.visistId
-  })
+    uni.navigateTo({
+        url: './visitReportDetail?visistId=' + item.visistId
+    })
 }
 
-
-
-// function handleSearch() {
-//   queryParams.inputval = searchValue.value
-//   downCallback(mescrollRef.value.mescroll);
-// }
+//点击查询方法，搜索当前报告信息
+let searchValue = ref()
+function handleSearch() {
+    queryParams.inputval = searchValue.value
+    downCallback(mescrollRef.value.mescroll);
+}
 
 </script>
 
 <style scoped>
 .all-body {
-  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
-  /* #endif */
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
 }
 
 .search {
-  display: flex;
+    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;
+    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;
+    display: none;
 }
 
 .search .custom-search {
-  width: 80%;
+    width: 80%;
 
 }
 
 .search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
+    padding-right: 0 !important;
 }
 
 .scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
 }
 
 .white-bg {
-  padding-bottom: 10rpx;
+    padding-bottom: 10rpx;
 }
 </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

@@ -244,7 +244,7 @@ const inputval = ref(''); // 搜索内容
 		noMoreSize: 5,
 		empty: {
 			tip: '~ 空空如也 ~',
-			icon: "../../static/images/mescroll-empty.png"
+			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">
@@ -237,7 +237,7 @@
 		noMoreSize: 5,
 		empty: {
 			tip: '~ 空空如也 ~',
-			icon: "../../static/images/mescroll-empty.png"			
+			icon: "../../../../static/images/mescroll-empty.png"			
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'
@@ -493,4 +493,8 @@
 	.report-list .title {
 		display: flex;
 	}
+	.btn-blue {
+	  background-color: #3384DF; /* 蓝色背景 */
+	  color: #ffffff;
+	}
 </style>

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

@@ -105,7 +105,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: { 
       tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+      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'
 		})  
 	} 
 	//定义数据接收的值

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/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

@@ -110,7 +110,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: { 
       tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+      icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'

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}"
-                    v-for="(item,index) in allPlans" :key="index"
-                    @click="handleNav(index)"
+        <view class="nav-item" :class="{'active': index == activeTab}"
+              v-for="(item,index) in allPlans" :key="index"
+              @click="handleNav(index)"
         >{{ getTapLabel(item) }}
         </view>
       </view>
-
-      <block v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="item">
-        <!-- 计划详情 -->
-        <view class="white-bg white-bg-2" :class="index == 0 ? 'white-bg-r' : ''">
-          <view class="report-list">
-            <view class="w-b-title">
-              <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
-              <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
-            </view>
-            <view class="r-list">
-              <view class="r-left">工作类型</view>
-              <view class="r-right">{{ getWorkType(index) || '' }}</view>
-            </view>
-            <view class="border-bottom b-width"></view>
-            <view class="r-list">
-              <view class="r-left">内容</view>
-              <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
+      <uni-transition :duration="300"
+                      :mode-class="['fade','slide-bottom']"
+                      :styles="{'width':'100%', 'background-color':'#f0f0f0','border-top-left-radius': '8px', 'border-top-right-radius': '8px'}"
+                      :show="showTrans">
+        <view v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="index">
+          <!-- 计划详情 -->
+          <view class="white-bg white-bg-2" :class="{'white-bg-r':index === 0}">
+            <view class="report-list">
+              <view class="w-b-title">
+                <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
+                <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
+              </view>
+              <view class="r-list">
+                <view class="r-left">工作类型</view>
+                <view class="r-right">{{ getWorkType(index) || '' }}</view>
+              </view>
+              <view class="border-bottom b-width"></view>
+              <view class="r-list">
+                <view class="r-left">内容</view>
+                <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
+              </view>
             </view>
           </view>
+          <view class='bottom-spliter'></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 {useMessage} from "@/utils/message";
+import {getWeeklyPlanList} from "@/api/crm/plan/getPlan";
 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 => {
-    userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
-    console.warn(err, "用户信息获取失败")
-  });
+  // getUserInfo().then(res => {
+  //   userInfo.value = res.user;
+  //   console.log(route.path, "：用户信息获取成功");
+  // }).catch(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, "用户周计划列表获取失败");
-    message.error("周计划获取失败");
+    console.log(err, "周计划列表获取失败")
   }).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({
-          icon: 'error',
-          title: '已有本周或下周计划',
-          duration: 2000
-        })
+        // uni.showToast({
+        //   icon: 'error',
+        //   title: '已有本周或下周计划',
+        //   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;*/
-/*  width: 690rpx;*/
-  overflow-x: auto;   /* 允许横向滚动 */
+  /*  display: flex;*/
+  /*  width: 690rpx;*/
+  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;
-  // 获取用户信息
-  getUserInfo().then(res => {
-    userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
-    console.warn(err, "用户信息获取失败")
-  });
-  console.log(route.path,`：创建${itemList[selectIndex]}计划`);
-  title.value="创建周计划";
+  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){ // 请求修改
-      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err=>{
+    if (!isAdd.value) { // 请求修改
+      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{ // 请求新增
-      console.log(weekPlanFormData.value,"新增计划");
-      let res = await addPlan(weekPlanFormData.value).catch(err=>{
+    } else { // 请求新增
+      console.log(weekPlanFormData.value, "新增计划");
+      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',
-      title:"请完善内容",
+      icon: 'none',
+      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"-->
-<!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
-<!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
-          <view class="white-bg" v-if="list.length">
-            <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
-            <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
-              {{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
-              <span class="line"></span>
-              {{searchValue.selectDate.substring(0, 4) }}年
-            </view>
+        <!--        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
+        <!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
+        <!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
+        <view class="white-bg" v-if="list.length">
+          <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
+          <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(5, 7) }}月
+            <span class="line"></span>
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(0, 4) }}年
+          </view>
+          <uni-row class="demo-uni-row">
+            <uni-col :span="1">
+              <view class="demo-uni-col right-radius"></view>
+            </uni-col>
+            <uni-col :span="2">
+              <view class="demo-uni-col left-radius">姓名</view>
+            </uni-col>
+            <!--日期 星期-->
+            <block v-for="(field, i) in OrdinalDate">
+              <uni-col :span="3">
+                <view class="demo-uni-col mar-left" >
+                  <text>{{ WeekShortCN[i] }}</text>
+                  <text v-if="list[0][field]" 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">
-                    <text>{{ WeekShortCN[i] }}</text>
-                    <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
+                  <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="font-weight: 300; color: gray">暂无</text>
                   </view>
                 </uni-col>
               </block>
             </uni-row>
-            <block v-for="(item, index) in list" :key="index">
-              <uni-row class="demo-uni-row">
-                <uni-col :span="1">
-                  <view class="demo-uni-col right-radius">
-                    <text>{{ index + 1 }}</text>
-                  </view>
-                </uni-col>
-                <uni-col :span="2">
-                  <view class="demo-uni-col left-radius">
-                    <text>{{ item.nickName || item.userName }}</text>
-                  </view>
-                </uni-col>
-                <block v-for="(field, i) in WorkType">
-                  <uni-col :span="3">
-                    <view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
-                          :style="{ backgroundColor: COLOR_MAP[item[field]] }"
-                    ><!--@click="handleView(index, i)"-->
-                      <text v-if="item[field]">{{ item[field] }}</text>
-                      <text v-else style="color: gray">暂无</text>
-                    </view>
-                  </uni-col>
-                </block>
-              </uni-row>
-            </block>
-          </view>
-          <view v-else style="text-align: center; margin-top: 50%; color: white">
-            暂无数据
-          </view>
-<!--        </mescroll-uni>-->
+          </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";
-
-// const currentYear = new Date().getFullYear();
-const currentMonth = new Date().getMonth() + 1;
-const currentWeekNum = getCurrentWeekNum();
+import {onPullDownRefresh} from "@dcloudio/uni-app";
 
 // 获取导航栏高度用于内容区域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,39 +155,38 @@ let searchValue = ref({
 
 // 查询列表
 let list = ref([]);
-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 mescrollRef = ref(null);
+onPullDownRefresh(() => {
+  uni.showLoading();
+  getPlanList().then(res => {
+    const {rows} = res;
+    list.value = rows;
+    console.log(rows,'刷新周计划成功');
+  }).finally(()=>{
+    uni.stopPullDownRefresh();
+    uni.hideLoading();
+  })
 });
 
-const downOption = ref({
-  auto: true,
-  textInOffset: '下拉刷新',
-  textOutOffset: '释放更新',
-  textLoading: '刷新中...'
+// 查询当前周一周日期
+// const currentYear = new Date().getFullYear();
+const currentWeekNum = getCurrentWeekNum();
+const aweek = getWeek2('本周');
+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 queryParams = {
-      month: month ? month : currentMonth,
-      date: date ? date : currentWeekNum,
-      pageNum: pageIndex ? pageIndex : 1,
-      pageSize: pageSize ? pageSize : 10
-    }
-
-    let {rows, total} = await getAllWeekPlanList(queryParams);
+    let {rows, total} = await getAllWeekPlanList(queryParams.value);
     resolve({
       rows,
       total
@@ -191,20 +205,17 @@ let bindDateChange = (e) => {
 let handleSearch = () => {
   console.log(searchValue.value, '查询参数')
   uni.showLoading();
-  getWeekPlanListByDate(searchValue.value).then(res=>{
-    const {total, rows } = res;
+  getWeekPlanListByDate(searchValue.value).then(res => {
+    const {total, rows} = res;
     list.value = rows;
     console.log(rows, '查询成功');
-  }).catch(err=>{
-    console.warn(err,'数据获取失败');
-  }).finally(()=>{
+  }).catch(err => {
+    console.warn(err, '数据获取失败');
+  }).finally(() => {
     uni.hideLoading();
   })
 }
-const mescrollInit = (mescroll) => {
-  cssFlag.value = true;
-  mescrollRef.value = mescroll;
-};
+
 // 搜索区域变更
 const bindPickerChange = (e) => {
   // console.log('picker发送选择改变，携带值为', peopleIndex.value)
@@ -213,32 +224,43 @@ const bindPickerChange = (e) => {
   // 查询
   handleSearch();
 }
-
-// 跳转到详情
-let handleDetail = (rowIndex, colIndex) => {
+// 模态窗可见性
+const modalVisible = ref(false);
+// 模态框的配置内容
+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){
-    uni.showModal({
-      title: `${workDate}\n${workType}`,
-      content: `${workEvent}`,
-      confirmText: '关闭',
-      showCancel: false,
-      maskClosable: true, // 允许点击蒙层关闭弹窗
-      success: function (res) {
-        if (res.confirm) {
+  if (workType && workEvent) {
+    showCloseableModal({
+      title: `${workType}`,
+      content: `姓名：${detail.userName}\n时间：${workDate}\n内容：${workEvent}`
+    });
+    // uni.showModal({
+    //   title: `${workDate}\n${workType}`,
+    //   content: `${workEvent}`,
+    //   confirmText: '关闭',
+    //   showCancel: false,
+    //   maskClosable: true, // 允许点击蒙层关闭弹窗
+    //   success: console.log
+    // })
 
-        } else if (res.cancel) {
-
-        }
-      }
-    })
-  }
-  else{
+  } else {
     uni.showToast({
-      title: "暂无内容",
+      title: "无计划内容",
       icon: "none",
       duration: 1500
     })
@@ -332,8 +354,9 @@ let handleDetail = (rowIndex, colIndex) => {
 
 .demo-uni-col {
   height: 36px;
-  border-radius: 4px;
-  background-color: #E7E7E7;
+  border-radius: 4rpx;
+  /*background-color: #E7E7E7;*/
+  background-color: #e7e7e782;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -370,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/scheduler/index.vue

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

src/pages/business/CRM/scheduler/taskListViewing.vue

@@ -0,0 +1,412 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="!searchShow ? '任务清单查看' : '搜索'"
+				:leftFlag="true" :rightFlag="true" @back="handleBack"
+				:searchType="searchShow ? 1 : undefined">
+				<!--    <template #right  v-if="!searchShow">
+			        <view class="head-right" @click="handleRead">
+			            <img :src="'static/images/icon-clean@2x.png'" />清除未读
+			        </view>
+			    </template> -->
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 搜索处理 -->
+			<customSearch v-if="searchShow" :searchKeywords="searchText" :searchType="searchTypeObj"
+				:checkTypeObj="notictTypeCheck" @confirm="handleSearchConfirm">
+			</customSearch>
+			<view class="search" v-else @click="handleSearchFocus">
+				<view class="search-bg">
+					<view class="search-left">
+						{{ notictTypeCheck.name ? notictTypeCheck.name : '全部' }}
+					</view>
+					<view class="search-right">
+						<input class="uni-input" v-model="inputval" placeholder="请输入您想查询的内容"
+							placeholder-class="search-color" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 正文内容 -->
+			<!-- 分页部分  -->
+			<mescroll-uni v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
+				@down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
+				:fixed="false" textColor="#ffffff" bgColor="#ffffff" class="scroll-h"
+				:class="{ 'loading-scroll': cssFlag }">
+				<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+					@click="showDetail(item)">
+					<view>
+						<view class="report-list">
+							<view class="title" style="font-size: 30rpx">
+								任务名称：{{ item.taskName }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								主线任务类型：{{ item.mainTaskName }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								计划开始时间：{{ formatDateStr(item.mainTaskStartTime) }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								计划结束时间：{{ formatDateStr(item.mainTaskEndTime) }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								是否超期：{{ item.mainTaskIsOverdue }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</mescroll-uni>
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		watch
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import customSearch from '@/components/customSearch.vue'
+	import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+	import {
+		getNavBarPaddingTop
+	} from '@/utils/system.js'
+
+	import {
+		SalesManTaskList
+	} from '@/api/crm/api_ys.js'
+	import {
+		getDate
+	} from '@/utils/datetime.js'
+
+
+	import {
+		onLoad,
+		onShow,
+		onUnload,
+		onHide
+	} from '@dcloudio/uni-app'
+	// 获取导航栏高度用于内容区域padding
+	const navBarPaddingTop = ref(0);
+	onMounted(() => {
+		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+		uni.$on('updateStatus', markVisited)
+	})
+	// 搜索处理
+	let searchShow = ref(false);
+	let searchText = ref(undefined);
+	let searchTypeObj = ref({
+		typeId: 3,
+		typeName: '消息类型'
+	});
+
+	let notictTypeCheck = ref({}); //选中类型
+
+	// 查询列表
+	let list = ref([]);
+	// 新增状态变量存储搜索条件
+	const inputval = ref(''); // 搜索内容
+	let searchValue = ref(null)
+	//监视查询的内容的变化
+	watch(searchValue, (newValue, oldValue) => {
+		//变化了之后，重新查询内容
+		var data = {
+			pageNum: 1,
+			pageSize: 10,
+		};
+		SalesManTaskList(data).then(res => {
+			if (res.code == 200) {
+				//设置列表数据
+				list.value = res.rows;
+			}
+		})
+	})
+	onHide(() => {
+		searchShow.value = false;
+	})
+
+	// 搜索返回操作
+	const handleBack = () => {
+		searchShow.value = false;
+	}
+	// 获取input 焦点跳转
+	const handleSearchFocus = () => {
+		searchShow.value = true;
+	}
+
+	const formatDateStr = (times) => {
+		const date = new Date(times);
+			
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let day = date.getDate();
+			
+		month = month > 9 ? month : '0' + month;;
+		day = day > 9 ? day : '0' + day;
+			
+		return `${year}-${month}-${day}`;
+	}
+	
+	// 搜索完返回处理
+	const handleSearchConfirm = (param1, param2) => {
+		// console.log(param1,param2)
+		notictTypeCheck.value = param1.value;
+		inputval.value = param2.value || '';
+		searchValue.value = param2.value;
+		// 重置mescroll触发刷新
+		if (mescrollRef.value) {
+			mescrollRef.value.resetUpScroll();
+		}
+		searchShow.value = false;
+	}
+
+	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 getSalesManTaskList(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 getSalesManTaskList(mescroll.num, mescroll.size,
+					inputval.value);
+				if (mescroll.num === 1) {
+					list.value = res.list;
+				} else {
+					list.value.push(...res.list);
+				}
+				mescroll.endBySize(res.list.length, res.total);
+			}, 500);
+		} catch (error) {
+			mescroll.endErr();
+		}
+	}
+
+	// 获取数据列表
+	const getSalesManTaskList = (pageNum, pageSize) => {
+		return new Promise(async (resolve) => {
+			let param = {
+				pageNum,
+				pageSize,
+				// 添加搜索条件参数
+				taskName: inputval.value
+			}
+			let res = await SalesManTaskList(param);
+			resolve({
+				list: res.rows,
+				total: res.total
+			});
+		});
+	}
+
+	function showDetail(item) {
+		uni.navigateTo({
+			url: "/pages/business/CRM/scheduler/taskViewingDetail?data=" + encodeURIComponent(
+				JSON
+				.stringify(item))
+		})
+	}
+
+	onUnload(() => {
+		uni.$off('updateStatus')
+	})
+
+	const markVisited = (informationId) => {
+		const newList = [...list.value].map(item => {
+			if (item.informationId == informationId) {
+				return {
+					...item,
+					myselfBrowsing: 1
+				};
+			}
+			return item;
+		});
+		list.value = newList;
+
+	};
+</script>
+
+<style scoped>
+	.all-body {
+		/* #ifdef APP-PLUS */
+		top: 150rpx;
+		height: calc(100vh - 75px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		top: 120rpx;
+		height: calc(100vh);
+		/* #endif */
+	}
+
+	.search {
+		display: flex;
+	}
+
+	.search .btn-search {
+		border: none;
+		background: none;
+		line-height: normal;
+		color: #fff;
+		line-height: 56rpx !important;
+		padding: 10rpx 0 0;
+		text-align: left;
+		cursor: pointer;
+	}
+
+	.search .btn-search::after {
+		display: none;
+	}
+
+	.search .custom-search {
+		width: 80%;
+
+	}
+
+	.search .custom-search.uni-searchbar {
+		padding-right: 0 !important;
+	}
+
+	.scroll-h {
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 120px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		height: calc(100vh - 110px);
+		/* #endif */
+	}
+
+	.white-bg {
+		padding-bottom: 10rpx;
+	}
+
+	.search_center {
+		display: flex;
+		align-items: center;
+		border: none;
+		flex: 1;
+		height: 70rpx;
+		margin-left: 20rpx;
+		padding-left: 20rpx;
+		border-radius: 32.5rpx;
+		background-color: #f5f5f5;
+
+		.search_icon {
+			width: 30rpx;
+			height: 30rpx;
+			margin-right: 22rpx;
+		}
+
+		.category {
+			display: flex;
+			align-items: center;
+			margin-right: 16rpx;
+			padding-right: 16rpx;
+			border-right: 2rpx solid #D4D4D4;
+			position: relative;
+
+			text {
+				font-size: 13px;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+			}
+
+			image {
+				margin-top: 4rpx;
+				width: 20rpx;
+				height: 11rpx;
+
+			}
+
+			.pop {
+				position: absolute;
+				top: 50rpx;
+				background: #FFFFFF;
+				box-shadow: 0px 0px 40rpx 0px rgba(59, 59, 59, 0.2);
+				border-radius: 12rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				padding: 20rpx;
+				z-index: 100;
+				max-height: 566rpx;
+				overflow-y: auto;
+
+				text {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					white-space: nowrap;
+					margin: 10rpx 0;
+					line-height: 56rpx;
+				}
+			}
+
+			.pop_arrow {
+				position: absolute;
+				top: 48rpx;
+				z-index: 999;
+
+				&::after {
+					position: absolute;
+					content: "";
+					left: 68rpx;
+					top: -26rpx;
+					border: 14rpx solid #fff;
+					border-color: transparent transparent #fff transparent;
+				}
+			}
+		}
+	}
+</style>

src/pages/business/CRM/scheduler/taskPlanAdded.vue

@@ -0,0 +1,363 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'任务计划新增'" :leftFlag="true"
+				:rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="主线任务" name="taskName" class="f-c-right">
+							<view class="form-item-container">
+								<text class="name">{{ formData.taskName}}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="计划内容" name="planContent" class="f-c-right">
+							<picker @change="onPlanContentChange" :value="planContentIndex"
+								:range="array" :range-key="'name'">
+								<view class="picker">
+									{{ array[planContentIndex]?.name || '请选择计划内容' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="计划开始时间" name="plannedStartTime" class="f-c-right">
+							<picker mode="date" :value="formData.plannedStartTime"
+								@change="onStartTimeChange">
+								<view class="picker">
+									{{ formData.plannedStartTime || '请选择计划开始时间' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="计划完成时间" name="plannedCompTime" class="f-c-right">
+							<picker mode="date" :value="formData.plannedCompTime"
+								@change="onCompTimeChange">
+								<view class="picker">
+									{{ formData.plannedCompTime || '请选择计划完成时间' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="次数" name="num">
+							<uni-number-box v-model="formData.num"
+								style="float: right;margin-right: 10rpx;margin-top: 15rpx;"></uni-number-box>
+						</uni-forms-item>
+						<uni-forms-item label="频率" name="frequency" class="f-c-right">
+							<picker @change="onFrequencyChange" :value="frequencyIndex"
+								:range="arrayFrequency" :range-key="'name'">
+								<view class="picker">
+									{{ arrayFrequency[frequencyIndex]?.name || '请选择频率' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="内容描述" name="description"
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.description"
+								placeholder="请输入内容描述" class="form-texarea" />
+						</uni-forms-item>
+
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+
+	import customHeader from '@/components/customHeader.vue'
+
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		taskPlanAdd
+	} from '@/api/crm/api_ys.js'
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		taskName: null,
+		planContent: "", // 机会类型
+		plannedStartTime: "", // 计划开始时间
+		plannedCompTime: "", // 计划完成时间
+		description: "", // 内容描述
+		num: "", // 次数
+	})
+
+	onLoad((options) => {
+		if (options.data) {
+			let mainData = JSON.parse(decodeURIComponent(options.data))
+			formData.value.taskName = mainData.mainTaskName
+			formData.value.taskId = mainData.taskId
+		}
+	})
+
+	// 表单验证规则
+	const rules = {
+		planContent: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择计划内容'
+			}]
+		},
+		plannedStartTime: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择计划开始时间'
+			}]
+		},
+		plannedCompTime: {
+			rules: [{
+					required: true,
+					errorMessage: '请选择计划完成时间aaa'
+				},
+				{
+					validateFunction: function(rule, value, data, callback) {
+						if (value && data.plannedStartTime) {
+							if (new Date(value) < new Date(data.plannedStartTime)) {
+								callback('计划完成时间不能早于计划开始时间')
+								return
+							}
+						}
+
+						callback()
+					}
+				}
+			]
+		},
+		description: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入内容描述'
+			}]
+		},
+	}
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '日常走访'
+		},
+		{
+			id: 1,
+			name: '业务招待'
+		},
+		{
+			id: 2,
+			name: '技术交流'
+		},
+		{
+			id: 3,
+			name: '来厂参观'
+		},
+		{
+			id: 4,
+			name: '党建活动'
+		},
+		{
+			id: 5,
+			name: '文体活动'
+		},
+		{
+			id: 6,
+			name: '联谊活动'
+		},
+		{
+			id: 7,
+			name: '礼尚往来'
+		},
+		{
+			id: 8,
+			name: '高层交流'
+		},
+		{
+			id: 9,
+			name: '组合拳服务活动'
+		}
+	])
+
+	const arrayFrequency = ref([{
+			id: 0,
+			name: '',
+			value: 0
+		},
+		{
+			id: 1,
+			name: '3天1次',
+			value: 3
+		},
+		{
+			id: 2,
+			name: '7天1次',
+			value: 7
+		},
+		{
+			id: 3,
+			name: '15天1次',
+			value: 15
+		},
+		{
+			id: 4,
+			name: '30天1次',
+			value: 30
+		}
+	])
+
+	const planContentIndex = ref(0)
+	const frequencyIndex = ref(0)
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+
+	//监听时间
+	onMounted(() => {
+		// 设置机会类型的默认值
+		formData.value.planContent = array.value[0].name;
+		planContentIndex.value = 0;
+		frequencyIndex.value = 0;
+	})
+
+
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			formData.value.planType = "0"
+			// 表单校验
+			await formRef.value.validate()
+			const res = await taskPlanAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketList');
+			setTimeout(() => {
+				uni.navigateBack(1);
+			}, 1500);
+
+			console.log('表单数据:', formData.value)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onPlanContentChange = (e) => {
+		planContentIndex.value = e.detail.value
+		formData.value.planContent = array.value[e.detail.value]?.name || ''
+	}
+
+	const onFrequencyChange = (e) => {
+		frequencyIndex.value = e.detail.value
+		formData.value.frequency = arrayFrequency.value[e.detail.value]?.value || null
+	}
+
+
+	// 计划开始时间变化事件
+	const onStartTimeChange = (e) => {
+		const value = e.detail.value
+		formData.value.plannedStartTime = value
+		// 如果已选择完成时间，重新校验完成时间
+		
+		// Vue3 中需要手动触发验证更新
+		if (formRef.value) {
+			// 方法1：使用 setValue
+			formRef.value.setValue('plannedStartTime', value)
+		
+			if (formData.value.plannedCompTime) {
+				formRef.value.validateField('plannedCompTime')
+			}
+		}
+		
+		
+	}
+
+	// 计划完成时间变化事件
+	const onCompTimeChange = (e) => {
+		const value = e.detail.value
+		formData.value.plannedCompTime = value
+
+		// Vue3 中需要手动触发验证更新
+		if (formRef.value) {
+			// 方法1：使用 setValue
+			formRef.value.setValue('plannedCompTime', value)
+
+			// 校验完成时间
+			formRef.value.validateField('plannedCompTime')
+		}
+	}
+
+
+	// 如果你原来在 onShow 中做了类似这样：
+	// let res = currPage.data.cusData; 判断是否传入了客户信息
+	// 那么在 Vue3 中通常是通过路由参数或者 Vuex/Pinia 等状态管理获取
+	// 暂时不做，如你后续需要可继续补充
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		min-height: calc(100vh - 100px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		min-height: calc(100vh - 80px);
+		/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>

src/pages/business/CRM/scheduler/taskPlanList.vue

@@ -0,0 +1,413 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="!searchShow ? '任务计划查看' : '搜索'"
+				:leftFlag="true" :rightFlag="true" @back="handleBack"
+				:searchType="searchShow ? 1 : undefined">
+				<!--    <template #right  v-if="!searchShow">
+			        <view class="head-right" @click="handleRead">
+			            <img :src="'static/images/icon-clean@2x.png'" />清除未读
+			        </view>
+			    </template> -->
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 搜索处理 -->
+			<customSearch v-if="searchShow" :searchKeywords="searchText" :searchType="searchTypeObj"
+				:checkTypeObj="notictTypeCheck" @confirm="handleSearchConfirm">
+			</customSearch>
+			<view class="search" v-else @click="handleSearchFocus">
+				<view class="search-bg">
+					<view class="search-left">
+						{{ notictTypeCheck.name ? notictTypeCheck.name : '全部' }}
+					</view>
+					<view class="search-right">
+						<input class="uni-input" v-model="inputval" placeholder="请输入您想查询的内容"
+							placeholder-class="search-color" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 正文内容 -->
+			<!-- 分页部分  -->
+			<mescroll-uni v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
+				@down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
+				:fixed="false" textColor="#ffffff" bgColor="#ffffff" class="scroll-h"
+				:class="{ 'loading-scroll': cssFlag }">
+				<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+					@click="showDetail(item)">
+					<view>
+						<view class="report-list">
+							<view class="title" style="font-size: 30rpx">
+								主线任务：{{ item.taskName }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								计划内容：{{ item.planContent }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								计划开始时间：{{ item.plannedStartTime }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								计划结束时间：{{ item.plannedCompTime }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								次数：{{ item.num }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								频率提醒：{{ item.reminderCount }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								完成状态：{{ item.completionCount }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								是否超时：{{ item.planStatus }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								审批状态：
+								<label v-if="item.approvalStatus == '0'" style="color: #cf0000;">{{ item.approvalStatus }}</label>
+								<label v-else-if="item.approvalStatus == '1'" style="color: #00cf00;">{{ item.approvalStatus }}</label>
+								<label v-else style="color: #60a0ff;">{{ item.approvalStatus }}</label>
+							</view>
+						</view>
+					</view>
+				</view>
+			</mescroll-uni>
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		watch
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import customSearch from '@/components/customSearch.vue'
+	import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+	import {
+		getNavBarPaddingTop
+	} from '@/utils/system.js'
+
+	import {
+		TaskPlanList
+	} from '@/api/crm/api_ys.js'
+
+	import {
+		onLoad,
+		onShow,
+		onUnload,
+		onHide
+	} from '@dcloudio/uni-app'
+	// 获取导航栏高度用于内容区域padding
+	const navBarPaddingTop = ref(0);
+	onMounted(() => {
+		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+		uni.$on('updateStatus', markVisited)
+	})
+	// 搜索处理
+	let searchShow = ref(false);
+	let searchText = ref(undefined);
+	let searchTypeObj = ref({
+		typeId: 3,
+		typeName: '消息类型'
+	});
+
+	let notictTypeCheck = ref({}); //选中类型
+
+	// 查询列表
+	let list = ref([]);
+	// 新增状态变量存储搜索条件
+	const inputval = ref(''); // 搜索内容
+	let searchValue = ref(null)
+	//监视查询的内容的变化
+	watch(searchValue, (newValue, oldValue) => {
+		//变化了之后，重新查询内容
+		var data = {
+			pageNum: 1,
+			pageSize: 10,
+		};
+		TaskPlanList(data).then(res => {
+			if (res.code == 200) {
+				//设置列表数据
+				list.value = res.rows;
+			}
+		})
+	})
+	onHide(() => {
+		searchShow.value = false;
+	})
+
+	// 搜索返回操作
+	const handleBack = () => {
+		searchShow.value = false;
+	}
+	// 获取input 焦点跳转
+	const handleSearchFocus = () => {
+		searchShow.value = true;
+	}
+	// 搜索完返回处理
+	const handleSearchConfirm = (param1, param2) => {
+		// console.log(param1,param2)
+		notictTypeCheck.value = param1.value;
+		inputval.value = param2.value || '';
+		searchValue.value = param2.value;
+		// 重置mescroll触发刷新
+		if (mescrollRef.value) {
+			mescrollRef.value.resetUpScroll();
+		}
+		searchShow.value = false;
+	}
+
+	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 getTaskPlanList(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 getTaskPlanList(mescroll.num, mescroll.size,
+					inputval.value);
+				if (mescroll.num === 1) {
+					list.value = res.list;
+				} else {
+					list.value.push(...res.list);
+				}
+				mescroll.endBySize(res.list.length, res.total);
+			}, 500);
+		} catch (error) {
+			mescroll.endErr();
+		}
+	}
+
+	// 获取数据列表
+	const getTaskPlanList = (pageNum, pageSize) => {
+		return new Promise(async (resolve) => {
+			let param = {
+				pageNum,
+				pageSize,
+				// 添加搜索条件参数
+				searchInput: inputval.value
+			}
+			let res = await TaskPlanList(param);
+			resolve({
+				list: res.rows,
+				total: res.total
+			});
+		});
+	}
+
+	function showDetail(item) {
+		uni.navigateTo({
+			url: "/pages/business/CRM/scheduler/taskViewingDetail?data=" + encodeURIComponent(
+				JSON
+				.stringify(item))
+		})
+	}
+
+	onUnload(() => {
+		uni.$off('updateStatus')
+	})
+
+	const markVisited = (informationId) => {
+		const newList = [...list.value].map(item => {
+			if (item.informationId == informationId) {
+				return {
+					...item,
+					myselfBrowsing: 1
+				};
+			}
+			return item;
+		});
+		list.value = newList;
+
+	};
+</script>
+
+<style scoped>
+	.all-body {
+		/* #ifdef APP-PLUS */
+		top: 150rpx;
+		height: calc(100vh - 75px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		top: 120rpx;
+		height: calc(100vh);
+		/* #endif */
+	}
+
+	.search {
+		display: flex;
+	}
+
+	.search .btn-search {
+		border: none;
+		background: none;
+		line-height: normal;
+		color: #fff;
+		line-height: 56rpx !important;
+		padding: 10rpx 0 0;
+		text-align: left;
+		cursor: pointer;
+	}
+
+	.search .btn-search::after {
+		display: none;
+	}
+
+	.search .custom-search {
+		width: 80%;
+
+	}
+
+	.search .custom-search.uni-searchbar {
+		padding-right: 0 !important;
+	}
+
+	.scroll-h {
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 120px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		height: calc(100vh - 110px);
+		/* #endif */
+	}
+
+	.white-bg {
+		padding-bottom: 10rpx;
+	}
+
+	.search_center {
+		display: flex;
+		align-items: center;
+		border: none;
+		flex: 1;
+		height: 70rpx;
+		margin-left: 20rpx;
+		padding-left: 20rpx;
+		border-radius: 32.5rpx;
+		background-color: #f5f5f5;
+
+		.search_icon {
+			width: 30rpx;
+			height: 30rpx;
+			margin-right: 22rpx;
+		}
+
+		.category {
+			display: flex;
+			align-items: center;
+			margin-right: 16rpx;
+			padding-right: 16rpx;
+			border-right: 2rpx solid #D4D4D4;
+			position: relative;
+
+			text {
+				font-size: 13px;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+			}
+
+			image {
+				margin-top: 4rpx;
+				width: 20rpx;
+				height: 11rpx;
+
+			}
+
+			.pop {
+				position: absolute;
+				top: 50rpx;
+				background: #FFFFFF;
+				box-shadow: 0px 0px 40rpx 0px rgba(59, 59, 59, 0.2);
+				border-radius: 12rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				padding: 20rpx;
+				z-index: 100;
+				max-height: 566rpx;
+				overflow-y: auto;
+
+				text {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					white-space: nowrap;
+					margin: 10rpx 0;
+					line-height: 56rpx;
+				}
+			}
+
+			.pop_arrow {
+				position: absolute;
+				top: 48rpx;
+				z-index: 999;
+
+				&::after {
+					position: absolute;
+					content: "";
+					left: 68rpx;
+					top: -26rpx;
+					border: 14rpx solid #fff;
+					border-color: transparent transparent #fff transparent;
+				}
+			}
+		}
+	}
+</style>

src/pages/business/CRM/scheduler/taskPlanReview.vue

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

src/pages/business/CRM/scheduler/taskViewingDetail.vue

@@ -0,0 +1,393 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="!searchShow ? '主线任务列表' : '搜索'"
+				:leftFlag="true" :rightFlag="true" @back="handleBack"
+				:searchType="searchShow ? 1 : undefined">
+				<!--    <template #right  v-if="!searchShow">
+			        <view class="head-right" @click="handleRead">
+			            <img :src="'static/images/icon-clean@2x.png'" />清除未读
+			        </view>
+			    </template> -->
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<!-- 分页部分  -->
+			<mescroll-uni v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
+				@down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
+				:fixed="false" textColor="#ffffff" bgColor="#ffffff" class="scroll-h"
+				:class="{ 'loading-scroll': cssFlag }">
+				<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index">
+					<view>
+						<view class="report-list">
+							<view class="title" style="font-size: 30rpx">
+								主线任务内容：{{ item.mainTaskName }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+
+							</view>
+
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								计划开始时间：{{ formatDateStr(item.mainTaskStartTime) }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								计划结束时间：{{ formatDateStr(item.mainTaskEndTime) }}
+							</view>
+							<view style="display: flex;align-items: center;">
+								<view class="r-left"
+									style="width:80%;font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+									完成状态：{{ item.mainTaskStatus }}
+								</view>
+								<view>
+									<uni-icons type="plus-filled" size="30" color="#38A6FF"
+										@click="showDetail(item)"></uni-icons>
+								</view>
+							</view>
+
+							<view class="right"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								完成状态：{{ item.mainTaskStatus }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								是否超期：{{ item.mainTaskIsOverdue }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								绩效分：{{ item.mainTaskScore_JX }}
+							</view>
+							<view class="r-left"
+								style="font-size: 25rpx;font-weight: 500;margin-top: 10rpx;">
+								能力分：{{ item.mainTaskScore_NL }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</mescroll-uni>
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		watch
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import customSearch from '@/components/customSearch.vue'
+	import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+	import {
+		getNavBarPaddingTop
+	} from '@/utils/system.js'
+
+	import {
+		SalesManTaskDetailList
+	} from '@/api/crm/api_ys.js'
+
+	import {
+		onLoad,
+		onShow,
+		onUnload,
+		onHide
+	} from '@dcloudio/uni-app'
+	// 获取导航栏高度用于内容区域padding
+	const navBarPaddingTop = ref(0);
+	let mainTaskId = ref("");
+	onMounted(() => {
+		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+		uni.$on('updateStatus', markVisited)
+	})
+
+let mainData = ref();
+	onLoad((options) => {
+		if (options.data) {
+			mainData = JSON.parse(decodeURIComponent(options.data))
+			mainTaskId.value = mainData.mainTaskId
+		}
+	})
+
+	// 搜索处理
+	let searchShow = ref(false);
+
+	// 查询列表
+	let list = ref([]);
+	// 新增状态变量存储搜索条件
+	const inputval = ref(''); // 搜索内容
+
+	onHide(() => {
+		searchShow.value = false;
+	})
+
+	// 搜索返回操作
+	const handleBack = () => {
+		searchShow.value = false;
+	}
+	// 获取input 焦点跳转
+	const handleSearchFocus = () => {
+		searchShow.value = true;
+	}
+
+	const formatDateStr = (times) => {
+		const date = new Date(times);
+
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let day = date.getDate();
+
+		month = month > 9 ? month : '0' + month;;
+		day = day > 9 ? day : '0' + day;
+
+		return `${year}-${month}-${day}`;
+	}
+
+	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 getSalesManTaskDetailList(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 getSalesManTaskDetailList(mescroll.num, mescroll
+					.size,
+					inputval.value);
+				if (mescroll.num === 1) {
+					list.value = res.list;
+				} else {
+					list.value.push(...res.list);
+				}
+				mescroll.endBySize(res.list.length, res.total);
+			}, 500);
+		} catch (error) {
+			mescroll.endErr();
+		}
+	}
+
+	// 获取数据列表
+	const getSalesManTaskDetailList = (pageNum, pageSize) => {
+		return new Promise(async (resolve) => {
+			let param = {
+				pageNum,
+				pageSize,
+				// 添加搜索条件参数
+				mainTaskId: mainTaskId.value
+			}
+			let res = await SalesManTaskDetailList(param);
+			resolve({
+				list: res.rows,
+				total: res.total
+			});
+		});
+	}
+
+	function showDetail(item) {
+		uni.navigateTo({
+			url: "/pages/business/CRM/scheduler/taskPlanAdded?data=" + encodeURIComponent(
+				JSON
+				.stringify(item))
+		})
+	}
+
+	onUnload(() => {
+		uni.$off('updateStatus')
+	})
+
+	const markVisited = (informationId) => {
+		const newList = [...list.value].map(item => {
+			if (item.informationId == informationId) {
+				return {
+					...item,
+					myselfBrowsing: 1
+				};
+			}
+			return item;
+		});
+		list.value = newList;
+
+	};
+</script>
+
+<style scoped>
+	.all-body {
+		/* #ifdef APP-PLUS */
+		top: 150rpx;
+		height: calc(100vh - 75px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		top: 120rpx;
+		height: calc(100vh);
+		/* #endif */
+	}
+
+	.search {
+		display: flex;
+	}
+
+	.search .btn-search {
+		border: none;
+		background: none;
+		line-height: normal;
+		color: #fff;
+		line-height: 56rpx !important;
+		padding: 10rpx 0 0;
+		text-align: left;
+		cursor: pointer;
+	}
+
+	.search .btn-search::after {
+		display: none;
+	}
+
+	.search .custom-search {
+		width: 80%;
+
+	}
+
+	.search .custom-search.uni-searchbar {
+		padding-right: 0 !important;
+	}
+
+	.scroll-h {
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 120px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		height: calc(100vh - 110px);
+		/* #endif */
+	}
+
+	.white-bg {
+		padding-bottom: 10rpx;
+	}
+
+	.search_center {
+		display: flex;
+		align-items: center;
+		border: none;
+		flex: 1;
+		height: 70rpx;
+		margin-left: 20rpx;
+		padding-left: 20rpx;
+		border-radius: 32.5rpx;
+		background-color: #f5f5f5;
+
+		.search_icon {
+			width: 30rpx;
+			height: 30rpx;
+			margin-right: 22rpx;
+		}
+
+		.category {
+			display: flex;
+			align-items: center;
+			margin-right: 16rpx;
+			padding-right: 16rpx;
+			border-right: 2rpx solid #D4D4D4;
+			position: relative;
+
+			text {
+				font-size: 13px;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+			}
+
+			image {
+				margin-top: 4rpx;
+				width: 20rpx;
+				height: 11rpx;
+
+			}
+
+			.pop {
+				position: absolute;
+				top: 50rpx;
+				background: #FFFFFF;
+				box-shadow: 0px 0px 40rpx 0px rgba(59, 59, 59, 0.2);
+				border-radius: 12rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				padding: 20rpx;
+				z-index: 100;
+				max-height: 566rpx;
+				overflow-y: auto;
+
+				text {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					white-space: nowrap;
+					margin: 10rpx 0;
+					line-height: 56rpx;
+				}
+			}
+
+			.pop_arrow {
+				position: absolute;
+				top: 48rpx;
+				z-index: 999;
+
+				&::after {
+					position: absolute;
+					content: "";
+					left: 68rpx;
+					top: -26rpx;
+					border: 14rpx solid #fff;
+					border-color: transparent transparent #fff transparent;
+				}
+			}
+		}
+	}
+</style>

src/pages/business/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>