nfc验证修改

.env.development

@@ -1,7 +1,7 @@
 
 #调用后台地址
 # 贝英斯公司
-# 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"
 
@@ -13,4 +13,4 @@
 # 友晟线上内网
 # VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
 # 友晟线上外网网
-VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'
+# VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

.env.production

@@ -1,7 +1,7 @@
 
 #调用后台地址
 # 贝英斯公司
-# 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"
 
@@ -12,5 +12,5 @@
 
 # 友晟线上内网
 # VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
-# 友晟线上外网网
-VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'
+# 友晟线上外网
+# VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

.hbuilderx/launch.json

@@ -2,6 +2,8 @@
     "version" : "1.0",
     "configurations" : [
         {
+            "customPlaygroundType" : "local",
+            "packageName" : "com.ys718.app",
             "playground" : "custom",
             "type" : "uni-app:app-android"
         },

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

@@ -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/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, defineExpose} 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,52 +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;
+    active.value = false;
 };
 
 // 定义组件实例暴露的方法
 defineExpose({
-  handleBlur
+    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",
@@ -22,7 +22,10 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Push" : {}
+            "Push" : {},
+            "Camera" : {},
+            "Barcode" : {},
+            "VideoPlayer" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -57,10 +60,14 @@
                     "<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.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" : {
@@ -82,12 +89,19 @@
                         "version" : "2",
                         "offline" : true,
                         "icons" : {
-                            "small" : {
+                            "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"
                             }
                         }
                     }
@@ -142,3 +156,5 @@
         "template" : "index.html"
     }
 }
+/* ios打包配置 */
+

src/pages.json

@@ -331,7 +331,8 @@
 			"path": "pages/business/CRM/plan/planView",
 			//周计划查看
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -542,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/customer/changeCustomerOwner.vue

@@ -295,7 +295,7 @@ let handleCopyInfo = (item) => {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
   top: 160rpx;
@@ -306,19 +306,9 @@ let handleCopyInfo = (item) => {
   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 {
+  height: 100%;
 }
 
 .white-bg {

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

@@ -612,12 +612,11 @@ let submitForm = async () => {
         uni.showToast({
           title: "更新成功"
         })
+        const eventChannel = instance.getOpenerEventChannel();
+        eventChannel.emit("refreshCusUserList");
         setTimeout(()=>{
           uni.navigateBack();
-          const eventChannel = instance.getOpenerEventChannel();
-          eventChannel.emit("refreshCusUserList");
         },1000);
-
       }else{
         uni.showToast({
           title: "操作失败",

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

@@ -7,7 +7,13 @@
   <view class="con-body">
     <view class="con-bg">
       <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="false">
+      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="list.length > 0">
+        <template #right>
+          <view class="head-right" @click="handleReSort">
+            <uni-icons type="arrow-down" size="20" color="#B7D2FF"></uni-icons>
+            {{iconType==='arrow-up'?'最新':'最早'}}
+          </view>
+        </template>
       </customHeader>
 
       <!-- 高度来避免头部遮挡 -->
@@ -101,9 +107,13 @@ 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([]);
 
@@ -230,12 +240,7 @@ let handleDetail = (item) => {
 }
 
 .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

@@ -163,7 +163,7 @@ const downCallback = async (mescroll) => {
       const res = await getList(1, mescroll.size || upOption.page.size);
       list.value = res.list;
       // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
     } catch (error) {
       mescroll.endErr();
     } finally {
@@ -184,7 +184,7 @@ 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);
     } catch (error) {
       mescroll.endErr();
@@ -222,6 +222,7 @@ let handleDetail = (item) => {
       url: "/pages/business/CRM/customer/components/customerUserEdit",
       events: {
         refreshCusUserList() {
+          console.log('refreshCusUserList',"响应刷新")
           handleSearch();
         }
       },

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

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

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

@@ -16,13 +16,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"-->
-        <!--          />-->
-        <!--          <button type="default" @click="clearSearchValue" size="mini" class="btn-search">清空</button>-->
-        <!--        </view>-->
+<!--        <view class="search">-->
+<!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
+<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
+<!--                          v-model="searchValue"-->
+<!--          />-->
+<!--        </view>-->
 
         <!-- 分页部分  -->
         <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -33,8 +32,8 @@
             <view class="report-list" @click.stop="handleDetail(item)">
               <view class="r-list title">
                 {{ item.cusName }}
-                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">
-                  {{ item.auditStatus ? '' : '待您审批' }}
+                <view class="r-right no-wrap" :class="item.auditStatus ? 'btn-blue' : 'btn-pink' ">
+                  {{ item.auditStatus ?  item.auditStatus : '待您审核' }}
                 </view>
               </view>
               <view class="r-list">
@@ -100,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 () => {
@@ -236,43 +236,17 @@ let handleDetail = (item) => {
   /* #endif */
 }
 
-.search {
-  display: flex;
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.search .custom-search {
-  width: 80%;
-
-}
-.scroll-h {
+.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 */
 }
 
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
-
 .white-bg {
   padding-bottom: 10rpx;
 
@@ -281,7 +255,11 @@ let handleDetail = (item) => {
   }
 }
 
-.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,7 +144,7 @@ const upCallback = async (mescroll) => {
 }
 
 const upOption = ref({
-  page: { num: 0, size: 10 },
+  page: {num: 0, size: 10},
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
@@ -180,7 +171,7 @@ function showDetail(item) {
 
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 
 .all-body {
   /* #ifdef APP-PLUS */
@@ -193,44 +184,30 @@ function showDetail(item) {
   /* #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/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/plan/dataMap.js

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

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

@@ -17,7 +17,7 @@
       <view class="top-height"></view>
 
       <view class="week-plan-title">
-        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
         <view v-if="weekNum">
           {{ yearMonth }}
           <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,37 +28,42 @@
       </view>
 
       <view class="nav-list">
-        <view class="nav-item" :class="{active:index==activeTab}"
+        <view class="nav-item" :class="{'active': index == activeTab}"
               v-for="(item,index) in allPlans" :key="index"
               @click="handleNav(index)"
         >{{ getTapLabel(item) }}
         </view>
       </view>
-
-      <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>
-        <view class='bottom-spliter bg-gray'></view>
-      </block>
-      <view v-else style="text-align: center; margin-top: 50%; color: white">
-        暂无数据
-      </view>
+
+        <view v-else style="text-align: center; margin-top: 50%; color: white">
+          暂无数据
+        </view>
+      </uni-transition>
       <!-- 底部加高度来避免tabbar遮挡 -->
       <!-- <view class="bottom-height bg-gray"></view> -->
     </view>
@@ -69,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)
@@ -94,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]] : '';
 };
@@ -107,7 +109,8 @@ let getWorkEvent = (index) => {
 };
 // 刷新计划列表
 const refreshPlanList = () => {
-  message.showLoading();
+  showTrans.value = false;
+  uni.showLoading();
   // 获取用户信息
   // getUserInfo().then(res => {
   //   userInfo.value = res.user;
@@ -124,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);
   })
 }
 
@@ -139,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) &&
@@ -204,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更换时间段");
@@ -247,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;
 }
@@ -273,27 +289,31 @@ function handleEdit(index) {
 .white-bg.white-bg-2 {
   /*  margin-bottom: 20rpx; */
 }
-.bottom-spliter{
+
+.bottom-spliter {
   height: 20rpx;
 }
-.bg-gray{
+
+.bg-gray {
   background-color: #f0f0f0;
 }
+
 .report-list .w-b-title .btn-edit {
   background-color: #5C96F7;
 }
 
 .con-bg {
-  /*height: 445rpx;*/
+  /*height: 100%;*/
+  /*  overflow-y: auto;*/
 }
 
 .nav-list {
   /*  display: flex;*/
   /*  width: 690rpx;*/
-  overflow-x: auto;   /* 允许横向滚动 */
+  overflow-x: auto; /* 允许横向滚动 */
   /*overflow-y: hidden;  隐藏垂直滚动 */
   /*-ms-overflow-style: none;   IE 隐藏滚动条 */
-  /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
+  /* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */
   /* 添加高度以确保有足够的空间 */
   /*  height: 80rpx;*/
   white-space: nowrap; /* 保持子元素在同一行显示 */
@@ -306,10 +326,12 @@ function handleEdit(index) {
   padding: 20rpx 30rpx 0;
   /* #endif */
 }
+
 /* 为 Webkit 浏览器隐藏滚动条 */
 .nav-list::-webkit-scrollbar {
   background-color: transparent;
 }
+
 .nav-list .nav-item {
   /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
   /*  width: 200rpx;*/
@@ -334,5 +356,4 @@ function handleEdit(index) {
   color: #3384DF;
   font-weight: bold;
 }
-
 </style>

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

@@ -16,11 +16,11 @@
 
       <!-- 正文内容 -->
       <view class="week-plan-title">
-        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+<!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
         <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
       </view>
       <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">
-        <block v-for="(item, index) in OrdinalDate">
+        <view v-for="(item, index) in OrdinalDate">
           <view class="white-bg" :class="index==0?'white-bg-2':'white-bg-3'">
             <view class="w-b-title" @click="handleExpand(index)">
               {{ weekPlanFormData[item] }} {{ WeekCN[index] }}
@@ -29,7 +29,8 @@
               </text>
             </view>
 
-            <view v-show="expandFlag[index]" class="form-con">
+            <!--v-show="expandFlag[index]"-->
+            <view class="form-con" :class="{'show': expandFlag[index], 'hidden': !expandFlag[index]}">
               <uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays">
                 <view class="form-picker">
                   <picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)">
@@ -41,13 +42,13 @@
                 </view>
               </uni-forms-item>
               <uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays">
-                <uni-easyinput type="textarea" autoHeight v-model="weekPlanFormData[getEventField(index)]"
+                <uni-easyinput type="textarea" v-model="weekPlanFormData[getEventField(index)]"
                                placeholder="请输入" class="form-texarea"/>
               </uni-forms-item>
             </view>
 
           </view>
-        </block>
+        </view>
       </uni-forms>
 
     </view>
@@ -62,7 +63,6 @@ import {useRoute} from "vue-router"
 import {useMessage} from "@/utils/message";
 import {onLoad} from "@dcloudio/uni-app";
 import {updateWeekPlanList, addPlan} from "@/api/crm/plan/updatePlan";
-import {getUserInfo} from "@/api/crm/plan/getPlan";
 import {getDate} from "@/utils/datetime";
 import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils";
 
@@ -127,17 +127,10 @@ const workDays = 5;
 // const instance = getCurrentInstance().proxy;
 let instance = null;
 // 初始化创建任务
-let initCreate = (params)=>{
+let initCreate = (params) => {
   const {itemList, selectIndex} = params;
-  // 获取用户信息
-  // 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">
@@ -32,7 +37,7 @@
               <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>
 
         <!-- 分页部分  -->
@@ -42,22 +47,24 @@
         <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)) }}月
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(5, 7) }}月
             <span class="line"></span>
-            {{searchValue.selectDate.substring(0, 4) }}年
+            {{ (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>
+              <view class="demo-uni-col right-radius"></view>
             </uni-col>
             <uni-col :span="2">
               <view class="demo-uni-col left-radius">姓名</view>
             </uni-col>
+            <!--日期 星期-->
             <block v-for="(field, i) in OrdinalDate">
               <uni-col :span="3">
-                <view class="demo-uni-col mar-left">
+                <view class="demo-uni-col mar-left" >
                   <text>{{ WeekShortCN[i] }}</text>
-                  <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</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>
@@ -80,7 +87,7 @@
                         :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>
+                    <text v-else style="font-weight: 300; color: gray">暂无</text>
                   </view>
                 </uni-col>
               </block>
@@ -94,32 +101,41 @@
       </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();
   })
 })
@@ -139,36 +155,38 @@ let searchValue = ref({
 
 // 查询列表
 let list = ref([]);
-const mescrollRef = ref(null);
-const upOption = ref({
-  page: {num: 0, size: 10},
-  noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
-  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
@@ -187,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)
@@ -209,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
     })
@@ -328,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;
@@ -366,35 +393,17 @@ let handleDetail = (rowIndex, colIndex) => {
   margin: 20rpx 0 0 0;
   border-radius: 8px 8px 0 0;
   /* #ifdef APP-PLUS */
-  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  );
   /* #endif */
   /* #ifndef APP-PLUS */
-  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  );
   /* #endif */
-  //overflow-y: auto;
-}
-
-.white-bg.white-bg-2 {
-  margin-bottom: 20rpx;
-}
-
-.white-bg.white-bg-3 {
-  border-radius: 0
-}
-
-.white-bg .w-b-title {
-  color: #3384DF;
-  font-size: 38rpx;
-}
-
-.form-con {
-  padding: 30rpx 0 0;
 }
 
 :deep(.form-con .uni-forms-item) {
   margin-bottom: 22px !important;
 }
-/*.con-bg {
-  height: 420rpx;
-}*/
+
 </style>

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

src/pages/business/business.vue

@@ -47,11 +47,12 @@
                     </view>
                     <block  v-if="!item.expandFlag">
                         <view class="logo-list" v-if="item.children&&item.children.length>0">
-                            <block v-for="(item2,index2) in item.children">
-                                <view  class="l-l-item"
-                                    @click="handleJump(item2.bizUrl)">
+                            <block v-for="(item2,index2) in item.children" :key="index2">
+                                <view  class="l-l-item" @click="handleJump(item2.bizUrl)">
                                     <img :src="'static/images/business/'+item2.icon+'.png'" />
                                     <text class="font-gray">{{ item2.bizName }}</text>
+                                    <!--后台创建业务的时候 bizCode 必须固定为 'jrxj' -->
+                                    <view class="red-bg" v-if="item2.bizCode=='jrxj'">{{todayCount}}</view>
                                 </view>
                             </block>
                         </view>
@@ -67,7 +68,7 @@
 
 <script setup>
 import { ref,onMounted } from 'vue'
-import { onLoad,onHide } from '@dcloudio/uni-app';
+import { onLoad,onShow,onHide } from '@dcloudio/uni-app';
 import customHeader from '@/components/customHeader.vue';
 import customSearch from '@/components/customSearch.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
@@ -75,12 +76,16 @@ import { getNavBarPaddingTop} from '@/utils/system.js'
 import { businessList } from '@/api/business.js';
 import {showLoading,hideLoading} from '@/utils/message.js'
 import { initTree } from '@/utils/common.js';
+import {querytodaytasknum} from '@/api/polling.js'
 
 onLoad(async(opt) => {
     // uni.setStorageSync('page_cache',true);
+})
+onShow(()=>{
     try {
         showLoading("加载中...")
         getList();
+        getTaskCount();
         hideLoading();
     } catch (error) {
         hideLoading();
@@ -93,6 +98,13 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
 
+// 查询待巡检的任务数量
+let todayCount =ref(0);
+const getTaskCount= async()=>{
+  let res = await querytodaytasknum({});
+  todayCount.value = res || 0;
+}
+
 // 搜索处理
 let searchShow = ref(false);
 let searchText = ref(undefined);
@@ -142,7 +154,7 @@ const mescrollInit = (mescroll) => {
     mescrollRef.value = mescroll;
 };
 const downOption = ref({
-    auto: true,
+    auto: false,
     textInOffset: '下拉刷新',
     textOutOffset: '释放更新',
     textLoading: '刷新中...'
@@ -151,10 +163,11 @@ const downOption = ref({
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        getList();
-        // setTimeout(async ()=>{
-        //     // mescroll.resetUpScroll();
-        // },500);
+        setTimeout(async ()=>{
+            getTaskCount();
+            getList();
+            // mescroll.resetUpScroll();
+        },500);
     } catch (error) {
         mescroll.endErr();
     } finally {
@@ -176,7 +189,7 @@ let handleJump=(url)=>{
 <style scope>
 .scroll-h{
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 130px) !important;
+    height: calc(100vh - 123px) !important;
     /* #endif */
     /* #ifndef APP-PLUS */
     height: calc(100vh - 140px) !important;

src/pages/business/polling/index.vue

@@ -0,0 +1,392 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="巡检任务"
+            :leftFlag="true" 
+            :rightFlag="true"
+        >
+            <template #right>
+                <view class="head-right" @click="handleJump">
+                    <img :src="'static/images/polling/icon-calendar.png'"  class="img-calendar" />日历
+                </view>
+            </template>
+        </customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+        <!-- <view class="week">{{dateStr}}</view> -->
+
+        <!-- 列表 @up="upCallback"  -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" 
+            @down="downCallback" :down="downOption" :up="upOption"
+            :fixed="false" class="scroll-h" 
+            :class="{'loading-scroll':cssFlag}">
+            <view class="white-bg">
+                <view class="blue-title">日常巡检</view>
+                <block v-if="list1.length>0">
+                    <view class="report-list" v-for="(item, index) in list1" :key="index" @click="handleDetail(item,1)">
+                        <view class="r-list" style="padding-bottom:0">
+                            <view class="r-name">{{ item.taskName }}</view>
+                            <view class="r-right">
+                                <!-- 任务(巡检)状态 1=未发布 2=已发布 3 进行中 4 已完成 5 已过期 -->
+                                <!-- 状态为3进行中时 进度>0执行中 进度=0为待执行 -->
+                                <block v-if="item.taskStatus==3">
+                                    <img v-if="item.beginTime" :src="'static/images/polling/icon-pending.png'"  class="img-w" />
+                                    <img v-else :src="'static/images/polling/icon-start.png'"  class="img-w" />
+                                </block>
+                                <img v-else-if="item.taskStatus==4" :src="'static/images/polling/icon-complete.png'"  class="img-complete" />
+                                <img v-else-if="item.taskStatus==5" :src="'static/images/polling/icon-Expired.png'"  class="img-w" />
+                            </view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">巡检单号<span class="r-gray">{{ item.taskId }}</span></view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">
+                                <view v-if="item.beginTime">
+                                    执行时间<span class="r-gray">{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                                </view>
+                                <view v-else>
+                                    开始时间<span class="r-gray">{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">
+                                <view class="r-l-left">
+                                    任务状态<span class="r-gray" v-if="item.taskStatus==3">
+                                        <block v-if="item.beginTime">执行中</block>
+                                        <block v-else>待执行</block>
+                                    </span>
+                                    <span class="r-gray" v-else>{{formatTaskStatus(item.taskStatus) }}</span>
+                                </view>
+                                <view class="r-l-right">任务时长<span class="r-gray">{{ item.workHour }}小时</span></view>
+                            </view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">
+                                <view class="r-l-left">
+                                    完成进度<span class="r-gray"><span :class="{'r-red':item.groupFinishNum<item.groupNum}">{{item.groupFinishNum}}</span>/{{item.groupNum}}</span>
+                                </view>
+                                <view class="r-l-right">
+                                    完成比率<span class="r-blue">{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}</span>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="report-border" v-if="index<list1.length-1"></view>
+                    </view>
+                </block>
+                <view v-else class="no-data">
+                    <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                </view>
+                <view class="green-title" style="margin-top:60rpx">临时巡检</view>
+                <block v-if="list2.length>0">
+                    <view class="report-list" v-for="(item, index) in list2" :key="index" @click="handleDetail(item,1)">
+                        <view class="r-list" style="padding-bottom:0">
+                            <view class="r-name">{{ item.taskName }}</view>
+                            <view class="r-right">
+                                <!-- 任务(巡检)状态 1=未发布 2=已发布 3 进行中 4 已完成 5 已过期 -->
+                                <!-- 状态为3进行中时 进度>0执行中 进度=0为待执行 -->
+                                <block v-if="item.taskStatus==3">
+                                    <img v-if="item.groupFinishNum==0" :src="'static/images/polling/icon-start.png'"  class="img-w" />
+                                    <img v-else :src="'static/images/polling/icon-pending.png'"  class="img-w" />
+                                </block>
+                                <img v-else-if="item.taskStatus==4" :src="'static/images/polling/icon-complete.png'"  class="img-complete" />
+                                <img v-else-if="item.taskStatus==5" :src="'static/images/polling/icon-Expired.png'"  class="img-w" />
+                            </view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">巡检单号<span class="r-gray">{{ item.taskId }}</span></view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">
+                                <view v-if="item.beginTime">
+                                    执行时间<span class="r-gray">{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                                </view>
+                                <view v-else>
+                                    开始时间<span class="r-gray">{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">
+                                <view class="r-l-left">
+                                    任务状态<span class="r-gray" v-if="item.taskStatus==3">
+                                        <block v-if="item.beginTime">执行中</block>
+                                        <block v-else>待执行</block>
+                                    </span>
+                                    <span class="r-gray" v-else>{{formatTaskStatus(item.taskStatus) }}</span>
+                                </view>
+                                <view class="r-l-right">
+                                    任务时长<span class="r-gray">{{ item.workHour }}小时</span>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">
+                                <view class="r-l-left">
+                                    完成进度<span class="r-gray"><span :class="{'r-red':item.groupFinishNum<item.groupNum}">{{item.groupFinishNum}}</span>/{{item.groupNum}}</span>
+                                </view>
+                                <view class="r-l-right">
+                                    完成比率<span class="r-blue">{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}</span>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="report-border" v-if="index<list2.length-1"></view>
+                    </view>
+                </block>
+                <view v-else class="no-data">
+                    <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                </view>
+            </view>
+            <view class="white-bg white-bg2">
+                <view class="red-title">问题跟踪</view>
+                <block v-if="list3.length>0">
+                    <view class="report-list" v-for="(item, index) in list3" :key="index" @click="handleDetail(item,2)">
+                        <view class="r-list" style="padding-bottom:0">
+                            <view class="r-name">{{ item.groupName }}</view>
+                            <view class="r-right">
+                                <!-- 问题状态 1=追踪、2=关闭 -->
+                                <view v-if="item.problemStatus==1" class="btn-red">进行中</view>
+                                <view v-if="item.problemStatus==2" class="btn-green">已解决</view>
+                            </view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">
+                                <view class="r-l-left" style="width:220rpx">跟踪次数<span class="r-gray">{{ item.logNum }}</span></view>
+                                <view class="r-l-right">最近跟踪时间<span class="r-gray">{{ parseTime(item.lastLogTime,'{y}-{m}-{d} {h}:{i}') }}</span></view>
+                            </view>
+                        </view>
+                        <view class="report-border" v-if="index<list3.length-1"></view>
+                    </view>
+                </block>
+                <view v-else class="no-data">
+                    <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                </view>
+            </view>
+        </mescroll-uni>
+    </view>
+</view>
+</template>
+<script setup>
+import { ref,onMounted } from 'vue'
+import { onLoad,onShow,onHide } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { parseTime } from '@/utils/datetime.js';
+import { formatTaskStatus } from '@/utils/status.js';
+import { taskList } from '@/api/polling.js'
+
+// '2025-12-29  星期五'
+let dateStr = ref('');
+onLoad(option => {
+	let date = new Date();
+	dateStr.value = parseTime(date,'{y}-{m}-{d} 星期{a}');
+})
+
+// 查询列表
+let list1 = ref([]);
+let list2 = ref([]);
+let list3 = ref([]);
+let mescroll = null; // 用于存放mescroll实例
+const mescrollRef = ref(null);
+const upOption = ref({
+    use: false,
+    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);//控制样式
+
+onShow(()=>{
+    if(mescroll)
+        mescroll.triggerDownScroll()
+})
+
+const mescrollInit = (mescrollInstance) => {
+    cssFlag.value = true;
+    mescroll = mescrollInstance;
+    // mescroll.setMescroll(mescrollRef.value); // 绑定mescroll实例
+    mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        // console.log("下拉刷新")
+        const res = await getList(1, upOption.value.page.size);
+        cssFlag.value = false;
+        list1.value = res.list1 || [];
+        list2.value = res.list2 || [];
+        list3.value = res.list3 || [];
+        // mescroll.resetUpScroll();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        console.log("上拉加载更多")
+        let res = await getList(mescroll.num, mescroll.size);
+        if (mescroll.num === 1) {
+            list1.value = res.list1 || [];
+            list2.value = res.list2 || [];
+            list3.value = res.list3 || [];
+        } else {
+            // list.value.push(...res.list);
+        }
+        mescroll.endBySize(res.list.length, res.total);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+/**
+ * {
+  "day": "",查询日期，格式yyyy-mm-dd
+  "month": "",查询日期，格式yyyy-mm
+  "taskType": 0, //1 日常任务 2 临时任务
+  "taskStatus": 0//1=未发布、2=已发布 3 进行中 4 已完成 5 已过期
+}
+ */
+const getList = (pageIndex, pageSize) => {
+   
+    return new Promise(async (resolve) => {
+        let param = {
+            // day:parseTime(new Date().getTime(),'{y}-{m}-{d}'),//今天
+            taskStatus:3,//进行中
+        }
+        let res = await taskList(param);
+        let data = res||{};
+        resolve({
+            ...data,
+        });
+    });
+    
+}
+
+// 查看详情 type 1-任务详情 2-问题详情
+const handleDetail = (item,type) =>{
+    let url='' 
+    if(type==1){
+        url = '/pages/business/polling/taskDetail?id='+item.taskId;
+    }else{
+        url = '/pages/business/polling/problemDetail?problemId='+item.problemId;
+    }
+    uni.navigateTo({
+        url
+    });
+}
+
+// 跳转webview
+const handleJump = (item)=>{
+    uni.navigateTo({
+        url:'/pages/business/polling/searchList'
+    });
+}
+
+
+</script>
+<style scoped>
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 78px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px);
+    /* #endif */
+}
+.head-right{
+    font-size:28rpx;
+}
+.img-calendar{
+    width: 30rpx;
+    height: 28rpx;
+}
+.week{
+    padding:0 40rpx;
+    color: #fff;
+    font-size:32rpx;
+    margin-bottom:20rpx;
+}
+
+.white-bg{
+    width: 670rpx;
+    padding: 30rpx 40rpx 40rpx;
+    margin: 0 auto !important;
+    border-radius: 8px 8px 0 0;
+}
+.white-bg2{
+    border-radius: 0;
+    border-top:20rpx solid #F5F5F5 
+}
+.report-list{
+    position: relative;
+}
+.img-w{
+    width:50rpx;
+    height:50rpx;
+}
+.img-complete{
+    position: absolute;
+    right:-40rpx;
+    top:60rpx;
+    width:133rpx;
+    height:150rpx;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+.report-list .r-list{
+    padding: 5rpx 0;
+}
+.report-list .r-list .r-left{
+    display: flex;
+    align-items: center;
+}
+.report-list .r-list .r-gray{
+    margin-left:10rpx;
+}
+.report-list .r-list .r-blue{
+    margin-left:10rpx;
+    font-weight: bold;
+}
+.report-list .r-list .r-red{
+    font-weight: bold;
+}
+.report-list .r-list .r-name{
+    width:525rpx
+}
+.r-left .r-l-left{
+    width:345rpx;
+}
+.r-left .r-l-right{
+   
+}
+.no-data .no-pic{
+    display: block;
+    width:440rpx;
+    height:210rpx;
+    margin:40rpx auto;
+}
+</style>

src/pages/business/polling/nfcTest/index.vue

@@ -0,0 +1,78 @@
+<template>
+	<view class="container">
+		<input class="input-box" v-model="inputText" @input="input" type="text" placeholder="请输入内容"/>
+		<view class="btn-box">
+			<button class="btn-write" @click="writeData()">写信息</button>
+			<button class="btn-read" @click="readData()">读信息</button>
+		</view> 
+	</view>
+</template>
+
+<script>
+	import nfc from './ouu-nfc.js'
+	export default {
+		data() {
+			return {
+				inputText: 'testtesttesttesttestfdsftttg'
+			}
+		},
+		onLoad() {
+			nfc.listenNFCStatus();
+		},
+		methods: {
+			input(e) {
+				nfc.inputChanage(e.detail.value)
+			},
+			writeData() {
+				nfc.writeData()
+			},
+			readData() {
+				nfc.readData()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		padding: 15px;
+		box-sizing: border-box;
+		.iframe {
+			height: 100vh;
+			width: 100vw;
+			border: none;
+			margin: 0;
+		}
+		.input-box {
+			border: 1px solid #aaa;
+			margin: 30px 0;
+			padding: 10px;
+			border-radius: 100px;
+		}
+		.btn-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			.btn-write {
+				width: 100%;
+				height: 100px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 20px;
+			}
+			.btn-read {
+				width: 100%;
+				margin-left: 20px;
+				height: 100px;
+				background-color: #1ee176;
+				color: #fff;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 20px;
+			}
+		}
+	}
+
+</style>

src/pages/business/polling/nfcTest/ouu-nfc.js

@@ -0,0 +1,246 @@
+// 包路径
+const package_NdefRecord = 'android.nfc.NdefRecord';
+const package_NdefMessage = 'android.nfc.NdefMessage';
+const package_TECH_DISCOVERED = 'android.nfc.action.TECH_DISCOVERED';
+const package_Intent = 'android.content.Intent'; 
+const package_Activity = 'android.app.Activity'; 
+const package_PendingIntent = 'android.app.PendingIntent'; 
+const package_IntentFilter = 'android.content.IntentFilter'; 
+const package_NfcAdapter = 'android.nfc.NfcAdapter'; 
+const package_Ndef = 'android.nfc.tech.Ndef'; 
+const package_NdefFormatable = 'android.nfc.tech.NdefFormatable'; 
+const package_Parcelable = 'android.os.Parcelable'; 
+const package_String = 'java.lang.String'; 
+
+let NfcAdapter;
+let NdefRecord;
+let NdefMessage;
+let Uri;
+let readyWriteData = false;
+let readyRead = false;
+let noNFC = false;
+let techListsArray = [
+	['android.nfc.tech.IsoDep'],
+	['android.nfc.tech.NfcA'],
+	['android.nfc.tech.NfcB'],
+	['android.nfc.tech.NfcF'],
+	['android.nfc.tech.Nfcf'],
+	['android.nfc.tech.NfcV'],
+	['android.net.Uri'],
+	['android.nfc.tech.NdefFormatable'],
+	['android.nfc.tech.MifareClassi'],
+	['android.nfc.tech.MifareUltralight']
+];
+// 要写入的数据
+let text = '';
+let readResult = '';
+
+export default {
+	
+	listenNFCStatus: function () {
+		let that = this;
+		try {
+			let main = plus.android.runtimeMainActivity();
+			let Intent = plus.android.importClass('android.content.Intent');
+			let Activity = plus.android.importClass('android.app.Activity');
+			let PendingIntent = plus.android.importClass('android.app.PendingIntent');
+			let IntentFilter = plus.android.importClass('android.content.IntentFilter');
+			Uri = plus.android.importClass('android.net.Uri');
+			NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter');
+			let nfcAdapter = NfcAdapter.getDefaultAdapter(main);
+			
+			if(nfcAdapter == null){
+				uni.showToast({
+				  title: '设备不支持NFC！',
+				  icon: 'none'
+				})
+				noNFC = true; 
+				return;
+			}
+			
+			if (!nfcAdapter.isEnabled()) {
+				uni.showToast({
+				  title: '请在系统设置中先启用NFC功能！',
+				  icon: 'none'
+				});
+				noNFC = true;
+				return;
+			}else{
+				noNFC = false;
+			}
+			
+			let intent = new Intent(main, main.getClass());
+			intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+			let pendingIntent = PendingIntent.getActivity(main, 0, intent, 0);
+			let ndef = new IntentFilter("android.nfc.action.TECH_DISCOVERED");
+			ndef.addDataType("*/*");
+			let intentFiltersArray = [ndef];
+
+			console.log('newintent running==>',intentFiltersArray);
+			
+			plus.globalEvent.addEventListener('newintent',function() {
+				console.log('newintent running');
+				// 监听 NFC
+				setTimeout(that.nfcRuning(), 1000);
+			});
+			plus.globalEvent.addEventListener('pause',function(e) {
+				console.log('pause running');
+				if (nfcAdapter) {
+					//关闭前台调度系统
+					//恢复默认状态
+					nfcAdapter.disableForegroundDispatch(main);
+				}
+			});
+			plus.globalEvent.addEventListener('resume',function(e) {
+				console.log('resume running');
+				if (nfcAdapter) {
+					 //开启前台调度系统
+					nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
+				}
+			});
+			nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray); 
+		} catch (e) {
+			console.error(e);
+		}
+	},
+	nfcRuning: function () {
+		NdefRecord = plus.android.importClass("android.nfc.NdefRecord");
+		NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
+		let main = plus.android.runtimeMainActivity();
+		let intent = main.getIntent();
+		let that = this;
+		
+		console.log("action type:" + intent.getAction());
+		
+		if (package_TECH_DISCOVERED == intent.getAction()) {
+			if (readyWriteData) {
+				that.write(intent);
+				readyWriteData = false;
+			} else if (readyRead) {
+				that.read(intent);
+				readyRead = false;
+			}
+		}
+	},
+	write(intent) {
+		try {
+			toast('请勿移开标签 正在写入...');
+			console.log("text=" + text);
+			let textBytes = plus.android.invoke(text, "getBytes");
+			// image/jpeg text/plain  
+			let uri = Uri.parse(text)
+			let message = new NdefMessage([new NdefRecord.createUri(uri)]);
+			console.log("====message===>", message)
+			let Ndef = plus.android.importClass('android.nfc.tech.Ndef');
+			let NdefFormatable = plus.android.importClass('android.nfc.tech.NdefFormatable'); 
+			let tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
+			let ndef = Ndef.get(tag);
+			if (ndef != null) {
+				// 待写入的数据长度
+				let size = message.toByteArray().length;
+				ndef.connect();
+				if (!ndef.isWritable()) {
+					toast('tag不允许写入！');
+					return;
+				}
+				if (ndef.getMaxSize() < size) {
+					toast('文件大小超出容量！');
+					return;
+				}
+				ndef.writeNdefMessage(message);
+				toast('写入数据成功！');
+				return;
+			} else {
+				let format = NdefFormatable.get(tag);
+				if (format != null) {
+					try {
+						format.connect();
+						format.format(message);
+						toast('格式化tag并且写入message');
+						return;
+					} catch (e) {
+						toast('格式化tag失败.');
+						return;
+					}
+				} else {
+					toast('Tag不支持NDEF');
+					return;
+				}
+			}
+		} catch (e) {
+			toast('写入失败');
+			console.log("error=" + e);
+		}
+	
+	},
+	read(intent) {
+		toast('请勿移开标签正在读取数据');
+		let that = this;
+		// NFC id
+		let bytesId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
+		let nfc_id = that.byteArrayToHexString(bytesId);
+		console.log('nfc_id:', nfc_id);
+		let Parcelable = plus.android.importClass("android.os.Parcelable");
+		let rawmsgs = intent.getParcelableArrayExtra("android.nfc.extra.NDEF_MESSAGES");
+		//let rawmsgs = intent.getParcelableArrayExtra();
+		
+		if(rawmsgs != null && rawmsgs.length > 0) {
+			let records = rawmsgs[0].getRecords();
+			let result = records[0].getPayload();
+			let data = plus.android.newObject("java.lang.String", result);
+			toast('NFC 数据：' + data);
+			plus.runtime.openURL(data, function(res) {  
+				console.log("NFC 数据----", res);  
+			});  
+			console.log('NFC 数据：',data);
+			readResult = data;
+			// return data;
+		}else{
+			toast('没有读取到数据');
+			return ""
+		}
+	},
+	byteArrayToHexString: function (inarray) { // converts byte arrays to string  
+		let i, j, inn;  
+		let hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];  
+		let out = "";  
+		
+		for(j = 0; j < inarray.length; ++j) {
+			inn = inarray[j] & 0xff;  
+			i = (inn >>> 4) & 0x0f;  
+			out += hex[i];  
+			i = inn & 0x0f;  
+			out += hex[i];  
+		}  
+		return out;  
+	},
+	writeData: function () {
+		if(noNFC){
+			toast('请检查设备是否支持并开启 NFC 功能！');
+			return;
+		}
+		// 监听事件，触发条件
+		readyWriteData = true;
+		toast('请将NFC标签靠近！');
+	},
+	readData: function () {
+		if(noNFC){
+			toast('请检查设备是否支持并开启 NFC 功能！');
+			return;
+		}
+		// 监听事件，触发条件
+		readyRead = true;
+		toast('请将NFC标签靠近！');
+	},
+	// 输入文本改变
+	inputChanage: function (res) {
+		console.log("正在编辑写入数据...", res)
+		text = res
+	}
+}
+function toast(content){
+	uni.showToast({
+		title: content,
+		icon: 'none'
+	})
+}

src/pages/business/polling/optionDetail.vue

@@ -0,0 +1,928 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="巡检详情" 
+            :leftFlag="true" :rightFlag="true"
+        >
+            <template #right>
+                <!-- 状态是4-已完成 5-已过期的不能再问题上报了 -->
+                <block v-if="optionObj.taskStatus==5||optionObj.taskStatus==4"></block>
+                <view v-else class="head-right" @click="handleQuestion">
+                    <view class="btn-yellow">
+                        <img :src="'static/images/polling/icon-repair.png'" class="img-repair" />新建问题上报
+                    </view>
+                </view>
+            </template>
+        </customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <!-- 1 单选 2多选 3判断  4 问答 5 读卡 6 扫码 7 拍照 8 视频 9 定位（暂时去掉了） -->
+            <view class="white-bg"  @click="handleMulSelect">
+                <view class="blue-title">{{optionObj.groupName}}</view>
+                <view class="blue-sub-title" style="margin-bottom:20rpx;">
+                    巡检日期：<text>{{parseTime(optionObj.lastCheckTime,'{y}-{m}-{d} 星期{a}')}}</text>
+                </view>
+                <block v-if="optionObj.pointList">
+                    <block v-if="optionObj.pointList.length>0">
+                        <view class="report-list" v-for="(item, index) in optionObj.pointList" :key="index">
+                            <!-- 单选 -->
+                            <block v-if="item.pointType==1">
+                                <view class="r-left" style="width:100%">
+                                    <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                    <view>{{ item.pointName }}</view>
+                                </view>
+                                <multipleSelect :multiple="false" :value="item.chooseList" downInner
+                                    :options="item.optionList"  @change="(...args) => changeCheck(...args, item)"
+                                    :slabel="'optionContent'" :svalue="'optionTitle'"
+                                >
+                                </multipleSelect>
+                            </block>
+                            <!-- 多选 -->
+                            <block v-else-if="item.pointType==2">
+                                <view class="r-left" style="width:100%">
+                                    <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                    <view>{{ item.pointName }}</view>
+                                </view>
+                                <multipleSelect ref="selectRef" :multiple="true" :value="item.chooseList" downInner
+                                    :options="item.optionList"  @change="(...args) => changeCheck(...args, item)"
+                                    :slabel="'optionContent'" :svalue="'optionTitle'"
+                                >
+                                </multipleSelect>
+                            </block>
+                            <!-- 判断 -->
+                            <block v-else-if="item.pointType==3">
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                        <view>{{ item.pointName }}</view>
+                                    </view>
+                                    <view class="r-right">
+                                        <radio-group @change="radioChange($event,item)" style="transform:scale(0.9)">
+                                            <radio :value="item2.optionTitle" color="#02C74C" 
+                                                v-for="(item2,index) in item.optionList" :key="index"
+                                                :style="{marginRight:index==0?'30rpx':'0'}"
+                                                :checked="item2.optionTitle === item.resultContent"
+                                            >
+                                                {{item2.optionContent}}
+                                            </radio>
+                                        </radio-group>
+                                    </view>
+                                </view>
+                            </block>
+                            <!-- 问答 -->
+                            <block v-else-if="item.pointType==4">
+                                <view class="r-left" style="width:100%">
+                                    <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                    <view>{{ item.pointName }}</view>
+                                </view>
+                                <view class="r-input">
+                                    <!-- <input class="uni-input" placeholder="请输入" placeholder-class="place-input" /> -->
+                                    <textarea class="textarea" v-model="item.resultContent" auto-height  placeholder="请输入" placeholder-class="place-input"></textarea>
+                                </view>
+                            </block>
+                            <!-- 读卡 -->
+                            <block v-else-if="item.pointType==5">
+                                <view class="r-list" >
+                                    <view class="r-left">
+                                        <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                        <view>{{ item.pointName }}</view>
+                                    </view>
+                                    <!-- #ifdef APP-PLUS -->
+                                    <view class="r-right r-active" v-if="item.resultContent"  @click.stop="initNFC(item,index)">
+                                        <img :src="'static/images/polling/icon-NFCcode-b.png'" class="img-nfc" />
+                                        <view>识别成功<view class="r-font">点击再次识别</view></view>
+                                    </view>
+                                    <view class="r-right" v-else  @click.stop="initNFC(item,index)">
+                                        <img :src="'static/images/polling/icon-NFCcode.png'" class="img-nfc" /> 开始识别
+                                    </view>
+                                    <!-- #endif -->
+                                    <!-- #ifndef APP-PLUS -->
+                                    <view class="r-right r-active" v-if="item.resultContent" >
+                                        <img :src="'static/images/polling/icon-NFCcode-b.png'" class="img-nfc" />
+                                        <view>识别成功</view>
+                                    </view>
+                                    <view class="r-right" v-else>
+                                        <img :src="'static/images/polling/icon-NFCcode.png'" class="img-nfc" /> 开始识别
+                                    </view>
+                                    <!-- #endif -->
+                                </view>
+                            </block>
+                            <!-- 扫码 -->
+                            <block v-else-if="item.pointType==6">
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                        <view>{{ item.pointName }}</view>
+                                    </view>
+                                    <!-- #ifdef APP-PLUS -->
+                                    <view class="r-right r-active" v-if="item.resultContent" @click="handleScan(item)">
+                                        <img :src="'static/images/polling/icon-QRcode-b.png'" class="img-nfc" />
+                                        <view>扫码成功<view class="r-font">点击再次扫码</view></view>
+                                    </view>
+                                    <view class="r-right" v-else @click="handleScan(item)">
+                                        <img :src="'static/images/polling/icon-QRcode.png'" class="img-nfc" /> 开始扫码
+                                    </view>
+                                    <!-- #endif -->
+                                    <!-- #ifndef APP-PLUS -->
+                                    <view class="r-right r-active" v-if="item.resultContent">
+                                        <img :src="'static/images/polling/icon-QRcode-b.png'" class="img-nfc" />
+                                        <view>扫码成功</view>
+                                    </view>
+                                    <view class="r-right" v-else>
+                                        <img :src="'static/images/polling/icon-QRcode.png'" class="img-nfc" /> 开始扫码
+                                    </view>
+                                    <!-- #endif -->
+                                </view>
+                            </block>
+                            <!-- 拍照 -->
+                            <block v-else-if="item.pointType==7">
+                                <view class="r-left" style="width:100%">
+                                    <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                    <view>{{ item.pointName }}</view>
+                                </view>
+                                <view class="img-flex">
+                                    <view class="img-show" v-for="(item2,index2) in item.imgArr2" :key="index2"  @click="showMediaPreview(item2)">
+                                        <view class="img-delete" @click.stop="handleDelete(item,index,index2)">
+                                            <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                                        </view>
+                                        <image :src="item2.shortUrl" mode="aspectFill" /> 
+                                    </view>
+                                    <view class="img-con" @click="chooseImage(item,index)">
+                                        <img :src="'static/images/polling/icon-AddPic.png'" class="img-pic" />
+                                        <view>添加照片</view>
+
+                                        <!-- loading -->
+                                        <view class="upload-loading" v-if="item.loading">
+                                            <uni-icons type="refreshempty" size="30" color="#C9C9C9"></uni-icons>
+                                            <view>上传中....</view>
+                                        </view>
+                                    </view>
+                                    
+                                </view>
+                            </block>
+                            <!-- 视频 -->
+                            <block v-else-if="item.pointType==8">
+                                <view class="r-left" style="width:100%">
+                                    <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                    <view>{{ item.pointName }}</view>
+                                </view>
+                                <view class="img-flex">
+                                    <view class="img-show" v-for="(item2,index2) in item.videoArr2" :key="index2"  @click="showMediaPreview(item2)">
+                                        <view class="img-delete" @click.stop="handleDelete(item,index,index2)">
+                                            <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                                        </view>
+                                        <view class="img-icon">
+                                            <img :src="'static/images/polling/icon-play.png'" />
+                                        </view>
+                                        <!-- <video :src="item2.url" controls v-show="videoShow"></video> -->
+                                        <DomVideoPlayer :src="item2.url" objectFit="cover" />
+                                    </view>
+                                    <view class="img-con" @click="chooseVideo(item,index)">
+                                        <img :src="'static/images/polling/icon-AddVideo.png'" class="img-pic" />
+                                        <view>添加视频</view>
+                                        <!-- loading -->
+                                        <view class="upload-loading" v-if="item.loading">
+                                            <uni-icons type="refreshempty" size="30" color="#C9C9C9"></uni-icons>
+                                            <view>上传中....</view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <view class="r-left" style="width:100%">
+                                    <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                    <view>{{ item.pointName }}</view>
+                                </view>
+                            </block>
+                            <view class="report-border" :style="{borderColor:index<optionObj.pointList.length-1?'#E7E7E7':'#fff'}"></view>
+                        </view>
+                        <!-- 状态是4-已完成 5-已过期的不能再修改了 -->
+                        <block  v-if="optionObj.taskStatus==5||optionObj.taskStatus==4"></block>
+                        <view v-else class="btn-submit">
+                            <button type="primary" @click="handleSubmit" :loading="submitLoading" >提交</button>
+                        </view>
+                    </block>
+                    <view v-else class="no-data">
+                        <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                    </view>
+                </block>
+                <view v-else class="no-data">
+                    <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                </view>
+            </view>
+        </mescroll-uni>
+    </view>
+    <!-- 弹窗提示 -->
+    <pollingShowModal :visible="visible"
+        :title="title"
+        :content="content" 
+        :subContent="subContent"
+        :btnFlag2="btnFlag2"
+        :btnTxt="btnTxt"
+        :isGreen="isGreen"
+        :subTime="subTime"
+        @close="handleClose"
+        @confirm="handleConfirm"
+        ref="showModel"
+    ></pollingShowModal>
+
+    <!-- 普通弹窗提示 -->
+    <customShowModal
+        :title="''"
+        :content="content3" 
+        :visible="visible3"
+        :btnFlag2="false"
+        @confirm="handleClose3"
+        ref="showModel3"
+    ></customShowModal>
+   
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" 
+        :url="mediaUrl" 
+        @close="handlePreviewClose"
+    ></mediaPreview>
+
+
+    <!-- NFC 数据读取 -->
+    <NFCTemplate v-if="nfcShow" ref="nfcReaderRef" 
+        :nfcId="nfcId"
+        @changeNfc="handleNfcData" 
+        @close="nfcClose"
+    ></NFCTemplate>
+</view>
+</template>
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive,getCurrentInstance } from 'vue'
+import { onLoad,onShow,onHide} from '@dcloudio/uni-app';
+import { MINIO_KEY } from '@/enums/cacheEnums';
+
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import multipleSelect from "@/components/multipleSelect.vue";
+import pollingShowModal from "@/components/pollingShowModal.vue";
+import customShowModal from "@/components/customShowModal.vue"
+import mediaPreview from "@/components/mediaPreview.vue"
+import NFCTemplate from "@/components/NFCTemplate.vue"
+import DomVideoPlayer from 'uniapp-video-player'
+
+import { parseTime } from '@/utils/datetime.js';
+import { formatTaskStatus } from '@/utils/status.js';
+import { taskGroupDetail,submitResult,minioUpload } from '@/api/polling.js'
+import {compressImageUni,getVideoFirstFrame} from '@/utils/common.js'
+// import {uploadFileMinio} from '@/utils/minio.js'
+const { proxy } = getCurrentInstance();
+
+let imgLoading = ref(false);
+let taskId = ref(undefined);
+let groupId = ref(undefined);
+let minioObj = {};
+onLoad(option => {
+    // console.log(option)
+    taskId.value = option.taskId;
+    groupId.value = option.groupId;
+
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+    // console.log(minioObj)
+    getList();
+
+})
+
+onShow(()=>{
+    
+})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    use:false,
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+// 查询列表
+let list = ref([]);
+let optionObj = ref({})
+
+// 获取数据列表
+const getList = async() => {
+    let param = {
+        taskId:taskId.value,
+        groupId:groupId.value
+    }
+    // 1 单选 2多选 3判断  4问答 5 读卡 6 扫码 7 拍照 8 视频 9 定位
+    let res = await taskGroupDetail(param);
+    let data = res||{};
+    data.pointList.forEach(item=>{
+        item['imgArr']=[];
+        item['imgArr2']=[];
+        item['videoArr']=[];
+        item['videoArr2']=[];
+        item['chooseList']=[];
+        item.loading=false;
+        if(item.resultContent){
+            if(item.pointType==2 ||item.pointType==1){
+                item['chooseList'] = item.resultContent.split(",")||[]; //JSON.parse(item.resultContent)
+            }else if(item.pointType==7){
+                let imgList = item.resultContent?.split(",")||[];
+                imgList.forEach(imgUrl=>{
+                    item.imgArr.push(imgUrl);
+                    item.imgArr2.push({
+                        shortUrl:minioObj.minioThumbUrl +"/"+imgUrl,
+                        url:minioObj.minioUrl +"/"+imgUrl,
+                    })
+                })
+            }else if(item.pointType==8){
+                let videoList = item.resultContent?.split(",")||[];
+                videoList.forEach(videoUrl=>{
+                    item.videoArr.push(videoUrl);
+                    item.videoArr2.push({
+                        shortUrl:minioObj.minioThumbUrl +"/"+videoUrl,
+                        url:minioObj.minioUrl +"/"+videoUrl,
+                    })
+                })
+            }
+        }
+    })
+    // console.log(data.pointList)
+    optionObj.value = data
+}
+
+// 跳转问题上报页面
+const handleQuestion=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemReport?taskId='+taskId.value+"&groupId="+groupId.value
+    });
+}
+
+// radio 判断选择
+const radioChange=(e,item)=>{
+    let radioValue = e.detail.value;
+    item['resultContent']=radioValue;
+}
+
+// 对 multipleSelect 组件的引用
+const selectRef = ref(null);
+// 多选组件失去焦点关闭
+let handleMulSelect = () => {
+    if (selectRef.value){
+        selectRef.value.forEach(item=>{
+            item.handleBlur();
+        })
+    }
+}
+
+// 单选多选处理
+const changeCheck = (param,param2,item) => {
+    item['resultContent'] = param2.join(",");
+}
+
+// 照片及拍照处理
+const chooseImage = (item,index) => {
+    // console.log("item=>",item)
+    try {
+        
+        uni.chooseImage({
+            // count: 1, // 默认是9，这里设置为1次只选1张
+            // sizeType: ['compressed'], // 可以指定是原图还是压缩图，可选 'original' 或 'compressed'
+            sourceType: ['camera'], // 指定来源是相册还是相机，默认二者都有//'album',
+            // quality:80,
+            // width:'1920px',
+            // height:'1920px',
+            success: async (res) => {
+                // 选择成功，返回本地文件路径列表
+                let files = res.tempFilePaths;
+                // console.log('111图片临时路径:', files, res.tempFiles);
+                files.forEach(async file=>{
+                    let compressImg = file;
+                    //  #ifdef APP-PLUS
+                    // 压缩图片
+                    compressImg = await compressImageUni(file);
+                    // console.log("333压缩图片返回=>",compressImg)
+                    // #endif
+
+                    // 执行上传
+                    let param = {
+                        filePath: compressImg,
+                        name: 'file',
+                        formData: {
+                            directory:'polling'
+                        },
+                    } 
+                    optionObj.value.pointList[index].loading=true;
+                    minioUpload(param).then(res=>{
+                        let data = res.data;
+                        item.imgArr2.push({
+                            shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                            url:minioObj.minioUrl +"/"+data.fileName,
+                        })
+                        item.imgArr.push(data.fileName)//传给后台的路径
+
+                        optionObj.value.pointList[index].imgArr=[...item.imgArr]
+                        optionObj.value.pointList[index].imgArr2=[...item.imgArr2]
+                        optionObj.value.pointList[index].resultContent = item.imgArr.join(",");
+                        // console.log("上传成功后=>",optionObj.value.pointList[index])
+                    }).finally(()=>{
+                        optionObj.value.pointList[index].loading=false;
+                    })
+                })
+            },
+            fail: (err) => {
+                console.log('选择图片失败', err);
+                
+            }
+        });
+    } catch (error) {
+        console.log(error)
+    }
+};
+
+// 视频处理
+const chooseVideo = (item,index) => {
+    uni.chooseVideo({
+        sourceType: ['camera'], // 来源：相册和相机//'album', 
+        maxDuration: 60, // 最大时长（秒）
+        camera: 'back', // 使用后置摄像头
+        compressed: true, // 压缩视频
+        success: async (res) => {
+            // console.log("res=>",res)
+            // videoSrc.value=res.tempFilePath;
+            // videoArr.value.push(res.tempFilePath)
+            // console.log('视频路径:', res.tempFilePath);
+            // console.log('视频时长:', res.duration);
+            // console.log('视频大小:', res.size);
+
+            // 执行上传
+            let param = {
+                filePath:  res.tempFilePath,
+                name: 'file',
+                formData: {
+                    directory:'polling'
+                },
+            }
+            optionObj.value.pointList[index].loading=true;
+            minioUpload(param).then(uploadRes=>{ 
+                let data = uploadRes.data;
+                item.videoArr2.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:data.fileUrl
+                });
+                item.videoArr.push(data.fileName)//传给后台的路径
+
+                optionObj.value.pointList[index].videoArr=[...item.videoArr];
+                optionObj.value.pointList[index].videoArr2=[...item.videoArr2];
+                optionObj.value.pointList[index].resultContent = item.videoArr.join(",");
+                // console.log(optionObj.value.pointList[index])
+            }).finally(()=>{
+                optionObj.value.pointList[index].loading=false;
+            })
+        },fail: (err) => {
+            console.error('选择视频失败:', err);
+        }
+    });
+};
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(item)=>{
+    // console.log("showMediaPreview===")
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = item.url
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+// 视频或图片删除 根据数组下标删除数组里的某个图片或视频
+const handleDelete=(item,index,index2)=>{
+    let imgArr2 =  optionObj.value.pointList[index].imgArr2;
+    let videoArr2 =  optionObj.value.pointList[index].videoArr2
+    if(imgArr2.length>0){
+        item.imgArr.splice(index2, 1);
+        item.imgArr2.splice(index2, 1);
+        optionObj.value.pointList[index].imgArr = [...item.imgArr]
+        optionObj.value.pointList[index].imgArr2 = [...item.imgArr2]
+        optionObj.value.pointList[index].resultContent = item.imgArr.join(",");
+    }else if(videoArr2.length>0){
+        item.videoArr.splice(index2, 1);
+        item.videoArr2.splice(index2, 1);
+        optionObj.value.pointList[index].videoArr = [...item.videoArr]
+        optionObj.value.pointList[index].videoArr2 = [...item.videoArr2]
+        optionObj.value.pointList[index].resultContent = item.videoArr.join(",");
+    }
+    // console.log("删除后=>",optionObj.value.pointList[index])
+}
+
+// nfc 处理
+let nfcShow = ref(false);
+const nfcReaderRef = ref(null);
+// optionObj.pointList
+let nfcIndex = ref(0);
+let nfcId = ref()
+const initNFC = async(item,index) => {
+    // console.log("item=>",item)
+    nfcId.value = item.refId;
+    nfcShow.value = true;
+    nfcIndex.value=index;
+    // uni.navigateTo({url:'/pages/business/polling/nfcTest/index'})
+    // #ifdef APP-PLUS
+    setTimeout(()=>{
+        if(nfcReaderRef.value){
+            nfcReaderRef.value.open();
+        }
+    },50)
+    // #endif
+}
+const nfcClose = async(item) => {
+    nfcShow.value = false;
+}
+
+const handleNfcData= async(data)=>{
+    console.log("NFC数据:", data);
+    optionObj.value.pointList[nfcIndex.value].resultContent = data;
+}
+
+// 扫二维码
+const scanStr = ref(undefined);
+const handleScan = (item) => {
+   // 调用扫码API
+    uni.scanCode({
+        success: (res) => {
+            scanStr.value = res.result;
+            console.log('扫码结果:', res.result); // 二维码内容
+            console.log('码类型:', res.scanType); // 码类型，如 QR_CODE
+            item.resultContent = res.result
+        },
+        fail: (err) => {
+            console.error('扫码失败:', err);
+        }
+    });
+}
+
+// 提交
+let submitParam = {}
+let submitLoading = ref(false)
+const handleSubmit=()=>{
+    submitLoading.value = true;
+    let list = optionObj.value.pointList;
+    let flag = false;
+    for (let i = 0; i < list.length; i++) {
+        const item = list[i];
+        if(!item.resultContent){
+            flag = true;
+            break;
+        }
+    }
+    // 如果有未完成的项提示
+    if(flag){
+        showModel('有未完成的巡检项');
+    }
+
+    // 循环处理给后台传值
+    let arr = [];
+    list.forEach(item => {
+        arr.push({
+            pointId:item.pointId,
+            resultContent:item.resultContent||'',
+            resultId: item.resultId || undefined
+        })
+    });
+    submitParam = {
+        taskId:taskId.value,
+        groupId:groupId.value,
+        resultList:arr
+    }
+    // console.log("submitParam=>",submitParam)
+
+    // 都答好了直接提交
+    if(!flag){
+        handleConfirm();
+    }
+}
+
+// 自定义弹窗
+let title = ref('');
+let content = ref('');
+let visible = ref(false);
+let subContent= ref('');
+let subTime= ref(undefined);
+let btnFlag2=ref(true)
+let btnTxt=ref('')
+let isGreen =ref(false);
+const showModel=(str)=>{
+    visible.value = true;
+    content.value = str;
+    subContent.value='是否确认提交?';
+    btnTxt.value='提交'
+    btnFlag2.value=true;
+    isGreen.value = false;
+    subTime.value=undefined;
+}
+const showModel2=(str)=>{
+    content.value = str;
+    subContent.value='提交时间';
+    btnTxt.value='确定';
+    btnFlag2.value=false;
+    isGreen.value = true;
+    visible.value = true;
+}
+//关闭
+const handleClose=()=>{
+    visible.value = false;
+    submitLoading.value = false;
+}
+
+// 执行提交
+const handleConfirm=()=>{
+    try {
+        if(isGreen.value){
+            visible.value = false;
+            isGreen.value=false;
+        }else{
+            // 执行提交
+            submitResult(submitParam).then(res=>{
+                subTime.value = res;
+                visible.value = false;
+                // console.log("submitResult=>",visible.value)
+                showModel2('此巡检项已完成');
+                uni.navigateBack();
+            }).finally(() => {
+                submitLoading.value = false;
+            })
+        }
+        
+    } catch (error) {
+        console.log("==========",error)
+        visible.value = false;
+    }
+   
+}
+
+// 基础弹窗
+const visible3 = ref(false);
+const content3 = ref('');
+const showModel3=(str)=>{
+    visible3.value = true;
+    content3.value = str;
+}
+const handleClose3=()=>{
+    visible3.value = false;
+    submitLoading.value = false;
+}
+
+
+onUnmounted(() => {
+ 
+})
+</script>
+<style scoped>
+
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 76px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+.head-right{}
+.head-right .btn-yellow{
+    background-color: #FCC123;
+    color: #4C2D11;
+    font-size: 28rpx;
+    font-weight: bold;
+    border-radius: 10rpx;
+    padding:10rpx 25rpx;
+    display: flex;
+    align-items: center;
+}
+.head-right .btn-yellow .img-repair{
+    width: 30rpx;
+    height: 30rpx;
+}
+.week{
+    padding:0 40rpx;
+    color: #fff;
+    font-size:32rpx;
+    margin-bottom:20rpx;
+}
+
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+.white-bg2{
+   /* padding:0 40rpx; */
+   margin-top:-30rpx;
+}
+.report-list{
+    position: relative;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+.report-list .r-list{
+    padding: 5rpx 0;
+}
+.report-list .r-left{
+    display: flex;
+    align-items: center;
+    width:70%;
+    font-size:28rpx;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+.report-list .r-right.r-active{
+    color:#05A3F4
+}
+.report-list .r-active .r-font{
+    color:#919191;
+    font-size:18rpx;
+    text-align: center;
+}
+.report-list .r-input{
+    border:1px solid #E7E7E7;
+    border-radius: 10rpx;
+    width:620rpx;
+    padding:15rpx 25rpx;
+    margin:20rpx 0 30rpx;
+}
+.report-list .place-input{
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+.report-list .textarea{
+    min-height: 50rpx;
+}
+.r-right :deep(.uni-radio-input){
+    width:36rpx;
+    height: 36rpx;
+}
+.r-right .uni-input{
+    width:100%;
+}
+.report-list :deep(.uni-select-dc){
+    margin:20rpx 0 30rpx;
+}
+.report-list :deep(.uni-select-dc .uni-select-dc-select){
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+.img-nfc{
+    width:50rpx;
+    height: 40rpx;
+    margin-right:10rpx;
+}
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    /* gap:30rpx 20rpx ; */
+    width:100%;
+}
+.report-list .img-show img,
+.report-list .img-show video,
+.report-list .img-show image,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height:140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:70rpx;
+    height: 50rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 20rpx 0 0;
+}
+
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-delete{
+    position: absolute;
+    /* #ifndef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    top:4rpx;
+    width:34rpx;
+    height:34rpx;
+    line-height:34rpx;
+    border-radius:3rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    text-align: center;
+    z-index:1;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+.bg-border{
+    width:750rpx;
+    height:20rpx;
+    background-color: #F5F5F5;
+    margin-left:-40rpx;
+    margin-top:40rpx;
+}
+
+.report-list .r-list .r-name{
+    width:525rpx
+}
+.r-left .r-l-left{
+    width:280rpx;
+}
+.r-left .r-l-right{
+   
+}
+.no-data{
+    padding:200rpx 0 200rpx;
+}
+.no-data .no-pic{
+    display: block;
+    width:440rpx;
+    height:210rpx;
+    margin:40rpx auto;
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.btn-submit{
+    width:400rpx;
+    margin:0 auto;
+}
+.btn-submit uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.2;   
+}
+.btn-submit uni-button:after{
+    border-color:#05A3F4;
+}
+</style>

src/pages/business/polling/problemDetail.vue

@@ -0,0 +1,416 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="问题跟踪" 
+            :leftFlag="true" :rightFlag="true"
+        >
+            <template #right>
+                <view class="head-right" @click="handleQuestion" v-if="problemObj.problemStatus==1">
+                    <view class="btn-yellow">
+                        <uni-icons type="plus" size="20" color="#4C2D11"></uni-icons> 新增跟踪信息
+                    </view>
+                </view>
+            </template>
+        </customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">问题：{{problemObj.groupName}}</view>
+                <view class="report-list">
+                    <view class="report-pro">问题项</view>
+                    <view class="report-right">
+                        <view class="r-list"  v-for="(item, index) in problemObj.list" :key="index">
+                            <view class="r-left" :class="{'r-red':item.active}">
+                                <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                <view>{{ item }}</view>
+                            </view>
+                            <view class="r-right">
+                                <view class="r-r-round" :class="{active:item.active}"></view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view style="width:45%;display:flex;">
+                        <view class="report-pro report-w" style="margin-right:20rpx;">提交人</view>
+                        <view class="report-right report-w">{{problemObj.createUserName}}</view>
+                    </view>
+                    <view style="width:55%;display:flex;">
+                        <view class="report-pro report-w" style="margin-right:20rpx;">提交时间</view>
+                        <view class="report-right report-w">{{parseTime(problemObj.createTime,'{y}-{m}-{d} {h}:{i}')}}</view>
+                    </view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list">问题描述</view>
+                <view class="report-list report-gray">{{problemObj.problemDesc}}</view>
+                <view class="report-border"></view>
+                <view class="report-list">问题点位照片或视频</view>
+                <view class="report-list">
+                    <view class="img-flex">
+                        <block v-for="(item2,index2) in problemObj.listFile" :key="index2">
+                            <view class="img-show" v-if="getFileType(item2)=='image'" @click="showMediaPreview(item2)">
+                                <image :src="minioObj.minioThumbUrl+'/'+item2" mode="aspectFill" /> 
+                            </view>
+                            <view class="img-show" v-else-if="getFileType(item2)=='video'" @click="showMediaPreview(item2)">
+                                <view class="img-icon">
+                                    <img :src="'static/images/polling/icon-play.png'" />
+                                </view>
+                                <!-- <video :src="minioObj.minioUrl+'/'+item" controls  v-show="videoShow"></video> -->
+                                <DomVideoPlayer :src="minioObj.minioUrl+'/'+item2"  objectFit="cover"  v-show="videoShow" />
+                            </view>
+                        </block>
+                    </view>
+                </view>
+
+                <!-- 当天提的 增加按钮 修改和删除 -->
+                <view class="btn-con" v-if="isToday && problemObj.problemStatus==1">
+                    <button type="primary" @click="handleUpdate" size="mini" style="margin-right:50rpx;" class="btn-primary">修改</button>
+                    <button type="primary" @click="handleDelete" size="mini">删除</button>
+                </view>
+
+                <!-- 追踪列表 -->
+                <block v-if="problemObj.logList">
+                <block v-if="problemObj.logList.length>0">
+                    <view class="bg-border"></view>
+                    <view v-for="(item,index) in problemObj.logList" :key="index" class="log-con">
+                        <view class="blue-title">
+                            {{parseTime(item.createTime,'{y}-{m}-{d} {h}:{i}')}}
+                            <text style="margin-left:20rpx;">巡检人：{{item.modifyUserName}}</text>
+                        </view>
+                        <view class="report-list">检查点跟踪情况描述</view>
+                        <view class="report-list report-gray">{{item.logDesc}}</view>
+                        <view class="report-border"></view>
+                        <view class="report-list">检查点位照片或视频</view>
+                        <view class="report-list">
+                            <view class="img-flex">
+                                <block v-for="(item2,index2) in item.listFile" :key="index2">
+                                    <view class="img-show" v-if="getFileType(item2)=='image'" @click="showMediaPreview(item2)">
+                                        <image :src="minioObj.minioThumbUrl+'/'+item2" mode="aspectFill" /> 
+                                    </view>
+                                    <view class="img-show" v-else-if="getFileType(item2)=='video'" @click="showMediaPreview(item2)">
+                                        <view class="img-icon">
+                                            <img :src="'static/images/polling/icon-play.png'" />
+                                        </view>
+                                        <!-- <video :src="minioObj.minioUrl+'/'+item" controls v-show="videoShow"></video> -->
+                                        <DomVideoPlayer :src="minioObj.minioUrl+'/'+item2"  objectFit="cover"  v-show="videoShow" />
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                </block>
+            </view>
+        </mescroll-uni>
+    </view>
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive } from 'vue'
+import { onLoad,onShow,onHide} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import mediaPreview from "@/components/mediaPreview.vue"
+import DomVideoPlayer from 'uniapp-video-player'
+import { parseTime } from '@/utils/datetime.js';
+import {getFileType} from '@/utils/common.js';
+import { problemDetail,problemDel } from '@/api/polling.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+
+let problemId=ref('');
+let problemObj = ref({});
+let isToday = ref(false);
+let minioObj = {};
+onLoad(option => {
+    // console.log(option)
+    problemId.value = option.problemId;
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+})
+
+onShow(()=>{
+    getList();
+})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+
+// 获取数据列表
+const getList = async() => {
+    isToday.value = false;
+    let data = await problemDetail({problemId:problemId.value});
+    data.list = data.pointName?.split(",") || [];
+    data.listFile=data.problemVedio?.split(",") || [];
+    data.logList.forEach(item => {
+        item.listFile = item.logVedio?.split(",")||[]
+    });
+    // 判断是否当天创建的，显示按钮
+    let createTime = parseTime(data.createTime,'{y}-{m}-{d}');
+    let dateNow = parseTime(new Date().getTime(),'{y}-{m}-{d}');
+    if(createTime == dateNow){
+        isToday.value = true;
+    }
+    problemObj.value = data;
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(url)=>{
+    url = minioObj.minioUrl+'/'+url;
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = url;
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+// 跳转问题上报页面
+const handleQuestion=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemLog?problemId='+problemId.value
+    });
+}
+
+// 修改
+const handleUpdate=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemReport?problemId='+problemId.value
+    });
+}
+
+// 删除
+const handleDelete=()=>{
+    showLoading("加载中...")
+    problemDel({problemId:problemId.value}).then(res=>{
+        // content, title = '提示',showCancel=false,succFun
+        showAlert("删除成功！",'提示',false,()=>{
+            uni.navigateBack()
+        })
+    }).finally(()=>{
+        hideLoading();
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.head-right{}
+.head-right .btn-yellow{
+    background-color: #FCC123;
+    color: #4C2D11;
+    font-size: 28rpx;
+    font-weight: bold;
+    border-radius: 10rpx;
+    padding:10rpx 25rpx;
+    display: flex;
+    align-items: center;
+}
+.head-right .btn-yellow .img-repair{
+    width: 30rpx;
+    height: 30rpx;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 50rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:30rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list.report-gray{
+    color:#919191;
+    padding:20rpx 0 0;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .report-w{
+    width:auto;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    /* align-items: center; */
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+
+
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 20rpx 0 0;
+}
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+.report-list .img-show img,
+.report-list .img-show video,
+.report-list .img-show image,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.btn-con{
+    text-align: center;
+    padding-top:50rpx;
+}
+uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.5;
+    padding:0 80rpx;
+}
+uni-button:after{
+    display: none;
+}
+
+.bg-border{
+    width:750rpx;
+    height:20rpx;
+    background-color: #F5F5F5;
+    margin-left:-40rpx;
+    margin-top:40rpx;
+}
+
+.log-con{
+    padding-top:10rpx;
+}
+.log-con .blue-title{
+    font-size:32rpx;
+}
+</style>

src/pages/business/polling/problemInitiative.vue

@@ -0,0 +1,501 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="新增问题上报" 
+            :leftFlag="true" :rightFlag="false"
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">
+                    问题名称
+                    <view class="report-list">
+                        <input class="r-input uni-input" v-model="optionObj.bugName" placeholder="请输入问题" placeholder-class="place-input" />
+                    </view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view class="report-pro">提交人</view>
+                    <view class="report-right">{{optionObj.createUserName?optionObj.createUserName:realname}}</view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    问题描述
+                    <textarea class="r-input textarea" v-model="optionObj.bugDesc" auto-height 
+                        placeholder="请输入问题项描述" placeholder-class="place-input"
+                    ></textarea>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    <view class="r-title">问题点位照片或视频 <text>*</text></view>
+                    <view class="img-flex">
+                        <view class="img-show" v-for="(item2,index2) in imgArr" :key="index2"  @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(imgArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <!-- <img :src="item2.shortUrl" /> -->
+                            <image :src="item2.shortUrl" mode="aspectFill" /> 
+                        </view>
+                        <view class="img-show" v-for="(item2,index2) in videoArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(videoArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <view class="img-icon">
+                                <img :src="'static/images/polling/icon-play.png'" />
+                            </view>
+                            <!-- <video :src="item.url" controls></video> -->
+                            <DomVideoPlayer :src="item2.url" objectFit="cover" />
+                        </view>
+                       
+                        <!-- loading -->
+                        <view class="img-con" v-if="imgLoading">
+                            <view class="upload-loading">
+                                <uni-icons type="refreshempty" size="30" color="#C9C9C9"></uni-icons>
+                                <view>上传中....</view>
+                            </view>
+                        </view>
+                        <view class="img-con" @click="chooseMedia" v-else>
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view>
+                        <!-- #ifdef APP-PLUS -->
+                        <!-- #endif -->
+                        <!-- #ifndef APP-PLUS -->
+                        <!-- <view class="img-con">
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view> -->
+                        <!-- #endif -->
+                    </view>
+                </view>
+                <view class="btn-submit">
+                    <button type="primary" @click="handleSubmit">提交</button>
+                </view>
+            </view>
+        </mescroll-uni>
+    </view>
+
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+
+    <!-- 选择图片或者视频 -->
+    <chooseMediaVue ref="chooseMediaRef" @getMediaArr="getMediaArr" @closeMedia="closeMedia"></chooseMediaVue>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive, watch,getCurrentInstance } from 'vue'
+import { onLoad,onShow,onHide} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import chooseMediaVue from '@/components/chooseMedia.vue'
+import mediaPreview from "@/components/mediaPreview.vue"
+import DomVideoPlayer from 'uniapp-video-player'
+import { getUserInfo } from '@/api/auth.js'
+import { patrolBugDetail,patrolBugAdd,patrolBugEdit,minioUpload } from '@/api/polling.js'
+import {compressImageUni,getFileType} from '@/utils/common.js'
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+const { proxy } = getCurrentInstance();
+
+let bugId = ref('');//问题id
+let realname = ref('');
+let desc = ref('');//描述
+let minioObj = {};
+onLoad(async option => {
+    // console.log(option)
+    bugId.value = option.bugId;
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+    let userinfo = await getUserInfo({});
+    realname.value = userinfo.realname;
+
+    if(bugId.value)
+        getList();
+})
+
+onShow(()=>{
+    imgLoading.value=false;
+})
+
+// 查询列表
+let list = ref([]);
+let optionObj = ref({})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    use:false,
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+// 获取数据列表
+const getList = async () => {
+    let param = {
+        bugId:bugId.value
+    }
+    let res = await patrolBugDetail(param);
+    let data = res||{};
+
+    // 视频回显
+    imgArr.value = [];
+    mediaArr.value=[];
+    videoArr.value=[];
+    let fileList =data.bugVedio?.split(",") || [];
+    fileList.forEach(item=>{
+        mediaArr.value.push(item)
+        if(getFileType(item)=='image'){
+            imgArr.value.push({
+                shortUrl:minioObj.minioThumbUrl +"/"+item,
+                url:minioObj.minioUrl +"/"+item,
+                name:item
+            })
+        }else if(getFileType(item)=='video'){
+            videoArr.value.push({
+                shortUrl:minioObj.minioThumbUrl +"/"+item,
+                url:minioObj.minioUrl +"/"+item,
+                name:item
+            })
+        }
+    })
+    optionObj.value = data;
+}
+
+// 图片或视频
+let mediaArr = ref([]);//传给后台的地址
+let imgArr=ref([]);//图片 后台返回的
+let videoArr = ref([]);//视频 后台返回的
+let imgLoading = ref(false)
+const chooseMedia = () => {
+    proxy.$refs["chooseMediaRef"].openPicker();
+    imgLoading.value=true; 
+}
+const closeMedia = ()=>{
+    imgLoading.value=false; 
+}
+
+// 插件回调
+const getMediaArr=(arr)=>{
+    // console.log("插件回调=>",arr)
+    try {
+        arr.forEach(data=>{
+            mediaArr.value.push(data.fileName);
+            if(data.fileType=="image"){
+                imgArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }else if(data.fileType == "video"){
+                videoArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }
+        })
+        // console.log(imgArr.value,videoArr.value)
+        imgLoading.value=false; 
+    } catch (error) {
+        console.error(error)
+        imgLoading.value=false; 
+    }
+    
+}
+
+// 视频或图片删除 根据数组下标删除数组里的某个图片或视频
+const handleDelete=(arr,index2)=>{
+    let item = arr[index2];
+    arr.splice(index2, 1);
+    mediaArr.value = mediaArr.value.filter(item2=>item2!=item.name);
+    console.log("删除后=>",mediaArr.value)
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(item)=>{
+    // console.log("调用放大视频==>",item)
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = item.url
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+// 提交
+const handleSubmit=()=>{
+
+    showLoading("加载中...")
+    if(bugId.value){
+        let param = {
+            bugId:bugId.value,
+            bugName:optionObj.value.bugName,
+            bugVedio:mediaArr.value.join(","),
+            bugDesc:optionObj.value.bugDesc
+        }
+        // console.log("patrolBugEdit=>",param)
+        patrolBugEdit(param).then(res=>{
+            // showAlert = (content, title = '提示',showCancel=false,succFun)
+            showAlert("修改问题上报成功！","提示",false,()=>{
+                uni.navigateBack()
+            })
+        }).finally(()=>{
+            hideLoading();
+        })
+    }else{
+        let param = {
+            bugName:optionObj.value.bugName,
+            bugVedio:mediaArr.value.join(","),
+            bugDesc:optionObj.value.bugDesc
+        }
+        // console.log("patrolBugAdd=>",param)
+        patrolBugAdd(param).then(res=>{
+            showAlert("新建问题上报成功！","提示",false,()=>{
+                bugId.value = res;
+                uni.navigateBack()
+            })
+        }).finally(()=>{
+            hideLoading();
+        })
+    }
+    
+}
+</script>
+
+<style scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+.white-bg .red-title .uni-input{
+    color:#333;
+    font-weight: normal;
+}
+
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:30rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .r-input{
+    border:1px solid #E7E7E7;
+    border-radius: 10rpx;
+    width:620rpx;
+    padding:15rpx 25rpx;
+    margin:20rpx 0 0rpx;
+}
+.report-list .place-input{
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+.report-list .textarea{
+    min-height: 120rpx;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    align-items: center;
+    width:90%;
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+.report-list .r-r-round{
+    width:35rpx;
+    height:35rpx;
+    border:1px solid #BDBDBD;
+    border-radius: 50%;
+}
+.report-list .r-r-round.active{
+    border:1px solid #FF2B44;
+    background-color: #FF2B44;
+    position: relative;
+}
+.report-list .r-r-round.active::after{
+    content:"!";
+    position: absolute;
+    top:0;
+    left:0;
+    color:#fff;
+    text-align: center;
+    width:35rpx;
+    height:35rpx;
+    /* #ifndef APP-PLUS */
+    line-height: 30rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    height:33rpx;
+    padding-top:2rpx;
+    /* #endif */
+}
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-show img,
+.report-list .img-show image,
+.report-list .img-show video,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 20rpx 0 0;
+}
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-delete{
+    position: absolute;
+    /* #ifndef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    top:8rpx;
+    width:34rpx;
+    height:34rpx;
+    line-height:34rpx;
+    border-radius:3rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    text-align: center;
+    z-index:1;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+
+.btn-submit{
+    width:400rpx;
+    margin:90rpx auto;
+}
+.btn-submit uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.2;   
+}
+.btn-submit uni-button:after{
+    border-color:#05A3F4;
+}
+</style>

src/pages/business/polling/problemInitiativeDetail.vue

@@ -0,0 +1,402 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="问题上报" 
+            :leftFlag="true" :rightFlag="true"
+        >
+            <template #right>
+                <view class="head-right" @click="handleQuestion" v-if="problemObj.bugStatus==1">
+                    <view class="btn-yellow">
+                        <uni-icons type="plus" size="20" color="#4C2D11"></uni-icons> 新增跟踪信息
+                    </view>
+                </view>
+            </template>
+        </customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">问题：{{problemObj.bugName}}</view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view style="width:45%;display:flex;">
+                        <view class="report-pro report-w" style="margin-right:20rpx;">提交人</view>
+                        <view class="report-right report-w">{{problemObj.createUserName}}</view>
+                    </view>
+                    <view style="width:55%;display:flex;">
+                        <view class="report-pro report-w" style="margin-right:20rpx;">提交时间</view>
+                        <view class="report-right report-w">{{parseTime(problemObj.createTime,'{y}-{m}-{d} {h}:{i}')}}</view>
+                    </view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list">问题描述</view>
+                <view class="report-list report-gray">{{problemObj.bugDesc}}</view>
+                <view class="report-border"></view>
+                <view class="report-list">问题点位照片或视频</view>
+                <view class="report-list">
+                    <view class="img-flex">
+                        <block v-for="(item2,index2) in problemObj.listFile" :key="index2">
+                            <view class="img-show" v-if="getFileType(item2)=='image'" @click="showMediaPreview(item2)">
+                                <image :src="minioObj.minioThumbUrl+'/'+item2" mode="aspectFill" /> 
+                            </view>
+                            <view class="img-show" v-else-if="getFileType(item2)=='video'" @click="showMediaPreview(item2)">
+                                <view class="img-icon">
+                                    <img :src="'static/images/polling/icon-play.png'" />
+                                </view>
+                                <!-- <video :src="minioObj.minioUrl+'/'+item" controls  v-show="videoShow"></video> -->
+                                <DomVideoPlayer :src="minioObj.minioUrl+'/'+item2"  objectFit="cover"  v-show="videoShow" />
+                            </view>
+                        </block>
+                    </view>
+                </view>
+
+                <!-- 当天提的 增加按钮 修改和删除 -->
+                <view class="btn-con" v-if="isToday && problemObj.bugStatus==1">
+                    <button type="primary" @click="handleUpdate" size="mini" style="margin-right:50rpx;" class="btn-primary">修改</button>
+                    <button type="primary" @click="handleDelete" size="mini">删除</button>
+                </view>
+
+                <!-- 追踪列表 -->
+                <block v-if="problemObj.logList">
+                <block v-if="problemObj.logList.length>0">
+                    <view class="bg-border"></view>
+                    <view v-for="(item,index) in problemObj.logList" :key="index" class="log-con">
+                        <view class="blue-title">
+                            {{parseTime(item.createTime,'{y}-{m}-{d} {h}:{i}')}}
+                            <text style="margin-left:20rpx;">巡检人：{{item.modifyUserName}}</text>
+                        </view>
+                        <view class="report-list">检查点跟踪情况描述</view>
+                        <view class="report-list report-gray">{{item.logDesc}}</view>
+                        <view class="report-border"></view>
+                        <view class="report-list">检查点位照片或视频</view>
+                        <view class="report-list">
+                            <view class="img-flex">
+                                <block v-for="(item2,index2) in item.listFile" :key="index2">
+                                    <view class="img-show" v-if="getFileType(item2)=='image'" @click="showMediaPreview(item2)">
+                                        <image :src="minioObj.minioThumbUrl+'/'+item2" mode="aspectFill" /> 
+                                    </view>
+                                    <view class="img-show" v-else-if="getFileType(item2)=='video'" @click="showMediaPreview(item2)">
+                                        <view class="img-icon">
+                                            <img :src="'static/images/polling/icon-play.png'" />
+                                        </view>
+                                        <!-- <video :src="minioObj.minioUrl+'/'+item" controls v-show="videoShow"></video> -->
+                                        <DomVideoPlayer :src="minioObj.minioUrl+'/'+item2"  objectFit="cover"  v-show="videoShow" />
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                </block>
+            </view>
+        </mescroll-uni>
+    </view>
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive } from 'vue'
+import { onLoad,onShow,onHide} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import mediaPreview from "@/components/mediaPreview.vue"
+import DomVideoPlayer from 'uniapp-video-player'
+import { parseTime } from '@/utils/datetime.js';
+import {getFileType} from '@/utils/common.js';
+import { patrolBugDetail,patrolBugDel } from '@/api/polling.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+
+let bugId=ref('');
+let problemObj = ref({});
+let isToday = ref(false);
+let minioObj = {};
+onLoad(option => {
+    // console.log(option)
+    bugId.value = option.bugId;
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+})
+
+onShow(()=>{
+    getList();
+})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+
+// 获取数据列表
+const getList = async() => {
+    isToday.value = false;
+    let data = await patrolBugDetail({bugId:bugId.value});
+    // data.list = data.pointName?.split(",") || [];
+    data.listFile=data.bugVedio?.split(",") || [];
+    data.logList.forEach(item => {
+        item.listFile = item.logVedio?.split(",")||[]
+    });
+    // 判断是否当天创建的，显示按钮
+    let createTime = parseTime(data.createTime,'{y}-{m}-{d}');
+    let dateNow = parseTime(new Date().getTime(),'{y}-{m}-{d}');
+    if(createTime == dateNow){
+        isToday.value = true;
+    }
+    problemObj.value = data;
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(url)=>{
+    url = minioObj.minioUrl+'/'+url;
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = url;
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+// 跳转问题上报页面
+const handleQuestion=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemInitiativeLog?bugId='+bugId.value
+    });
+}
+
+// 修改
+const handleUpdate=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemInitiative?bugId='+bugId.value
+    });
+}
+
+// 删除
+const handleDelete=()=>{
+    showLoading("加载中...")
+    patrolBugDel({bugId:bugId.value}).then(res=>{
+        // content, title = '提示',showCancel=false,succFun
+        showAlert("删除成功！",'提示',false,()=>{
+            uni.navigateBack()
+        })
+    }).finally(()=>{
+        hideLoading();
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.head-right{}
+.head-right .btn-yellow{
+    background-color: #FCC123;
+    color: #4C2D11;
+    font-size: 28rpx;
+    font-weight: bold;
+    border-radius: 10rpx;
+    padding:10rpx 25rpx;
+    display: flex;
+    align-items: center;
+}
+.head-right .btn-yellow .img-repair{
+    width: 30rpx;
+    height: 30rpx;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 50rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:30rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list.report-gray{
+    color:#919191;
+    padding:20rpx 0 0;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .report-w{
+    width:auto;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    /* align-items: center; */
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+
+
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 20rpx 0 0;
+}
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+.report-list .img-show img,
+.report-list .img-show video,
+.report-list .img-show image,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.btn-con{
+    text-align: center;
+    padding-top:50rpx;
+}
+uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.5;
+    padding:0 80rpx;
+}
+uni-button:after{
+    display: none;
+}
+
+.bg-border{
+    width:750rpx;
+    height:20rpx;
+    background-color: #F5F5F5;
+    margin-left:-40rpx;
+    margin-top:40rpx;
+}
+
+.log-con{
+    padding-top:10rpx;
+}
+.log-con .blue-title{
+    font-size:32rpx;
+}
+</style>

src/pages/business/polling/problemInitiativeList.vue

@@ -0,0 +1,334 @@
+<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>
+                    <view class="head-right" @click="handleQuestion">
+                        <view class="btn-yellow">
+                            <uni-icons type="plus" size="20" color="#4C2D11"></uni-icons> 新建问题上报
+                        </view>
+                    </view>
+                </template>
+            </customHeader>
+            
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+          
+            <!-- 搜索处理   -->
+            <customSearch v-if="searchShow"   
+                :searchKeywords="searchText" 
+                :searchType="searchTypeObj" 
+                @confirm="handleSearchConfirm"
+            ></customSearch>
+            <view class="search"  v-else>
+                <uni-search-bar class="custom-search" radius="28" 
+                    placeholder="请输入搜索条件"
+                    clearButton="auto" cancelButton="none" 
+                    bgColor="#6FA2F8" textColor="#ffffff"
+                    @focus="handleSearchFocus"
+                    v-model="searchText"
+                />
+            </view>
+
+            <!-- 列表 -->
+            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                :up="upOption" :down="downOption" :fixed="false" class="scroll-h" :class="{'loading-scroll':cssFlag}">
+                <view class="white-bg" :class="{'bg-height':list.length<8}">
+                    <block v-if="list.length>0">
+                        <view class="report-list" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+                            <view class="r-list" style="padding-bottom:0">
+                                <view class="r-name">{{ item.bugName }}</view>
+                                <view class="r-right">
+                                    <!-- 问题状态 1=追踪、2=关闭 -->
+                                    <view v-if="item.bugStatus==1" class="btn-red">进行中</view>
+                                    <view v-if="item.bugStatus==2" class="btn-green">已解决</view>
+                                </view>
+                            </view>
+                            <view class="r-list">
+                                <view class="r-left">
+                                    <view class="r-l-left" style="width:220rpx">跟踪次数<span class="r-gray">{{ item.logNum }}</span></view>
+                                    <view class="r-l-right">最近跟踪时间<span class="r-gray">{{parseTime(item.lastLogTime,'{y}-{m}-{d} {h}:{i}') }}</span></view>
+                                </view>
+                            </view>
+                            <view class="report-border" v-if="index<list.length-1"></view>
+                        </view>
+                    </block>
+                    <view v-else class="no-data">
+                        <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                    </view>
+                </view>
+            </mescroll-uni>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted,computed } from 'vue'
+import { onLoad,onHide, onShow } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
+import customSearch from '@/components/customSearch.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { parseTime } from '@/utils/datetime.js'
+import { patrolBugList } from '@/api/polling.js'
+
+onLoad(async(opt) => {
+    uni.setStorageSync('page_cache',true);
+})
+
+onShow(()=>{
+    triggerRefresh();
+})
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 搜索处理
+let searchShow = ref(false);
+let searchText = ref(undefined);
+let searchTypeObj = ref({typeId:5});
+
+onHide(()=>{
+    searchShow.value=false;
+})
+
+// 搜索返回操作
+const handleBack=()=>{
+    searchShow.value=false;
+}
+// 获取input 焦点跳转
+const handleSearchFocus=()=>{
+    searchShow.value = true;
+}
+
+// 搜索完返回处理
+const handleSearchConfirm = (param1,param2)=>{
+    // console.log(param1,param2)
+    searchText.value=param2.value;;
+    searchShow.value=false;
+}
+
+// 清除未读
+const handleRead = () => {
+    list.value.forEach(item => {
+        item.isRead = false;
+    })
+}
+// 查询通知列表
+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 downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let cssFlag=ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        console.log("下拉刷新")
+        const res = await getList(1, upOption.value.page.size);
+        cssFlag.value = false;
+        list.value = res.list;
+        // mescroll.resetUpScroll();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        console.log("上拉加载更多")
+        let res = await getList(mescroll.num, mescroll.size);
+        if (mescroll.num === 1) {
+            list.value = res.list;
+        } else {
+            list.value.push(...res.list);
+        }
+        mescroll.endBySize(res.list.length, res.total);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+    return new Promise(async (resolve) => {
+        let param = {
+            pageIndex,
+            pageSize,
+            key:searchText.value?searchText.value:undefined,
+        }
+        let res = await patrolBugList(param);
+        let list = res.list || [];
+        resolve({
+            list,
+            // total: res.recordCount || 0
+        });
+    });
+
+}
+
+// 主动触发下拉刷新
+const triggerRefresh = () => {
+    if (mescrollRef.value) {
+        mescrollRef.value.mescroll.triggerDownScroll()
+    }
+}
+
+// 跳转问题上报页面
+const handleQuestion=()=>{
+    uni.navigateTo({
+        url: '/pages/business/polling/problemInitiative'
+    });
+}
+
+// 查看详情
+const handleDetail = (item) =>{
+    let url= '/pages/business/polling/problemInitiativeDetail?bugId='+item.bugId;
+    uni.navigateTo({
+        url
+    });
+}
+</script>
+
+<style scoped>
+.all-body{
+    position: absolute;
+    /* #ifdef APP-PLUS */
+    top:150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top:120rpx;
+    height: calc(100vh - 64px);
+    /* #endif */
+    overflow: hidden;
+}
+
+:deep(.mescroll-downwarp .downwarp-progress){
+    border-color:#fff !important;
+}
+
+:deep(.mescroll-downwarp .downwarp-tip){
+    color:#fff;
+}
+
+.head-right{}
+.head-right .btn-yellow{
+    background-color: #FCC123;
+    color: #4C2D11;
+    font-size: 28rpx;
+    font-weight: bold;
+    border-radius: 10rpx;
+    padding:10rpx 25rpx;
+    display: flex;
+    align-items: center;
+}
+.head-right .btn-yellow .img-repair{
+    width: 30rpx;
+    height: 30rpx;
+}
+
+.white-bg {
+    width: 670rpx;
+    padding: 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+    position: relative;
+}
+.white-bg.bg-height{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 150px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 140px);
+    /* #endif */
+}
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 123px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 105px) !important;
+    /* #endif */
+}
+
+.report-list{
+    position: relative;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+.report-list .r-list{
+    padding: 5rpx 0;
+}
+.report-list .r-list .r-left{
+    display: flex;
+}
+.report-list .r-list .r-gray{
+    margin-left:10rpx;
+}
+.report-list .r-list .r-blue{
+    margin-left:10rpx;
+    font-weight: bold;
+}
+.report-list .r-list .r-red{
+    font-weight: bold;
+}
+.report-list .r-list .r-name{
+    width:525rpx
+}
+.r-left .r-l-left{
+    width:280rpx;
+}
+.r-left .r-l-right{
+   
+}
+.no-data .no-pic{
+    display: block;
+    width:440rpx;
+    height:210rpx;
+    margin:40rpx auto;
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+
+:deep(.mescroll-empty){
+    display: none !important;
+}
+</style>

src/pages/business/polling/problemInitiativeLog.vue

@@ -0,0 +1,498 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="新增跟踪信息" 
+            :leftFlag="true" :rightFlag="false"
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">问题：{{optionObj.bugName}}</view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view class="report-pro">提交人</view>
+                    <view class="report-right">{{optionObj.createUserName}}</view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    检查点跟踪情况描述
+                    <textarea class="r-input textarea" v-model="desc" auto-height 
+                        placeholder="请输入跟踪情况描述" placeholder-class="place-input"
+                    ></textarea>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    <view class="r-title">问题点位照片或视频 <text>*</text></view>
+                    <view class="img-flex">
+                        <view class="img-show" v-for="(item2,index2) in imgArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(imgArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <image :src="item2.shortUrl" mode="aspectFill" /> 
+                        </view>
+                        <view class="img-show" v-for="(item2,index2) in videoArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(videoArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <view class="img-icon">
+                                <img :src="'static/images/polling/icon-play.png'" />
+                            </view>
+                            <!-- <video :src="item" controls></video> -->
+                            <DomVideoPlayer :src="item2.url" objectFit="cover" />
+                        </view>
+
+                        <!-- loading -->
+                        <view class="img-con" v-if="imgLoading">
+                            <view class="upload-loading">
+                                <uni-icons type="refreshempty" size="30" color="#C9C9C9"></uni-icons>
+                                <view>上传中....</view>
+                            </view>
+                        </view>
+                        <view class="img-con" @click="chooseMedia" v-else>
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view>
+
+                        <!-- #ifdef APP-PLUS -->
+                        <!-- #endif -->
+                        <!-- #ifndef APP-PLUS -->
+                        <!-- <view class="img-con">
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view> -->
+                        <!-- #endif -->
+                    </view>
+                </view>
+                <view class="btn-submit">
+                    <button type="primary" @click="handleSubmit">提交</button>
+                </view>
+            </view>
+        </mescroll-uni>
+    </view>
+
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+
+    <!-- 选择图片或者视频 -->
+    <chooseMediaVue ref="chooseMediaRef" @getMediaArr="getMediaArr" @closeMedia="closeMedia"></chooseMediaVue>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive,getCurrentInstance } from 'vue'
+import { onLoad,onHide, onShow} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import mediaPreview from "@/components/mediaPreview.vue"
+import chooseMediaVue from '@/components/chooseMedia.vue'
+import DomVideoPlayer from 'uniapp-video-player'
+import { getUserInfo } from '@/api/auth.js'
+import { patrolBugDetail,patrolBugAddLog,minioUpload } from '@/api/polling.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+import {compressImageUni} from '@/utils/common.js'
+const { proxy } = getCurrentInstance();
+
+let bugId = ref('');
+let realname = ref('');
+let desc = ref('');//描述
+let minioObj = {};
+onLoad(async option => {
+    // console.log(option)
+    bugId.value = option.bugId;
+
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+    let userinfo = await getUserInfo({});
+    realname.value = userinfo.realname
+
+    getList();
+})
+onShow(()=>{
+    imgLoading.value=false;
+})
+
+// 查询列表
+let list = ref([]);
+let optionObj = ref({})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    use:false,
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+// 获取数据列表
+const getList = async () => {
+    let res = await patrolBugDetail({bugId:bugId.value});
+    let data = res || {};
+    // data.list = data.pointName.split(",") || [];
+    optionObj.value = data;
+}
+
+// 图片或视频
+let mediaArr = ref([]);//传给后台的地址
+let imgArr=ref([]);//图片 后台返回的
+let videoArr = ref([]);//视频 后台返回的
+let imgLoading = ref(false)
+const chooseMedia = () => {
+    proxy.$refs["chooseMediaRef"].openPicker();
+    imgLoading.value=true; 
+   /* uni.chooseMedia({
+        count: 9,
+        mediaType: ['image', 'video'], // 指定可选择图片和视频
+        sourceType: ['album', 'camera'],
+        maxDuration: 60, // 拍摄视频最长拍摄时间
+        camera: 'back',
+        success: (res) => {
+            console.log("问题跟踪chooseMedia=>",res)
+            res.tempFiles.forEach(async file => {
+                console.log(`文件类型: ${file.type}, 文件路径: ${file.tempFilePath}`);
+                let compressImg = file.tempFilePath;
+                // 图片进行压缩
+                if (file.fileType === 'image') {
+                    // #ifdef APP-PLUS
+                    // 压缩图片
+                    compressImg = await compressImageUni(file.tempFilePath);
+                    // #endif
+                }
+                // 执行上传
+                let param = {
+                    filePath: compressImg,
+                    name: 'file',
+                    formData: {
+                        directory:'polling'
+                    },
+                }
+                imgLoading.value=true;         
+                minioUpload(param).then(res=>{
+                    let data = res.data;
+                    mediaArr.value.push(data.fileName);
+                    if (file.fileType === 'image') {// 图片
+                        imgArr.value.push({
+                            shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                            url:minioObj.minioUrl +"/"+data.fileName,
+                            name:data.fileName
+                        })
+                    } else if (file.fileType === 'video') {// 视频
+                         videoArr.value.push({
+                            shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                            url:minioObj.minioUrl +"/"+data.fileName,
+                            name:data.fileName
+                        })
+                    }
+                }).finally(()=>{
+                    imgLoading.value=false;
+                })
+            });
+        }
+    });*/
+}
+
+const closeMedia = ()=>{
+    imgLoading.value=false; 
+}
+
+// 插件回调
+const getMediaArr=(arr)=>{
+    // console.log("插件回调=>",arr)
+    try {
+        arr.forEach(data=>{
+            mediaArr.value.push(data.fileName);
+            if(data.fileType=="image"){
+                imgArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }else if(data.fileType == "video"){
+                videoArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }
+        })
+        // console.log(imgArr.value,videoArr.value)
+        imgLoading.value=false; 
+    } catch (error) {
+        console.error(error)
+        imgLoading.value=false; 
+    }
+    
+}
+
+// 视频或图片删除 根据数组下标删除数组里的某个图片或视频
+const handleDelete=(arr,index2)=>{
+    arr.splice(index2, 1);
+    let item = arr[index2];
+    mediaArr.value = mediaArr.value.filter(item2=>item2!=item.name);
+    // console.log("删除后=>",mediaArr.value)
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(item)=>{
+    // console.log("调用放大视频==>",item)
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = item.url
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+// 提交
+const handleSubmit=()=>{
+    let param = {
+        bugId:bugId.value,
+        logVedio:mediaArr.value.join(","),
+        logDesc:desc.value
+    }
+    // console.log("patrolBugAddLog=>",param)
+    patrolBugAddLog(param).then(res=>{
+        showAlert("新建问题跟踪成功！");
+        uni.navigateBack();
+    }).finally(()=>{
+        hideLoading();
+    })
+}
+</script>
+
+<style scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .r-input{
+    border:1px solid #E7E7E7;
+    border-radius: 10rpx;
+    width:620rpx;
+    padding:15rpx 25rpx;
+    margin:20rpx 0 30rpx;
+}
+.report-list .place-input{
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+.report-list .textarea{
+    min-height: 120rpx;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+.report-list .r-r-round{
+    width:35rpx;
+    height:35rpx;
+    border:1px solid #BDBDBD;
+    border-radius: 50%;
+}
+.report-list .r-r-round.active{
+    border:1px solid #FF2B44;
+    background-color: #FF2B44;
+    position: relative;
+}
+.report-list .r-r-round.active::after{
+    content:"!";
+    position: absolute;
+    top:0;
+    left:0;
+    color:#fff;
+    text-align: center;
+    width:35rpx;
+    height:35rpx;
+    /* #ifndef APP-PLUS */
+    line-height: 30rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    height:30rpx;
+    padding-top:5rpx;
+    /* #endif */
+}
+
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-show img,
+.report-list .img-show image,
+.report-list .img-show video,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 10rpx 0;
+}
+
+.report-list .img-show:first-child,
+.report-list .img-con:first-child{
+    margin-left:0;
+}
+
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-delete{
+    position: absolute;
+    /* #ifndef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    top:8rpx;
+    width:34rpx;
+    height:34rpx;
+    line-height:34rpx;
+    border-radius:3rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    text-align: center;
+    z-index:1;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+.btn-submit{
+    width:400rpx;
+    margin:90rpx auto;
+}
+.btn-submit uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.2;   
+}
+.btn-submit uni-button:after{
+    border-color:#05A3F4;
+}
+</style>

src/pages/business/polling/problemList.vue

@@ -0,0 +1,301 @@
+<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"></view>
+          
+            <!-- 搜索处理 -->
+            <customSearch v-if="searchShow"   
+                :searchKeywords="searchText" 
+                :searchType="searchTypeObj" 
+                :checkTypeObj="notictTypeCheck"
+                :searchTypeList="noticeTypeList" 
+                @confirm="handleSearchConfirm"
+            ></customSearch>
+            <view class="search" v-else  @click="handleSearchFocus">
+                <view class="search-bg">
+                    <view class="search-left">{{ notictTypeCheck.name?notictTypeCheck.name:'全部' }}</view>
+                    <view class="search-right">
+                        <uni-icons type="search" size="20" color="#ffffff"></uni-icons>
+                        <input class="uni-input" v-model="searchText" 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" class="scroll-h" :class="{'loading-scroll':cssFlag}">
+                <view class="white-bg" :class="{'bg-height':list.length<8}">
+                    <block v-if="list.length>0">
+                        <view class="report-list" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+                            <view class="r-list" style="padding-bottom:0">
+                                <view class="r-name">{{ item.groupName }}</view>
+                                <view class="r-right">
+                                    <!-- 问题状态 1=追踪、2=关闭 -->
+                                    <view v-if="item.problemStatus==1" class="btn-red">进行中</view>
+                                    <view v-if="item.problemStatus==2" class="btn-green">已解决</view>
+                                </view>
+                            </view>
+                            <view class="r-list">
+                                <view class="r-left">
+                                    <view class="r-l-left" style="width:220rpx">跟踪次数<span class="r-gray">{{ item.logNum }}</span></view>
+                                    <view class="r-l-right">最近跟踪时间<span class="r-gray">{{parseTime(item.lastLogTime,'{y}-{m}-{d} {h}:{i}') }}</span></view>
+                                </view>
+                            </view>
+                            <view class="report-border" v-if="index<list.length-1"></view>
+                        </view>
+                    </block>
+                    <view v-else class="no-data">
+                        <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                    </view>
+                </view>
+            </mescroll-uni>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted,computed } from 'vue'
+import { onLoad,onHide } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
+import customSearch from '@/components/customSearch.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { parseTime } from '@/utils/datetime.js'
+import { problemList } from '@/api/polling.js'
+
+onLoad(async(opt) => {
+    uni.setStorageSync('page_cache',true);
+})
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 搜索处理
+let searchShow = ref(false);
+let searchText = ref(undefined);
+let searchTypeObj = ref({typeId:4,typeName:'巡检类型'});
+let noticeTypeList=ref([
+    {id:1,name:'日常巡检'}, 
+    {id:2,name:'临时巡检'}, 
+]);
+let notictTypeCheck = ref({});//选中类型
+
+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;
+    searchText.value=param2.value;;
+    searchShow.value=false;
+}
+
+// 清除未读
+const handleRead = () => {
+    list.value.forEach(item => {
+        item.isRead = false;
+    })
+}
+// 查询通知列表
+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 downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let cssFlag=ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        console.log("下拉刷新")
+        const res = await getList(1, upOption.value.page.size);
+        cssFlag.value = false;
+        list.value = res.list;
+        // mescroll.resetUpScroll();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        console.log("上拉加载更多")
+        let res = await getList(mescroll.num, mescroll.size);
+        if (mescroll.num === 1) {
+            list.value = res.list;
+        } else {
+            list.value.push(...res.list);
+        }
+        mescroll.endBySize(res.list.length, res.total);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+    return new Promise(async (resolve) => {
+        let param = {
+            pageIndex,
+            pageSize,
+            key:searchText.value?searchText.value:undefined,
+            taskType:notictTypeCheck.value.id
+        }
+        let res = await problemList(param);
+        let list = res.list || [];
+        resolve({
+            list,
+            // total: res.recordCount || 0
+        });
+    });
+
+}
+
+// 查看详情
+const handleDetail = (item) =>{
+    let url= '/pages/business/polling/problemDetail?problemId='+item.problemId;
+    uni.navigateTo({
+        url
+    });
+}
+</script>
+
+<style scoped>
+.all-body{
+    position: absolute;
+    /* #ifdef APP-PLUS */
+    top:150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top:120rpx;
+    height: calc(100vh - 64px);
+    /* #endif */
+    overflow: hidden;
+}
+
+:deep(.mescroll-downwarp .downwarp-progress){
+    border-color:#fff !important;
+}
+
+:deep(.mescroll-downwarp .downwarp-tip){
+    color:#fff;
+}
+
+
+.white-bg {
+    width: 670rpx;
+    padding: 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+    position: relative;
+}
+.white-bg.bg-height{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 150px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 140px);
+    /* #endif */
+}
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 123px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 105px) !important;
+    /* #endif */
+}
+
+.report-list{
+    position: relative;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+.report-list .r-list{
+    padding: 5rpx 0;
+}
+.report-list .r-list .r-left{
+    display: flex;
+}
+.report-list .r-list .r-gray{
+    margin-left:10rpx;
+}
+.report-list .r-list .r-blue{
+    margin-left:10rpx;
+    font-weight: bold;
+}
+.report-list .r-list .r-red{
+    font-weight: bold;
+}
+.report-list .r-list .r-name{
+    width:525rpx
+}
+.r-left .r-l-left{
+    width:280rpx;
+}
+.r-left .r-l-right{
+   
+}
+.no-data .no-pic{
+    display: block;
+    width:440rpx;
+    height:210rpx;
+    margin:40rpx auto;
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+:deep(.mescroll-empty){
+    display: none !important;
+}
+</style>

src/pages/business/polling/problemLog.vue

@@ -0,0 +1,509 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="新增跟踪信息" 
+            :leftFlag="true" :rightFlag="false"
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">问题：{{optionObj.groupName}}</view>
+                <view class="report-list">
+                    <view class="report-pro">问题项</view>
+                    <view class="report-right">
+                        <view class="r-list"  v-for="(item, index) in optionObj.list" :key="index">
+                            <view class="r-left">
+                                <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                <view>{{ item }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view class="report-pro">提交人</view>
+                    <view class="report-right">{{optionObj.createUserName}}</view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    检查点跟踪情况描述
+                    <textarea class="r-input textarea" v-model="desc" auto-height 
+                        placeholder="请输入跟踪情况描述" placeholder-class="place-input"
+                    ></textarea>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    <view class="r-title">问题点位照片或视频 <text>*</text></view>
+                    <view class="img-flex">
+                        <view class="img-show" v-for="(item2,index2) in imgArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(imgArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <image :src="item2.shortUrl" mode="aspectFill" /> 
+                        </view>
+                        <view class="img-show" v-for="(item2,index2) in videoArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(videoArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <view class="img-icon">
+                                <img :src="'static/images/polling/icon-play.png'" />
+                            </view>
+                            <!-- <video :src="item" controls></video> -->
+                            <DomVideoPlayer :src="item2.url" objectFit="cover" />
+                        </view>
+
+                        <!-- loading -->
+                        <view class="img-con" v-if="imgLoading">
+                            <view class="upload-loading">
+                                <uni-icons type="refreshempty" size="30" color="#C9C9C9"></uni-icons>
+                                <view>上传中....</view>
+                            </view>
+                        </view>
+                        <view class="img-con" @click="chooseMedia" v-else>
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view>
+
+                        <!-- #ifdef APP-PLUS -->
+                        <!-- #endif -->
+                        <!-- #ifndef APP-PLUS -->
+                        <!-- <view class="img-con">
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view> -->
+                        <!-- #endif -->
+                    </view>
+                </view>
+                <view class="btn-submit">
+                    <button type="primary" @click="handleSubmit">提交</button>
+                </view>
+            </view>
+        </mescroll-uni>
+    </view>
+
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+
+    <!-- 选择图片或者视频 -->
+    <chooseMediaVue ref="chooseMediaRef" @getMediaArr="getMediaArr" @closeMedia="closeMedia"></chooseMediaVue>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive,getCurrentInstance } from 'vue'
+import { onLoad,onHide, onShow} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import mediaPreview from "@/components/mediaPreview.vue"
+import chooseMediaVue from '@/components/chooseMedia.vue'
+import DomVideoPlayer from 'uniapp-video-player'
+import { getUserInfo } from '@/api/auth.js'
+import { problemDetail,problemAddLog,minioUpload } from '@/api/polling.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+import {compressImageUni} from '@/utils/common.js'
+const { proxy } = getCurrentInstance();
+
+let problemId = ref('');
+let realname = ref('');
+let desc = ref('');//描述
+let minioObj = {};
+onLoad(async option => {
+    // console.log(option)
+    problemId.value = option.problemId;
+
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+    let userinfo = await getUserInfo({});
+    realname.value = userinfo.realname
+
+    getList();
+})
+onShow(()=>{
+    imgLoading.value=false;
+})
+
+// 查询列表
+let list = ref([]);
+let optionObj = ref({})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    use:false,
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+// 获取数据列表
+const getList = async () => {
+    let res = await problemDetail({problemId:problemId.value});
+    let data = res || {};
+    data.list = data.pointName.split(",") || [];
+    optionObj.value = data;
+}
+
+// 图片或视频
+let mediaArr = ref([]);//传给后台的地址
+let imgArr=ref([]);//图片 后台返回的
+let videoArr = ref([]);//视频 后台返回的
+let imgLoading = ref(false)
+const chooseMedia = () => {
+    proxy.$refs["chooseMediaRef"].openPicker();
+    imgLoading.value=true; 
+   /* uni.chooseMedia({
+        count: 9,
+        mediaType: ['image', 'video'], // 指定可选择图片和视频
+        sourceType: ['album', 'camera'],
+        maxDuration: 60, // 拍摄视频最长拍摄时间
+        camera: 'back',
+        success: (res) => {
+            console.log("问题跟踪chooseMedia=>",res)
+            res.tempFiles.forEach(async file => {
+                console.log(`文件类型: ${file.type}, 文件路径: ${file.tempFilePath}`);
+                let compressImg = file.tempFilePath;
+                // 图片进行压缩
+                if (file.fileType === 'image') {
+                    // #ifdef APP-PLUS
+                    // 压缩图片
+                    compressImg = await compressImageUni(file.tempFilePath);
+                    // #endif
+                }
+                // 执行上传
+                let param = {
+                    filePath: compressImg,
+                    name: 'file',
+                    formData: {
+                        directory:'polling'
+                    },
+                }
+                imgLoading.value=true;         
+                minioUpload(param).then(res=>{
+                    let data = res.data;
+                    mediaArr.value.push(data.fileName);
+                    if (file.fileType === 'image') {// 图片
+                        imgArr.value.push({
+                            shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                            url:minioObj.minioUrl +"/"+data.fileName,
+                            name:data.fileName
+                        })
+                    } else if (file.fileType === 'video') {// 视频
+                         videoArr.value.push({
+                            shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                            url:minioObj.minioUrl +"/"+data.fileName,
+                            name:data.fileName
+                        })
+                    }
+                }).finally(()=>{
+                    imgLoading.value=false;
+                })
+            });
+        }
+    });*/
+}
+
+const closeMedia = ()=>{
+    imgLoading.value=false; 
+}
+
+// 插件回调
+const getMediaArr=(arr)=>{
+    // console.log("插件回调=>",arr)
+    try {
+        arr.forEach(data=>{
+            mediaArr.value.push(data.fileName);
+            if(data.fileType=="image"){
+                imgArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }else if(data.fileType == "video"){
+                videoArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }
+        })
+        // console.log(imgArr.value,videoArr.value)
+        imgLoading.value=false; 
+    } catch (error) {
+        console.error(error)
+        imgLoading.value=false; 
+    }
+    
+}
+
+// 视频或图片删除 根据数组下标删除数组里的某个图片或视频
+const handleDelete=(arr,index2)=>{
+    arr.splice(index2, 1);
+    let item = arr[index2];
+    mediaArr.value = mediaArr.value.filter(item2=>item2!=item.name);
+    // console.log("删除后=>",mediaArr.value)
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(item)=>{
+    // console.log("调用放大视频==>",item)
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = item.url
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+// 提交
+const handleSubmit=()=>{
+    let param = {
+        problemId:problemId.value,
+        logVedio:mediaArr.value.join(","),
+        logDesc:desc.value
+    }
+    // console.log("problemAddLog=>",param)
+    problemAddLog(param).then(res=>{
+        showAlert("新建问题跟踪成功！");
+        uni.navigateBack();
+    }).finally(()=>{
+        hideLoading();
+    })
+}
+</script>
+
+<style scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .r-input{
+    border:1px solid #E7E7E7;
+    border-radius: 10rpx;
+    width:620rpx;
+    padding:15rpx 25rpx;
+    margin:20rpx 0 30rpx;
+}
+.report-list .place-input{
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+.report-list .textarea{
+    min-height: 120rpx;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+.report-list .r-r-round{
+    width:35rpx;
+    height:35rpx;
+    border:1px solid #BDBDBD;
+    border-radius: 50%;
+}
+.report-list .r-r-round.active{
+    border:1px solid #FF2B44;
+    background-color: #FF2B44;
+    position: relative;
+}
+.report-list .r-r-round.active::after{
+    content:"!";
+    position: absolute;
+    top:0;
+    left:0;
+    color:#fff;
+    text-align: center;
+    width:35rpx;
+    height:35rpx;
+    /* #ifndef APP-PLUS */
+    line-height: 30rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    height:30rpx;
+    padding-top:5rpx;
+    /* #endif */
+}
+
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-show img,
+.report-list .img-show image,
+.report-list .img-show video,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 10rpx 0;
+}
+
+.report-list .img-show:first-child,
+.report-list .img-con:first-child{
+    margin-left:0;
+}
+
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-delete{
+    position: absolute;
+    /* #ifndef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    top:8rpx;
+    width:34rpx;
+    height:34rpx;
+    line-height:34rpx;
+    border-radius:3rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    text-align: center;
+    z-index:1;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+.btn-submit{
+    width:400rpx;
+    margin:90rpx auto;
+}
+.btn-submit uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.2;   
+}
+.btn-submit uni-button:after{
+    border-color:#05A3F4;
+}
+</style>

src/pages/business/polling/problemReport.vue

@@ -0,0 +1,589 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="问题上报" 
+            :leftFlag="true" :rightFlag="false"
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view class="red-title">问题：{{optionObj.groupName}}</view>
+                <view class="report-list">
+                    <view class="report-pro">问题项</view>
+                    <view class="report-right">
+                        <view class="r-list"  v-for="(item, index) in optionObj.pointList" :key="index"  @click="handleRound(item)">
+                            <view class="r-left" :class="{'r-red':item.active}">
+                                <view>{{String(index+1).padStart(2, '0')+'.'}}</view>
+                                <view>{{ item.pointName }}</view>
+                            </view>
+                            <view class="r-right">
+                                <view class="r-r-round" :class="{active:item.active}"></view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list">
+                    <view class="report-pro">提交人</view>
+                    <view class="report-right">{{optionObj.createUserName?optionObj.createUserName:realname}}</view>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    问题描述
+                    <textarea class="r-input textarea" v-model="optionObj.problemDesc" auto-height 
+                        placeholder="请输入问题项描述" placeholder-class="place-input"
+                    ></textarea>
+                </view>
+                <view class="report-border"></view>
+                <view class="report-list" style="display:block;">
+                    <view class="r-title">问题点位照片或视频 <text>*</text></view>
+                    <view class="img-flex">
+                        <view class="img-show" v-for="(item2,index2) in imgArr" :key="index2"  @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(imgArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <!-- <img :src="item2.shortUrl" /> -->
+                            <image :src="item2.shortUrl" mode="aspectFill" /> 
+                        </view>
+                        <view class="img-show" v-for="(item2,index2) in videoArr" :key="index2" @click="showMediaPreview(item2)">
+                            <view class="img-delete" @click.stop="handleDelete(videoArr,index2)">
+                                <uni-icons type="closeempty" size="16" color="#fff"></uni-icons>
+                            </view>
+                            <view class="img-icon">
+                                <img :src="'static/images/polling/icon-play.png'" />
+                            </view>
+                            <!-- <video :src="item.url" controls></video> -->
+                            <DomVideoPlayer :src="item2.url" objectFit="cover" />
+                        </view>
+                       
+                        <!-- loading -->
+                        <view class="img-con" v-if="imgLoading">
+                            <view class="upload-loading">
+                                <uni-icons type="refreshempty" size="30" color="#C9C9C9"></uni-icons>
+                                <view>上传中....</view>
+                            </view>
+                        </view>
+                        <view class="img-con" @click="chooseMedia" v-else>
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view>
+                        <!-- #ifdef APP-PLUS -->
+                        <!-- #endif -->
+                        <!-- #ifndef APP-PLUS -->
+                        <!-- <view class="img-con">
+                            <img :src="'static/images/polling/icon-AddPorV.png'" class="img-pic" />
+                        </view> -->
+                        <!-- #endif -->
+                    </view>
+                </view>
+                <view class="btn-submit">
+                    <button type="primary" @click="handleSubmit">{{problemId?'修改问题跟踪表':'生成问题跟踪表'}}</button>
+                </view>
+            </view>
+        </mescroll-uni>
+    </view>
+
+    <!-- 图片放大 -->
+    <mediaPreview :visible="isVisible" :url="mediaUrl" @close="handlePreviewClose"></mediaPreview>
+
+    <!-- 选择图片或者视频 -->
+    <chooseMediaVue ref="chooseMediaRef" @getMediaArr="getMediaArr" @closeMedia="closeMedia"></chooseMediaVue>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted,onUnmounted,nextTick,computed,reactive, watch,getCurrentInstance } from 'vue'
+import { onLoad,onShow,onHide} from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import chooseMediaVue from '@/components/chooseMedia.vue'
+import mediaPreview from "@/components/mediaPreview.vue"
+import DomVideoPlayer from 'uniapp-video-player'
+import { getUserInfo } from '@/api/auth.js'
+import { problemDetail,problemAdd,problemEdit,minioUpload } from '@/api/polling.js'
+import {compressImageUni,getFileType} from '@/utils/common.js'
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js'
+import { MINIO_KEY } from '@/enums/cacheEnums';
+const { proxy } = getCurrentInstance();
+
+let taskId = ref('');//任务id
+let groupId = ref('');//组id
+let problemId = ref('');//问题id
+let realname = ref('');
+let desc = ref('');//描述
+let minioObj = {};
+onLoad(async option => {
+    // console.log(option)
+    taskId.value = option.taskId;
+    groupId.value = option.groupId;
+    problemId.value = option.problemId;
+
+    minioObj = JSON.parse(uni.getStorageSync(MINIO_KEY) || "\{\}")
+    
+    let userinfo = await getUserInfo({});
+    realname.value = userinfo.realname;
+    getList();
+})
+
+onShow(()=>{
+    imgLoading.value=false;
+})
+
+// 查询列表
+let list = ref([]);
+let optionObj = ref({})
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    use:false,
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        getList();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+
+// 获取数据列表
+const getList = async () => {
+    let param = {
+        taskId:problemId.value?undefined:taskId.value,
+        groupId:problemId.value?undefined:groupId.value,
+        problemId:problemId.value
+    }
+    let res = await problemDetail(param);
+    let data = res||{};
+
+    let pointIds = data.pointId?.split(",") || [];
+    data.pointList.forEach(item2=>{
+        item2.active=false;
+        for (let i = 0; i < pointIds.length; i++) {
+            if(item2.pointId == pointIds[i]){
+                item2.active=true;
+                break;
+            }
+        }
+    })
+
+    // 视频回显
+    imgArr.value = [];
+    mediaArr.value=[];
+    videoArr.value=[];
+    let fileList =data.problemVedio?.split(",") || [];
+    fileList.forEach(item=>{
+        mediaArr.value.push(item)
+        if(getFileType(item)=='image'){
+            imgArr.value.push({
+                shortUrl:minioObj.minioThumbUrl +"/"+item,
+                url:minioObj.minioUrl +"/"+item,
+                name:item
+            })
+        }else if(getFileType(item)=='video'){
+            videoArr.value.push({
+                shortUrl:minioObj.minioThumbUrl +"/"+item,
+                url:minioObj.minioUrl +"/"+item,
+                name:item
+            })
+        }
+    })
+    optionObj.value = data;
+}
+
+// 图片或视频
+let mediaArr = ref([]);//传给后台的地址
+let imgArr=ref([]);//图片 后台返回的
+let videoArr = ref([]);//视频 后台返回的
+let imgLoading = ref(false)
+const chooseMedia = () => {
+    // console.log("chooseMedia=>") 
+    proxy.$refs["chooseMediaRef"].openPicker();
+    imgLoading.value=true; 
+    // uni.chooseMedia({
+    //     count: 9,
+    //     mediaType: ['image', 'video'], // 指定可选择图片和视频
+    //     sourceType: ['album', 'camera'],
+    //     maxDuration: 60, // 拍摄视频最长拍摄时间
+    //     camera: 'back',
+    //     success: (res) => {
+    //         // console.log("chooseMedia=>",res)
+    //         res.tempFiles.forEach(async file => {
+    //             // console.log(`文件类型: ${file.fileType}, 文件路径: ${file.tempFilePath}`);
+    //             let compressImg = file.tempFilePath;
+    //             // 图片进行压缩
+    //             if (file.fileType === 'image') {
+    //                 // #ifdef APP-PLUS
+    //                 // 压缩图片
+    //                 compressImg = await compressImageUni(file.tempFilePath);
+    //                 // #endif
+    //             }
+
+    //             // 执行上传
+    //             let param = {
+    //                 filePath: compressImg,
+    //                 name: 'file',
+    //                 formData: {
+    //                     directory:'polling'
+    //                 },
+    //             }
+    //             imgLoading.value=true;        
+    //             minioUpload(param).then(res=>{
+    //                 let data = res.data;//console.log("上传成功后=>",res)
+    //                 mediaArr.value.push(data.fileName);
+    //                 if (file.fileType === 'image') {// 图片
+    //                     imgArr.value.push({
+    //                         shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+    //                         url:minioObj.minioUrl +"/"+data.fileName,
+    //                         name:data.fileName
+    //                     })
+    //                 } else if (file.fileType === 'video') {// 视频
+    //                     videoArr.value.push({
+    //                         shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+    //                         url:minioObj.minioUrl +"/"+data.fileName,
+    //                         name:data.fileName
+    //                     })
+    //                 }
+    //             }).finally(()=>{
+    //                 imgLoading.value=false;
+    //             })
+                
+    //         });
+    //     }
+    // });
+}
+const closeMedia = ()=>{
+    imgLoading.value=false; 
+}
+
+// 插件回调
+const getMediaArr=(arr)=>{
+    // console.log("插件回调=>",arr)
+    try {
+        arr.forEach(data=>{
+            mediaArr.value.push(data.fileName);
+            if(data.fileType=="image"){
+                imgArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }else if(data.fileType == "video"){
+                videoArr.value.push({
+                    shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                    url:minioObj.minioUrl +"/"+data.fileName,
+                    name:data.fileName
+                })
+            }
+        })
+        // console.log(imgArr.value,videoArr.value)
+        imgLoading.value=false; 
+    } catch (error) {
+        console.error(error)
+        imgLoading.value=false; 
+    }
+    
+}
+
+// 视频或图片删除 根据数组下标删除数组里的某个图片或视频
+const handleDelete=(arr,index2)=>{
+    let item = arr[index2];
+    arr.splice(index2, 1);
+    mediaArr.value = mediaArr.value.filter(item2=>item2!=item.name);
+    console.log("删除后=>",mediaArr.value)
+}
+
+// 放大视频或图片
+let isVisible= ref(false);//放大处理
+let mediaUrl= ref('');//放大地址
+let videoShow = ref(true);
+const showMediaPreview=(item)=>{
+    // console.log("调用放大视频==>",item)
+    isVisible.value = true;
+    videoShow.value = false;
+    mediaUrl.value = item.url
+}
+const handlePreviewClose=()=>{
+    isVisible.value = false;
+    videoShow.value = true;
+}
+
+
+// 红点点击
+const handleRound=(item)=>{
+    item.active=!item.active
+}
+
+// 提交
+const handleSubmit=()=>{
+    let pointIds = [];
+    optionObj.value.pointList.forEach(item => {
+        if(item.active){
+            pointIds.push(item.pointId)
+        }
+    });
+
+    showLoading("加载中...")
+    if(problemId.value){
+        let param = {
+            problemId:problemId.value,
+            pointId:pointIds.join(","),
+            problemVedio:mediaArr.value.join(","),
+            problemDesc:optionObj.value.problemDesc
+        }
+        // console.log("problemEdit=>",param)
+        problemEdit(param).then(res=>{
+            // showAlert = (content, title = '提示',showCancel=false,succFun)
+            showAlert("修改问题上报成功！","提示",false,()=>{
+                uni.navigateBack()
+            })
+        }).finally(()=>{
+            hideLoading();
+        })
+    }else{
+        let param = {
+            taskId:taskId.value,
+            groupId:groupId.value,
+            pointId:pointIds.join(","),
+            problemVedio:mediaArr.value.join(","),
+            problemDesc:optionObj.value.problemDesc
+        }
+        // console.log("problemAdd=>",param)
+        problemAdd(param).then(res=>{
+            showAlert("新建问题上报成功！","提示",false,()=>{
+                problemId.value = res;
+                uni.navigateBack()
+            })
+        }).finally(()=>{
+            hideLoading();
+        })
+    }
+    
+}
+</script>
+
+<style scoped>
+.scroll-h{
+   /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px) !important;
+    /* #endif */
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+.white-bg{
+    width: 680rpx;
+    padding: 15rpx 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg .red-title{
+    margin-bottom:30rpx;
+    color:#FF2B44;
+    font-size:38rpx;
+}
+
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+
+.report-list{
+    display: flex;
+    font-size:28rpx;
+}
+.report-list .r-title{
+    position: relative;
+}
+.report-list text{
+    color:#FF2B44;
+    font-size:28rpx;
+}
+.report-list .report-pro{
+    font-size:28rpx;
+    width:16%;
+    /* margin-right:30rpx; */
+}
+.report-list .report-right{
+    width:84%;
+    color:#919191;
+    font-size:28rpx;
+}
+.report-list .r-input{
+    border:1px solid #E7E7E7;
+    border-radius: 10rpx;
+    width:620rpx;
+    padding:15rpx 25rpx;
+    margin:20rpx 0 30rpx;
+}
+.report-list .place-input{
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+.report-list .textarea{
+    min-height: 120rpx;
+}
+.report-list .r-list{
+    padding: 10rpx 0;
+}
+.report-list .r-list:first-child{
+    padding-top:0;
+}
+.report-list .r-left{
+    display: flex;
+    align-items: center;
+    width:90%;
+    font-size:28rpx;
+    color:#919191;
+}
+.report-list .r-left view:first-child{
+    margin-right: 10rpx;
+}
+.report-list .r-left.r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
+
+.report-list .r-right{
+    display: flex;
+    font-size:30rpx;
+    align-items: center;
+    justify-content: center;
+}
+.report-list .r-r-round{
+    width:35rpx;
+    height:35rpx;
+    border:1px solid #BDBDBD;
+    border-radius: 50%;
+}
+.report-list .r-r-round.active{
+    border:1px solid #FF2B44;
+    background-color: #FF2B44;
+    position: relative;
+}
+.report-list .r-r-round.active::after{
+    content:"!";
+    position: absolute;
+    top:0;
+    left:0;
+    color:#fff;
+    text-align: center;
+    width:35rpx;
+    height:35rpx;
+    /* #ifndef APP-PLUS */
+    line-height: 30rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    height:33rpx;
+    padding-top:2rpx;
+    /* #endif */
+}
+.report-list .img-flex{
+    display: flex;
+    flex-flow:row wrap;
+    margin-bottom:30rpx;
+    width:100%;
+}
+.report-list .img-show img,
+.report-list .img-show image,
+.report-list .img-show video,
+.report-list .img-show .player-wrapper{
+    width:210rpx;
+    height: 140rpx;
+}
+.report-list .img-show :deep(.uni-video-cover-play-button){
+    width:64rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size:60rpx;
+}
+
+.report-list .img-con{
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 140rpx;
+    text-align: center;
+    color:#919191;
+    font-size: 24rpx;
+}
+.report-list .img-con .img-pic{
+    width:76rpx;
+    height: 76rpx;
+    margin-top:30rpx;
+}
+.report-list .img-show,
+.report-list .img-con{
+    width: calc(100% / 3 - 10px); /* 减去一些间隙以避免溢出 */
+    margin:20rpx 20rpx 0 0;
+}
+.report-list .img-show{
+    position: relative;
+}
+.report-list .img-show .img-delete{
+    position: absolute;
+    /* #ifndef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    /* #ifdef APP-PLUS */
+    right:4rpx;
+    /* #endif */
+    top:8rpx;
+    width:34rpx;
+    height:34rpx;
+    line-height:34rpx;
+    border-radius:3rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    text-align: center;
+    z-index:1;
+}
+.report-list .img-show .img-icon{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    width: 64rpx;
+    height:64rpx;
+    margin-left:-32rpx;
+    margin-top:-32rpx;
+    z-index:1;
+}
+.report-list .img-show .img-icon img{
+    width: 64rpx;
+    height:64rpx;
+}
+
+
+.btn-submit{
+    width:400rpx;
+    margin:90rpx auto;
+}
+.btn-submit uni-button[type='primary']{
+    background-color: #05A3F4;
+    border-radius: 40rpx;
+    line-height: 2.2;   
+}
+.btn-submit uni-button:after{
+    border-color:#05A3F4;
+}
+</style>

src/pages/business/polling/searchList.vue

@@ -0,0 +1,685 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" title="" :leftFlag="true" :rightFlag="true">
+            <template #title>
+                <view class="tab-list">
+                    <view class="tab-item" :class="{active:index==activeTab,active1:index==1}" 
+                        v-for="(item,index) in tabList" :key="index" 
+                        @click="handleTab(index)"
+                    >{{item}}</view>
+                </view>
+            </template>
+        </customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 列表  @down="downCallback" @up="upCallback"
+            :up="upOption" :down="downOption" :fixed="false" -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" :fixed="false"
+            class="scroll-h" :class="{'loading-scroll':cssFlag}"
+            @down="downCallback" :down="downOption"
+            @up="upCallback" :up="upOption"
+            @scroll="onScroll"
+        >
+            <view class="white-bg">
+                <!-- 日历 -->
+                <view class="white-top" v-if="isMonth">
+                    <view class="calender-con">
+                        <uni-calendar class="uni-calendar--hook"  v-if="activeTab==0"
+                            :selected="calendarInfo.selected" 
+                            :showMonth="false" @change="calendarChange" 
+                            @monthSwitch="monthSwitch" 
+                        />
+                        <calenderMonth :year="year" :month="month"  v-else-if="activeTab==1"
+                            @change="calendarChange2"
+                        ></calenderMonth>                       
+                    </view>
+                    <view class="calender-list">
+                        <view class="calender-item">
+                            <view class="item-blue">{{count1}}</view>
+                            <view class="font28">已巡检</view>
+                        </view>
+                        <view class="calender-item">
+                            <view :class="{'item-red':count2>0,'item-blue':count2==0}">{{count2}}</view>
+                            <view class="font28">待巡检</view>
+                        </view>
+                        <view class="calender-item">
+                            <view class="item-red">{{count3}}</view>
+                            <view class="font28">已过期</view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 当是月的时候，日历滚动没了的时候 显示 -->
+                <view v-else class="calender-blue">
+                    <view class="calender-simple">
+                        <calenderMonthSimple :year="year" :month="month" 
+                            @change="calendarChange2"
+                        ></calenderMonthSimple>
+                    </view>
+                </view>
+                <view v-if="!isMonth" style="height:100rpx;"></view>
+
+                <block v-for="(row,index) in list" :key="index">
+
+                    <!-- 日期展示 parseTime(row.date,'{y}-{m}-{d} 星期{a}')-->
+                    <view class="date-title" v-if="activeTab==1 && row.day">{{row.day}}</view>
+                    <view class="bg-border" v-else></view>
+                    
+                    <!-- 日常巡检 -->
+                    <view class="blue-title">日常巡检</view>
+                    <block v-if="row.list1">
+                        <block v-if="row.list1.length>0">
+                            <view class="report-list" v-for="(item, index) in row.list1" :key="index" @click="handleDetail(item,1)">
+                                <view class="r-list" style="padding-bottom:0">
+                                    <view class="r-name">{{ item.taskName }}</view>
+                                    <view class="r-right">
+                                        <!-- 任务(巡检)状态 1=未发布 2=已发布 3 进行中 4 已完成 5 已过期 -->
+                                        <!-- 状态为3进行中时 进度>0执行中 进度=0为待执行 -->
+                                        <block v-if="item.taskStatus==3">
+                                            <img v-if="item.beginTime" :src="'static/images/polling/icon-pending.png'"  class="img-w" />
+                                            <img v-else :src="'static/images/polling/icon-start.png'"  class="img-w" />
+                                        </block>
+                                        <img v-else-if="item.taskStatus==4" :src="'static/images/polling/icon-complete.png'"  class="img-complete" />
+                                        <img v-else-if="item.taskStatus==5" :src="'static/images/polling/icon-Expired.png'"  class="img-w" />
+                                    </view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">巡检单号<span class="r-gray">{{ item.taskId }}</span></view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view v-if="item.beginTime">
+                                            执行时间<span class="r-gray">{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                                        </view>
+                                        <view v-else>
+                                            开始时间<span class="r-gray">{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view class="r-l-left">
+                                            任务状态<span class="r-gray" v-if="item.taskStatus==3">
+                                                <block v-if="item.beginTime">执行中</block>
+                                                <block v-else>待执行</block>
+                                            </span>
+                                            <span class="r-gray" v-else>{{formatTaskStatus(item.taskStatus) }}</span>
+                                        </view>
+                                        <view class="r-l-right">
+                                            任务时长<span class="r-gray">{{ item.workHour }}小时</span>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view class="r-l-left">
+                                            完成进度<span class="r-gray"><span :class="{'r-red':item.groupFinishNum<item.groupNum}">{{item.groupFinishNum}}</span>/{{item.groupNum}}</span>
+                                        </view>
+                                        <view class="r-l-right">
+                                            完成比率<span class="r-blue">{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}</span>
+                                        </view>
+                                    </view>
+                                </view>
+                                
+                                <view class="report-border" v-if="index<row.list1.length-1"></view>
+                            </view>
+                        </block>
+                        <view v-else class="no-data">
+                            <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                        </view>
+                    </block>
+                    <view v-else class="no-data">
+                        <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                    </view>
+
+                    <!-- 临时巡检 -->
+                    <view class="green-title" style="margin-top:60rpx">临时巡检</view>
+                    <block v-if="row.list2">
+                        <block v-if="row.list2.length>0">
+                            <view class="report-list" v-for="(item, index) in row.list2" :key="index" @click="handleDetail(item,1)">
+                                <view class="r-list" style="padding-bottom:0">
+                                    <view class="r-name">{{ item.taskName }}</view>
+                                    <view class="r-right">
+                                        <!-- 任务(巡检)状态 1=未发布 2=已发布 3 进行中 4 已完成 5 已过期 -->
+                                        <!-- 状态为3进行中时 进度>0执行中 进度=0为待执行 -->
+                                        <block v-if="item.taskStatus==3">
+                                            <img v-if="item.beginTime" :src="'static/images/polling/icon-pending.png'"  class="img-w" />
+                                            <img v-else :src="'static/images/polling/icon-start.png'"  class="img-w" />
+                                        </block>
+                                        <img v-else-if="item.taskStatus==4" :src="'static/images/polling/icon-complete.png'"  class="img-complete" />
+                                        <img v-else-if="item.taskStatus==5" :src="'static/images/polling/icon-Expired.png'"  class="img-w" />
+                                    </view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">巡检单号<span class="r-gray">{{ item.taskId }}</span></view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view v-if="item.beginTime">
+                                            执行时间<span class="r-gray">{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                                        </view>
+                                        <view v-else>
+                                            开始时间<span class="r-gray">{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view class="r-l-left">
+                                            任务状态<span class="r-gray" v-if="item.taskStatus==3">
+                                                <block v-if="item.beginTime">执行中</block>
+                                                <block v-else>待执行</block>
+                                            </span>
+                                            <span class="r-gray" v-else>{{formatTaskStatus(item.taskStatus) }}</span>
+                                        </view>
+                                        <view class="r-l-right">
+                                            任务时长<span class="r-gray">{{ item.workHour }}小时</span>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view class="r-l-left">
+                                            完成进度<span class="r-gray"><span :class="{'r-red':item.groupFinishNum<item.groupNum}">{{item.groupFinishNum}}</span>/{{item.groupNum}}</span>
+                                        </view>
+                                        <view class="r-l-right">
+                                            完成比率<span class="r-blue">{{item.percentage}}</span>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="report-border" v-if="index<row.list2.length-1"></view>
+                            </view>
+                        </block>
+                        <view v-else class="no-data">
+                            <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                        </view>
+                    </block>
+                    <view v-else class="no-data">
+                        <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                    </view>
+
+                    <!-- 问题跟踪 按月没有问题跟踪-->
+                    <block v-if="activeTab==0">
+                        <view class="bg-border"></view>
+                        <view class="red-title">问题跟踪</view>
+                        <block v-if="row.list3">
+                            <block v-if="row.list3.length>0">
+                                <view class="report-list" v-for="(item, index) in row.list3" :key="index" @click="handleDetail(item,2)">
+                                    <view class="r-list" style="padding-bottom:0">
+                                        <view class="r-name">{{ item.groupName }}</view>
+                                        <view class="r-right">
+                                            <!-- 问题状态 1=追踪、2=关闭 -->
+                                            <view v-if="item.problemStatus==1" class="btn-red">进行中</view>
+                                            <view v-if="item.problemStatus==2" class="btn-green">已解决</view>
+                                        </view>
+                                    </view>
+                                    <view class="r-list">
+                                        <view class="r-left">
+                                            <view class="r-l-left" style="width:220rpx">跟踪次数<span class="r-gray">{{ item.logNum }}</span></view>
+                                            <view class="r-l-right">最近跟踪时间<span class="r-gray">{{ parseTime(item.lastLogTime,'{y}-{m}-{d} {h}:{i}') }}</span></view>
+                                        </view>
+                                    </view>
+                                    <view class="report-border" v-if="index<row.list3.length-1"></view>
+                                </view>
+                            </block>
+                            <view v-else class="no-data">
+                                <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                            </view>
+                        </block>
+                        <view v-else class="no-data">
+                            <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                        </view>
+                    </block>
+                </block>
+            </view>
+        </mescroll-uni>
+    </view>
+</view>
+</template>
+<script setup>
+import { ref,onMounted } from 'vue'
+import { onLoad,onHide } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import calenderMonth from '@/components/calenderMonth.vue'
+import calenderMonthSimple from '@/components/calenderMonthSimple.vue'
+import customTabs from '@/components/customTabs.vue';
+import { parseTime } from '@/utils/datetime.js';
+import { formatTaskStatus } from '@/utils/status.js';
+import { taskList,taskListMonth } from '@/api/polling.js'
+
+const selectDate = ref({});//查询条件
+
+const year=ref('');//默认月份
+const month=ref('');//默认月份
+const activeTab = ref(0);//默认按天查看
+const tabList = ['按天查看', '按月查看'];
+
+let count1=ref(0);//已巡检
+let count2=ref(0);//待巡检
+let count3=ref(0);//已过期
+
+onLoad(option => {
+	let date = new Date();
+    year.value = date.getFullYear();
+    month.value = date.getMonth()+1;
+
+    selectDate.value = parseTime(date,'{y}-{m}-{d}')//默认查今天
+})
+
+// tab切换 按日 or 按月 0-按日 1-按月
+const handleTab = async (index)=>{
+    activeTab.value = index;
+    isMonth.value=true;
+    // scrollToPosition();
+    if(index==1){
+        selectDate.value = parseTime(new Date(),'{y}-{m}')
+    }else{
+        selectDate.value = parseTime(new Date(),'{y}-{m}-{d}')
+    }
+    const res = await getList();
+    list.value = res.list;
+}
+// 日历初始化
+const calendarInfo = ref({
+    range: true,
+    insert: false,//插入模式，可选值，ture：插入模式；false：弹窗模式；默认为插入模式
+    selected: [],
+    showMonth:true,
+});
+// 按日选择 选月处理
+const monthSwitch=(e)=>{
+    console.log('monthSwitchs 返回:', e)
+}
+// 按日选择 日历change
+const calendarChange= async(e)=> {
+    // console.log('按日选择 返回:', e.fulldate)
+    selectDate.value = e.fulldate
+    const res = await getList();
+    list.value = res.list;
+}
+
+// 按月选择 日历change
+const calendarChange2= async(value)=> {
+    // console.log("按月选择 选择具体月份=>",value)
+    selectDate.value = value.ymStr
+    year.value = value.year;
+    month.value = value.month;
+
+    const res = await getList();
+    list.value = res.list;
+}
+
+
+// 查询列表
+let list = ref([])
+const mescrollRef = ref(null);
+const isMonth = ref(true);
+const upOption = ref({
+    onScroll:true,
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../../static/images/mescroll-empty.png"
+    },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let cssFlag=ref(false);//控制样式
+const mescrollInit = async(mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+// 滚动到指定位置
+const scrollToPosition = () => {
+    console.log(mescrollRef)
+    if (mescrollRef) {
+        // 滚动到指定Y坐标位置（单位px）
+        mescrollRef.value.scrollTo(0, 300) // 滚动到Y=500的位置，动画时长300ms
+        // mescrollRef.value.scrollTop=0;
+    }
+}
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        // console.log("下拉刷新")
+        isMonth.value=true;
+        const res = await getList(1, upOption.value.page.size);
+        cssFlag.value = false;
+        list.value = res.list;
+        // mescroll.resetUpScroll();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        // console.log("上拉加载更多")
+        let res = await getList(mescroll.num, mescroll.size);
+        if (mescroll.num === 1) {
+            list.value = res.list;
+        } else {
+            // list.value.push(...res.list);
+        }
+        mescroll.endBySize(res.list.length, res.total);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+    return new Promise(async (resolve) => {
+        let res ={};
+        if(activeTab.value==1){//月查询
+            let param = {
+                month: selectDate.value
+            }
+            let response = await taskListMonth(param);
+            res ={
+                ...response,
+                list:response.list || []
+            }
+            // 没数据时补值
+            if(res.list.length==0){
+                res.list.push({
+                    list1: [],
+                    list2: [],
+                });
+            }
+
+        }else{//天查询
+            let param = {
+                day:selectDate.value
+            }
+            let response = await taskList(param);
+            res ={
+                ...response,
+                list:[]
+            }
+            res.list.push({
+                list1:response.list1 || [],
+                list2:response.list2 || [],
+                list3:response.list3 || []
+            });
+        }
+        // console.log(res)
+       
+        let data = res||{};
+        count1.value = data.finishNum;
+        count2.value = data.waitNum;
+        count3.value = data.expiredNum
+
+        resolve({
+            ...data,
+        });
+    });
+
+}
+
+// 滚动位置
+const onScroll = (mescrollInstance)=>{
+    const y = mescrollInstance.getScrollTop()
+    // const maxScroll = mescrollInstance.getScrollHeight() - mescrollInstance.getClientHeight()
+    // console.log(y)
+    if(activeTab.value==1){
+        if(y==0){
+            isMonth.value=true;
+        }
+        if(y>=200){
+            isMonth.value=false;
+        }
+    }
+   
+}
+
+// 查看详情 type 1-任务详情 2-问题详情
+const handleDetail = (item,type) =>{
+    let url='' 
+    if(type==1){
+        url = '/pages/business/polling/taskDetail?id='+item.taskId;
+    }else{
+        url = '/pages/business/polling/problemDetail?problemId='+item.problemId;
+    }
+    uni.navigateTo({
+        url
+    });
+}
+
+// 跳转webview
+const handleJump = (item)=>{
+    // uni.navigateTo({
+    //     // url: '/pages/h5-webview/h5-webview?url=' + item.mobileLink+"&title="+item.subject
+    //     // url:'/pages/notice/noticeDetail?title='+item.subject+'&time='+item.createTime+'&appName='+item.appName
+    // });
+}
+
+
+</script>
+<style scoped>
+.white-top{
+    position: relative;
+    padding-bottom:30rpx;
+    margin-bottom:26rpx;
+}
+
+.calender-list{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding:20rpx 0;
+}
+.calender-list .calender-item{
+    /* flex-grow: 1; */
+    width:33.3%;
+    text-align: center;
+    position: relative;
+}
+.calender-list .calender-item::after{
+    position: absolute;
+    content: " ";
+    width:1px;
+    height:80%;
+    background-color: #EAEAEA;
+    right:0;
+    top:25rpx;
+}
+.calender-list .calender-item:last-child::after{
+    display:none;
+}
+
+.calender-list .calender-item .item-blue,
+.calender-list .calender-item .item-red{
+    color:#579FF9;
+    font-size:60rpx;
+    font-weight: bold;
+}
+.calender-list .calender-item .item-red{
+    color: #FF687A;
+}
+.calender-list .calender-item .font28{
+    font-size:28rpx;
+}
+
+.tab-list{
+    display: flex;
+    justify-content: center;
+}
+.tab-list .tab-item{
+    color:rgba(255, 255, 255, 0.5);
+    margin-right:74rpx;
+    font-size:32rpx;
+    padding-bottom:10rpx;
+}
+.tab-list .tab-item.active{
+    border-bottom:8rpx solid #fff;
+    color:#fff;
+    position: relative;
+}
+.tab-item.active::before {
+  content: '';
+  position: absolute;
+  bottom: -4px;
+  left:-4px;
+  width: 10px;
+  height: 4px;
+  background: #307AF5;
+  transform: skewX(45deg);
+}
+.tab-item.active::after{
+  content: '';
+  position: absolute;
+  bottom: -4px;
+  right:-4px;
+  width: 10px;
+  height: 4px;
+  background: #307AF5;
+  transform: skewX(-45deg);
+}
+.tab-item.active1::after{
+    background: #4F8EF7;
+}
+/* 日历 */
+
+.date-title{
+    background-color: #F5F5F5;
+    padding:40rpx 40rpx 30rpx;
+    width:670rpx;
+    margin-left:-40rpx;
+    color:#919191;
+    font-size:28rpx;
+    margin-top:30rpx;
+}
+
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 77px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 58px);
+    /* #endif */
+}
+.head-right{
+    font-size:28rpx;
+}
+.img-calendar{
+    width: 30rpx;
+    height: 28rpx;
+}
+.week{
+    padding:0 40rpx;
+    color: #fff;
+    font-size:32rpx;
+    margin-bottom:20rpx;
+}
+
+.white-bg{
+    width: 670rpx;
+    padding: 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+    position: relative;
+}
+.white-bg .blue-title,
+.white-bg .red-title{
+    margin-top:30rpx
+}
+.white-bg .calender-blue{
+    position: fixed;
+    width:750rpx;
+    left:0rpx;
+    top:115rpx;
+    /* #ifdef APP-PLUS */
+    top:155rpx;
+    /* #endif */
+    z-index: 9999;
+    background-color: #307AF5;
+}
+.white-bg .calender-simple{
+    padding-top:30rpx;
+    background-color: #fff;
+    border-radius: 8px 8px 0 0;
+}
+
+.bg-border{
+    width:750rpx;
+    height:20rpx;
+    background-color: #F5F5F5;
+    margin-left:-40rpx;
+    margin-top:40rpx;
+}
+.report-list{
+    position: relative;
+}
+.img-w{
+    width:50rpx;
+    height:50rpx;
+}
+.img-complete{
+    position: absolute;
+    right:-40rpx;
+    top:60rpx;
+    width:133rpx;
+    height:150rpx;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+.report-list .r-list{
+    padding: 5rpx 0;
+}
+.report-list .r-list .r-left{
+    display: flex;
+    align-items:center;
+}
+.report-list .r-list .r-gray{
+    margin-left:10rpx;
+}
+.report-list .r-list .r-blue{
+    margin-left:10rpx;
+    font-weight: bold;
+}
+.report-list .r-list .r-red{
+    font-weight: bold;
+}
+.report-list .r-list .r-name{
+    width:525rpx
+}
+.r-left .r-l-left{
+    width:280rpx;
+}
+.r-left .r-l-right{
+   
+}
+.no-data .no-pic{
+    display: block;
+    width:440rpx;
+    height:210rpx;
+    margin:40rpx auto;
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+</style>

src/pages/business/polling/taskDetail.vue

@@ -0,0 +1,435 @@
+<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="week">{{parseTime(taskObj.planTime,'{y}-{m}-{d} 星期{a} {h}:{i}')}}开始 时长{{taskObj.workHour}}小时</view>
+        <view class="bg-progress">
+            <view class="progress-container">
+                <circleTemplate :progress="progress"></circleTemplate>
+                <span>{{ (taskObj.groupFinishNum / taskObj.groupNum*100).toFixed()  }}%</span>
+            </view>
+            <view class="polling">
+                <view class="p-title p-border">巡检单号<text>{{taskObj.taskNo}}</text></view>
+                <view class="p-title">完成进度<text class="p-blue">{{taskObj.groupFinishNum}}</text>/{{taskObj.groupNum}}</view>
+                <view class="btn-primary">
+                    <button type="primary" size="mini" @click="handleConfirm" :disabled="taskObj.taskStatus!=3">任务提交</button>
+                </view>
+            </view>
+        </view>
+
+        <!-- 列表 -->
+        <view class="white-bg2">
+            <!-- @up="upCallback" :up="upOption"  -->
+            <mescroll-uni ref="mescrollRef" @init="mescrollInit" 
+                @down="downCallback" :down="downOption" :up="upOption"
+                :fixed="false" class="scroll-h" 
+                :class="{'loading-scroll':cssFlag}"
+            >
+                <view class="white-bg">
+                    <view class="blue-title">{{taskObj.taskName}}</view>
+                    <block v-if="taskObj.groupList">
+                        <block v-if="taskObj.groupList.length>0">
+                            <view class="report-list" v-for="(item, index) in taskObj.groupList" :key="index" @click="handleDetail(item,1)">
+                                <view class="r-list">
+                                    <view class="r-left">{{ item.groupName }}</view>
+                                    <view class="r-right">
+                                        <block v-if="item.pointFinishNum<item.pointNum">
+                                            <text class="r-orange">{{item.pointFinishNum}}</text>/{{item.pointNum}}
+                                        </block>
+                                        <block v-else>{{item.pointFinishNum}}/{{item.pointNum}}</block>
+                                        <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+                                    </view>
+                                </view>
+                                <view class="report-border" :style="{borderColor:index<taskObj.groupList.length-1?'#E7E7E7':'#fff'}"></view>
+                            </view>
+                        </block>
+                        <view v-else class="no-data">
+                            <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                        </view>
+                    </block>
+                    <view v-else class="no-data">
+                        <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                    </view>
+
+                    <!-- 问题跟踪 -->
+                    <view class="bg-border"></view>
+                    <view class="red-title">问题跟踪</view>
+                    <block v-if="taskObj.problemList">
+                        <block v-if="taskObj.problemList.length>0">
+                            <view class="report-list" v-for="(item, index) in taskObj.problemList" :key="index" @click="handleDetail(item,2)">
+                                <view class="r-list" style="padding-bottom:0">
+                                    <view class="r-name">{{ item.groupName }}</view>
+                                    <view class="r-right">
+                                        <!-- 问题状态 1=追踪、2=关闭 -->
+                                        <view v-if="item.problemStatus==1" class="btn-red">进行中</view>
+                                        <view v-if="item.problemStatus==2" class="btn-green">已解决</view>
+                                    </view>
+                                </view>
+                                <view class="r-list">
+                                    <view class="r-left">
+                                        <view class="r-l-left" style="width:220rpx">跟踪次数<span class="r-gray">{{ item.logNum }}</span></view>
+                                        <view class="r-l-right">最近跟踪时间<span class="r-gray">{{ parseTime(item.lastLogTime,'{m}-{d} {h}:{i}') }}</span></view>
+                                    </view>
+                                </view>
+                                <view class="report-border" v-if="index<taskObj.problemList.length-1"></view>
+                            </view>
+                        </block>
+                        <view v-else class="no-data">
+                            <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                        </view>
+                    </block>
+                    <view v-else class="no-data">
+                        <img :src="'static/images/polling/pic-NoResult.png'" class="no-pic" />
+                    </view>
+                </view>
+            </mescroll-uni>
+        </view>
+    </view>
+
+    <!-- 弹窗提示 -->
+    <pollingShowModal :visible="visible"
+        :title="title"
+        :content="content" 
+        :subContent="subContent"
+        :btnFlag2="btnFlag2"
+        :btnTxt="btnTxt"
+        :isGreen="isGreen"
+        :subTime="subTime"
+        @close="handleClose"
+        @confirm="submitConfirm"
+        ref="showModel"
+    ></pollingShowModal>
+</view>
+</template>
+<script setup>
+import { ref,onMounted,nextTick,computed } from 'vue'
+import { onLoad,onHide, onShow } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import pollingShowModal from "@/components/pollingShowModal.vue";
+import circleTemplate from '@/components/circleTemplate.vue';
+import { parseTime } from '@/utils/datetime.js';
+import { formatTaskStatus } from '@/utils/status.js';
+import { taskDetail,submitTask } from '@/api/polling.js';
+import {showAlert,showLoading,hideLoading} from '@/utils/message.js';
+
+// '2025-12-29  星期五'
+let taskId = ref(undefined);
+let dateStr = ref('');
+const progress = ref(0); // 初始进度为0
+onLoad(option => {
+    // console.log(option)
+    taskId.value = option.id;
+})
+
+onShow(async ()=>{
+    let res = await getList(1, 10);
+    taskObj.value = res;
+})
+
+// 查询列表
+let taskObj = ref({
+    list:[],
+    questList:[],
+    groupFinishNum:0,
+    groupNum:1
+});
+const mescrollRef = ref(null);
+const upOption = ref({
+    use: false,
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../../static/images/mescroll-empty.png"
+    },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let cssFlag=ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        console.log("下拉刷新")
+        const res = await getList(1, upOption.value.page.size);
+        cssFlag.value = false;
+        taskObj.value = res;
+        // mescroll.resetUpScroll();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        console.log("上拉加载更多")
+        let res = await getList(mescroll.num, mescroll.size);
+        if (mescroll.num === 1) {
+            taskObj.value = res;
+        } else {
+            // list.value.push(...res.list);
+        }
+        mescroll.endBySize(res.list.length, res.total);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize) => {
+    return new Promise(async (resolve) => {
+        let param = {
+            taskId:taskId.value
+        }
+        let res = await taskDetail(param);
+        let data = res||{};
+        progress.value = (data.groupFinishNum / data.groupNum*100).toFixed()
+        resolve({
+            ...data,
+        });
+    });
+
+}
+
+// 自定义弹窗
+let title = ref('');
+let content = ref('');
+let visible = ref(false);
+let subContent= ref('');
+let subTime= ref(undefined);
+let btnFlag2=ref(true)
+let btnTxt=ref('')
+let isGreen =ref(false);
+const showModel=(str)=>{
+    visible.value = true;
+    content.value = str;
+    subContent.value='是否确认提交?';
+    btnTxt.value='提交'
+    btnFlag2.value=true;
+    isGreen.value = false;
+    subTime.value=undefined;
+}
+const showModel2=(str)=>{
+    content.value = str;
+    subContent.value='提交时间';
+    btnTxt.value='确定';
+    btnFlag2.value=false;
+    isGreen.value = true;
+    visible.value = true;
+}
+//关闭
+const handleClose=()=>{
+    visible.value = false;
+}
+
+
+// 执行提交
+const handleConfirm=()=>{
+    let taskItem = taskObj.value;
+    if(taskItem.groupFinishNum<taskItem.groupNum){
+        showModel('有未完成的巡检项');
+    }else{
+        let param = {
+            taskId:taskObj.value.taskId
+        }
+        showLoading("加载中...")
+        submitTask(param).then(async res=>{
+            showAlert("任务提交成功！");
+            let res2 = await getList(1, 10);
+            taskObj.value = res2;
+        }).finally(()=>{
+            hideLoading();
+        })
+    }
+   
+}
+
+// 提交
+const submitConfirm=()=>{
+    let param = {
+        taskId:taskObj.value.taskId
+    }
+    showLoading("加载中...")
+    submitTask(param).then( async res=>{
+        visible.value = false;
+        showAlert("任务提交成功！");
+        let res2 = await getList(1, 10);
+        taskObj.value = res2;
+    }).finally(()=>{
+        hideLoading();
+    })
+}
+
+
+// 查看详情 type 1-详情 2-问题详情
+const handleDetail = (item,type) =>{
+    let url='' 
+    if(type==1){
+        url = '/pages/business/polling/optionDetail?taskId='+taskId.value+"&groupId="+item.groupId;
+    }else{
+        url = '/pages/business/polling/problemDetail?problemId='+item.problemId;
+    }
+    uni.navigateTo({
+        url
+    });
+}
+
+</script>
+<style scoped>
+.week{
+    padding:0 40rpx;
+    color: #fff;
+    font-size:32rpx;
+    margin-bottom:20rpx;
+}
+
+.bg-progress{
+    background: url('@/static/images/polling/bg-XunJian.png') no-repeat;
+    background-size:750rpx 352rpx;
+    /* width:750rpx;
+    height: 352rpx; */
+    width:730rpx;
+    height: 312rpx;
+    padding:20rpx 0rpx 20rpx 20rpx;
+    display: flex;
+}
+
+.bg-progress .progress-container{
+    width:280rpx;
+    height: 280rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+}
+.bg-progress .progress-container span{
+    position: absolute;
+    font-size: 72rpx;
+    color:#10F6FC;
+    font-weight: bold;
+}
+.bg-progress .polling{
+    padding:20rpx 0rpx 50rpx 50rpx;
+}
+.polling .p-title{
+    font-size:26rpx;
+    color:#fff;
+    padding:10rpx 30rpx 20rpx 0;
+    width:328rpx;
+}
+.polling .p-title.p-border{
+    border-bottom: 1px solid rgba(255, 255, 255, 0.5);
+}
+.polling .p-title text{
+    font-size:32rpx;
+    font-weight: bold;
+    margin-left:10rpx;
+}
+.polling .p-title text.p-blue{
+    color:#10F6FC
+}
+.polling .btn-primary{
+    width:220rpx;
+    margin-top:10rpx;
+}
+.polling .btn-primary uni-button[type='primary']{
+    background-color: #05A3F4;
+}
+
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 253px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 253px);
+    /* #endif */
+}
+.white-bg{
+    width: 680rpx;
+    padding: 30rpx 30rpx 30rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+.white-bg2{
+   /* padding:0 40rpx; */
+   margin-top:-30rpx;
+}
+.report-list{
+    position: relative;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+.report-list .r-list{
+    padding: 5rpx 0;
+}
+.report-list .r-list .r-left{
+    display: flex;
+}
+.report-list .r-list .r-gray{
+    margin-left:10rpx;
+}
+.report-list .r-list .r-right{
+    display: flex;
+    align-items: center;
+}
+.report-list .r-list .r-right .r-orange{
+    color:#FF9638
+}
+.report-list .r-list .r-right .uniui-right{
+    margin-left:20rpx;
+}
+
+.bg-border{
+    width:750rpx;
+    height:20rpx;
+    background-color: #F5F5F5;
+    margin-left:-40rpx;
+    margin-top:40rpx;
+}
+
+.report-list .r-list .r-name{
+    width:525rpx
+}
+.r-left .r-l-left{
+    width:280rpx;
+}
+.r-left .r-l-right{
+   
+}
+.no-data .no-pic{
+    display: block;
+    width:440rpx;
+    height:210rpx;
+    margin:40rpx auto;
+}
+:deep(.mescroll-upwarp){
+    display: none !important;
+}
+</style>

src/pages/business/polling/taskList.vue

@@ -0,0 +1,389 @@
+<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="search">
+            <view class="search-bg s-b-left" @click="chooseDate">
+                <img :src="'static/images/polling/icon-search-clock.png'" class="img-icon" />
+                {{dateStrName}}
+                <uni-icons type="down" size="16" color="#C8DCFF" style="margin-left:auto;"></uni-icons>
+            </view>
+            <view class="search-bg s-b-right">
+                <img :src="'static/images/polling/icon-type.png'" class="img-type" />
+                <picker @change="changeTaskType" :value="taskTypeIndex" :range="taskTypeArr">
+                    <view class="uni-input">{{taskTypeArr[taskTypeIndex]}}</view>
+                </picker>
+                <uni-icons type="down" size="16" color="#C8DCFF" style="margin-left:auto;"></uni-icons>
+            </view>
+            <view class="search-btn" @click="handleSearch">查询</view>
+        </view>
+        <view class="week">{{dateStr}}</view>
+
+        <!-- 列表 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+            :up="upOption" :down="downOption" :fixed="false" class="scroll-h" :class="{'loading-scroll':cssFlag}">
+            <view class="white-bg" v-if="list.length>0">
+                <!-- <view class="r-title">{{ parseTime(obj.dateStr,'{y}-{m}-{d} 星期{a}')}}</view> -->
+                <view class="report-list" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+                    <view class="r-list" style="padding-bottom:0">
+                        <view class="r-name">{{ item.taskName }}</view>
+                        <view class="r-right">
+                            <!-- 任务(巡检)状态 1=未发布 2=已发布 3 进行中 4 已完成 5 已过期 -->
+                            <!-- 状态为3进行中时 进度>0执行中 进度=0为待执行 -->
+                            <block v-if="item.taskStatus==3">
+                                <img v-if="item.beginTime" :src="'static/images/polling/icon-pending.png'"  class="img-w" />
+                                <img v-else :src="'static/images/polling/icon-start.png'"  class="img-w" />
+                            </block>
+                            <img v-else-if="item.taskStatus==4" :src="'static/images/polling/icon-complete.png'"  class="img-complete" />
+                            <img v-else-if="item.taskStatus==5" :src="'static/images/polling/icon-Expired.png'"  class="img-w" />
+                        </view>
+                    </view>
+                    <view class="r-list">
+                        <view class="r-left">
+                            <view class="r-l-left">巡检单号<span class="r-gray">{{ item.taskId }}</span></view>
+                            <view class="r-l-right">类型<span class="r-gray">{{ formatTaskType(item.taskType) }}</span></view>
+                        </view>
+                    </view>
+                    <view class="r-list">
+                        <view class="r-left">
+                            <view v-if="item.beginTime">
+                                执行时间<span class="r-gray">{{ parseTime(item.beginTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                            </view>
+                            <view v-else>
+                                开始时间<span class="r-gray">{{ parseTime(item.planTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="r-list">
+                        <view class="r-left">
+                            <view class="r-l-left">
+                                任务状态<span class="r-gray" v-if="item.taskStatus==3">
+                                    <block v-if="item.beginTime">执行中</block>
+                                    <block v-else>待执行</block>
+                                </span>
+                                <span class="r-gray" v-else>{{formatTaskStatus(item.taskStatus) }}</span>
+                            </view>
+                            <view class="r-l-right">
+                                任务时长<span class="r-gray">{{ item.workHour }}小时</span>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="r-list">
+                        <view class="r-left">
+                            <view class="r-l-left">
+                                完成进度<span class="r-gray"><span :class="{'r-red':item.groupFinishNum<item.groupNum}">{{item.groupFinishNum}}</span>/{{item.groupNum}}</span>
+                            </view>
+                            <view class="r-l-right">
+                                完成比率<span class="r-blue">{{(item.groupFinishNum/item.groupNum*100).toFixed()+'%'}}</span>
+                            </view>
+                        </view>
+                    </view>
+                   
+                    <view class="report-border" v-if="index<list.length-1"></view>
+                </view>
+                   
+            </view>
+        </mescroll-uni>
+    </view>
+
+    <!-- 选择日期 -->
+    <searchDate :isShow="isShow" @close="dateClose" @confirm="dateConfirm"></searchDate>
+   
+</view>
+</template>
+<script setup>
+import { ref,onMounted,getCurrentInstance } from 'vue'
+import { onLoad,onHide } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue';
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import searchDate from '@/components/searchDate.vue';
+import { parseTime,getDateRange,getDateRangeName } from '@/utils/datetime.js';
+import { taskTypeOptions,formatTaskType,formatTaskStatus } from '@/utils/status.js';
+import { taskLists } from '@/api/polling.js'
+const { proxy } = getCurrentInstance();
+
+// 底部日期选择
+let isShow = ref(false);
+const chooseDate = ()=>{
+    isShow.value = true;
+}
+const dateClose=()=>{
+    isShow.value = false;
+}
+// 选完日期提交回显
+const dateConfirm=(dateObj)=>{
+    isShow.value = false;
+    dateStr.value =  dateObj.startDate + ' 至 '+dateObj.endDate;
+    dateStrName.value = getDateRangeName(dateObj.lastType)
+
+    form.value.startDate = dateObj.startDate;
+    form.value.endDate = dateObj.endDate
+}
+
+// 类型索引
+let taskTypeIndex = ref(0);
+let taskTypeArr = ref([]);
+let dateStr = ref('');
+let dateStrName=ref('');
+onLoad(async option => {
+    taskTypeOptions.forEach(item => {
+        taskTypeArr.value.push(item.label)
+    });
+
+    let dateObj = getDateRange('3days');
+    dateStr.value = dateObj.startDate + ' 至 '+dateObj.endDate;
+    dateStrName.value="近3天"
+
+    form.value.startDate = dateObj.startDate;
+    form.value.endDate = dateObj.endDate
+
+    // let res = await getList(0,3);
+    // cssFlag.value = false;
+    // list.value = res.list;
+    
+})
+
+
+// 选择类型筛选
+const changeTaskType = (e)=>{
+    taskTypeIndex.value = e.detail.value
+    let obj = taskTypeOptions[taskTypeIndex.value];
+    console.log('obj=>', obj)
+}
+
+// 查询列表
+let lastId = ref('');
+let list = ref([]);
+let form = ref({
+    startDate:''
+})
+const mescrollRef = ref(null);
+const upOption = ref({
+    // use: false,
+    auto: true, // 禁用自动上拉
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../../static/images/mescroll-empty.png"
+    },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let cssFlag=ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+    // mescrollRef.value.triggerUpScroll();
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        console.log("下拉刷新");
+        const res = await getList(1, upOption.value.page.size,undefined);
+        cssFlag.value = false;
+        list.value = res.list;
+        // mescroll.resetUpScroll()
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        console.log("上拉加载更多",mescroll)
+        let res = await getList(mescroll.num, mescroll.size,lastId.value);
+        if (mescroll.num === 1) {
+            list.value = res.list;
+        } else {
+            list.value.push(...res.list);
+        }
+        mescroll.endBySize(res.list.length, res.total);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+const getList = (pageIndex, pageSize,last) => {
+    return new Promise(async (resolve) => {
+        let param = {
+            // pageIndex,
+            pageSize,
+            timeBegin: form.value.startDate,
+            timeEnd:  form.value.endDate,
+            lastId:last,
+            taskType:taskTypeOptions[taskTypeIndex.value].value
+        }
+        let res = await taskLists(param);
+        let data = res ||{};
+        lastId.value = data.isEnd==1?undefined:data.lastId
+        resolve({
+            ...data,
+            total: (data.isEnd==1?0:data.lastId) || 1, //是否最后一页(1-是,0-否)
+            lastId: data.isEnd==1?undefined:data.lastId
+        });
+    });
+}
+
+// 执行查询
+const handleSearch= async ()=>{
+    let res = await getList(0,10);
+    cssFlag.value = false;
+    list.value = res.list;
+}
+
+// 查看详情
+const handleDetail = (item,type) =>{
+    let url='/pages/business/polling/taskDetail?id='+item.taskId;
+    uni.navigateTo({
+        url
+    });
+}
+</script>
+
+<style scoped>
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 148px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 132px);
+    /* #endif */
+}
+
+.search{
+    display: flex;
+    align-items: center;
+    padding:0 30rpx;
+}
+.search .search-bg{
+    margin:20rpx 0;
+    line-height:56rpx;
+}
+.search .s-b-left{
+    width:230rpx;
+    display: flex;
+    align-items: center;
+}
+.search .s-b-right{
+    width:270rpx;
+    margin-left:20rpx;
+    margin-right:20rpx;
+    display: flex;
+    align-items: center;
+}
+.search .search-bg .img-icon,
+.search .search-bg .img-type{
+    width:28rpx;
+    height: 28rpx;
+    margin-right:20rpx;
+}
+.search .search-bg .img-icon{
+    width:30rpx;
+    height:30rpx;
+}
+.search .search-btn{
+    width:150rpx;
+    color:#fff;
+    font-size:28rpx;
+}
+
+.week{
+    padding:0 40rpx;
+    color: #fff;
+    font-size:28rpx;
+    margin-bottom:10rpx;
+}
+
+.white-bg{
+    width: 670rpx;
+    padding: 30rpx 40rpx 40rpx;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+.white-bg2{
+    border-radius: 0;
+    margin-top:20rpx;
+}
+.r-title{
+    width:670rpx;
+    color:#919191;
+    font-size:28rpx;
+    background-color: #F5F5F5;
+    margin-left:-40rpx;
+    padding:40rpx 40rpx 30rpx;
+    margin-bottom:15rpx;
+}
+.report-list{
+    position: relative;
+}
+.img-w{
+    width:50rpx;
+    height:50rpx;
+}
+.img-complete{
+    position: absolute;
+    right:-40rpx;
+    top:60rpx;
+    width:133rpx;
+    height:150rpx;
+}
+.report-border{
+    border-bottom:1px solid #E7E7E7;
+    width:710rpx;
+    height: 1px;
+    margin:20rpx 0;
+}
+
+.report-list .r-list{
+    padding: 5rpx 0;
+}
+.report-list .r-list .r-left{
+    display: flex;
+}
+.report-list .r-list .r-gray{
+    margin-left:10rpx;
+}
+.report-list .r-list .r-blue{
+    margin-left:10rpx;
+    font-weight: bold;
+}
+.report-list .r-list .r-red{
+    font-weight: bold;
+}
+.report-list .r-list .r-name{
+    width:525rpx
+}
+.r-left .r-l-left{
+    width:350rpx;
+}
+.r-left .r-l-right{
+   
+}
+.no-data .no-pic{
+    display: block;
+    width:440rpx;
+    height:210rpx;
+    margin:40rpx auto;
+}
+</style>

src/pages/deviceAuth/deviceAuth.vue

@@ -407,7 +407,9 @@ const handleSubmit=()=>{
 .container .bg-h{
     background:url('@/static/images/PicLogoTxt2@2x.png') center bottom 10rpx no-repeat;
     background-size:487rpx 214rpx;
+    /* #ifdef APP-PLUS */
     width: 100vw;
+    /* #endif */
     height: calc(100vh - 110px) ;
     margin:0 auto;
 }

src/pages/home/home.vue

@@ -108,8 +108,10 @@
               <view class="w-b-title">常用服务</view>
               <view class="logo-list">
                   <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index"  @click="handleJump(item.bizUrl)">
-                      <img :src="'static/images/business/'+item.icon+'.png'" />
-                      <text class="font-gray">{{ item.bizName }}</text>
+                    <img :src="'static/images/business/'+item.icon+'.png'" />
+                    <text class="font-gray">{{ item.bizName }}</text>
+                    <!--后台创建业务的时候 bizCode 必须固定为 'jrxj' -->
+                    <view class="red-bg" v-if="item.bizCode=='jrxj'">{{todayCount}}</view>
                   </view>
                   <!-- <view  class="l-l-item" @click="handleAddCommonSercice">
                     <img :src="'static/images/business/icon-add.png'">
@@ -153,6 +155,7 @@ import { messageNotifyCount,messageFlowCount,getUserFavorite} from '@/api/home.j
 import { getWeekStr,formatTimestamp } from '@/utils/datetime.js'
 import { formatMoney } from '@/utils/formatter.js'
 import {showLoading,hideLoading} from '@/utils/message.js'
+import {querytodaytasknum} from '@/api/polling.js'
 
 // #ifdef APP-PLUS
 // 获取 存储手机的module 
@@ -199,12 +202,21 @@ const initLoad =()=>{
     getSalesTask();
     getCommonServices();
     getNewsList();
+    getTaskCount();
     hideLoading();
   } catch (error) {
     hideLoading();
   }
 }
 
+// 查询待巡检的任务数量
+let todayCount =ref(0);
+const getTaskCount= async()=>{
+  let res = await querytodaytasknum({});
+  todayCount.value = res || 0;
+  backBlogObj.value.count3  = res || 0;
+}
+
 // 下拉刷新
 const mescrollRef = ref(null);
 const mescrollInit = (mescroll) => {

src/pages/loading/loading.vue

@@ -24,10 +24,13 @@
 <script setup>
 import { ref,getCurrentInstance } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
+import { MINIO_KEY } from '@/enums/cacheEnums';
 import { versionCheck,getBindStatus } from '@/api/auth.js';
 import { formatIOS } from '@/utils/status.js'
-import { requestAndroidPermissionAsync,requestAndroidPermission } from '@/utils/common.js'
-import {showAlert} from '@/utils/message.js'
+// import { requestAndroidPermissionAsync,requestAndroidPermission } from '@/utils/common.js'
+import {showAlert,showToast} from '@/utils/message.js'
+import {isNetwork,openNetworkSettings} from '@/utils/common.js'
+import { minioParam } from '@/api/polling.js'
 import { useUserStore } from '@/stores/user';
 const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
@@ -47,13 +50,23 @@ let downloadURL = ref(''); //下载地址
 let versionData = ref({}); //版本参数
 // 初始load页面
 onLoad(async(opt) => {
-    console.log("onLoad");
-
+    // console.log("onLoad");
     // uni.preloadPage({url: "/pages/login/login"});
     // uni.preloadPage({url: "/pages/deviceAuth/deviceAuth"});
     // uni.preloadPage({url: "/pages/home/home"});
 
     // #ifdef APP-PLUS
+	let res = await isNetwork();//验证是否有网络
+	if(res==='none'){
+		showAlert('当前网络不可用，请检查网络设置','提示',false,()=>{
+			openNetworkSettings();
+		});
+		return;
+	}
+	
+    //手机通知授权
+    noticMsgTool();
+
     // 查询版本接口
     await getOSVesion();
     
@@ -89,8 +102,23 @@ onLoad(async(opt) => {
     // },1000)
     // #endif
 
+    // 内网才有minio参数
+    if(networkEnv.value==1){
+        getMinioParam();
+    }
+
 });
 
+// 获取minio参数
+const getMinioParam=async ()=>{
+    let data = await minioParam({});
+    let minioThumbUrl = data.endpoint + "/thumb/"+data.bucketName;
+    let minioUrl = data.endpoint + "/"+data.bucketName
+    uni.setStorageSync(MINIO_KEY,JSON.stringify({
+        minioThumbUrl,minioUrl
+    }))
+}
+
 // 检查版本是否是最新的s
 const getOSVesion = async()=>{
     let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
@@ -111,7 +139,7 @@ const getOSVesion = async()=>{
     versionData.value = param;
     let data = await versionCheck(param);
     newVersion.value = data.verNumber;
-    downloadURL.value = data.downloadUrl || '';
+    downloadURL.value = data.downPageUrl || '';
 
     // isForceUpdate 是否强制更新 1-是 2-否
     let isForceUpdate = data.isForceUpdate;
@@ -200,6 +228,78 @@ const handleClose=()=>{
         selectDeviceId()
     }
 }
+
+//通知授权
+const noticMsgTool=()=>{
+    if (uni.getSystemInfoSync().platform == "ios") {
+        // iOS: 使用 iOS API 检查通知权限
+        plus.ios.import('UserNotifications');
+        var UNNotificationSettings = plus.ios.invoke('UNUserNotificationCenter', 'currentNotificationCenter');
+        plus.ios.invoke(UNNotificationSettings, 'getNotificationSettingsWithCompletionHandler', function(settings) {
+            var authorizationStatus = plus.ios.invoke(settings, 'authorizationStatus');
+            if (authorizationStatus !== 3) { // 3表示已授权
+                //苹果打开对应的通知栏
+                uni.showModal({
+                    title: '通知权限开启提醒',
+                    content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
+                    showCancel: false,
+                    confirmText: '去设置',
+                    success: function(res) {
+                        if (res.confirm) {
+                            var app = plus.ios.invoke('UIApplication', 'sharedApplication');
+                            var setting = plus.ios.invoke('NSURL', 'URLWithString:','app-settings:');
+                            plus.ios.invoke(app, 'openURL:', setting);
+                            plus.ios.deleteObject(setting);
+                            plus.ios.deleteObject(app);
+                        }
+                    }
+                });
+            }
+        });
+
+    } else {
+        //android打开对应的通知栏
+        var main = plus.android.runtimeMainActivity();
+        var pkName = main.getPackageName();
+        var uid = main.getApplicationInfo().plusGetAttribute("uid");
+        var context = main.getApplicationContext();
+        var NotificationManager = plus.android.importClass('android.app.NotificationManager');
+        var notificationManager = context.getSystemService(context.NOTIFICATION_SERVICE);
+        var areNotificationsEnabled = notificationManager.areNotificationsEnabled();
+
+        if (!areNotificationsEnabled) {
+            // 提示用户开启通知权限
+            uni.showModal({
+                title: '通知权限开启提醒',
+                content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
+                showCancel: false,
+                confirmText: '去设置',
+                success: function(res) {
+                    if (res.confirm) {
+                        var Intent = plus.android.importClass('android.content.Intent');
+                        var Build = plus.android.importClass("android.os.Build");
+                        //android 8.0引导  
+                        if (Build.VERSION.SDK_INT >= 26) {
+                            var intent = new Intent('android.settings.APP_NOTIFICATION_SETTINGS');
+                            intent.putExtra('android.provider.extra.APP_PACKAGE', pkName);
+                        } else if (Build.VERSION.SDK_INT >= 21) { //android 5.0-7.0  
+                            var intent = new Intent('android.settings.APP_NOTIFICATION_SETTINGS');
+                            intent.putExtra("app_package", pkName);
+                            intent.putExtra("app_uid", uid);
+                        } else { //(<21)其他--跳转到该应用管理的详情页  
+                            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                            var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+                            intent.setData(uri);
+                        }
+                        // 跳转到该应用的系统通知设置页  
+                        main.startActivity(intent);
+                    }
+                }
+            });
+        }
+
+    }
+}
 </script>
 
 <style>

src/pages/login/login.vue

@@ -88,7 +88,7 @@ import { AGREEWELCOME_KEY } from '@/enums/cacheEnums';
 import { getNavBarPaddingTop} from '@/utils/system.js'
 import { useUserStore } from '@/stores/user';
 import encryptObj from '@/utils/encrypt.js'
-import {showAlert} from '@/utils/message.js'
+import {showAlert,showToast} from '@/utils/message.js'
 
 
 // #ifdef APP-PLUS
@@ -264,9 +264,9 @@ const submitForm = () => {
 
             // #ifdef H5
             //h5测试用 内网-sn123456
-            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee'
+            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' 529a5543-6957-401e-b090-13df6dee5429
             //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' 
-            param.uniqCode = 'f3fca83f-bf56-47f4-a98b-a602ed8bddee';
+            param.uniqCode = '9a41dec6-536f-443f-9d98-8dc5c0b18332';
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })
@@ -302,20 +302,21 @@ const submitForm = () => {
                         })
                        
                     } else {
-                        // showAlert('读取失败:'+res3.msg)
+                        showToast('读取失败:'+res3.msg)
                         console.error('读取失败:', error);
                         btnLoading.value = false;
                     }
                 })
             } catch (error) {
                 console.error('读取失败:', error);
-                // showAlert('出错:', error)
+                showToast('err:'+ error)
                 btnLoading.value = false;
             }
             // #endif
            
         }).catch(err => {
             console.log('表单错误11:', err);
+            showToast('err:'+ err)
             btnLoading.value = false;
         });
     }
@@ -362,7 +363,9 @@ page{
 .login-con .bg-h{
     background:url('@/static/images/login-txt.png') center bottom 10rpx no-repeat;
     background-size:654rpx 121rpx;
+    /* #ifdef APP-PLUS */
     width: 100vw;
+    /* #endif */
     height: calc(100vh - 10px) ;
     margin:0 auto;
 }

src/pages/notice/notice.vue

@@ -162,7 +162,7 @@ const downCallback = async (mescroll) => {
         const res = await getNoticeList(1, upOption.value.page.size);
         cssFlag.value = false;
         list.value = res.list;
-        mescroll.resetUpScroll();
+        // mescroll.resetUpScroll();
     } catch (error) {
         mescroll.endErr();
     } finally {
@@ -260,7 +260,7 @@ const handleJump = (item)=>{
 }
 .scroll-h{
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 120px);
+    height: calc(100vh - 150px);
     /* #endif */
     /* #ifndef APP-PLUS */
     height: calc(100vh - 160px);

src/pages/notice/waitApprove.vue

@@ -103,7 +103,7 @@ const downCallback = async (mescroll) => {
         const res = await getFlowList(1, upOption.value.page.size);
         cssFlag.value = false;
         list.value = res.list;
-        mescroll.resetUpScroll();
+        // mescroll.resetUpScroll();
     } catch (error) {
         mescroll.endErr();
     } finally {

src/static/common.css

@@ -288,6 +288,33 @@ page {
     padding: 30rpx;
     border-radius: 8px;
 }
+.white-bg .blue-title{
+    color:#3384DF;
+    font-size:38rpx;
+    font-weight: bold;
+    margin:10rpx 0;
+}
+.white-bg .blue-sub-title{
+    color:#3384DF;
+    font-size:28rpx;
+    font-weight: bold;
+    margin:10rpx 0;
+}
+.white-bg .blue-sub-title text{
+    font-weight:normal;
+}
+.white-bg .green-title{
+    color:#12BC36;
+    font-size:38rpx;
+    font-weight: bold;
+    margin:10rpx 0;
+}
+.white-bg .red-title{
+    color:#FF687A;
+    font-size:38rpx;
+    font-weight: bold;
+    margin:10rpx 0;
+}
 
 .white-bg .w-b-title {
     display: flex;
@@ -329,8 +356,8 @@ page {
     /* 项目间距 */
     margin-left:-10rpx;
     margin-right:-10rpx;
+    position: relative;
 }
-
 .white-bg .logo-list .l-l-item {
     width: 140rpx;
     text-align: center;
@@ -341,6 +368,21 @@ page {
 }
 
 
+.white-bg .logo-list .l-l-item .red-bg{
+    position: absolute;
+    top:0rpx;
+    right: 15rpx;
+    width:32rpx;
+    height: 32rpx;
+    line-height: 32rpx;
+    background-color: #FF2B44;
+    text-align: center;
+    border-radius: 50%;
+    color:#fff;
+    font-size:24rpx;
+}
+
+
 .white-bg .logo-list .l-l-item img {
     width: 90rpx;
     height: 90rpx;
@@ -485,6 +527,14 @@ uni-button[type='primary'][plain] {
     color: #919191;
     font-size: 28rpx;
 }
+.report-list .r-list .r-blue{
+    color: #05A3F4;
+    font-size: 28rpx;
+}
+.report-list .r-list .r-red{
+    color: #FF2B44;
+    font-size: 28rpx;
+}
 
 .report-list .r-list .r-right {
     margin-left: auto;
@@ -529,6 +579,24 @@ uni-button[type='primary'][plain] {
     font-weight: normal;
 }
 
+.report-list .r-list .btn-green{
+    background-color: #09BC48;
+    color:#fff;
+    text-align: center;
+    padding:5rpx 20rpx;
+    font-size:28rpx;
+    border-radius: 10rpx;
+}
+.report-list .r-list .btn-red{
+    background-color: #FF687A;
+    color:#fff;
+    text-align: center;
+    padding:5rpx 20rpx;
+    font-size:28rpx;
+    border-radius: 10rpx;
+}
+
+
 .form-con {
     padding: 0 30rpx;
 }
@@ -647,4 +715,103 @@ uni-button[type='primary'][plain] {
 .mescroll-empty .empty-tip{
     color: #fff !important;
     font-size:28rpx !important;
+}
+
+/* 日历修改 begin */
+.calender-con{
+    box-shadow: 0px 0px 15px 0px rgba(4, 0, 0, 0.15);
+    padding-bottom:40rpx;
+}
+.calender-con .uni-calendar__content{
+    padding:0 20rpx !important;
+}
+.calender-con .uni-calendar__backtoday{
+    right:-20rpx !important;
+}
+.calender-con .uni-calendar__header-text{
+    color:#333333 !important;
+    font-weight: bold !important;
+    font-size: 34rpx !important;
+}
+.calender-con .uni-calendar__weeks-day{
+    border:none !important;
+}
+.calender-con .uni-calendar__weeks-day-text{
+    color:#333333 !important;
+    font-weight: bold !important;
+    font-size: 34rpx !important;
+}
+.calender-con .uni-calendar__weeks{
+    padding:0 0rpx !important;
+}
+
+.calender-con .uni-calendar-item__weeks-box-item{
+    width:auto !important;
+    height:80rpx !important;
+}
+.calender-con .uni-calendar-item--checked{
+    background-color:#fff !important;
+    opacity:1 !important;
+    color:#333 !important;
+}
+.calender-con .uni-calendar-item--isDay{
+    background-color: #fff !important;
+    opacity: 1 !important;
+}
+.calender-con .uni-calendar-item__weeks-box-text{
+    background-color: #EEEEEE !important;
+    width:62rpx !important;
+    height:62rpx !important;
+    line-height: 55rpx !important;
+    /* #ifdef APP-PLUS */
+    line-height: 65rpx !important;
+    /* #endif */
+    border-radius: 50% !important;
+    text-align: center !important;
+    font-size:34rpx !important;
+    color:#333333 !important;
+}
+.calender-con .uni-calendar-item--checked .uni-calendar-item__weeks-box-text{
+    background-color:#FF9638 !important;
+    color:#fff !important;
+}
+.calender-con .uni-calendar-item--disable{
+    background-color: transparent !important;
+    color:#E3E3E3 !important;
+}
+.calender-con .uni-calendar-item--isDay.uni-calendar-item--isDay-text{
+    background-color: #FF9638 !important;
+    color:#fff !important;
+    width:65rpx !important;/*72rpx*/
+    height: 65rpx !important;
+    line-height: 60rpx !important;
+    /* #ifdef APP-PLUS */
+    line-height: 65rpx !important;
+    /* #endif */
+}
+.calender-con .uni-calendar-item__weeks-lunar-text.uni-calendar-item--isDay-text{
+    display: none !important;
+}
+
+/* 日历修改 end */
+
+/* 图片loading */
+.img-flex .img-con{position: relative;}
+.img-flex .img-con .upload-loading{
+    position: absolute;
+    left:0;
+    top:0;
+    background-color: #EEEEEE;
+    width:210rpx;
+    height: 120rpx;
+    /* line-height: 140rpx; */
+    padding-top:20rpx;
+}
+.upload-loading .uni-icons{
+    display: inline-block;
+    animation: spin 2s linear infinite;
+}
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
 }