From 036f2a61bfc5dbbf33e0ee67815efe014cd552be Mon Sep 17 00:00:00 2001
From: "PC-202311141343\\Administrator" <505354293@qq.com>
Date: Mon, 1 Sep 2025 10:16:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/business/CRM/map/checkInView.vue    | 24 ++++-----
 .../CRM/marketActivity/detailForApproval.vue  | 49 ++++++++++++++++---
 .../CRM/marketActivity/visitorReportAdd.vue   | 18 ++++---
 3 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/src/pages/business/CRM/map/checkInView.vue b/src/pages/business/CRM/map/checkInView.vue
index c490281..d1d874b 100644
--- a/src/pages/business/CRM/map/checkInView.vue
+++ b/src/pages/business/CRM/map/checkInView.vue
@@ -10,18 +10,18 @@
             <!-- 正文内容 -->
             <view>
                 <!-- 搜索 -->
-                <view class="search">
-                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
-                        class="picker-bg">
-                        <view class="picker">
-                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
-                                size="18"></uni-icons>
-                            <view>{{ defaultDate }}</view>
-                            <uni-icons type="down" size="18"></uni-icons>
-                        </view>
-                    </picker>
-                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
-                </view>
+<!--                <view class="search">-->
+<!--                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"-->
+<!--                        class="picker-bg">-->
+<!--                        <view class="picker">-->
+<!--                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"-->
+<!--                                size="18"></uni-icons>-->
+<!--                            <view>{{ defaultDate }}</view>-->
+<!--                            <uni-icons type="down" size="18"></uni-icons>-->
+<!--                        </view>-->
+<!--                    </picker>-->
+<!--                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
+<!--                </view>-->
 
                 <!-- 分页部分  -->
                 <view class="white-bg margin-bottom20" v-for="(item, index) in list">
diff --git a/src/pages/business/CRM/marketActivity/detailForApproval.vue b/src/pages/business/CRM/marketActivity/detailForApproval.vue
index e2dad85..bc420d7 100644
--- a/src/pages/business/CRM/marketActivity/detailForApproval.vue
+++ b/src/pages/business/CRM/marketActivity/detailForApproval.vue
@@ -95,7 +95,12 @@ import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import customHeader from '@/components/customHeader.vue'
 import customTabs from '@/components/customTabs.vue';
-import { auditActivityReport, getVisistDetailList, getYsVisistInfo } from '../../../../api/crm/activity/activity';
+import {
+  auditActivityReport,
+  getRejectReason,
+  getVisistDetailList,
+  getYsVisistInfo
+} from '../../../../api/crm/activity/activity';
 
 
 let visistId = ref(0)
@@ -127,10 +132,38 @@ const activeTab = ref(0);//默认报告明细
 const tabList = ['报告明细'];
 
 //点击驳回
-function refuse() {
-    uni.navigateTo({
-        url: './auditReject?visistId=' + visistId.value
-    })
+// 修正后的驳回方法
+const refuse = async () => {
+  uni.showModal({
+    title: '驳回原因',
+    content: '',
+    editable: true,
+    success: async function (modalRes) { // 使用modalRes避免重名
+      if (modalRes.confirm) {
+        try {
+          const param = {
+            visistId: visistId.value,
+            rejectReason: modalRes.content // 用户输入的驳回原因
+          };
+          const apiRes = await getRejectReason(param); // 避免与modalRes重名
+          uni.showToast({
+            title: '驳回成功',
+            icon: 'success'
+          });
+          // 操作完成后返回
+          setTimeout(() => {
+            uni.navigateBack(1);
+          }, 800);
+        } catch (err) {
+          console.log('驳回失败:', err);
+          uni.showToast({
+            title: '驳回失败',
+            icon: 'error'
+          });
+        }
+      }
+    }
+  });
 }
 
 //点击通过
@@ -145,7 +178,7 @@ function adopt(item) {
                     reportStaffName: item.staffName,
                 }).then(res => {
                     if (res.code == 200) {
-                        // that.mescroll.resetUpScroll()
+                        mescroll.resetUpScroll()
                     } else {
                         uni.showToast({
                             icon: 'none',
@@ -153,6 +186,10 @@ function adopt(item) {
                         });
                     }
                 })
+
+              uni.navigateBack({
+              })
+
             }
         }
 
diff --git a/src/pages/business/CRM/marketActivity/visitorReportAdd.vue b/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
index b40fd87..131a919 100644
--- a/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
+++ b/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
@@ -69,7 +69,10 @@
                             class="uni-forms-item is-direction-top is-top">
 
                             <multipleSelect :multiple="true" :value="chooseMyLeaderList" downInner
-                                :options="myLeaderList" @change="changeValue2" :key="Math.round()" :slabel="'text'">
+                                :options="myLeaderList" 
+                                @change="changeValue2" :key="Math.round()" 
+                                :slabel="'text'"
+                            >
                             </multipleSelect>
                         </uni-forms-item>
 
@@ -138,7 +141,9 @@ const submitForm = async () => {
             icon: 'success'
         });
         saveVisistReportForm.cusId = formData.value.cusId
-        saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
+        if (Array.isArray(formData.value.leader)) {
+          saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',');
+        }
         saveVisistReportForm.visistDate = formData.value.visitDate
         saveVisistReportForm.visistType = 'I类活动（走访）'
         saveVisistReportForm.mapId = mapId.value
@@ -249,10 +254,11 @@ function chooseRecord(e) {
 
 .form-con {
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 100px)
-        /* #endif */
-        /* #ifndef APP-PLUS */
-        /* #endif */
+    height: calc(100vh - 95px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height:calc(100vh - 68px) !important;
+    /* #endif */
 }
 
 :deep(.uni-date-x) {