admin/ys-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
wangyang
2025-09-01 09:38:41 +08:00
parent 1f4fc0b0cc ed26947cce
commit 487a367c5a
36 changed files with 239 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/business/CRM/marketActivity/auditReport.vue
View File

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

2
src/pages/business/CRM/marketActivity/chooseCus.vue
View File

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

49
src/pages/business/CRM/marketActivity/detailForApproval.vue
View File

@@ -95,12 +95,7 @@ import { ref } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import customHeader from '@/components/customHeader.vue'
import customTabs from '@/components/customTabs.vue';
import {
auditActivityReport,
getRejectReason,
getVisistDetailList,
getYsVisistInfo
} from '../../../../api/crm/activity/activity';
import { auditActivityReport, getVisistDetailList, getYsVisistInfo } from '../../../../api/crm/activity/activity';
let visistId = ref(0)
@@ -132,38 +127,10 @@ const activeTab = ref(0);//默认报告明细
const tabList = ['报告明细'];
//点击驳回
// 修正后的驳回方法
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'
});
}
}
}
});
function refuse() {
uni.navigateTo({
url: './auditReject?visistId=' + visistId.value
})
}
//点击通过
@@ -178,7 +145,7 @@ function adopt(item) {
reportStaffName: item.staffName,
}).then(res => {
if (res.code == 200) {
mescroll.resetUpScroll()
// that.mescroll.resetUpScroll()
} else {
uni.showToast({
icon: 'none',
@@ -186,10 +153,6 @@ function adopt(item) {
});
}
})
uni.navigateBack({
})
}
}

20
src/pages/business/CRM/marketActivity/visitReport.vue
View File

@@ -79,7 +79,6 @@ import customHeader from '@/components/customHeader.vue'
import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
import { getNavBarPaddingTop } from '@/utils/system.js'
import { getYsVisistList, removeVisist, updateStatus } from '../../../../api/crm/activity/activity';
import {onHide, onShow} from "@dcloudio/uni-app";
// 获取导航栏高度用于内容区域padding
const navBarPaddingTop = ref(0);
@@ -87,10 +86,6 @@ onMounted(() => {
navBarPaddingTop.value = getNavBarPaddingTop() * 2;
})
onShow(()=>{
getList()
})
// 查询列表
let list = ref([]);
@@ -147,7 +142,7 @@ const upOption = ref({
noMoreSize: 5,
empty: {
tip: '~ 空空如也 ~',
icon: "../../static/images/mescroll-empty.png"
icon: "../../../../static/images/mescroll-empty.png"
},
textLoading: '加载中...',
textNoMore: '已经到底了'
@@ -215,13 +210,6 @@ const getVisitorReportList = (pageNum, pageSize) => {
});
}
//页面数据方法
function getList(){
getYsVisistList({pageNum: 1, pageSize: 10}).then(res=>{
list.value=res.rows;
})
}
let Loop = ref(0)
let now
@@ -264,7 +252,7 @@ function touchstart(item) {
});
}
// 刷新内容
downCallback(mescrollRef.value.mescroll);
upCallback()
});
}
}
@@ -273,10 +261,6 @@ function touchstart(item) {
}
onHide(()=>{
clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
})
function touchend() {
let endDate = new Date();
console.log('结束时间', endDate)

418
src/pages/business/CRM/marketActivity/visitReportView.vue
View File

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

18
src/pages/business/CRM/marketActivity/visitorReportAdd.vue
View File

@@ -69,10 +69,7 @@
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>
@@ -141,9 +138,7 @@ const submitForm = async () => {
icon: 'success'
});
saveVisistReportForm.cusId = formData.value.cusId
if (Array.isArray(formData.value.leader)) {
saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',');
}
saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
saveVisistReportForm.visistDate = formData.value.visitDate
saveVisistReportForm.visistType = 'I类活动（走访）'
saveVisistReportForm.mapId = mapId.value
@@ -254,11 +249,10 @@ function chooseRecord(e) {
.form-con {
/* #ifdef APP-PLUS */
height: calc(100vh - 95px) !important;
/* #endif */
/* #ifndef APP-PLUS */
height:calc(100vh - 68px) !important;
/* #endif */
height: calc(100vh - 100px)
/* #endif */
/* #ifndef APP-PLUS */
/* #endif */
}
:deep(.uni-date-x) {