From 050ee0fd8c5b9edd3887fe38e25752a50dcb99ef Mon Sep 17 00:00:00 2001
From: wangzhuo <wangzhuo03@sevenstatr.com>
Date: Thu, 21 Aug 2025 13:02:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?pref:=20=E4=BC=98=E5=8C=96=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=8D=95=E9=80=89=E7=BB=84=E7=9A=84?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=20fix:=20=E8=B0=83=E6=95=B4=E5=91=A8?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CRM/customer/changeCustomerOwner.vue      |  9 ++++++---
 .../business/CRM/customer/customerAdd.vue     |  3 ++-
 .../business/CRM/customer/customerAudit.vue   | 19 ++++++++-----------
 .../CRM/customer/customerUserBelong.vue       |  4 ++--
 .../business/CRM/customer/selectCustomer.vue  | 17 +++++++----------
 src/pages/business/CRM/plan/planView.vue      |  7 +++++++
 6 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/pages/business/CRM/customer/changeCustomerOwner.vue b/src/pages/business/CRM/customer/changeCustomerOwner.vue
index 1f5d820..16dedca 100644
--- a/src/pages/business/CRM/customer/changeCustomerOwner.vue
+++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue
@@ -298,7 +298,7 @@ let handleCopyInfo=(item)=>{
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
   top: 150rpx;
@@ -343,7 +343,10 @@ let handleCopyInfo=(item)=>{
   }
 }
 
-.btn-edit{
-  white-space: nowrap;
+.white-bg:hover{
+  //background-color: #f1f1f1;
+  background-color: #f1f1f1; /* Chrome, Safari, Opera */
+  box-shadow: 0px 0px 5rpx white;
+  //filter: rgba(237, 242, 250, 0.5);
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/customer/customerAdd.vue b/src/pages/business/CRM/customer/customerAdd.vue
index f6f3a7a..4e07bde 100644
--- a/src/pages/business/CRM/customer/customerAdd.vue
+++ b/src/pages/business/CRM/customer/customerAdd.vue
@@ -179,7 +179,7 @@
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
               <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
-                              @change="handleHobbyChange" :key="Math.round()" :slabel="'name'"
+                              @change="handleHobbyChange" :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
             </uni-forms-item>
@@ -435,6 +435,7 @@ let handleFunctionChange = (e) => {
   console.log(e.detail.value, '职能索引');
   const {name} = functionalRequirementList[e.detail.value];
   formData.value.functionalRequirements = name;
+  formData.value.function = name;
   getRecommendLevel();
 }
 
diff --git a/src/pages/business/CRM/customer/customerAudit.vue b/src/pages/business/CRM/customer/customerAudit.vue
index 2fa806a..31f23eb 100644
--- a/src/pages/business/CRM/customer/customerAudit.vue
+++ b/src/pages/business/CRM/customer/customerAudit.vue
@@ -16,13 +16,13 @@
       <!-- 正文内容 -->
       <view class="all-body">
         <!-- 搜索-->
-<!--        <view class="search">-->
+        <view class="search">
 <!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
 <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
 <!--                          v-model="searchValue"-->
 <!--          />-->
-<!--          &lt;!&ndash;                  <button type="default" @click="clearSearchValue" size="mini" class="btn-search">清空</button>&ndash;&gt;-->
-<!--        </view>-->
+          <view class="custom-search"></view>
+          </view>
 
         <!-- 分页部分  -->
         <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -90,16 +90,9 @@ let timerId = null;
 let handleSearch = () => {
   // 防抖搜索    console.log(searchValue.value)
   if (timerId) clearTimeout(timerId);
-  uni.showLoading()
   timerId = setTimeout(async () => {
-
-    cssFlag.value = true;
-
     // let res = await getList(1, upOption.value.page.size)
     await downCallback(mescrollRef.value.mescroll);
-
-    cssFlag.value = false;
-    uni.hideLoading();
     clearTimeout(timerId);
     timerId = null;
   }, 500)
@@ -138,6 +131,8 @@ const mescrollInit = (mescroll) => {
 // 下拉刷新
 const downCallback = async (mescroll) => {
   try {
+    uni.showLoading();
+    cssFlag.value = true;
     setTimeout(async () => {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
@@ -145,6 +140,8 @@ const downCallback = async (mescroll) => {
       list.value = res.list;
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
+      uni.hideLoading();
+      cssFlag.value = false;
     }, 500);
   } catch (error) {
     console.log(error)
@@ -162,6 +159,7 @@ const upCallback = async (mescroll) => {
       } else {
         list.value.push(...res.list);
       }
+      mescroll.endBySize(res.list.length, res.total);
       // 正确判断是否还有更多数据
       mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
     }, 500);
@@ -218,7 +216,6 @@ let handleDetail = (item) => {
   /* #endif */
 }
 
-
 .scroll-h {
   /* #ifdef APP-PLUS */
   height: calc(100vh - 120px);
diff --git a/src/pages/business/CRM/customer/customerUserBelong.vue b/src/pages/business/CRM/customer/customerUserBelong.vue
index 179491b..c017c4f 100644
--- a/src/pages/business/CRM/customer/customerUserBelong.vue
+++ b/src/pages/business/CRM/customer/customerUserBelong.vue
@@ -32,8 +32,8 @@
           <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
                 @click.stop="handleDetail(item)">
             <view class="report-list">
-              <view class="w-b-title title" @touchstart.prevent="handleTouchStart(item)"
-                    @touchend.prevent="handleTouchEnd">
+              <view class="w-b-title title" @touchstart="handleTouchStart(item)"
+                    @touchend="handleTouchEnd">
                 {{ item.cusName }}
                 <view v-if="item.nodeCode" class="r-right btn-edit" :class="statusColorMap[item.nodeCode]">
                   {{ item.nodeCode }}
diff --git a/src/pages/business/CRM/customer/selectCustomer.vue b/src/pages/business/CRM/customer/selectCustomer.vue
index 88deb74..7126d19 100644
--- a/src/pages/business/CRM/customer/selectCustomer.vue
+++ b/src/pages/business/CRM/customer/selectCustomer.vue
@@ -33,10 +33,9 @@
           <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?true:false"
-                     :value="item"
-                     :data-index="index">
+                     :class="index === selectIndex ? 'checked' : ''"
+                     :checked="index === selectIndex"
+                     :value="index+''">
               </radio>
 
               <view class="report-list">
@@ -118,7 +117,6 @@ let timerId = null;
 watch(searchValue, (newValue, oldValue) => {
   // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
   if(timerId) clearTimeout(timerId);
-  cssFlag.value = true;
   timerId = setTimeout(async ()=>{
      handleSearch();
      clearTimeout(timerId);
@@ -130,7 +128,6 @@ watch(searchValue, (newValue, oldValue) => {
 const downCallback = async (mescroll) => {
   try {
     const res = await getList(1, upOption.value.page.size);
-    cssFlag.value = false;
     list.value = res.list;
     // 正确结束下拉刷新状态
     mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
@@ -163,9 +160,11 @@ const upCallback = async (mescroll) => {
 let handleSearch = async () => {
   // 触发下拉刷新以重新加载数据
   if (mescrollRef.value) {
+    cssFlag.value = true;
     uni.showLoading()
     await downCallback(mescrollRef.value.mescroll);
     uni.hideLoading()
+    cssFlag.value = false;
   }
 }
 // 获取数据列表
@@ -181,12 +180,10 @@ const getList = async (pageIndex, pageSize) => {
 // 选中项的索引号
 const selectIndex = ref(null);
 const radioChange = (e) => {
-  let {value} = e.detail;
-  let {index} = e.target.dataset;
+  let {value} = e.detail; // index
   // console.log(value);
-  // console.log(e.target.dataset);
   const eventChannel = instance.getOpenerEventChannel();
-  eventChannel.emit('cuSelected', value);
+  eventChannel.emit('cuSelected', list.value[value]);
   uni.navigateBack()
 }
 
diff --git a/src/pages/business/CRM/plan/planView.vue b/src/pages/business/CRM/plan/planView.vue
index cfa8580..f265deb 100644
--- a/src/pages/business/CRM/plan/planView.vue
+++ b/src/pages/business/CRM/plan/planView.vue
@@ -366,6 +366,13 @@ let handleDetail = (rowIndex, colIndex) => {
   width: 690rpx;
   margin: 20rpx 0 0 0;
   border-radius: 8px 8px 0 0;
+  /* #ifdef APP-PLUS */
+  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  /* #endif */
+  //overflow-y: auto;
 }
 
 .white-bg.white-bg-2 {

From 1703e5987c842bc09eb16a6f30817d87f7580155 Mon Sep 17 00:00:00 2001
From: wangzhuo <wangzhuo03@sevenstatr.com>
Date: Fri, 22 Aug 2025 09:13:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=99=BD=E8=89=B2=E8=83=8C=E6=99=AF=E9=AB=98=E5=BA=A6100vh?=
 =?UTF-8?q?=E4=B8=BA=E9=AB=98=E5=BA=A6=E6=9C=80=E5=B0=8F=E6=98=AF100vh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainOwner/view/viewMainOwnerDetail.vue    | 50 +------------------
 1 file changed, 1 insertion(+), 49 deletions(-)

diff --git a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
index 694a87f..9574355 100644
--- a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
+++ b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
@@ -135,55 +135,7 @@ function getCrmCusUserNewChangeOwnerList() {
 <style scoped>
 .con-bg{
   background: white;
-  height: 100vh;
-}
-
-.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 */
+  min-height: 100vh;
 }
 
 .white-bg {

From 8389a78b3af9d1b2ebfc6ff1f8ba3315179c0a14 Mon Sep 17 00:00:00 2001
From: wangzhuo <wangzhuo03@sevenstatr.com>
Date: Fri, 22 Aug 2025 17:09:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=B8=8A=E6=8B=89=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CRM/customer/changeCustomerOwner.vue      | 154 +++++++++---------
 .../CRM/customer/customerUserBelong.vue       |   3 +-
 2 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/src/pages/business/CRM/customer/changeCustomerOwner.vue b/src/pages/business/CRM/customer/changeCustomerOwner.vue
index 16dedca..5df8146 100644
--- a/src/pages/business/CRM/customer/changeCustomerOwner.vue
+++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue
@@ -23,55 +23,59 @@
           />
         </view>
 
-        <!-- 分页部分  -->
-        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+        <!-- 分页部分  top="68rpx" -->
+        <mescroll-uni  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
                       :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
                       class="scroll-h" :class="{'loading-scroll':cssFlag}"
         >
-          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
-                @touchstart="handleTouchStart(item)"
-                @touchend="handleTouchEnd">
-            <view class="report-list">
-              <view class="w-b-title title" @dblclick.stop="handleDetail(item)">
-                {{ item.cusName }}
-                <!--<view v-if="item.nodeCode" class="r-right btn-edit" @click.prevent="handleCopyInfo(item)"> 复制信息 </view>-->
-              </view>
-              <view class="r-list">
-                <view class="r-left">客户人员名称</view>
-                <view class="r-right">{{ item.userName }}</view>
-              </view>
-              <view class="border-bottom"></view>
+          <block v-for="(item, index) in list" :key="index">
+            <view class="white-bg margin-bottom20"
+                  @touchstart="handleTouchStart(item)"
+                  @touchend="handleTouchEnd"
+                  v-if="item && item.auditStatus !== '办事处审核通过'"
+            >
+              <view class="report-list">
+                <view class="w-b-title title" @dblclick.stop="handleDetail(item)">
+                  {{ item.cusName }}
+                  <!--<view v-if="item.nodeCode" class="r-right btn-edit" @click.prevent="handleCopyInfo(item)"> 复制信息 </view>-->
+                </view>
+                <view class="r-list">
+                  <view class="r-left">客户人员名称</view>
+                  <view class="r-right">{{ item.userName }}</view>
+                </view>
+                <view class="border-bottom"></view>
+
+                <view class="r-list">
+                  <view class="r-left">性别</view>
+                  <view class="r-right">{{ item.sex }}</view>
+                </view>
+                <view class="border-bottom"></view>
+
+                <view class="r-list">
+                  <view class="r-left">手机号</view>
+                  <view class="r-right">{{ item.mobilePhone || item.iphone }}</view>
+                </view>
+                <view class="border-bottom"></view>
+
+                <view class="r-list">
+                  <view class="r-left">部门</view>
+                  <view class="r-right">{{ item.userDept }}</view>
+                </view>
+                <view class="border-bottom"></view>
+
+                <view class="r-list">
+                  <view class="r-left">业务员认定等级</view>
+                  <view class="r-right">{{ item.salesmanThinkLevel }}</view>
+                </view>
+
+                <!--<view v-if="item.systemThinkLevel" class="r-list">
+                  <view class="r-left">系统认定等级</view>
+                  <view class="r-right">{{ item.systemThinkLevel }}</view>
+                </view>-->
 
-              <view class="r-list">
-                <view class="r-left">性别</view>
-                <view class="r-right">{{ item.sex }}</view>
               </view>
-              <view class="border-bottom"></view>
-
-              <view class="r-list">
-                <view class="r-left">手机号</view>
-                <view class="r-right">{{ item.mobilePhone || item.iphone }}</view>
-              </view>
-              <view class="border-bottom"></view>
-
-              <view class="r-list">
-                <view class="r-left">部门</view>
-                <view class="r-right">{{ item.userDept }}</view>
-              </view>
-              <view class="border-bottom"></view>
-
-              <view class="r-list">
-                <view class="r-left">业务员认定等级</view>
-                <view class="r-right">{{ item.salesmanThinkLevel }}</view>
-              </view>
-
-<!--              <view v-if="item.systemThinkLevel" class="r-list">
-                <view class="r-left">系统认定等级</view>
-                <view class="r-right">{{ item.systemThinkLevel }}</view>
-              </view>-->
-
             </view>
-          </view>
+          </block>
         </mescroll-uni>
       </view>
     </view>
@@ -113,7 +117,7 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
   handleSearch()
 })
-let clearSearchValue = ()=>{
+let clearSearchValue = () => {
   searchValue.value = '';
 }
 // 查询列表
@@ -151,7 +155,7 @@ const downCallback = async (mescroll) => {
       list.value = res.list;
       cssFlag.value = false;
       // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
       uni.hideLoading();
 
     }, 500);
@@ -173,7 +177,7 @@ const upCallback = async (mescroll) => {
         list.value.push(...res.list);
       }
       // 正确判断是否还有更多数据
-      mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
       uni.hideLoading();
     }, 500);
   } catch (error) {
@@ -203,10 +207,8 @@ const getList = (pageIndex, pageSize) => {
 let handleDetail = (item) => {
   uni.navigateTo({
     url: "/pages/business/CRM/customer/components/customerUserEdit",
-    events: {
-
-    },
-    success(res){
+    events: {},
+    success(res) {
       res.eventChannel.emit('editCusData', {param: item, isAdd: false})
     }
   })
@@ -216,8 +218,8 @@ let handleDetail = (item) => {
 let touchTimerId = null;
 
 // 开始触摸
-let handleTouchStart = (item)=>{
-  touchTimerId = setTimeout(()=>{
+let handleTouchStart = (item) => {
+  touchTimerId = setTimeout(() => {
     // console.log(item, "长按客户人员项")
     handleChange(item)
 
@@ -226,39 +228,39 @@ let handleTouchStart = (item)=>{
 }
 
 // 结束触摸
-let handleTouchEnd = ()=>{
-  if(touchTimerId !== null){
+let handleTouchEnd = () => {
+  if (touchTimerId !== null) {
     clearTimeout(touchTimerId);
   }
 }
 
 // 变更主归属人
-let handleChange = (item)=>{
+let handleChange = (item) => {
 
   uni.showModal({
     title: '是否将该客户人员主的归属人变更为自己？',
     editable: true,
     placeholderText: '请输入变更理由',
-    success(res){
-      if(res.confirm){
-        if(res.content){
+    success(res) {
+      if (res.confirm) {
+        if (res.content) {
           submissionOfChangeOfMainOwner({
             userId: item.userId,
             userName: item.userName,
             reasonForChange: res.content
-          }).then(res=>{
-            if(res.code===200){
+          }).then(res => {
+            if (res.code === 200) {
               uni.showToast({
                 title: '操作成功'
               })
-            }else{
+            } else {
               uni.showToast({
                 title: '操作失败',
                 icon: 'error'
               })
             }
           })
-        }else{
+        } else {
           uni.showToast({
             title: '操作失败！变更原因不能为空',
             icon: 'none'
@@ -270,21 +272,21 @@ let handleChange = (item)=>{
 }
 
 // 复制信息
-let handleCopyInfo=(item)=>{
+let handleCopyInfo = (item) => {
   const {cusName, userName, sex, iphone, mobilePhone, jobTelphone, userDept, salesmanThinkLevel} = item;
-/*  item = JSON.stringify({
-    '客户名称':item.cusName,
-    '客户人员名称': item.userName,
-    '性别': item.sex,
-    '手机号': item.iphone || item.mobilePhone || item.jobTelphone,
-    '部门': item.userDept,
-    '业务员认定等级': item.salesmanThinkLevel}
-  );
-  console.log(item, '复制信息');*/
+  /*  item = JSON.stringify({
+      '客户名称':item.cusName,
+      '客户人员名称': item.userName,
+      '性别': item.sex,
+      '手机号': item.iphone || item.mobilePhone || item.jobTelphone,
+      '部门': item.userDept,
+      '业务员认定等级': item.salesmanThinkLevel}
+    );
+    console.log(item, '复制信息');*/
   uni.setClipboardData({
     data: `客户名称：${cusName}
 客户人员名称：${userName}
-性别：${iphone||mobilePhone||jobTelphone}
+性别：${iphone || mobilePhone || jobTelphone}
 部门：${userDept}
 业务员认定等级：${salesmanThinkLevel}`,
     success: function () {
@@ -311,7 +313,6 @@ let handleCopyInfo=(item)=>{
 }
 
 
-
 .search .btn-search {
   border: none;
   background: none;
@@ -338,12 +339,13 @@ let handleCopyInfo=(item)=>{
 
 .white-bg {
   padding-bottom: 10rpx;
-  .w-b-title{
+
+  .w-b-title {
     align-items: flex-start;
   }
 }
 
-.white-bg:hover{
+.white-bg:hover {
   //background-color: #f1f1f1;
   background-color: #f1f1f1; /* Chrome, Safari, Opera */
   box-shadow: 0px 0px 5rpx white;
diff --git a/src/pages/business/CRM/customer/customerUserBelong.vue b/src/pages/business/CRM/customer/customerUserBelong.vue
index c017c4f..a4a5cbd 100644
--- a/src/pages/business/CRM/customer/customerUserBelong.vue
+++ b/src/pages/business/CRM/customer/customerUserBelong.vue
@@ -181,7 +181,8 @@ const upCallback = async (mescroll) => {
         list.value.push(...res.list);
       }
       // 正确判断是否还有更多数据
-      mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
+      mescroll.endBySize(res.list.length, res.total)
+      // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
     }, 500);
   } catch (error) {
     console.log(error)

From 3d8df521071a65051ab2093edeab4ea1c1f2e622 Mon Sep 17 00:00:00 2001
From: "PC-202311141343\\Administrator" <505354293@qq.com>
Date: Tue, 26 Aug 2025 09:27:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=B0718=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customHeader.vue               |   14 +-
 src/components/customSearch.vue               |  343 +++++-
 src/pages.json                                | 1065 +++++++++--------
 .../CRM/marketInformation/infomationView.vue  |  205 ++--
 .../addPaymentCollection.vue                  |  182 +++
 .../fullStaffStatisticsViewingTable.vue       |  262 ++++
 .../business/CRM/paymentCollection/index.vue  |  254 ++++
 .../paymentCollectionCheck.vue                |  106 ++
 .../CRM/paymentCollection/paymentDetail.vue   |  213 ++++
 .../personalPaymentCollectionTable.vue        |  294 +++++
 src/static/common.css                         |   48 +-
 11 files changed, 2319 insertions(+), 667 deletions(-)
 create mode 100644 src/pages/business/CRM/paymentCollection/addPaymentCollection.vue
 create mode 100644 src/pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable.vue
 create mode 100644 src/pages/business/CRM/paymentCollection/index.vue
 create mode 100644 src/pages/business/CRM/paymentCollection/paymentCollectionCheck.vue
 create mode 100644 src/pages/business/CRM/paymentCollection/paymentDetail.vue
 create mode 100644 src/pages/business/CRM/paymentCollection/personalPaymentCollectionTable.vue

diff --git a/src/components/customHeader.vue b/src/components/customHeader.vue
index 702d7da..f07f1a2 100644
--- a/src/components/customHeader.vue
+++ b/src/components/customHeader.vue
@@ -25,6 +25,7 @@ const props = defineProps({
     title: String,
     leftFlag:true,//默认左侧显示 false-不显示
     rightFlag:false,//默认右侧不显示
+    searchType:{default:0}//搜索返回为1，其他暂时不处理
 })
 
 const emit = defineEmits(['back'])
@@ -35,7 +36,7 @@ let navbarHeight = ref(0)
 let navHeight = ref(0)
 
 onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop();console.log(navBarPaddingTop.value)
+    navBarPaddingTop.value = getNavBarPaddingTop();
     statusBarHeight.value = getStatusBarHeight();
     navbarHeight.value = getNavBarHeight();
     navHeight.value = navbarHeight.value - statusBarHeight.value
@@ -43,7 +44,8 @@ onMounted(() => {
 
 const handleBack = () => {
     emit('back')
-    uni.navigateBack()
+    if(!props.searchType)
+        uni.navigateBack()
 }
 </script>
 
@@ -56,15 +58,15 @@ const handleBack = () => {
     margin-left:-375rpx;
     z-index: 999;
     /* #ifdef APP-PLUS */
-    background: url('@/static/images/bg-Blue-header.png') no-repeat;
+    /* background: url('@/static/images/bg-Blue-header.png') no-repeat;
     background-size:750rpx 160rpx;
-    height:160rpx;
+    height:160rpx; */
     /* #endif */
 
     /* #ifndef APP-PLUS */
-    background: url('@/static/images/bg-Blue-header2.png') no-repeat;
+    /* background: url('@/static/images/bg-Blue-header2.png') no-repeat;
     background-size:750rpx 116rpx;
-    height:116rpx;
+    height:116rpx; */
     /* #endif */
    
 }
diff --git a/src/components/customSearch.vue b/src/components/customSearch.vue
index c3ab321..28ad531 100644
--- a/src/components/customSearch.vue
+++ b/src/components/customSearch.vue
@@ -1,84 +1,307 @@
 <template>
     <view>
         <!-- 搜索框 -->
-        <uni-search-bar v-model="searchText" @confirm="handleSearch" />
-
-        <!-- <view v-if="showSuggestions" class="suggestions-list">
-            <view 
-                v-for="(item, index) in suggestions" 
-                :key="index"
-                class="suggestion-item"
-                @click="selectSuggestion(item)"
-            >
-                {{ item }}
-            </view>
-        </view> -->
-
-        <!-- 筛选条件 -->
-        <view class="filter-container">
-            <picker mode="selector" :range="categoryOptions" @change="handleCategoryChange">
-                <view class="filter-item">{{ categoryText }}</view>
-            </picker>
-            <picker mode="selector" :range="sortOptions" @change="handleSortChange">
-                <view class="filter-item">{{ sortText }}</view>
-            </picker>
+        <view class="search search-sao">
+            <!--   @confirm="handleSearch"  @cancel="handleCancel"-->
+            <uni-search-bar class="custom-search" 
+                radius="28" 
+                placeholder="请输入您想查询的内容或服务" 
+                clearButton="auto"
+                bgColor="#6FA2F8" textColor="#ffffff" 
+                v-model="searchText"
+                cancelButton="none"
+                focus
+            />
+            <text class="search-btn" @click="handleSearch">查询</text>
         </view>
+        <view class="white-bg">
 
-        <!-- 搜索结果 -->
-        <search-results :list="results" />
+            <!-- 类型列表 -->
+            <view class="search-section" v-if="searchTypeList.length>0">
+                <view class="section-header">
+                    <text class="section-title">{{ searchType.typeName }}</text>
+                </view>
+                <view class="tag-container">
+                    <view class="search-tag notice-tag" :class="{'notice-check':!searchCheckObj.id}"  @click="handleNoticeClick({})">全部</view>
+                    <view class="search-tag notice-tag" :class="{'notice-check':item.id==searchCheckObj.id}"
+                        v-for="(item, index) in searchTypeList"
+                        :key="'notice-' + index"
+                        @click="handleNoticeClick(item)"
+                    >
+                        {{ item.name }}
+                    </view>
+                </view>
+            </view>
+
+            <!-- 历史记录  v-if="historyList.length>0" -->
+            <view class="search-section">
+                <view class="section-header">
+                    <text class="section-title">历史搜索</text>
+                    <uni-icons type="trash" size="18" color="#999" @click="clearHistory"></uni-icons>
+                </view>
+                <view class="tag-container">
+                    <view class="search-tag" v-for="(item, index) in historyList" :key="'history-' + index"
+                        @click="handleHistoryClick(item)">
+                        {{ item }}
+                    </view>
+                </view>
+            </view>
+
+            <!-- 搜索结果 -->
+            <!-- <view class="search-result" v-if="searchResult.length > 0">
+                <view class="result-item"
+                    v-for="(item, index) in searchResult"
+                    :key="'result-' + index"
+                    @click="handleResultClick(item)"
+                >
+                    {{ item.name }}
+                </view>
+            </view> -->
+        </view>
     </view>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref,watch } from 'vue'
 
-// const suggestions = ref([])
-// const showSuggestions = ref(false)
+const props = defineProps({
+    searchKeywords:{//搜索文本
+        type:String
+    },
+    searchType:{//哪种类型显示对象 typeId:1-首页，2-业务首页，3-消息  之后可以自动添加
+        type:Object
+    },
+    searchTypeList:{//类型列表
+        type:Array,
+        default:[]
+    },
+    checkTypeObj:{//选中的类型对象
+        type:Object
+    },
+   
+})
 
-// const handleInput = debounce(async () => {
-//   if (!searchText.value.trim()) {
-//     showSuggestions.value = false
-//     return
-//   }
-  
-//   try {
-//     const res = await getSuggestions(searchText.value)
-//     suggestions.value = res
-//     showSuggestions.value = true
-//   } catch (error) {
-//     console.error('获取搜索建议失败:', error)
-//   }
-// }, 300)
+const searchText = ref('');// 搜索文本
+const searchCheckObj = ref({});//选中的类型对象
 
-const searchText = ref('')
-const category = ref(0)
-const sort = ref(0)
+const showCancel = ref(false)// 是否显示取消按钮
+const historyList = ref([])// 历史记录列表
 
-const categoryOptions = ['全部类别', '电子产品', '服装', '食品']
-const sortOptions = ['默认排序', '价格从低到高', '价格从高到低', '销量最高']
+const searchResult = ref([])// 搜索结果
 
-const categoryText = computed(() => categoryOptions[category.value])
-const sortText = computed(() => sortOptions[sort.value])
+// 搜索文本内容
+watch(() => props.searchKeywords, (newVal, oldVal) => {
+    searchText.value = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
 
-const handleSearch = async () => {
-    const params = {
-        keyword: searchText.value,
-        category: category.value,
-        sort: sort.value
+// 选中类型对象
+watch(() => props.checkTypeObj, (newVal, oldVal) => {
+    searchCheckObj.value = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
+
+
+// 调用父组件的方法
+const emit = defineEmits(['confirm']);
+
+//  加载历史记录
+const loadHistory = () => {
+    let typeId = props.searchType?props.searchType.typeId:undefined
+    const history = uni.getStorageSync('searchHistory'+typeId) || []
+    historyList.value = history
+}
+loadHistory();
+
+// 处理搜索
+const handleSearch = () => {
+    let txtContent = searchText.value?searchText.value.trim():undefined
+    if (txtContent) {
+        // uni.showToast({
+        //     title: '请输入搜索内容',
+        //     icon: 'none'
+        // })
+        // return
+        // 添加到历史记录
+        addToHistory(txtContent)
     }
 
-    // 调用搜索API
-    const res = await searchAPI(params)
-    results.value = res.data
+    // 模拟搜索请求
+    // searchResult.value = [
+    //     { id: 1, name: `${searchText.value} 结果1` },
+    //     { id: 2, name: `${searchText.value} 结果2` },
+    //     { id: 3, name: `${searchText.value} 结果3` }
+    // ]
+
+
+    // 传给父组件
+    emit('confirm',searchCheckObj,searchText);
 }
 
-const handleCategoryChange = (e) => {
-    category.value = e.detail.value
+// 处理输入
+const handleInput = () => {
+    showCancel.value = searchText.value.length > 0
+}
+
+// 清除搜索
+const clearSearch = () => {
+    searchText.value = ''
+    showCancel.value = false
+    searchResult.value = []
+}
+
+
+// 添加到历史记录
+const addToHistory = (keyword) => {
+    const index = historyList.value.indexOf(keyword)
+    if (index !== -1) {
+        historyList.value.splice(index, 1)
+    }
+    historyList.value.unshift(keyword)
+
+    // 限制历史记录数量
+    if (historyList.value.length > 10) {
+        historyList.value = historyList.value.slice(0, 10)
+    }
+
+    let typeId = props.searchType.typeId
+    uni.setStorageSync('searchHistory'+typeId, historyList.value)
+}
+
+// 清除历史记录
+const clearHistory = () => {
+    uni.showModal({
+        title: '提示',
+        content: '确定要清空历史记录吗？',
+        success: (res) => {
+            if (res.confirm) {
+                historyList.value = []
+                let typeId = props.searchType.typeId;
+                uni.removeStorageSync('searchHistory'+typeId)
+            }
+        }
+    })
+}
+
+// 点击历史记录
+const handleHistoryClick = (item) => {
+    searchText.value = item
     handleSearch()
 }
 
-const handleSortChange = (e) => {
-    sort.value = e.detail.value
+// 点击消息类型
+const handleNoticeClick = (item) => {
+    // searchText.value = item
+    searchCheckObj.value = item;
     handleSearch()
 }
-</script>
\ No newline at end of file
+
+// 点击搜索结果
+const handleResultClick = (item) => {
+    uni.showToast({
+        title: `点击了 ${item.name}`,
+        icon: 'none'
+    })
+    // 实际项目中这里可以跳转到详情页
+    // uni.navigateTo({ url: `/pages/detail/detail?id=${item.id}` })
+}
+</script>
+<style scoped>
+
+.search-sao {
+    display: flex;
+}
+
+.search-sao .custom-search {
+    /* width:615rpx; */
+    width: 590rpx;
+    padding: 0 20rpx;
+    margin-bottom:15rpx;
+}
+
+.search-sao :deep(.custom-search.uni-searchbar) {
+    padding-bottom: 15rpx !important;
+}
+
+.search-sao .search-btn {
+    margin: 15rpx 30rpx 10rpx 0;
+    color: #fff;
+    font-size: 28rpx;
+    font-weight: bold;
+    text-align: center;
+}
+.white-bg {
+    width: 750rpx;
+    padding: 40rpx 0;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 130px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 150px);
+    /* #endif */
+}
+
+.search-section {
+    margin-bottom: 40rpx;
+    padding:0 45rpx;
+}
+
+.section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20rpx;
+}
+
+.section-title {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: bold;
+}
+
+.tag-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap:20rpx;
+}
+
+.search-tag {
+    background-color: #fff;
+    border:1px solid #E8E8E8;
+    border-radius: 10rpx;
+    padding: 10rpx 15rpx;
+    /* margin-right: 20rpx;
+    margin-bottom: 20rpx; */
+    font-size: 28rpx;
+}
+
+.search-tag.notice-tag{
+    padding: 10rpx 45rpx;
+}
+.notice-tag:nth-child(3n){
+    margin-right: 0;
+}
+
+.notice-check{
+    background-color: #05A3F4;
+    color:#fff;
+    border-color:#05A3F4;
+}
+.search-result {
+    margin-top: 20rpx;
+    padding:0 20rpx;
+}
+
+.result-item {
+    padding: 20rpx 0;
+    border-bottom: 1rpx solid #eee;
+    font-size: 28rpx;
+    color: #333;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 07cd9ee..721d3be 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,531 +1,536 @@
 {
-  "easycom": {
-    "autoscan": true,
-    "custom": {
-      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
-    }
-  },
-  "pages": [
-    {
-      "path": "pages/loading/loading",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/login/login",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/home/home",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/business",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/visitorReport",
-      //市场信息管理
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/visitorReportAdd",
-      //走访报告添加
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/visitorReportDetail",
-      //走访报告详情
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/visitorReportEnter",
-      //走访报告内容录入
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    //市场信息管理（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/marketInformation",
-      "style": {
-        "navigationBarTitleText": "市场信息管理"
-      }
-    },
-    //市场机会录入（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/marketOpportunities",
-      "style": {
-        "navigationBarTitleText": "市场机会录入"
-      }
-    },
-    //市场机会修改（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/marketOpportunitiesDetail",
-      "style": {
-        "navigationBarTitleText": "市场机会修改"
-      }
-    },
-    //重大事项录入（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/majorMatter",
-      "style": {
-        "navigationBarTitleText": "重大事项录入"
-      }
-    },
-    //重大事项更改（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/majorMatterDetail",
-      "style": {
-        "navigationBarTitleText": "重大事项更改"
-      }
-    },
-    //竞争对手信息录入（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/competitor",
-      "style": {
-        "navigationBarTitleText": "竞争对手信息录入"
-      }
-    },
-    //竞争对手信息更改（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/competitorDetail",
-      "style": {
-        "navigationBarTitleText": "竞争对手信息更改"
-      }
-    },
-    //人员变化信息录入（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/personnelChanges",
-      "style": {
-        "navigationBarTitleText": "人员变化信息录入"
-      }
-    },
-    //人员变化信息更改（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/personnelChangesDetail",
-      "style": {
-        "navigationBarTitleText": "人员变化信息更改"
-      }
-    },
-    //重点型号任务信息录入（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/keyModelTasks",
-      "style": {
-        "navigationBarTitleText": "重点型号任务信息录入"
-      }
-    },
-    //重点型号任务信息更新（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/keyModelTasksDetail",
-      "style": {
-        "navigationBarTitleText": "重点型号任务信息更新"
-      }
-    },
-    //通用信息录入（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/beCurrent",
-      "style": {
-        "navigationBarTitleText": "通用信息录入"
-      }
-    },
-    //通用信息更新（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/beCurrentDetail",
-      "style": {
-        "navigationBarTitleText": "通用信息更新"
-      }
-    },
-    //选择客户（已更新）
-    {
-      "path": "pages/business/CRM/chooseCus",
-      "style": {
-        "navigationBarTitleText": "客户选择"
-      }
-    },
-    //选择客户人员（已更新）
-    {
-      "path": "pages/business/CRM/customerUserList",
-      "style": {
-        "navigationBarTitleText": "客户人员选择"
-      }
-    },
-    //市场信息查看（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/infomationView",
-      "style": {
-        "navigationBarTitleText": "市场信息查看"
-      }
-    },
-    //市场信息详情（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/informationDetail",
-      "style": {
-        "navigationBarTitleText": "市场信息详情"
-      }
-    },
-    //市场信息审核（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/marketInformationReview",
-      "style": {
-        "navigationBarTitleText": "市场信息审核"
-      }
-    },
-    //市场信息审核详情（已更新）
-    {
-      "path": "pages/business/CRM/marketInformation/marketInformationReviewDetail",
-      "style": {
-        "navigationBarTitleText": "市场信息审核"
-      }
-    },
-    //回款首页查看（已更新）
-    {
-      "path": "pages/business/CRM/paymentCollection/index",
-      "style": {
-        "navigationBarTitleText": "回款首页查看"
-      }
-    },
-    //回款新增（已更新）
-    {
-      "path": "pages/business/CRM/paymentCollection/addPaymentCollection",
-      "style": {
-        "navigationBarTitleText": "回款新增"
-      }
-    },
-    //回款更新（已更新）
-    {
-      "path": "pages/business/CRM/paymentCollection/paymentDetail",
-      "style": {
-        "navigationBarTitleText": "回款新增"
-      }
-    },
-    //回款查看公用页面（已更新）
-    {
-      "path": "pages/business/CRM/paymentCollection/paymentCollectionCheck",
-      "style": {
-        "navigationBarTitleText": "回款查看"
-      }
-    },
-    //回款查看全员统计查看（已更新）
-    {
-      "path": "pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable",
-      "style": {
-        "navigationBarTitleText": "全员统计查看"
-      }
-    },
-    //回款查看个人详情查看（已更新）
-    {
-      "path": "pages/business/CRM/paymentCollection/personalPaymentCollectionTable",
-      "style": {
-        "navigationBarTitleText": "个人详情查看"
-      }
-    },
-    {
-      "path": "pages/business/CRM/weekPlanUpdate",
-      //修改周计划
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/plan/index",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/plan/myPlan",
-      //我的计划列表
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/plan/planEdit",
-      //计划修改
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/plan/planView",
-      //周计划查看
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/customer/customerAdd",
-      //客户人员新增
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/customer/customerAudit",
-      //客户人员审核
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/customer/customerUserBelong",
-      //客户人员归属
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/customer/components/confirmForm",
-      //客户人员主归属人变更审核提交
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/customer/changeCustomerOwner",
-      //客户人员主归属人变更
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit",
-      //客户人员主归属人变更审核
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/mainOwner/audit/confirmForm",
-      //客户人员主归属人变更审核提交
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/customer/components/customerUserEdit",
-      //客户人员详情编辑
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/customer/selectCustomer",
-      //选择客户
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/vistorCheckin",
-      //签到打卡
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/checkinStatistics",
-      //打卡统计
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/paymentCollection",
-      //回款查看
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    //===================================活动报告====================
-    {
-      "path": "pages/business/CRM/marketActivity/visitReport",
-      //市场信息管理
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/visitorReportAdd",
-      //走访报告添加
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/visitReportView",
-      //走访报告查看
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/visitReportDetail",
-      //走访报告查看具体明细
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/auditReport",
-      //走访报告审批列表查看
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/detailForApproval",
-      //走访报告明细审批
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/visitorReportEnter",
-      //走访报告内容录入
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/auditReject",
-      //走访报告驳回输入原因
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/customerUserList",
-      //客户公司人员信息
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/myUserList",
-      //我公司人员信息
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/activityTypeList",
-      //活动类型
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/marketActivity/chooseCus",
-      //选择客户单位
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    //====================地图======
-    {
-      "path": "pages/business/CRM/map/vistorCheckin",
-      //签到打卡
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/map/addRearkSignIn",
-      //签到备注
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/map/checkInView",
-      //打卡信息（考勤查看）
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/business/CRM/map/checkinStatistics",
-      //打卡统计
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    //===================================活动报告====================
-    {
-      "path": "pages/notice/notice",
-      "style": {
-        "navigationBarTitleText": "",
-        "app-plus": {
-          "bounce": "none"
-          // 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
-        },
-        "mp-alipay": {
-          "allowsBounceVertical": "NO"
-        }
-        // 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
-      }
-    },
-    {
-      "path": "pages/userinfo/userinfo",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "718友晟",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "navigationStyle": "custom"
-  },
-  "tabBar": {
-    "color": "#919191",
-    "selectedColor": "#ffffff",
-    "borderStyle": "#ffffff",
-    "backgroundColor": "#000000",
-    "fontSize": "12px",
-    "iconWidth": "24px",
-    "list": [
-      {
-        "pagePath": "pages/home/home",
-        "iconPath": "static/images/tabs/menu-home.png",
-        "selectedIconPath": "static/images/tabs/menu-home-on.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/business/business",
-        "iconPath": "static/images/tabs/menu-business.png",
-        "selectedIconPath": "static/images/tabs/menu-business-on.png",
-        "text": "业务中心"
-      },
-      {
-        "pagePath": "pages/notice/notice",
-        "iconPath": "static/images/tabs/menu-info.png",
-        "selectedIconPath": "static/images/tabs/menu-info-on.png",
-        "text": "消息"
-      },
-      {
-        "pagePath": "pages/userinfo/userinfo",
-        "iconPath": "static/images/tabs/menu-me.png",
-        "selectedIconPath": "static/images/tabs/menu-me-on.png",
-        "text": "我的"
-      }
-    ]
-  }
-}
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
+		}
+	},
+	"pages": [{
+			"path": "pages/loading/loading",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/home/home",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/business",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/visitorReport",
+			//市场信息管理
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/visitorReportAdd",
+			//走访报告添加
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/visitorReportDetail",
+			//走访报告详情
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/visitorReportEnter",
+			//走访报告内容录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//市场信息管理（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketInformation",
+			"style": {
+				"navigationBarTitleText": "市场信息管理"
+			}
+		},
+		//市场机会录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketOpportunities",
+			"style": {
+				"navigationBarTitleText": "市场机会录入"
+			}
+		},
+		//市场机会修改（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketOpportunitiesDetail",
+			"style": {
+				"navigationBarTitleText": "市场机会修改"
+			}
+		},
+		//重大事项录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/majorMatter",
+			"style": {
+				"navigationBarTitleText": "重大事项录入"
+			}
+		},
+		//重大事项更改（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/majorMatterDetail",
+			"style": {
+				"navigationBarTitleText": "重大事项更改"
+			}
+		},
+		//竞争对手信息录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/competitor",
+			"style": {
+				"navigationBarTitleText": "竞争对手信息录入"
+			}
+		},
+		//竞争对手信息更改（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/competitorDetail",
+			"style": {
+				"navigationBarTitleText": "竞争对手信息更改"
+			}
+		},
+		//人员变化信息录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/personnelChanges",
+			"style": {
+				"navigationBarTitleText": "人员变化信息录入"
+			}
+		},
+		//人员变化信息更改（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/personnelChangesDetail",
+			"style": {
+				"navigationBarTitleText": "人员变化信息更改"
+			}
+		},
+		//重点型号任务信息录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/keyModelTasks",
+			"style": {
+				"navigationBarTitleText": "重点型号任务信息录入"
+			}
+		},
+		//重点型号任务信息更新（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/keyModelTasksDetail",
+			"style": {
+				"navigationBarTitleText": "重点型号任务信息更新"
+			}
+		},
+		//通用信息录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/beCurrent",
+			"style": {
+				"navigationBarTitleText": "通用信息录入"
+			}
+		},
+		//通用信息更新（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/beCurrentDetail",
+			"style": {
+				"navigationBarTitleText": "通用信息更新"
+			}
+		},
+		//选择客户（已更新）
+		{
+			"path": "pages/business/CRM/chooseCus",
+			"style": {
+				"navigationBarTitleText": "客户选择"
+			}
+		},
+		//选择客户人员（已更新）
+		{
+			"path": "pages/business/CRM/customerUserList",
+			"style": {
+				"navigationBarTitleText": "客户人员选择"
+			}
+		},
+		//市场信息查看（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/infomationView",
+			"style": {
+				"navigationBarTitleText": "市场信息查看"
+			}
+		},
+		//市场信息详情（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/informationDetail",
+			"style": {
+				"navigationBarTitleText": "市场信息详情"
+			}
+		},
+		//市场信息审核（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketInformationReview",
+			"style": {
+				"navigationBarTitleText": "市场信息审核"
+			}
+		},
+		//市场信息审核详情（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketInformationReviewDetail",
+			"style": {
+				"navigationBarTitleText": "市场信息审核"
+			}
+		},
+		//回款首页查看（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/index",
+			"style": {
+				"navigationBarTitleText": "回款首页查看"
+			}
+		},
+		//回款新增（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/addPaymentCollection",
+			"style": {
+				"navigationBarTitleText": "回款新增"
+			}
+		},
+		//回款更新（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/paymentDetail",
+			"style": {
+				"navigationBarTitleText": "回款新增"
+			}
+		},
+		//回款查看公用页面（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/paymentCollectionCheck",
+			"style": {
+				"navigationBarTitleText": "回款查看"
+			}
+		},
+		//回款查看全员统计查看（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable",
+			"style": {
+				"navigationBarTitleText": "全员统计查看"
+			}
+		},
+		//回款查看个人详情查看（已更新）
+		{
+			"path": "pages/business/CRM/paymentCollection/personalPaymentCollectionTable",
+			"style": {
+				"navigationBarTitleText": "个人详情查看"
+			}
+		},
+		{
+			"path": "pages/business/CRM/weekPlanUpdate",
+			//修改周计划
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/plan/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/plan/myPlan",
+			//我的计划列表
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/plan/planEdit",
+			//计划修改
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/plan/planView",
+			//周计划查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/customerAdd",
+			//客户人员新增
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/customerAudit",
+			//客户人员审核
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/customerUserBelong",
+			//客户人员归属
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/components/confirmForm",
+			//客户人员主归属人变更审核提交
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/changeCustomerOwner",
+			//客户人员主归属人变更
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit",
+			//客户人员主归属人变更审核
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/mainOwner/audit/confirmForm",
+			//客户人员主归属人变更审核提交
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/components/customerUserEdit",
+			//客户人员详情编辑
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/customer/selectCustomer",
+			//选择客户
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/vistorCheckin",
+			//签到打卡
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/checkinStatistics",
+			//打卡统计
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/paymentCollection",
+			//回款查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//===================================活动报告====================
+		{
+			"path": "pages/business/CRM/mainOwner/view/viewMainOwner", //查看主归属人变更信息 
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+
+			"path": "pages/business/CRM/marketActivity/visitReport",
+			//市场信息管理
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitorReportAdd",
+			//走访报告添加
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitReportView",
+			//走访报告查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitReportDetail",
+			//走访报告查看具体明细
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/auditReport",
+			//走访报告审批列表查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/detailForApproval",
+			//走访报告明细审批
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitorReportEnter",
+			//走访报告内容录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/auditReject",
+			//走访报告驳回输入原因
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/customerUserList",
+			//客户公司人员信息
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/myUserList",
+			//我公司人员信息
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/activityTypeList",
+			//活动类型
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/chooseCus",
+			//选择客户单位
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//====================地图======
+		{
+			"path": "pages/business/CRM/map/vistorCheckin",
+			//签到打卡
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/addRearkSignIn",
+			//签到备注
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/checkInView",
+			//打卡信息（考勤查看）
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/checkinStatistics",
+			//打卡统计
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//===================================活动报告====================
+		{
+			"path": "pages/notice/notice",
+			"style": {
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"bounce": "none"
+					// 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+				},
+				"mp-alipay": {
+					"allowsBounceVertical": "NO"
+				}
+				// 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+			}
+		},
+		{
+			"path": "pages/userinfo/userinfo",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "718友晟",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8",
+		"navigationStyle": "custom"
+	},
+	"tabBar": {
+		"color": "#919191",
+		"selectedColor": "#ffffff",
+		"borderStyle": "#ffffff",
+		"backgroundColor": "#000000",
+		"fontSize": "12px",
+		"iconWidth": "24px",
+		"list": [{
+				"pagePath": "pages/home/home",
+				"iconPath": "static/images/tabs/menu-home.png",
+				"selectedIconPath": "static/images/tabs/menu-home-on.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/business/business",
+				"iconPath": "static/images/tabs/menu-business.png",
+				"selectedIconPath": "static/images/tabs/menu-business-on.png",
+				"text": "业务中心"
+			},
+			{
+				"pagePath": "pages/notice/notice",
+				"iconPath": "static/images/tabs/menu-info.png",
+				"selectedIconPath": "static/images/tabs/menu-info-on.png",
+				"text": "消息"
+			},
+			{
+				"pagePath": "pages/userinfo/userinfo",
+				"iconPath": "static/images/tabs/menu-me.png",
+				"selectedIconPath": "static/images/tabs/menu-me-on.png",
+				"text": "我的"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/pages/business/CRM/marketInformation/infomationView.vue b/src/pages/business/CRM/marketInformation/infomationView.vue
index 41d8790..7df89d7 100644
--- a/src/pages/business/CRM/marketInformation/infomationView.vue
+++ b/src/pages/business/CRM/marketInformation/infomationView.vue
@@ -2,59 +2,61 @@
 	<view class="con-body">
 		<view class="con-bg">
 			<!-- 头部 -->
-			<customHeader ref="customHeaderRef" :title="'市场信息查看'" :leftFlag="true" :rightFlag="true">
-				<template #right>
-				</template>
+			<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" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+			<view class="top-height"></view>
+
+			<!-- 搜索处理 -->
+			<customSearch v-if="searchShow" :searchKeywords="searchText" :searchType="searchTypeObj"
+				:checkTypeObj="notictTypeCheck" :searchTypeList="noticeTypeList" @confirm="handleSearchConfirm">
+			</customSearch>
+			<view class="search" v-else @click="handleSearchFocus">
+				<view class="search-bg">
+					<view class="search-left">{{ notictTypeCheck.name?notictTypeCheck.name:'全部' }}</view>
+					<view class="search-right">
+						<input class="uni-input" v-model="inputval" placeholder="请输入您想查询的内容或服务"
+							placeholder-class="search-color" />
+					</view>
+				</view>
+			</view>
+
+
+
 
 			<!-- 正文内容 -->
-			<view class="all-body">
-				<!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
-				<!-- <view class="search">
-          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
-                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
-          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
-        </view> -->
-				<view class="search_center">
-					<view class="category">
-						<view class="flex_row_center_center" @click="showCate">
-							<text>{{selCategory.val||'全部'}}</text>
-							<image src="@/static/images/icon-notice@2x.png" mode=""></image>
-						</view>
-						<view class="pop_arrow" v-if="maskShow"></view>
-						<view class="pop" v-if="maskShow">
-							<text v-for="(item,index) in categories" :key="index"
-								@click="toList(item.categoryId,item.categoryName)">{{item.categoryName}}</text>
-						</view>
-					</view>
-					<image class="search_icon" src="@/static/images/icon-notice@2x.png"></image>
-					<input class='sea_input' :focus="inputFocus" type='text' :value="inputval" placeholder="请输入搜索条件"
-						@input="inputChange" @confirm='search' maxlength="50" placeholder-class="placeClass"></input>
-					<image class='clear_content' v-show="inputval" @click="clearInputVal"
-						src="@/static/images/icon-notice@2x.png" />
-				</view>
-				<text class='sea_btn' @click="btnSearch(1)">{{'搜索'}}</text>
+			
+				
 				<!-- 分页部分  -->
-				<mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+				<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 class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+						@click="showDetail(item)">
 						<view>
 							<view class="report-list">
 								<view class="title">信息类型:{{ item.informationType }}</view>
-								
-								
+
+
 								<view class="r-list">
-									<view class="r-name"v-if="item.cusName!=null">公司名称:{{ item.cusName }}</view>
-									<view class="r-right btn-gray flex-auto" :class="item.myselfBrowsing==0?'btn-blue':'btn-green'"
-										size="mini">{{item.myselfBrowsing==0?'未读':'已读'}}</view>
+									<view class="r-name" v-if="item.cusName!=null">公司名称:{{ item.cusName }}</view>
+									<view class="r-right btn-gray flex-auto"
+										:class="item.myselfBrowsing==0?'btn-blue':'btn-green'" size="mini">
+										{{item.myselfBrowsing==0?'未读':'已读'}}</view>
 
 								</view>
 								<view class="border-bottom"></view>
-								
+
 								<view class="border-bottom"></view>
 								<view class="r-list">
 									<view class="r-left">报告人</view>
@@ -70,7 +72,7 @@
 						</view>
 					</view>
 				</mescroll-uni>
-			</view>
+			
 		</view>
 	</view>
 </template>
@@ -82,6 +84,7 @@
 		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
@@ -90,12 +93,13 @@
 		visitorReportList
 	} from '@/api/business.js'
 	import {
-	viewingMarketInfForAllMembers
+		viewingMarketInfForAllMembers
 	} from '@/api/crm/api_ys.js';
 	import {
 		onLoad,
 		onShow,
-		onUnload
+		onUnload,
+		onHide
 	} from '@dcloudio/uni-app'
 	// 获取导航栏高度用于内容区域padding
 	const navBarPaddingTop = ref(0);
@@ -103,10 +107,45 @@
 		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 		uni.$on('updateStatus', markVisited)
 	})
+	// 搜索处理
+	let searchShow = ref(false);
+	let searchText = ref(undefined);
+	let searchTypeObj = ref({
+		typeId: 3,
+		typeName: '消息类型'
+	});
+	let noticeTypeList = ref([{
+			id: 1,
+			name: '市场机会'
+		},
+		{
+			id: 2,
+			name: '重大事项信息'
+		},
+		{
+			id: 3,
+			name: '竞争对手信息'
+		},
+		{
+			id: 4,
+			name: '人员变化信息'
+		},
+		{
+			id: 5,
+			name: '重点型号任务信息'
+		},
+		{
+			id: 6,
+			name: '通用信息'
+		}
+	]);
+	let notictTypeCheck = ref({}); //选中类型
 
 	// 查询列表
 	let list = ref([]);
-
+// 新增状态变量存储搜索条件
+const selValue = ref(''); // 搜索类型名称
+const inputval = ref(''); // 搜索内容
 	let searchValue = ref(null)
 	//监视查询的内容的变化
 	watch(searchValue, (newValue, oldValue) => {
@@ -114,7 +153,6 @@
 		var data = {
 			pageNum: 1,
 			pageSize: 10,
-			searchContent: searchValue.value
 		};
 		viewingMarketInfForAllMembers(data).then(res => {
 			if (res.code == 200) {
@@ -123,6 +161,10 @@
 			}
 		})
 	})
+	onHide(()=>{
+	    searchShow.value=false;
+	})
+	
 	const index = ref(0)
 	const categories = ref([{
 		categoryId: 1,
@@ -143,16 +185,39 @@
 		categoryId: 6,
 		categoryName: '通用信息'
 	}])
-	const selCategory = ref ({
-	id: 1,
-	val: ''
+	const selCategory = ref({
+		id: 1,
+		val: ''
 	})
+	// 搜索返回操作
+	const handleBack=()=>{
+	    searchShow.value=false;
+	}
+	// 获取input 焦点跳转
+	const handleSearchFocus=()=>{
+	    searchShow.value = true;
+	}
+	// 搜索完返回处理
+	const handleSearchConfirm = (param1,param2)=>{
+	    // console.log(param1,param2)
+	    notictTypeCheck.value=param1.value;
+	    inputval.value=param2.value || '';
+		selValue.value = param1.value.name || '';
+		searchValue.value = param2.value;
+		console.log("selValue"+selValue.value)
+		console.log("inputval"+inputval.value)
+// 重置mescroll触发刷新
+    if (mescrollRef.value) {
+        mescrollRef.value.resetUpScroll();
+    }
+    searchShow.value = false;
+	}
 	// 查询搜索跳转
 	let handleSearch = () => {
 		var data = {
 			pageNum: 1,
 			pageSize: 10,
-			searchContent: searchValue.value
+			
 		};
 		viewingMarketInfForAllMembers(data).then(res => {
 			if (res.code == 200) {
@@ -218,7 +283,8 @@
 	const upCallback = async (mescroll) => {
 		try {
 			setTimeout(async () => {
-				const res = await getViewingMarketInfForAllMembers(mescroll.num, mescroll.size);
+				const res = await getViewingMarketInfForAllMembers(mescroll.num, mescroll.size,selValue.value, 
+                inputval.value);
 				if (mescroll.num === 1) {
 					list.value = res.list;
 				} else {
@@ -236,7 +302,10 @@
 		return new Promise(async (resolve) => {
 			let param = {
 				pageNum,
-				pageSize
+				pageSize,
+				// 添加搜索条件参数
+				            selValue: selValue.value,
+				            inputval: inputval.value
 			}
 			let res = await viewingMarketInfForAllMembers(param);
 			resolve({
@@ -245,7 +314,6 @@
 			});
 		});
 	}
-
 	let Loop = ref(0)
 	let now
 	const visistId = ref();
@@ -255,25 +323,28 @@
 
 	function showDetail(item) {
 		uni.navigateTo({
-		  url: "/pages/business/CRM/marketInformation/informationDetail?informationId=" + item.informationId + '&selValue=' + item.selValue+ '&inputval=' + item.inputval
+			url: "/pages/business/CRM/marketInformation/informationDetail?informationId=" + item.informationId +
+				'&selValue=' + item.selValue + '&inputval=' + item.inputval
 		})
-		}
-		
-		onUnload(() => {
-		    uni.$off('updateStatus')
-		})
-		
+	}
+
+	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;
-	    
+		const newList = [...list.value].map(item => {
+			if (item.informationId == informationId) {
+				return {
+					...item,
+					myselfBrowsing: 1
+				};
+			}
+			return item;
+		});
+		list.value = newList;
+
 	};
-		
 </script>
 
 <style scoped>
diff --git a/src/pages/business/CRM/paymentCollection/addPaymentCollection.vue b/src/pages/business/CRM/paymentCollection/addPaymentCollection.vue
new file mode 100644
index 0000000..b4ce4df
--- /dev/null
+++ b/src/pages/business/CRM/paymentCollection/addPaymentCollection.vue
@@ -0,0 +1,182 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'回款计划新增'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="计划回款金额" name="targetAmount" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.targetAmount" placeholder="请输入计划回款金额"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		addPaymentCollection
+	} from '@/api/crm/api_ys.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		promiseCode: null,
+		cusName: null,
+		targetAmount: null
+
+
+	})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		targetAmount: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入回款计划金额'
+			},
+			{
+			      format: 'number',
+			      errorMessage: '必须输入数字（可包含小数点）'
+			},
+			]
+		}
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await addPaymentCollection(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			   uni.$emit('refreshList');
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable.vue b/src/pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable.vue
new file mode 100644
index 0000000..2719ab9
--- /dev/null
+++ b/src/pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable.vue
@@ -0,0 +1,262 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'全员信息查看统计表'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view>
+				<!-- 搜索 -->
+				<view class="search">
+					<picker :value="index1" @change="handlePlace1" :range="monthArray" :range-key="'name'"
+						class="picker-bg">
+						<view class="picker">
+							<uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+								size="18"></uni-icons>
+							<view>{{ monthArray[index1]?.name || '选择月份' }}</view>
+							<uni-icons type="down" size="18"></uni-icons>
+						</view>
+					</picker>
+					<picker @change="handlePlace" :value="index2" :range="palceArray" class="picker-bg"
+						:range-key="'name'">
+						<view class="picker">
+							<uni-icons type="person" size="18"></uni-icons>
+							<view>{{palceArray[index2]?.name || '选择区域' }}</view>
+							<uni-icons type="down" size="18"></uni-icons>
+						</view>
+					</picker>
+					<button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+				</view>
+
+				<!-- 回款信息查询 -->
+				<view class="white-bg">
+					<view class="table-title">回款信息查询</view>
+					<view v-if="loading" class="loading-container">
+											<uni-load-more status="loading" contentText="加载中..."></uni-load-more>
+										</view>
+										<!-- 添加空数据提示 -->
+										<view v-else-if="tableData.length === 0" class="empty-tip">
+											暂无数据
+										</view>
+					
+					
+					<table v-else  class="my-table">
+						<tr>
+							<th class="tab-width100">业务员姓名</th>
+							<!-- <th class="tab-width160">客户名称</th> -->
+							<th>目标回款</th>
+							<th>实际回款</th>
+							<th>完成度</th>
+						</tr>
+						<tr v-for="(item, index) in tableData" :key="index">
+							<td>{{ item.userName }}</td>
+							<!-- <td class="txtLeft">{{ item.guestName }}</td> -->
+							<td>{{ item.targetAmount }}</td>
+							<td>{{ item.backMoneyRatio }}</td>
+							<td>{{ item.jisuan }}</td>
+						</tr>
+					</table>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getDate
+	} from '@/utils/datetime.js'
+	import {
+		getFullStaffStatisticsViewingTable
+	} from '@/api/crm/api_ys.js' 
+const loading = ref(false) // 加载状态
+	const index1 = ref(0)
+	const index2 = ref(0)
+	let peopleIndex = ref(0);
+	// 选择列表
+	let bindPickerChange = (e) => {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		peopleIndex.value = e.detail.value
+	}
+
+	let searchValue = ref(null)
+	// 查询搜索跳转
+	let handleSearch = () => {
+		getCrmMarketInformationList();
+	}
+	// 表单数据
+	const formData = ref({
+		month: "1",
+		region: "北京大区",
+	})
+	const tableData  = ref([])
+	const palceArray = ref([{
+		id: 1,
+		name: '北京大区'
+	}, {
+		id: 2,
+		name: '市场三部'
+	}, {
+		id: 3,
+		name: '市场二部'
+	}, {
+		id: 4,
+		name: '南方大区'
+	}, {
+		id: 5,
+		name: '北方大区'
+	}, {
+		id: 6,
+		name: '西部大区'
+	}])
+	const monthArray = ref([
+	  { id: 1, name: '1月' },
+	  { id: 2, name: '2月' },
+	  { id: 3, name: '3月' },
+	  { id: 4, name: '4月' },
+	  { id: 5, name: '5月' },
+	  { id: 6, name: '6月' },
+	  { id: 7, name: '7月' },
+	  { id: 8, name: '8月' },
+	  { id: 9, name: '9月' },
+	  { id: 10, name: '10月' },
+	  { id: 11, name: '11月' },
+	  { id: 12, name: '12月' }
+	])
+			const handlePlace1 = (e) => {
+				index1.value = e.detail.value
+				console.log('index1:', monthArray.value[e.detail.value]?.name)
+				formData.value.month = monthArray.value[e.detail.value]?.id || ''
+			}
+			const handlePlace = (e) => {
+				index2.value = e.detail.value
+				console.log('index2:', palceArray.value[e.detail.value]?.name)
+				formData.value.region = palceArray.value[e.detail.value]?.name || ''
+			}
+			
+			// 获取数据列表
+			const getCrmMarketInformationList = async () => {
+				loading.value = true
+				try {
+					const res = await getFullStaffStatisticsViewingTable(formData.value);
+					// 直接赋值给响应式变量
+					tableData.value = res.rows || []
+					console.log('获取到的数据:', tableData.value)
+				} catch (error) {
+					console.error('获取数据失败:', error)
+					uni.showToast({
+						title: '获取数据失败',
+						icon: 'error'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+			// 获取数据列表（无参数）
+			const getCrmMarketInformationListNoPo = async () => {
+				loading.value = true
+				try {
+					const res = await getFullStaffStatisticsViewingTable();
+					// 直接赋值给响应式变量
+					tableData.value = res.rows || []
+					console.log('获取到的数据:', tableData.value)
+				} catch (error) {
+					console.error('获取数据失败:', error)
+					uni.showToast({
+						title: '获取数据失败',
+						icon: 'error'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+				onMounted(() => {
+					getCrmMarketInformationListNoPo()
+				})
+			
+</script>
+
+<style scoped>
+	.search {
+		display: flex;
+		padding: 0 30rpx;
+	}
+
+	.search .btn-search {
+		border: none;
+		background: none;
+		line-height: normal;
+		color: #fff;
+		line-height: 56rpx !important;
+		padding: 10rpx 0 0;
+		text-align: left;
+		cursor: pointer;
+	}
+
+	.search .btn-search::after {
+		display: none;
+	}
+
+	.search .picker-bg {
+		display: flex;
+		background-color: #6FA2F8;
+		border-radius: 25px;
+		color: #fff;
+		font-size: 28rpx;
+		padding: 0rpx 20rpx;
+		/* #ifndef APP-PLUS */
+		padding: 10rpx 20rpx 0 20rpx;
+		/* #endif */
+		margin-right: 20rpx;
+	}
+
+	.search .picker-bg .picker {
+		display: flex;
+		align-items: center;
+		/* #ifndef APP-PLUS */
+		padding-top: 2rpx;
+		/* #endif */
+	}
+
+	.search .picker-bg .picker .uni-icons {
+		color: #fff !important;
+	}
+
+	.search .picker-bg .picker .uni-icons:first-child {
+		margin-right: 10rpx;
+	}
+
+	.search .picker-bg .picker .uniui-down {
+		margin-left: 20rpx;
+	}
+
+	.white-bg {
+		width: 750rpx;
+		margin: 0;
+		border-radius: 8px 8px 0 0;
+		padding: 20rpx 0rpx;
+		margin-top: 20rpx;
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 135px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		height: calc(100vh - 112px);
+		/* #endif */
+	}
+
+	.table-title {
+		text-align: center;
+		font-weight: bold;
+		border-bottom: 2px solid #E7E7E7;
+		padding-bottom: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/paymentCollection/index.vue b/src/pages/business/CRM/paymentCollection/index.vue
new file mode 100644
index 0000000..f1490ba
--- /dev/null
+++ b/src/pages/business/CRM/paymentCollection/index.vue
@@ -0,0 +1,254 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'个人回款信息查看'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="handleAdd">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>新增
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view class="all-body">
+        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
+     <!--   <view class="search">
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
+          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+        </view> -->
+
+        <!-- 分页部分  -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="touchstart(item)">
+            <view>
+              <view class="report-list">
+                <view class="title">客户：{{ item.cusName }}</view>
+                <view class="r-list">
+                  <!-- <view class="r-name">{{ item.visistCode }}</view> -->
+
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">计划年份</view>
+                  <view class="r-right">{{ item.year }}</view>
+                </view>
+                <view class="r-list">
+                  <view class="r-left">计划月份</view>
+                  <view class="r-right">{{ item.month }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">创建时间</view>
+                  <view class="r-right">{{ item.createTime }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">计划汇款金额</view>
+                  <view class="r-right"  style="color: red;">{{ item.targetAmount }}</view>
+                </view>
+
+              </view>
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, onMounted, watch,onUnmounted } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { visitorReportList } from '@/api/business.js'
+import { getPaymentList } from '@/api/crm/api_ys.js';
+import { onShow  } from '@dcloudio/uni-app'
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 查询列表
+let list = ref([]);
+
+let searchValue = ref(null)
+
+//监视查询的内容的变化
+watch(searchValue, (newValue, oldValue) => {
+  //变化了之后，重新查询内容
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+    searchContent: searchValue.value
+  };
+  getYsVisistList(data).then(res => {
+    if (res.code == 200) {
+      //设置列表数据
+      list.value = res.rows;
+    }
+  })
+})
+
+// 新增
+let handleAdd = () => {
+  uni.navigateTo({url: '/pages/business/CRM/paymentCollection/addPaymentCollection'})
+}
+
+
+const mescrollRef = ref(null);
+const upOption = ref({
+  page: {num: 0, size: 10},
+  noMoreSize: 5,
+  empty: {tip: '~ 空空如也 ~'},
+  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 GetPaymentList(1, upOption.value.page.size);
+      cssFlag.value = false;
+      list.value = res.list;
+      mescroll.resetUpScroll();
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  } finally {
+    setTimeout(async () => {
+      mescroll.endSuccess();
+    }, 500);
+  }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await GetPaymentList(mescroll.num, mescroll.size);
+      if (mescroll.num === 1) {
+        list.value = res.list;
+      } else {
+        list.value.push(...res.list);
+      }
+      mescroll.endBySize(res.list.length, res.total);
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  }
+}
+
+// 获取数据列表
+const GetPaymentList = (pageNum, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum,
+      pageSize
+    }
+    let res = await getPaymentList(param);
+    resolve({
+      list: res.rows,
+      total: res.total
+    });
+  });
+}
+let Loop = ref(0)
+
+function touchstart(item) {
+    uni.navigateTo({
+      url: "/pages/business/CRM/paymentCollection/paymentDetail?collectionId=" + item.collectionId + '&cusId=' + item.cusId + '&targetAmount=' + item.targetAmount + '&cusName=' + item.cusName
+    })
+}
+// 生命周期钩子
+onShow(() => {
+  // 监听刷新事件
+  
+  uni.$on('refreshList', GetPaymentList(1,10))
+  
+  // 页面显示时也加载一次数据
+  GetPaymentList(1,10)
+})
+onUnmounted(() => {
+  // 移除监听（避免重复触发）
+  uni.$off('refreshList')
+})
+onMounted(() => {
+  GetPaymentList()
+})
+</script>
+
+<style scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
+}
+
+.search {
+  display: flex;
+}
+
+.search .btn-search {
+  border: none;
+  background: none;
+  line-height: normal;
+  color: #fff;
+  line-height: 56rpx !important;
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search .btn-search::after {
+  display: none;
+}
+
+.search .custom-search {
+  width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+  padding-right: 0 !important;
+}
+
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  padding-bottom: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/paymentCollection/paymentCollectionCheck.vue b/src/pages/business/CRM/paymentCollection/paymentCollectionCheck.vue
new file mode 100644
index 0000000..c38266a
--- /dev/null
+++ b/src/pages/business/CRM/paymentCollection/paymentCollectionCheck.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'回款计划查看'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<!-- <view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view> -->
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="全员统计查看" name="cusName" class="f-c-right" >
+							<view @click="DiligenceStatistics" class="form-item-container">
+								<text class="name">{{'点击跳转'}}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="个人详细查看" name="cusName" class="f-c-right">
+							<view @click="MarketActivity" class="form-item-container">
+								<text class="name">{{'点击跳转'}}</text>
+							</view>
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+		import { onLoad } from '@dcloudio/uni-app'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+
+	
+	// 选择客户页面跳转
+	function DiligenceStatistics() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable'
+		})
+	}
+	// 选择客户页面跳转
+	function MarketActivity() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/paymentCollection/personalPaymentCollectionTable'
+		})
+	}
+	
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/paymentCollection/paymentDetail.vue b/src/pages/business/CRM/paymentCollection/paymentDetail.vue
new file mode 100644
index 0000000..4b46007
--- /dev/null
+++ b/src/pages/business/CRM/paymentCollection/paymentDetail.vue
@@ -0,0 +1,213 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'回款任务单修改'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="计划回款金额" name="targetAmount" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.targetAmount"
+								placeholder="请输入计划回款金额" class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+					<view class="footer-con">
+					    <button class="btn-default" type="default" @click="handleDelete" size="mini">删 除</button>
+					    <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		updatePaymentDetail,deletePaymentDetail
+	} from '@/api/crm/api_ys.js'
+		import { onLoad } from '@dcloudio/uni-app'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+				cusId: null,
+				promiseCode: null,
+				cusName:null,
+				targetAmount:null,
+					collectionId:null
+				})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		targetAmount: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入回款计划金额'
+			},
+			{
+			      format: 'number',
+			      errorMessage: '必须输入数字（可包含小数点）'
+			},
+			]
+		}
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await updatePaymentDetail(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+	
+	//定义查询参数
+	const queryParams = ref({
+	    informationId: 0
+	})
+		onLoad(options => {
+		    formData.value.cusName = options.cusName
+		    formData.value.cusId = options.cusId
+		    formData.value.collectionId = options.collectionId
+		    formData.value.targetAmount = options.targetAmount;
+		})
+		
+	// 根据ID删除表单
+	const handleDelete = async () => {
+		try {
+	
+	        const res = await deletePaymentDetail(formData.value);
+			uni.showToast({
+				title: '删除成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/paymentCollection/personalPaymentCollectionTable.vue b/src/pages/business/CRM/paymentCollection/personalPaymentCollectionTable.vue
new file mode 100644
index 0000000..a52c7e5
--- /dev/null
+++ b/src/pages/business/CRM/paymentCollection/personalPaymentCollectionTable.vue
@@ -0,0 +1,294 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'个人详情查看统计表'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view>
+				<!-- 搜索 -->
+				<view class="search">
+					<picker :value="index1" @change="handlePlace1" :range="monthArray" :range-key="'name'"
+						class="picker-bg">
+						<view class="picker">
+							<uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+								size="18"></uni-icons>
+							<view>{{ monthArray[index1]?.name || '选择月份' }}</view>
+							<uni-icons type="down" size="18"></uni-icons>
+						</view>
+					</picker>
+					<!-- <picker @change="handlePlace" :value="index2" :range="palceArray" class="picker-bg"
+						:range-key="'name'">
+						<view class="picker">
+							<uni-icons type="person" size="18"></uni-icons>
+							<view>{{palceArray[index2]?.name || '选择区域' }}</view>
+							<uni-icons type="down" size="18"></uni-icons>
+						</view>
+					</picker> -->
+					<view class="picker-bg">
+					            <view class="picker">
+					              <uni-icons type="person" size="18" color="#ffffff"></uni-icons>
+					              <input 
+					                class="search-input"
+					                v-model="formData.bandResult" 
+					                placeholder="输入业务员"
+					                placeholder-style="color:#ffffff;font-size:28rpx"
+					              />
+					            </view>
+					          </view>
+					<button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+				</view>
+
+				<!-- 回款信息查询 -->
+				<view class="white-bg">
+					<view class="table-title">回款信息查询</view>
+					<view v-if="loading" class="loading-container">
+											<uni-load-more status="loading" contentText="加载中..."></uni-load-more>
+										</view>
+										<!-- 添加空数据提示 -->
+										<view v-else-if="tableData.length === 0" class="empty-tip">
+											暂无数据
+										</view>
+					
+					
+					<table v-else  class="my-table">
+						<tr>
+							<th class="tab-width100">业务员姓名</th>
+							<th class="tab-width160">客户名称</th>
+							<th>目标回款</th>
+							<th>实际回款</th>
+							<th>完成度</th>
+						</tr>
+						<tr v-for="(item, index) in tableData" :key="index">
+							<td>{{ item.userName }}</td>
+							<td class="txtLeft">{{ item.cusName }}</td>
+							<td>{{ item.targetAmount }}</td>
+							<td>{{ item.backNum }}</td>
+							<td>{{ item.jisuan }}</td>
+						</tr>
+					</table>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getDate
+	} from '@/utils/datetime.js'
+	import {
+		getPersonalPaymentCollectionTable
+	} from '@/api/crm/api_ys.js' 
+const loading = ref(false) // 加载状态
+	const index1 = ref(0)
+	const index2 = ref(0)
+	let peopleIndex = ref(0);
+	// 选择列表
+	let bindPickerChange = (e) => {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		peopleIndex.value = e.detail.value
+	}
+
+	let searchValue = ref(null)
+	// 查询搜索跳转
+	let handleSearch = () => {
+		getCrmMarketInformationList();
+	}
+	// 表单数据
+	const formData = ref({
+		month: "1",
+		bandResult: '',
+	})
+	const tableData  = ref([])
+	const palceArray = ref([{
+		id: 1,
+		name: '北京大区'
+	}, {
+		id: 2,
+		name: '市场三部'
+	}, {
+		id: 3,
+		name: '市场二部'
+	}, {
+		id: 4,
+		name: '南方大区'
+	}, {
+		id: 5,
+		name: '北方大区'
+	}, {
+		id: 6,
+		name: '西部大区'
+	}])
+	const monthArray = ref([
+	  { id: 1, name: '1月' },
+	  { id: 2, name: '2月' },
+	  { id: 3, name: '3月' },
+	  { id: 4, name: '4月' },
+	  { id: 5, name: '5月' },
+	  { id: 6, name: '6月' },
+	  { id: 7, name: '7月' },
+	  { id: 8, name: '8月' },
+	  { id: 9, name: '9月' },
+	  { id: 10, name: '10月' },
+	  { id: 11, name: '11月' },
+	  { id: 12, name: '12月' }
+	])
+			const handlePlace1 = (e) => {
+				index1.value = e.detail.value
+				console.log('index1:', monthArray.value[e.detail.value]?.name)
+				formData.value.month = monthArray.value[e.detail.value]?.id || ''
+			}
+			const handlePlace = (e) => {
+				index2.value = e.detail.value
+				console.log('index2:', palceArray.value[e.detail.value]?.name)
+				formData.value.region = palceArray.value[e.detail.value]?.name || ''
+			}
+			
+			// 获取数据列表
+			const getCrmMarketInformationList = async () => {
+				loading.value = true
+				try {
+					const res = await getPersonalPaymentCollectionTable(formData.value);
+					// 直接赋值给响应式变量
+					tableData.value = res.rows || []
+					console.log('获取到的数据:', tableData.value)
+				} catch (error) {
+					console.error('获取数据失败:', error)
+					uni.showToast({
+						title: '获取数据失败',
+						icon: 'error'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+			// 获取数据列表（无参数）
+			const getPersonalPaymentCollectionTableNoPo = async () => {
+				loading.value = true
+				try {
+					const res = await getPersonalPaymentCollectionTable();
+					// 直接赋值给响应式变量
+					tableData.value = res.rows || []
+					console.log('获取到的数据:', tableData.value)
+				} catch (error) {
+					console.error('获取数据失败:', error)
+					uni.showToast({
+						title: '获取数据失败',
+						icon: 'error'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+				onMounted(() => {
+					getPersonalPaymentCollectionTableNoPo()
+				})
+			
+</script>
+
+<style scoped>
+  /* 新增搜索输入框样式 */
+  .search-input {
+    flex: 1;
+    height: 100%;
+    color: #ffffff;
+    font-size: 28rpx;
+    background: transparent;
+    border: none;
+    outline: none;
+    padding: 0 10rpx;
+    line-height: 1;
+  }
+
+  .search-input::placeholder {
+    color: rgba(255, 255, 255, 0.7);
+  }
+  
+  /* 保持原有样式 */
+  .search {
+    display: flex;
+    padding: 0 30rpx;
+  }
+
+  .search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+  }
+
+  .search .btn-search::after {
+    display: none;
+  }
+
+  .search .picker-bg {
+    /* display: flex; */
+    background-color: #6FA2F8;
+    border-radius: 25px;
+    color: #fff;
+    font-size: 28rpx;
+    padding: 0rpx 20rpx;
+    /* #ifndef APP-PLUS */
+    padding: 10rpx 20rpx 0 20rpx;
+    /* #endif */
+    margin-right: 20rpx;
+    /* 设置固定宽度确保布局一致 */
+    width: 102.72px;
+  }
+
+  .search .picker-bg .picker {
+    display: flex;
+    align-items: center;
+    width: 100%; /* 确保picker占据全部宽度 */
+    /* #ifndef APP-PLUS */
+    padding-top: 2rpx;
+    /* #endif */
+  }
+
+  .search .picker-bg .picker .uni-icons {
+    color: #fff !important;
+  }
+
+  .search .picker-bg .picker .uni-icons:first-child {
+    margin-right: 10rpx;
+  }
+
+  .search .picker-bg .picker .uniui-down {
+    margin-left: 20rpx;
+  }
+
+  .white-bg {
+    width: 750rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+    padding: 20rpx 0rpx;
+    margin-top: 20rpx;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 135px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 112px);
+    /* #endif */
+  }
+
+  .table-title {
+    text-align: center;
+    font-weight: bold;
+    border-bottom: 2px solid #E7E7E7;
+    padding-bottom: 20rpx;
+  }
+</style>
\ No newline at end of file
diff --git a/src/static/common.css b/src/static/common.css
index c9c2e31..18154c7 100644
--- a/src/static/common.css
+++ b/src/static/common.css
@@ -87,6 +87,8 @@ page {
 
 
 /* 弹出提示框修改样式 begin */
+/* #ifdef H5 */
+
 .uni-modal {
     border-radius: 24rpx !important;
     width: 70% !important;
@@ -136,7 +138,7 @@ page {
     background-color: #05A3F4 !important;
     color: #fff !important;
 }
-
+/* #endif */
 /* 弹出提示框修改样式 end */
 
 /* 搜索框修改样式 begin */
@@ -169,13 +171,51 @@ page {
 }
 
 .custom-search .uni-searchbar__box-icon-clear {
-    display: none !important;
+    /* display: none !important; */
+    margin-right:10rpx;
 }
 
-/* .custom-search .uni-searchbar__box-icon-clear .uniui-clear{
+.custom-search .uni-searchbar__box-icon-clear .uniui-clear{
     color:#fff !important;
     font-size: 40rpx !important;
-} */
+}
+
+/* 自定义搜索框 */
+.search-bg{
+    background-color: #6FA2F8;
+    border-radius: 28rpx;
+    /* width:690rpx; */
+    width:630rpx;
+    height:56rpx;
+    margin:0 auto 30rpx;
+    padding:0 30rpx;
+    display: flex;
+    color:#fff;
+    font-size:28rpx;
+    flex: auto;
+}
+.search-bg .search-left{
+    border-right:1px solid #4687F2;
+    margin-top:10rpx;
+    margin-bottom:10rpx;
+    padding-right:30rpx;
+    /* width:10%; */
+}
+.search-bg .search-right{
+    margin-top:10rpx;
+    padding-left:30rpx;
+    /* width:60%; */
+}
+.search-bg .search-right .uni-input{
+    color:#fff;
+    font-size:28rpx;
+}
+.search-bg .search-right .uni-input .uni-input-input{
+    width: 380rpx;
+}
+.search-bg .search-right .uni-input .search-color{
+    color:#fff !important;
+}
 /* 搜索框修改样式 end */
 
 .head-right {