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

Merge branch 'develop' of http://123.57.20.168:4000/admin/ys-app into develop

Browse Source
This commit is contained in:
cui
2025-09-29 15:41:51 +08:00
parent 2a1ef92bd0 af25a14c17
commit c8c0f4752a
26 changed files with 1073 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.env.development
View File

@@ -1,12 +1,16 @@
#调用后台地址 #调用后台地址
# 公司 # 贝英斯公司
VITE_APP_BASE_URL = 'http://118.186.13.120:31302' # VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
# VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://192.168.236.71:31302"
# VITE_APP_BASE_URL = "http://123.57.20.168:3000" # VITE_APP_BASE_URL = "http://123.57.20.168:3000"
# 友晟外网 # 友晟test外网
# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app' # VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
# 友晟内网 # 友晟test内网
# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app' # VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
# 友晟线上内网
# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
# 友晟线上外网网
VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

13
.env.production
View File

@@ -1,11 +1,16 @@
#调用后台地址 #调用后台地址
# 公司 # 贝英斯公司
# VITE_APP_BASE_URL = 'http://118.186.13.120:31302' # VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
# VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://192.168.236.71:31302"
# VITE_APP_BASE_URL = "http://123.57.20.168:3000" # VITE_APP_BASE_URL = "http://123.57.20.168:3000"
# 友晟外网 # 友晟test外网
VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app' # VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
# 友晟内网 # 友晟test内网
# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app' # VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
# 友晟线上内网
# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
# 友晟线上外网网
VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

8
src/api/crm/activity/map.js
View File

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

176
src/components/closeableModal.vue Normal file
View File

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

22
src/constants/mapApiConstants.js Normal file
View File

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

3
src/pages.json
View File

@@ -331,7 +331,8 @@
"path": "pages/business/CRM/plan/planView", "path": "pages/business/CRM/plan/planView",
//周计划查看 //周计划查看
"style": { "style": {
"navigationBarTitleText": "" "navigationBarTitleText": "",
"enablePullDownRefresh": true
} }
}, },
{ {

115
src/pages/business/CRM/customer/changeCustomerOwner.vue
View File

@@ -24,7 +24,7 @@
</view> </view>
<!-- 分页部分 top="68rpx" --> <!-- 分页部分 top="68rpx" -->
<mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
:up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff" :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
class="scroll-h" :class="{'loading-scroll':cssFlag}" class="scroll-h" :class="{'loading-scroll':cssFlag}"
> >
@@ -149,44 +149,31 @@ const mescrollInit = (mescroll) => {
// 下拉刷新 // 下拉刷新
const downCallback = async (mescroll) => { const downCallback = async (mescroll) => {
try { uni.showLoading();
uni.showLoading(); cssFlag.value = true;
cssFlag.value = true; setTimeout(async () => {
setTimeout(async () => { // 重置页码为第一页
// 重置页码为第一页 const res = await getList(1, mescroll.size || upOption.page.size);
const res = await getList(1, mescroll.size || upOption.page.size); cssFlag.value = false;
list.value = res.list; list.value = res.list;
cssFlag.value = false; // 正确传递 total 参数
// 正确传递 total 参数 mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
mescroll.endSuccess(res.list.length, res.total >= mescroll.size); }, 500);
uni.hideLoading();
}, 500);
} catch (error) {
console.log(error)
mescroll.endErr();
}
} }
// 上拉加载更多 // 上拉加载更多
const upCallback = async (mescroll) => { const upCallback = async (mescroll) => {
try { uni.showLoading();
uni.showLoading(); setTimeout(async () => {
setTimeout(async () => { // 使用 mescroll 提供的页码和大小参数
// 使用 mescroll 提供的页码和大小参数 const res = await getList(mescroll.num, mescroll.size);
const res = await getList(mescroll.num, mescroll.size); if (mescroll.num === 1) {
if (mescroll.num === 1) { list.value = res.list;
list.value = res.list; } else {
} else { list.value.push(...res.list);
list.value.push(...res.list); }
} // 正确判断是否还有更多数据
// 正确判断是否还有更多数据 mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
mescroll.endSuccess(res.list.length, res.total >= mescroll.size); }, 500);
uni.hideLoading();
}, 500);
} catch (error) {
console.log(error)
mescroll.endErr();
}
} }
// 获取数据列表 // 获取数据列表
@@ -197,12 +184,17 @@ const getList = (pageIndex, pageSize) => {
pageSize, pageSize,
searchContent: searchValue.value searchContent: searchValue.value
} }
try {
let res = await SearchForAllPerson(param); let res = await SearchForAllPerson(param);
resolve({ resolve({
list: res.rows, list: res.rows,
total: res.total total: res.total
}); });
} catch (e) {
console.log(e, '数据获取失败');
} finally {
uni.hideLoading();
}
}); });
} }
@@ -303,41 +295,20 @@ let handleCopyInfo = (item) => {
} }
</script> </script>
<style lang="scss" scoped> <style scoped>
.all-body { .all-body {
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
top: 150rpx; top: 160rpx;
height: calc(100vh - 75px); height: calc(100vh - 160rpx);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
top: 120rpx; top: 116rpx;
height: calc(100vh); height: calc(100vh - 116rpx);
/* #endif */ /* #endif */
} }
.search .btn-search {
border: none;
background: none;
line-height: normal;
color: #fff;
line-height: 56rpx !important;
padding: 10rpx 0 0;
text-align: left;
cursor: pointer;
}
.search .btn-search::after {
display: none;
}
.scroll-h { .scroll-h {
/* #ifdef APP-PLUS */ height: 100%;
height: calc(100vh - 120px);
/* #endif */
/* #ifndef APP-PLUS */
height: calc(100vh - 110px);
/* #endif */
} }
.white-bg { .white-bg {
@@ -348,10 +319,4 @@ let handleCopyInfo = (item) => {
} }
} }
.white-bg:hover {
//background-color: #f1f1f1;
background-color: #f1f1f1; /* Chrome, Safari, Opera */
box-shadow: 0px 0px 5rpx white;
//filter: rgba(237, 242, 250, 0.5);
}
</style> </style>

5
src/pages/business/CRM/customer/components/customerUserEdit.vue
View File

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

97
src/pages/business/CRM/customer/customerAudit.vue
View File

@@ -7,7 +7,13 @@
<view class="con-body"> <view class="con-body">
<view class="con-bg"> <view class="con-bg">
<!-- 头部 --> <!-- 头部 -->
<customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="false"> <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="list.length > 0">
<template #right>
<view class="head-right" @click="handleReSort">
<uni-icons type="arrow-down" size="20" color="#B7D2FF"></uni-icons>
{{iconType==='arrow-up'?'最新':'最早'}}
</view>
</template>
</customHeader> </customHeader>
<!-- 高度来避免头部遮挡 --> <!-- 高度来避免头部遮挡 -->
@@ -17,12 +23,12 @@
<view class="all-body"> <view class="all-body">
<!-- 搜索--> <!-- 搜索-->
<view class="search"> <view class="search">
<!-- <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"--> <!-- <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
<!-- cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"--> <!-- cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
<!-- v-model="searchValue"--> <!-- v-model="searchValue"-->
<!-- />--> <!-- />-->
<view class="custom-search"></view> <view class="custom-search"></view>
</view> </view>
<!-- 分页部分 --> <!-- 分页部分 -->
<mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -101,9 +107,13 @@ let handleSearch = () => {
watch(searchValue, (newValue, oldValue) => { watch(searchValue, (newValue, oldValue) => {
handleSearch() handleSearch()
}) })
let clearSearchValue = () => { // 排序图标
searchValue.value = ''; const iconType = ref('arrow-up');
let handleReSort = () => {
iconType.value = iconType.value === 'arrow-down' ? 'arrow-up' : 'arrow-down';
list.value = list.value.reverse();
} }
// 查询列表 // 查询列表
let list = ref([]); let list = ref([]);
@@ -112,7 +122,7 @@ const upOption = ref({
noMoreSize: 5, noMoreSize: 5,
empty: { empty: {
tip: '~ 空空如也 ~', tip: '~ 空空如也 ~',
icon: "../../static/images/mescroll-empty.png" icon: "../../../../static/images/mescroll-empty.png"
}, },
textLoading: '加载中...', textLoading: '加载中...',
textNoMore: '已经到底了' textNoMore: '已经到底了'
@@ -133,10 +143,11 @@ const mescrollInit = (mescroll) => {
// 下拉刷新 // 下拉刷新
const downCallback = async (mescroll) => { const downCallback = async (mescroll) => {
try {
uni.showLoading(); uni.showLoading();
cssFlag.value = true; cssFlag.value = true;
setTimeout(async () => { setTimeout(async () => {
try {
// 重置页码为第一页 // 重置页码为第一页
const res = await getList(1, mescroll.size || upOption.page.size); const res = await getList(1, mescroll.size || upOption.page.size);
@@ -144,17 +155,21 @@ const downCallback = async (mescroll) => {
// 正确传递 total 参数 // 正确传递 total 参数
mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
uni.hideLoading(); uni.hideLoading();
} catch (error) {
console.log(error)
mescroll.endErr();
} finally {
cssFlag.value = false; cssFlag.value = false;
}, 500); }
} catch (error) { }, 500);
console.log(error)
mescroll.endErr();
}
} }
// 上拉加载更多 // 上拉加载更多
const upCallback = async (mescroll) => { const upCallback = async (mescroll) => {
try {
setTimeout(async () => { setTimeout(async () => {
try {
// 使用 mescroll 提供的页码和大小参数 // 使用 mescroll 提供的页码和大小参数
const res = await getList(mescroll.num, mescroll.size); const res = await getList(mescroll.num, mescroll.size);
if (mescroll.num === 1) { if (mescroll.num === 1) {
@@ -165,11 +180,11 @@ const upCallback = async (mescroll) => {
mescroll.endBySize(res.list.length, res.total); mescroll.endBySize(res.list.length, res.total);
// 正确判断是否还有更多数据 // 正确判断是否还有更多数据
mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
}, 500); } catch (error) {
} catch (error) { mescroll.endErr();
console.log(error) }
mescroll.endErr(); }, 500);
}
} }
// 获取数据列表 // 获取数据列表
@@ -180,12 +195,17 @@ const getList = (pageIndex, pageSize) => {
pageSize, pageSize,
searchContent: searchValue.value searchContent: searchValue.value
} }
try {
let res = await getCusUserApprovalList(param); let res = await getCusUserApprovalList(param);
resolve({ resolve({
list: res.rows, list: res.rows,
total: res.total total: res.total
}); });
} catch (e) {
console.log(e, "客户人员审核任务列表获取失败");
} finally {
uni.hideLoading();
}
}); });
} }
@@ -210,22 +230,17 @@ let handleDetail = (item) => {
<style scoped> <style scoped>
.all-body { .all-body {
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
top: 150rpx; top: 160rpx;
height: calc(100vh - 75px); height: calc(100vh - 160rpx);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
top: 120rpx; top: 116rpx;
height: calc(100vh); height: calc(100vh - 116rpx);
/* #endif */ /* #endif */
} }
.scroll-h { .scroll-h {
/* #ifdef APP-PLUS */ height: 100%;
height: calc(100vh - 120px);
/* #endif */
/* #ifndef APP-PLUS */
height: calc(100vh - 110px);
/* #endif */
} }
.white-bg { .white-bg {

69
src/pages/business/CRM/customer/customerUserBelong.vue
View File

@@ -134,7 +134,7 @@ const upOption = ref({
noMoreSize: 5, noMoreSize: 5,
empty: { empty: {
tip: '~ 空空如也 ~', tip: '~ 空空如也 ~',
icon: "../../static/images/mescroll-empty.png" icon: "../../../../static/images/mescroll-empty.png"
}, },
textLoading: '加载中...', textLoading: '加载中...',
textNoMore: '已经到底了' textNoMore: '已经到底了'
@@ -155,27 +155,27 @@ const mescrollInit = (mescroll) => {
// 下拉刷新 // 下拉刷新
const downCallback = async (mescroll) => { const downCallback = async (mescroll) => {
try { cssFlag.value = true;
cssFlag.value = true; uni.showLoading();
uni.showLoading(); setTimeout(async () => {
setTimeout(async () => { try {
// 重置页码为第一页 // 重置页码为第一页
const res = await getList(1, mescroll.size || upOption.page.size); const res = await getList(1, mescroll.size || upOption.page.size);
cssFlag.value = false;
list.value = res.list; list.value = res.list;
// 正确传递 total 参数 // 正确传递 total 参数
mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
uni.hideLoading(); } catch (error) {
}, 500); mescroll.endErr();
} catch (error) { } finally {
console.log(error) cssFlag.value = false;
mescroll.endErr(); }
} }, 500);
} }
// 上拉加载更多 // 上拉加载更多
const upCallback = async (mescroll) => { const upCallback = async (mescroll) => {
try { setTimeout(async () => {
setTimeout(async () => { try {
// 使用 mescroll 提供的页码和大小参数 // 使用 mescroll 提供的页码和大小参数
const res = await getList(mescroll.num, mescroll.size); const res = await getList(mescroll.num, mescroll.size);
if (mescroll.num === 1) { if (mescroll.num === 1) {
@@ -184,13 +184,12 @@ const upCallback = async (mescroll) => {
list.value.push(...res.list); list.value.push(...res.list);
} }
// 正确判断是否还有更多数据 // 正确判断是否还有更多数据
mescroll.endBySize(res.list.length, res.total) mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
// mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
}, 500); } catch (error) {
} catch (error) { mescroll.endErr();
console.log(error) }
mescroll.endErr(); }, 500);
}
} }
// 获取数据列表 // 获取数据列表
@@ -201,12 +200,18 @@ const getList = (pageIndex, pageSize) => {
pageSize, pageSize,
searchContent: searchValue.value searchContent: searchValue.value
} }
try {
let res = await SearchForAllCustomersSalesperson(param);
resolve({
list: res.rows,
total: res.total
});
} catch (e) {
console.log(e, "获取所有客户人员所属失败");
} finally {
uni.hideLoading();
}
let res = await SearchForAllCustomersSalesperson(param);
resolve({
list: res.rows,
total: res.total
});
}); });
} }
@@ -217,6 +222,7 @@ let handleDetail = (item) => {
url: "/pages/business/CRM/customer/components/customerUserEdit", url: "/pages/business/CRM/customer/components/customerUserEdit",
events: { events: {
refreshCusUserList() { refreshCusUserList() {
console.log('refreshCusUserList',"响应刷新")
handleSearch(); handleSearch();
} }
}, },
@@ -224,7 +230,7 @@ let handleDetail = (item) => {
res.eventChannel.emit('editCusData', {param: item, isAdd: false}) res.eventChannel.emit('editCusData', {param: item, isAdd: false})
} }
}) })
}else{ } else {
uni.showToast({ uni.showToast({
title: '已完成审核，不可修改', title: '已完成审核，不可修改',
icon: 'none' icon: 'none'
@@ -278,16 +284,15 @@ let handleDelete = async (item) => {
<style lang="scss" scoped> <style lang="scss" scoped>
.all-body { .all-body {
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
top: 150rpx; top: 160rpx;
height: calc(100vh - 75px); height: calc(100vh - 160rpx);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
top: 120rpx; top: 116rpx;
height: calc(100vh); height: calc(100vh - 116rpx);
/* #endif */ /* #endif */
} }
.search .btn-search { .search .btn-search {
border: none; border: none;
background: none; background: none;

13
src/pages/business/CRM/customer/selectCustomer.vue
View File

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

4
src/pages/business/CRM/mainOwner/audit/confirmForm.vue
View File

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

140
src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
View File

@@ -16,13 +16,12 @@
<!-- 正文内容 --> <!-- 正文内容 -->
<view class="all-body"> <view class="all-body">
<!-- 搜索--> <!-- 搜索-->
<!-- <view class="search">--> <!-- <view class="search">-->
<!-- <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"--> <!-- <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
<!-- cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"--> <!-- cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
<!-- v-model="searchValue"--> <!-- v-model="searchValue"-->
<!-- />--> <!-- />-->
<!-- <button type="default" @click="clearSearchValue" size="mini" class="btn-search">清空</button>--> <!-- </view>-->
<!-- </view>-->
<!-- 分页部分 --> <!-- 分页部分 -->
<mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -31,9 +30,11 @@
> >
<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"> <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index">
<view class="report-list" @click.stop="handleDetail(item)"> <view class="report-list" @click.stop="handleDetail(item)">
<view class="r-list title" > <view class="r-list title">
{{ item.cusName }} {{ item.cusName }}
<view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">{{item.auditStatus?'':'待您审批'}}</view> <view class="r-right no-wrap" :class="item.auditStatus ? 'btn-blue' : 'btn-pink' ">
{{ item.auditStatus ? item.auditStatus : '待您审核' }}
</view>
</view> </view>
<view class="r-list"> <view class="r-list">
<view class="r-left">客户人员名称</view> <view class="r-left">客户人员名称</view>
@@ -98,7 +99,8 @@ const mescrollRef = ref(null);
let timerId = null; let timerId = null;
// 查询搜索跳转 // 查询搜索跳转
let handleSearch = () => { let handleSearch = () => {
// 防抖搜索 console.log(searchValue.value) // 防抖搜索
console.log(searchValue.value)
if (timerId) clearTimeout(timerId); if (timerId) clearTimeout(timerId);
timerId = setTimeout(async () => { timerId = setTimeout(async () => {
@@ -113,7 +115,7 @@ let handleSearch = () => {
watch(searchValue, (newValue, oldValue) => { watch(searchValue, (newValue, oldValue) => {
handleSearch() handleSearch()
}) })
let clearSearchValue = ()=>{ let clearSearchValue = () => {
searchValue.value = ''; searchValue.value = '';
} }
// 查询列表 // 查询列表
@@ -122,7 +124,10 @@ let list = ref([]);
const upOption = ref({ const upOption = ref({
page: {num: 0, size: 10}, page: {num: 0, size: 10},
noMoreSize: 5, noMoreSize: 5,
empty: {tip: '~ 空空如也 ~'}, empty: {
tip: '~ 空空如也 ~',
icon: "../../../../../static/images/mescroll-empty.png"
},
textLoading: '加载中...', textLoading: '加载中...',
textNoMore: '已经到底了' textNoMore: '已经到底了'
}); });
@@ -142,28 +147,28 @@ const mescrollInit = (mescroll) => {
// 下拉刷新 // 下拉刷新
const downCallback = async (mescroll) => { const downCallback = async (mescroll) => {
try { cssFlag.value = true;
cssFlag.value = true; uni.showLoading();
uni.showLoading(); setTimeout(async () => {
setTimeout(async () => { try {
// 重置页码为第一页 // 重置页码为第一页
const res = await getList(1, mescroll.size || upOption.page.size); const res = await getList(1, mescroll.size || upOption.page.size);
list.value = res.list; list.value = res.list;
cssFlag.value = false;
// 正确传递 total 参数 // 正确传递 total 参数
mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
uni.hideLoading(); } catch (error) {
}, 500); console.log(error)
} catch (error) { mescroll.endErr();
console.log(error) } finally {
mescroll.endErr(); cssFlag.value = false;
} }
}, 500);
} }
// 上拉加载更多 // 上拉加载更多
const upCallback = async (mescroll) => { const upCallback = async (mescroll) => {
try { setTimeout(async () => {
setTimeout(async () => { try {
// 使用 mescroll 提供的页码和大小参数 // 使用 mescroll 提供的页码和大小参数
const res = await getList(mescroll.num, mescroll.size); const res = await getList(mescroll.num, mescroll.size);
if (mescroll.num === 1) { if (mescroll.num === 1) {
@@ -173,11 +178,11 @@ const upCallback = async (mescroll) => {
} }
// 正确判断是否还有更多数据 // 正确判断是否还有更多数据
mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
}, 500); } catch (error) {
} catch (error) { console.log(error)
console.log(error) mescroll.endErr();
mescroll.endErr(); }
} }, 500);
} }
// 获取数据列表 // 获取数据列表
@@ -188,12 +193,16 @@ const getList = (pageIndex, pageSize) => {
pageSize, pageSize,
searchContent: searchValue.value searchContent: searchValue.value
} }
try {
let res = await personnelAwaitingReviewForChange(param); let res = await personnelAwaitingReviewForChange(param);
resolve({ resolve({
list: res.rows, list: res.rows,
total: res.total total: res.total
}); });
} catch (e) {
} finally {
uni.hideLoading();
}
}); });
} }
@@ -203,11 +212,11 @@ let handleDetail = (item) => {
uni.navigateTo({ uni.navigateTo({
url: "/pages/business/CRM/mainOwner/audit/confirmForm", url: "/pages/business/CRM/mainOwner/audit/confirmForm",
events: { events: {
refreshOwnerChangeList(){ refreshOwnerChangeList() {
handleSearch(); handleSearch();
} }
}, },
success(res){ success(res) {
res.eventChannel.emit('auditCusOwner', {data: {userId}, editable: false}) res.eventChannel.emit('auditCusOwner', {data: {userId}, editable: false})
} }
}) })
@@ -218,60 +227,39 @@ let handleDetail = (item) => {
<style scoped> <style scoped>
.all-body { .all-body {
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
top: 150rpx; top: 160rpx;
height: calc(100vh - 75px); height: calc(100vh - 160rpx);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
top: 120rpx; top: 116rpx;
height: calc(100vh); height: calc(100vh - 116rpx);
/* #endif */ /* #endif */
} }
.search { .scroll-h{
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 */ /* #ifdef APP-PLUS */
height: calc(100vh - 120px); top: 160rpx;
height: calc(100vh - 160rpx);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
height: calc(100vh - 110px); top: 116rpx;
height: calc(100vh - 116rpx);
/* #endif */ /* #endif */
} }
.white-bg { .white-bg {
padding-bottom: 10rpx; padding-bottom: 10rpx;
.title{
.title {
align-items: flex-start; align-items: flex-start;
} }
} }
.btn-pink{ .no-wrap {
white-space: nowrap; white-space: nowrap;
} }
.btn-blue {
border-radius: 10rpx;
}
</style> </style>

105
src/pages/business/CRM/mainOwner/view/viewMainOwner.vue
View File

@@ -1,19 +1,17 @@
<!--
* @description 查看主归属人变更
* @update date 2025/9/17 21:45
-->
<template> <template>
<view class="con-body"> <view class="con-body">
<view class="con-bg"> <view class="con-bg">
<!-- 头部 --> <!-- 头部 -->
<customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true" :rightFlag="false"></customHeader> <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true"
:rightFlag="false"></customHeader>
<!-- 高度来避免头部遮挡 --> <!-- 高度来避免头部遮挡 -->
<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view> <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
<view class="all-body"> <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" <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
:up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff" :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
@@ -22,25 +20,17 @@
@click="showDetail(item)"> @click="showDetail(item)">
<view> <view>
<view class="report-list"> <view class="report-list">
<view class="title">客户：{{ item.cusName }}</view> <view class="r-list title">{{ item.cusName }}
<view class="r-list">
<view class="r-name">{{ item.visistCode }}</view> <view class="r-name">{{ item.visistCode }}</view>
<view> <view class="r-right btn-blue no-wrap"> 查看 </view>
<view
class="r-right btn-blue"
size="mini">
查看
</view>
</view>
</view> </view>
<view class="border-bottom"></view> <view class="border-bottom"></view>
<view class="r-list"> <view class="r-list">
<view class="r-left">客户人员名称</view> <view class="r-left">客户人员名称</view>
<view class="r-right">{{ item.userName}}</view> <view class="r-right">{{ item.userName }}</view>
</view> </view>
<view class="r-list" > <view class="r-list">
<view class="r-left">目前业务员</view> <view class="r-left">目前业务员</view>
<view class="r-right">{{ item.belonger }}</view> <view class="r-right">{{ item.belonger }}</view>
</view> </view>
@@ -68,7 +58,7 @@
<script setup> <script setup>
import customHeader from "../../../../../components/customHeader.vue"; import customHeader from "../../../../../components/customHeader.vue";
import { onMounted, ref } from 'vue'; import {onMounted, ref} from 'vue';
import {getNavBarPaddingTop} from "../../../../../utils/system"; import {getNavBarPaddingTop} from "../../../../../utils/system";
import MescrollUni from "mescroll-uni/mescroll-uni.vue"; import MescrollUni from "mescroll-uni/mescroll-uni.vue";
@@ -88,16 +78,17 @@ let queryParams = ref({
onMounted(() => { onMounted(() => {
navBarPaddingTop.value = getNavBarPaddingTop() * 2; navBarPaddingTop.value = getNavBarPaddingTop() * 2;
}) })
onShow(()=>{ onShow(() => {
getList(queryParams) getList(queryParams)
}) })
let list = ref([]) let list = ref([])
//获取列表信息 //获取列表信息
function getList(queryParams){ function getList(queryParams) {
queryViewMainOwnerList(queryParams.value).then(res => { queryViewMainOwnerList(queryParams.value).then(res => {
list.value = res.rows list.value = res.rows
}) })
} }
@@ -153,11 +144,11 @@ const upCallback = async (mescroll) => {
} }
const upOption = ref({ const upOption = ref({
page: { num: 0, size: 10 }, page: {num: 0, size: 10},
noMoreSize: 5, noMoreSize: 5,
empty: { empty: {
tip: '~ 空空如也 ~', tip: '~ 空空如也 ~',
icon: "../../static/images/mescroll-empty.png" icon: "../../../../../static/images/mescroll-empty.png"
}, },
textLoading: '加载中...', textLoading: '加载中...',
textNoMore: '已经到底了' textNoMore: '已经到底了'
@@ -180,57 +171,43 @@ function showDetail(item) {
</script> </script>
<style lang="scss" scoped> <style scoped>
.all-body { .all-body {
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
top: 150rpx; top: 160rpx;
height: calc(100vh - 75px); height: calc(100vh - 160rpx);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
top: 120rpx; top: 116rpx;
height: calc(100vh); height: calc(100vh - 116rpx);
/* #endif */ /* #endif */
} }
.search { .scroll-h{
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 */ /* #ifdef APP-PLUS */
height: calc(100vh - 120px); top: 160rpx;
height: calc(100vh - 160rpx);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
height: calc(100vh - 110px); top: 116rpx;
height: calc(100vh - 116rpx);
/* #endif */ /* #endif */
} }
.white-bg { .white-bg {
padding-bottom: 10rpx; padding-bottom: 10rpx;
} }
.title {
align-items: baseline
}
.no-wrap {
white-space: nowrap;
}
.btn-blue {
border-radius: 10rpx;
}
</style> </style>

12
src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
View File

@@ -138,6 +138,18 @@ function getCrmCusUserNewChangeOwnerList() {
/* min-height: 100vh; */ /* min-height: 100vh; */
} }
.all-body {
/* #ifdef APP-PLUS */
top: 160rpx;
height: calc(100vh - 160rpx);
/* #endif */
/* #ifndef APP-PLUS */
top: 116rpx;
height: calc(100vh - 116rpx);
/* #endif */
overflow-y: auto;
}
.white-bg { .white-bg {
padding-bottom: 10rpx; padding-bottom: 10rpx;
} }

221
src/pages/business/CRM/map/checkInView.vue
View File

@@ -1,164 +1,171 @@
<template> <template>
<view class="con-body"> <view class="con-body">
<view class="con-bg"> <view class="con-bg">
<!-- 头部 --> <!-- 头部 -->
<customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader> <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
<!-- 高度来避免头部遮挡 --> <!-- 高度来避免头部遮挡 -->
<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view> <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
<!-- 正文内容 --> <!-- 正文内容 -->
<view> <view>
<!-- 搜索 --> <!-- 搜索 -->
<!-- <view class="search">--> <!-- <view class="search">-->
<!-- <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"--> <!-- <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"-->
<!-- class="picker-bg">--> <!-- class="picker-bg">-->
<!-- <view class="picker">--> <!-- <view class="picker">-->
<!-- <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"--> <!-- <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"-->
<!-- size="18"></uni-icons>--> <!-- size="18"></uni-icons>-->
<!-- <view>{{ defaultDate }}</view>--> <!-- <view>{{ defaultDate }}</view>-->
<!-- <uni-icons type="down" size="18"></uni-icons>--> <!-- <uni-icons type="down" size="18"></uni-icons>-->
<!-- </view>--> <!-- </view>-->
<!-- </picker>--> <!-- </picker>-->
<!-- <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>--> <!-- <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
<!-- </view>--> <!-- </view>-->
<!-- 分页部分 --> <!-- 分页部分 -->
<view class="white-bg margin-bottom20" v-for="(item, index) in list"> <view class="white-bg margin-bottom20" v-for="(item, index) in list">
<view class="report-list" > <view class="report-list">
<view class="title" <view class="title"
:style="{color: item.mapType == 1 ? '#F5813A' : '#1989FA'}" :style="{color: MapType[item.mapType].color}"
>类型：{{ item.mapType == 1 ? '签到' : '打卡' }}</view> >类型：{{ MapType[item.mapType].label }}
<view class="r-list"> </view><!--item.mapType == 1 ? '#F5813A' : '#1989FA'}-->
<view class="r-left">开始签到时间</view> <view class="r-list">
<view class="r-right">{{ item.goVisistStartTime }}</view> <view class="r-left">开始签到时间</view>
</view> <view class="r-right">{{ item.goVisistStartTime }}</view>
<view class="border-bottom"></view> </view>
<view class="r-list"> <view class="border-bottom"></view>
<view class="r-left">开始签到地点</view> <view class="r-list">
<view class="r-right">{{ item.addressForStart }}</view> <view class="r-left">开始签到地点</view>
</view> <view class="r-right">{{ item.addressForStart }}</view>
<view class="border-bottom"></view> </view>
<view class="r-list"> <view class="border-bottom"></view>
<view class="r-left">结束签到时间</view> <view class="r-list">
<view class="r-right">{{ item.goVisistEndTime }}</view> <view class="r-left">结束签到时间</view>
</view> <view class="r-right">{{ item.goVisistEndTime }}</view>
<view class="border-bottom"></view> </view>
<view class="r-list"> <view class="border-bottom"></view>
<view class="r-left">结束签到地点</view> <view class="r-list">
<view class="r-right">{{ item.addressForEnd }}</view> <view class="r-left">结束签到地点</view>
</view> <view class="r-right">{{ item.addressForEnd }}</view>
<view class="r-list" v-if="item.remark != null"> </view>
<view class="r-left">备注内容</view> <view class="r-list" v-if="item.remark != null">
<view class="r-right">{{ item.remark }}</view> <view class="r-left">备注内容</view>
</view> <view class="r-right">{{ item.remark }}</view>
</view> </view>
</view> </view>
</view>
</view> </view>
</view>
</view> </view>
</view>
</template> </template>
<script setup> <script setup>
import customHeader from '@/components/customHeader.vue' import customHeader from '@/components/customHeader.vue'
import { getNavBarPaddingTop } from '@/utils/system.js' import {getNavBarPaddingTop} from '@/utils/system.js'
import { onMounted, ref } from 'vue'; import {onMounted, ref} from 'vue';
import { getDate } from '@/utils/datetime.js' import {getDate} from '@/utils/datetime.js'
import { CheckInInformationViewing } from '../../../../api/crm/activity/map'; import {CheckInInformationViewing} from '../../../../api/crm/activity/map';
import { onLoad } from '@dcloudio/uni-app'; import {onLoad} from '@dcloudio/uni-app';
import {MapType} from "./dataMap";
const navBarPaddingTop = ref(0); const navBarPaddingTop = ref(0);
onMounted(() => { onMounted(() => {
navBarPaddingTop.value = getNavBarPaddingTop() * 2; navBarPaddingTop.value = getNavBarPaddingTop() * 2;
}) })
// 开始时间 // 开始时间
let startDate = getDate('start'); let startDate = getDate('start');
// 结束时间，间隔10年 // 结束时间，间隔10年
let endDate = getDate('end'); let endDate = getDate('end');
let defaultDate = getDate({ format: true }) let defaultDate = getDate({format: true})
let bindDateChange = (e) => { let bindDateChange = (e) => {
defaultDate = e.detail.value defaultDate = e.detail.value
} }
//获取list集合信息 //获取list集合信息
let list = ref([]) let list = ref([])
function getList() { function getList() {
CheckInInformationViewing().then(res => { CheckInInformationViewing().then(res => {
list.value = res.rows list.value = res.rows
}) })
} }
onLoad(() => { onLoad(() => {
getList() getList()
}) })
</script> </script>
<style scoped> <style scoped>
.r-left {
min-width: 6em;
}
.con-bg {
overflow-y: auto;
}
.search { .search {
display: flex; display: flex;
margin-bottom: 30rpx; margin-bottom: 30rpx;
padding: 0 30rpx; padding: 0 30rpx;
} }
.search .btn-search { .search .btn-search {
border: none; border: none;
background: none; background: none;
color: #fff; color: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 28rpx; font-size: 28rpx;
/* 调整为更合适的字号 */ /* 调整为更合适的字号 */
font-weight: normal; font-weight: normal;
/* 如果不需要加粗，可以去掉 bolder */ /* 如果不需要加粗，可以去掉 bolder */
margin-left: 0rpx; margin-left: 0rpx;
padding: 0 20rpx; padding: 0 20rpx;
/* 调整 padding，去掉 padding-top */ /* 调整 padding，去掉 padding-top */
height: 56rpx; height: 56rpx;
/* 固定高度，确保与 picker 对齐 */ /* 固定高度，确保与 picker 对齐 */
cursor: pointer; cursor: pointer;
} }
.search .btn-search::after { .search .btn-search::after {
display: none; display: none;
} }
.search .picker-bg { .search .picker-bg {
display: flex; display: flex;
background-color: #6FA2F8; background-color: #6FA2F8;
border-radius: 25px; border-radius: 25px;
color: #fff; color: #fff;
font-size: 28rpx; font-size: 28rpx;
padding: 0rpx 20rpx; padding: 0rpx 20rpx;
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
padding: 10rpx 20rpx 0 20rpx; padding: 10rpx 20rpx 0 20rpx;
/* #endif */ /* #endif */
margin-right: 20rpx; margin-right: 20rpx;
} }
.search .picker-bg .picker { .search .picker-bg .picker {
display: flex; display: flex;
align-items: center; align-items: center;
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
padding-top: 2rpx; padding-top: 2rpx;
/* #endif */ /* #endif */
} }
.search .picker-bg .picker .uni-icons { .search .picker-bg .picker .uni-icons {
color: #fff !important; color: #fff !important;
} }
.search .picker-bg .picker .uni-icons:first-child { .search .picker-bg .picker .uni-icons:first-child {
margin-right: 10rpx; margin-right: 10rpx;
} }
.search .picker-bg .picker .uniui-down { .search .picker-bg .picker .uniui-down {
margin-left: 10rpx; margin-left: 10rpx;
} }
</style> </style>

9
src/pages/business/CRM/map/dataMap.js Normal file
View File

@@ -0,0 +1,9 @@
/**
* 签到/打卡/出差
* @type {{"1": {label: 签到, bgc: string}, "2": {label: 打卡, bgc: string}, "3": {label: 出差, bgc: string}}}
*/
export const MapType = {
'1': {label:'签到', color:'#F5813A'},
'2': {label:'打卡', color:'#1989FA'},
'3': {label:'出差', color:'#42b883'}
}

483
src/pages/business/CRM/map/vistorCheckin.vue
View File

@@ -1,109 +1,183 @@
<template> <template>
<view class="con-body"> <view class="con-body">
<view class="con-bg"> <view class="con-bg">
<!-- 头部 --> <!-- 头部 -->
<customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader> <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
<!-- 高度来避免头部遮挡 --> <!-- 高度来避免头部遮挡 -->
<view class="top-height"></view> <view class="top-height"></view>
<!-- 正文内容 --> <!-- 正文内容 -->
<view class="white-bg"> <view class="white-bg">
<image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn" /> <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn"/>
<image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn" /> <!-- <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn"/>-->
<view class="check-desc"> <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClick"/>
业务人员可通过<text class="font-orange">签到</text>或<text <view class="check-desc">
class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。 业务人员可通过
</view> <text class="font-orange">签到</text>
或
<text
class="font-blue">打卡
</text>
进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
</view>
</view>
</view>
<closeable-modal v-model="modalVisible"
title="确认在此处打卡？"
:content="form.addressForStart"
closeTip="轻触空白处关闭"
cancelText="出差"
confirmText="打卡"
contentAlign="center"
@confirm="handleConfirm"
@cancel="handleCancel"/>
<!-- 打卡遮罩层 -->
<!-- <view class="check-con" v-if="checkFlag">
<view class="check-in">
<view class="check-tip">打卡</view>
<view class="check-title">确定要在此处打卡吗？</view>
<view class="check-location">
<uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
</view>
<view class="check-address">北京市朝阳区天辰东路1号院</view>
<view class="check-footer">
<button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
<button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
</view> </view>
</view> </view>
</view> -->
<!-- 打卡遮罩层 --> </view>
<!-- <view class="check-con" v-if="checkFlag">
<view class="check-in">
<view class="check-tip">打卡</view>
<view class="check-title">确定要在此处打卡吗？</view>
<view class="check-location">
<uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
</view>
<view class="check-address">北京市朝阳区天辰东路1号院</view>
<view class="check-footer">
<button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
<button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
</view>
</view>
</view> -->
</view>
</template> </template>
<script setup> <script setup>
import { ref, onMounted, reactive } from 'vue' import {ref, onMounted, reactive} from 'vue'
import customHeader from '@/components/customHeader.vue' import customHeader from '@/components/customHeader.vue'
import { addStartMapForClockIn } from '../../../../api/crm/activity/map'; import {addStartMapForClockIn, businessTripClockIn} from '../../../../api/crm/activity/map';
import CloseableModal from "@/components/closeableModal.vue";
import {MapApiConfig} from "../../../../constants/mapApiConstants";
let form = reactive({ let form = reactive({
addressForStart: null, addressForStart: null,
addressForEnd: null, addressForEnd: null,
createId: null, createId: null,
staffName: null, staffName: null,
visistCode: null, visistCode: null,
visistId: null, visistId: null,
mapId: null remark: null,
mapId: null
}) })
// 签到 // 签到
let handleCheckIn = () => { let handleCheckIn = () => {
uni.navigateTo({ uni.navigateTo({
url: './addRearkSignIn' url: './addRearkSignIn'
}) })
} }
// 打卡 // 打卡
let handleClockIn = () => { // let handleClockIn = () => {
uni.getLocation({ // uni.getLocation({
type: 'wgs84', // type: 'wgs84',
success: (res) => { // success: (res) => {
const latiude = res.latitude; // const latiude = res.latitude;
const longitude = res.longitude; // const longitude = res.longitude;
//进行解析 // //进行解析
inverseGeocoding(latiude, longitude); // inverseGeocoding(latiude, longitude);
}, // },
fail: function (err) { // fail: function (err) {
console.log("获取地址失败" + err) // console.log("获取地址失败" + err)
} // }
// })
// }
let modalVisible = ref(false);
let handleClick = () => {
uni.getLocation({
type: 'wgs84',
success: (res) => {
const latitude = res.latitude;
const longitude = res.longitude;
console.log('纬度:',latitude,'，经度:', longitude);
inverseGeocoding(latitude, longitude);
},
fail: function (err) {
console.log("获取地址失败" + err)
}
})
}
// 反馈提示
const feedback = (res, callback)=>{
if(res.code===200){
if(callback) callback();
uni.showToast({
title: MapApiConfig.OTHER.typeName === form.addressForStart ? MapApiConfig.OTHER.typeName : res.msg,
icon: 'success'
}) })
setTimeout(()=>{
uni.navigateBack(1);
}, 500)
}
else{
uni.showToast({
icon: 'none',
title: res.msg
})
}
}
// 出差
const handleCancel = () => {
businessTripClockIn(form).then(res=>{
feedback(res,()=>console.log('出差打卡成功'));
}).catch(e=>{
console.log(e);
})
}
// 打卡
let handleConfirm = () => {
addStartMapForClockIn(form).then(res=>{
feedback(res, ()=>console.log('打卡成功'));
}).catch(e=>{
console.log(e)
})
} }
// 判定是否在范围内
function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) { function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
const distance = haversineDistance(centerLat, centerLon, lat, lon); const distance = haversineDistance(centerLat, centerLon, lat, lon);
return distance <= rangeKm; return distance <= rangeKm;
} }
function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) { function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
const dLat = degToRad(lat2 - lat1); const dLat = degToRad(lat2 - lat1);
const dLon = degToRad(lon2 - lon1); const dLon = degToRad(lon2 - lon1);
const a = const a =
Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.sin(dLat / 2) * Math.sin(dLat / 2) +
Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) * Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
Math.sin(dLon / 2) * Math.sin(dLon / 2); Math.sin(dLon / 2) * Math.sin(dLon / 2);
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
return radius * c; // 距离，单位：公里 return radius * c; // 距离，单位：公里
} }
// 角度转弧度
function degToRad(deg) { function degToRad(deg) {
return deg * (Math.PI / 180); return deg * (Math.PI / 180);
} }
//解析地址 //解析地址
function inverseGeocoding(latiude, longitude) { function inverseGeocoding(latitude, longitude) {
let points = longitude + ',' + latiude uni.showLoading();
const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo'; const apiURL = MapApiConfig.URL;
const params = { const params = {
lat: latiude, lat: latitude,
lng: longitude, lng: longitude,
radius: 1000, radius: 1000,
pageSize: 1, pageSize: 1,
currentPage: 1, currentPage: 1,
//classify: 220100 //classify: 220100
}; };
const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf'; const token = MapApiConfig.token;
uni.request({ uni.request({
url: apiURL, url: apiURL,
method: 'GET', method: 'GET',
@@ -112,124 +186,31 @@ function inverseGeocoding(latiude, longitude) {
'Authorization': 'Bearer ' + token 'Authorization': 'Bearer ' + token
}, },
success: (res) => { success: (res) => {
console.log(res, "----") modalVisible.value=true;
if (res.statusCode == 200 && res.data.status == 200) { console.log(res, "经纬度解析成功")
if (res.statusCode === 200 && res.data.status === 200) {
let resdata = res.data.data.rows[0].address let resdata = res.data.data.rows[0].address
if (resdata == null) { if (resdata == null) {
console.log(resdata.srcLat) console.log(resdata.srcLat)
const latiude1 = 34.1360; if (isWithinRange(latitude1, longitude1, latiude, longitude, 1)) {
const longitude1 = 108.9126; form.addressForStart = MapApiConfig.XI_AN_BAN.typeName;
if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) { form.path = MapApiConfig.XI_AN_BAN.longitude + ',' + MapApiConfig.XI_AN_BAN.latitude ;
form.addressForStart = "西安办事处位置打卡"
uni.showModal({
title: '确定要在此处打卡吗',
content: form.addressForStart,
success: function (res) {
if (res.confirm) {
var data = {
mapId: form.mapId,
addressForStart: form.addressForStart,
cusName: form.cusName,
cusId: form.cusId,
remark: form.remark,
path: longitude1 + "," + latiude1
}
addStartMapForClockIn(data).then(res => {
if (res.code == 200) {
uni.showToast({
icon: 'success',
title: res.msg,
duration: 1500,
});
setTimeout(() => {
uni.navigateBack(1)
}, 500)
} else {
uni.showToast({
icon: 'none',
title: res.msg,
});
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} }
} else { }
else {
form.addressForStart = resdata; form.addressForStart = resdata;
uni.showModal({ form.path = longitude + ',' + latitude; // 经度，纬度
title: '确定要在此处打卡吗',
content: form.addressForStart,
success: function (res) {
if (res.confirm) {
var data = {
mapId: form.mapId,
addressForStart: form.addressForStart,
cusName: form.cusName,
cusId: form.cusId,
path: points
}
addStartMapForClockIn(data).then(res => {
if (res.code == 200) {
uni.showToast({
icon: 'success',
title: res.msg,
duration: 1500,
});
} else {
uni.showToast({
icon: 'none',
title: res.msg,
});
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} }
} else { } else {
form.addressForStart = "第三方维护打卡" form.addressForStart = MapApiConfig.OTHER.typeName;
uni.showModal({ form.path = longitude + ',' + latitude; // 经度，纬度
title: '确定要在此处打卡吗',
content: form.addressForStart,
success: function (res) {
if (res.confirm) {
var data = {
mapId: form.mapId,
addressForStart: form.addressForStart,
cusName: form.cusName,
cusId: form.cusId,
path: points
}
addStartMapForClockIn(data).then(res => {
if (res.code == 200) {
uni.showToast({
icon: 'success',
title: '第三方维护打卡',
duration: 1500,
});
} else {
uni.showToast({
icon: 'none',
title: res.msg,
});
}
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} }
uni.hideLoading();
}, },
fail(e) { fail(e) {
console.log("获取位置失败", e) console.log("获取位置失败", e)
} uni.hideLoading();
},
}) })
@@ -239,125 +220,125 @@ function inverseGeocoding(latiude, longitude) {
<style scoped> <style scoped>
.white-bg { .white-bg {
width: 650rpx; width: 650rpx;
margin: 0; margin: 0;
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
padding: 50rpx; padding: 50rpx;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
height: calc(100vh - 125px); height: calc(100vh - 125px);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
height: calc(100vh - 98px); height: calc(100vh - 98px);
/* #endif */ /* #endif */
} }
.btn-image { .btn-image {
width: 340rpx; width: 340rpx;
height: 340rpx; height: 340rpx;
margin: 30rpx auto 60rpx; margin: 30rpx auto 60rpx;
display: block; display: block;
} }
.check-desc { .check-desc {
background-color: #F5F5F5; background-color: #F5F5F5;
padding: 40rpx 50rpx; padding: 40rpx 50rpx;
font-size: 28rpx; font-size: 28rpx;
border-radius: 10px; border-radius: 10px;
margin-top: 100rpx; margin-top: 100rpx;
} }
.check-desc .font-orange { .check-desc .font-orange {
color: #F5813A; color: #F5813A;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
} }
.check-desc .font-blue { .check-desc .font-blue {
color: #2CBAEF; color: #2CBAEF;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
} }
/* 弹窗处理 */ /* 弹窗处理 */
.check-con { .check-con {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background-color: rgba(0, 0, 0, 0.4); background-color: rgba(0, 0, 0, 0.4);
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
z-index: 999; z-index: 999;
} }
/* 遮罩层内容样式 */ /* 遮罩层内容样式 */
.check-in { .check-in {
background-color: #fff; background-color: #fff;
padding: 40rpx 30rpx 60rpx; padding: 40rpx 30rpx 60rpx;
border-radius: 10px; border-radius: 10px;
/* width: 620rpx; */ /* width: 620rpx; */
width: 560rpx; width: 560rpx;
position: absolute; position: absolute;
top: 48%; top: 48%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
text-align: center; text-align: center;
} }
.check-in .check-tip { .check-in .check-tip {
font-weight: bold; font-weight: bold;
} }
.check-in .check-title { .check-in .check-title {
font-size: 32rpx; font-size: 32rpx;
padding: 20rpx 0; padding: 20rpx 0;
} }
.check-in .check-location { .check-in .check-location {
color: #0395E0; color: #0395E0;
font-size: 42rpx; font-size: 42rpx;
font-weight: bold; font-weight: bold;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin: 30rpx 0; margin: 30rpx 0;
} }
.check-in .check-location .uniui-location-filled { .check-in .check-location .uniui-location-filled {
font-weight: normal; font-weight: normal;
margin-right: 20rpx; margin-right: 20rpx;
} }
.check-in .check-address { .check-in .check-address {
color: #919191; color: #919191;
font-size: 32rpx; font-size: 32rpx;
margin-bottom: 80rpx; margin-bottom: 80rpx;
} }
.check-in .check-footer { .check-in .check-footer {
display: flex; display: flex;
} }
.check-in .check-footer .btn-default, .check-in .check-footer .btn-default,
.check-in .check-footer .btn-primary { .check-in .check-footer .btn-primary {
background-color: #fff; background-color: #fff;
border: 1px solid #05A3F4; border: 1px solid #05A3F4;
color: #05A3F4; color: #05A3F4;
border-radius: 25px; border-radius: 25px;
padding: 0rpx 80rpx; padding: 0rpx 80rpx;
font-size: 34rpx; font-size: 34rpx;
/* margin-left: 0; /* margin-left: 0;
margin-right: 20rpx; */ margin-right: 20rpx; */
} }
.check-in .check-footer .btn-primary { .check-in .check-footer .btn-primary {
background-color: #05A3F4; background-color: #05A3F4;
border: 1px solid #05A3F4; border: 1px solid #05A3F4;
color: #fff; color: #fff;
/* padding: 0rpx 60rpx; */ /* padding: 0rpx 60rpx; */
} }
</style> </style>

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

@@ -27,14 +27,17 @@
:up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff" :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
class="scroll-h" :class="{ 'loading-scroll': cssFlag }"> class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
@touchstart.prevent="touchstart(item)" @touchend.prevent="touchend"> @longpress="touchstart(item)"
longpress-time="1500"
@tap="touchend(item)"
>
<view> <view>
<view class="report-list"> <view class="report-list">
<view class="title">客户：{{ item.cusName }}</view> <view class="title">客户：{{ item.cusName }}</view>
<view class="r-list"> <view class="r-list">
<view class="r-name">{{ item.visistCode }}</view> <view class="r-name">{{ item.visistCode }}</view>
<view @touchstart.stop="handleStatusTouchStart" <view
@touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)"> @click.stop="chooseStatus(item)">
<view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini"> <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
{{ item.status == '驳回' ? '再次提交' : item.status }} {{ item.status == '驳回' ? '再次提交' : item.status }}
</view> </view>
@@ -211,8 +214,6 @@ const getVisitorReportList = (pageNum, pageSize) => {
} }
let Loop = ref(0)
let now
const visistId = ref(); const visistId = ref();
const cusName = ref(); const cusName = ref();
const cusId = ref(); const cusId = ref();
@@ -223,9 +224,6 @@ function touchstart(item) {
cusName.value = item.cusName cusName.value = item.cusName
cusId.value = item.cusId cusId.value = item.cusId
status.value = item.status status.value = item.status
now = new Date();
clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
Loop.value = setTimeout(() => {
uni.showModal({ uni.showModal({
title: '删除', title: '删除',
content: '请问要删除本条消息吗？', content: '请问要删除本条消息吗？',
@@ -257,21 +255,29 @@ function touchstart(item) {
} }
} }
}); });
}, 750);
} }
let isLongPressed = ref(false);
function touchend() { function touchend(item) {
let endDate = new Date(); visistId.value = item.visistId
console.log('结束时间', endDate) cusName.value = item.cusName
let cha = endDate.getTime() - now.getTime(); cusId.value = item.cusId
console.log(cha, 'casd') status.value = item.status
if (cha < 750) { // 如果未触发长按，则执行点击逻辑
if (!isLongPressed.value) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId="
+ visistId.value
+ '&cusName='
+ cusName.value
+ '&cusId='
+ cusId.value
+ '&status='
+ status.value
}) })
} }
clearInterval(Loop.value); // 重置状态（避免影响下次事件）
isLongPressed.value = false;
} }
//点击状态按钮 //点击状态按钮

2
src/pages/business/CRM/plan/dataMap.js
View File

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

101
src/pages/business/CRM/plan/myPlan.vue
View File

@@ -17,7 +17,7 @@
<view class="top-height"></view> <view class="top-height"></view>
<view class="week-plan-title"> <view class="week-plan-title">
<view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view> <!-- <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
<view v-if="weekNum"> <view v-if="weekNum">
{{ yearMonth }} {{ yearMonth }}
<view v-if="isThisWeek" style=" display: inline-block;"> <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,35 +28,42 @@
</view> </view>
<view class="nav-list"> <view class="nav-list">
<view class="nav-item" :class="{active:index==activeTab}" <view class="nav-item" :class="{'active': index == activeTab}"
v-for="(item,index) in allPlans" :key="index" v-for="(item,index) in allPlans" :key="index"
@click="handleNav(index)" @click="handleNav(index)"
>{{ getTapLabel(item) }} >{{ getTapLabel(item) }}
</view> </view>
</view> </view>
<uni-transition :duration="300"
<block v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="item"> :mode-class="['fade','slide-bottom']"
<!-- 计划详情 --> :styles="{'width':'100%', 'background-color':'#f0f0f0','border-top-left-radius': '8px', 'border-top-right-radius': '8px'}"
<view class="white-bg white-bg-2" :class="index == 0 ? 'white-bg-r' : ''"> :show="showTrans">
<view class="report-list"> <view v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="index">
<view class="w-b-title"> <!-- 计划详情 -->
<view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view> <view class="white-bg white-bg-2" :class="{'white-bg-r':index === 0}">
<view class="r-right btn-edit" @click="handleEdit(index)">编辑</view> <view class="report-list">
</view> <view class="w-b-title">
<view class="r-list"> <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
<view class="r-left">工作类型</view> <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
<view class="r-right">{{ getWorkType(index) || '' }}</view> </view>
</view> <view class="r-list">
<view class="border-bottom b-width"></view> <view class="r-left">工作类型</view>
<view class="r-list"> <view class="r-right">{{ getWorkType(index) || '' }}</view>
<view class="r-left">内容</view> </view>
<view class="r-right">{{ getWorkEvent(index) || '' }}</view> <view class="border-bottom b-width"></view>
<view class="r-list">
<view class="r-left">内容</view>
<view class="r-right">{{ getWorkEvent(index) || '' }}</view>
</view>
</view> </view>
</view> </view>
<view class='bottom-spliter'></view>
</view> </view>
<view class='bottom-spliter bg-gray'></view>
</block>
<view v-else style="text-align: center; margin-top: 50%; color: white">
暂无数据
</view>
</uni-transition>
<!-- 底部加高度来避免tabbar遮挡 --> <!-- 底部加高度来避免tabbar遮挡 -->
<!-- <view class="bottom-height bg-gray"></view> --> <!-- <view class="bottom-height bg-gray"></view> -->
</view> </view>
@@ -67,13 +74,12 @@
<script setup> <script setup>
import {onMounted, ref, reactive, computed} from "vue"; import {onMounted, ref, computed, watch} from "vue";
import {useRoute} from "vue-router" import {useRoute} from "vue-router"
import customHeader from '@/components/customHeader.vue' import customHeader from '@/components/customHeader.vue'
import {WeekCN, WorkType, WorkEvent, OrdinalDate} from "./dataMap"; import {WeekCN, WorkType, WorkEvent, OrdinalDate} from "./dataMap";
import {getCurrentWeekNum} from "./dateTimeUtils"; import {getCurrentWeekNum} from "./dateTimeUtils";
import {getUserInfo, getWeeklyPlanList} from "@/api/crm/plan/getPlan"; import {getWeeklyPlanList} from "@/api/crm/plan/getPlan";
import {useMessage} from "@/utils/message";
import {judgeThisWeek} from "@/api/crm/plan/updatePlan"; import {judgeThisWeek} from "@/api/crm/plan/updatePlan";
const userInfo = ref(null) const userInfo = ref(null)
@@ -92,8 +98,6 @@ const yearMonth = ref(null);
const weekNum = ref(0); const weekNum = ref(0);
const allPlans = ref([]); const allPlans = ref([]);
const onShowPlan = ref(null); const onShowPlan = ref(null);
const message = useMessage();
let getWorkDate = (index) => { let getWorkDate = (index) => {
return onShowPlan.value ? onShowPlan.value[OrdinalDate[index]] : ''; return onShowPlan.value ? onShowPlan.value[OrdinalDate[index]] : '';
}; };
@@ -105,7 +109,8 @@ let getWorkEvent = (index) => {
}; };
// 刷新计划列表 // 刷新计划列表
const refreshPlanList = () => { const refreshPlanList = () => {
message.showLoading(); showTrans.value = false;
uni.showLoading();
// 获取用户信息 // 获取用户信息
// getUserInfo().then(res => { // getUserInfo().then(res => {
// userInfo.value = res.user; // userInfo.value = res.user;
@@ -122,12 +127,12 @@ const refreshPlanList = () => {
weekNum.value = rows[0].date; weekNum.value = rows[0].date;
yearMonth.value = rows[0].firstDayOfTheWeek.substring(0, 7); yearMonth.value = rows[0].firstDayOfTheWeek.substring(0, 7);
} }
console.log(route.path, "：用户周计划列表获取成功"); console.log(route.path, "用户周计划列表获取成功");
}).catch(err => { }).catch(err => {
console.warn(err, "用户周计划列表获取失败"); console.log(err, "周计划列表获取失败")
message.error("周计划获取失败");
}).finally(() => { }).finally(() => {
message.hideLoading(); uni.hideLoading();
setTimeout(() => showTrans.value = true, 20);
}) })
} }
@@ -137,7 +142,7 @@ onMounted(() => {
// 判断计划是否为本周 // 判断计划是否为本周
let isThisWeek = computed(() => { let isThisWeek = computed(() => {
let theYear = onShowPlan.value.year || onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份 let theYear = onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
weekNum.value = onShowPlan.value.date; // 当目前展示的计划列表变化时，更新weekNum.value weekNum.value = onShowPlan.value.date; // 当目前展示的计划列表变化时，更新weekNum.value
yearMonth.value = onShowPlan.value.firstDayOfTheWeek.substring(0, 7); // 获取年月 yearMonth.value = onShowPlan.value.firstDayOfTheWeek.substring(0, 7); // 获取年月
return date.getFullYear() === parseInt(theYear) && return date.getFullYear() === parseInt(theYear) &&
@@ -202,6 +207,19 @@ function getTapLabel(row) {
return row.firstDayOfTheWeek.substring(0, 4) + '年' + row.month + '月 第' + row.date + '周'; return row.firstDayOfTheWeek.substring(0, 4) + '年' + row.month + '月 第' + row.date + '周';
} }
// 展示动画
const showTrans = ref(false);
// 监听 activeTab 变化，触发动画
watch(activeTab, (newVal, oldVal) => {
if (oldVal !== newVal) { // 确保不是初始化时的触发
showTrans.value = false; // 先隐藏
setTimeout(() => {
onShowPlan.value = allPlans.value[newVal]; // 更新计划列表视图
showTrans.value = true; // 再显示，触发动画
}, 20);
}
});
// 选中计划时间段 // 选中计划时间段
function handleNav(index) { function handleNav(index) {
console.log(index, "tab更换时间段"); console.log(index, "tab更换时间段");
@@ -245,7 +263,7 @@ function handleEdit(index) {
<style scoped> <style scoped>
.week-plan-title { .week-plan-title {
color: #fff; color: #fff;
padding: 0 30rpx 30rpx; padding: 0 30rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
@@ -271,27 +289,31 @@ function handleEdit(index) {
.white-bg.white-bg-2 { .white-bg.white-bg-2 {
/* margin-bottom: 20rpx; */ /* margin-bottom: 20rpx; */
} }
.bottom-spliter{
.bottom-spliter {
height: 20rpx; height: 20rpx;
} }
.bg-gray{
.bg-gray {
background-color: #f0f0f0; background-color: #f0f0f0;
} }
.report-list .w-b-title .btn-edit { .report-list .w-b-title .btn-edit {
background-color: #5C96F7; background-color: #5C96F7;
} }
.con-bg { .con-bg {
height: 445rpx; /*height: 100%;*/
/* overflow-y: auto;*/
} }
.nav-list { .nav-list {
/* display: flex;*/ /* display: flex;*/
/* width: 690rpx;*/ /* width: 690rpx;*/
overflow-x: auto; /* 允许横向滚动 */ overflow-x: auto; /* 允许横向滚动 */
/*overflow-y: hidden; 隐藏垂直滚动 */ /*overflow-y: hidden; 隐藏垂直滚动 */
/*-ms-overflow-style: none; IE 隐藏滚动条 */ /*-ms-overflow-style: none; IE 隐藏滚动条 */
/* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */ /* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */
/* 添加高度以确保有足够的空间 */ /* 添加高度以确保有足够的空间 */
/* height: 80rpx;*/ /* height: 80rpx;*/
white-space: nowrap; /* 保持子元素在同一行显示 */ white-space: nowrap; /* 保持子元素在同一行显示 */
@@ -304,10 +326,12 @@ function handleEdit(index) {
padding: 20rpx 30rpx 0; padding: 20rpx 30rpx 0;
/* #endif */ /* #endif */
} }
/* 为 Webkit 浏览器隐藏滚动条 */ /* 为 Webkit 浏览器隐藏滚动条 */
.nav-list::-webkit-scrollbar { .nav-list::-webkit-scrollbar {
background-color: transparent; background-color: transparent;
} }
.nav-list .nav-item { .nav-list .nav-item {
/* flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */ /* flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
/* width: 200rpx;*/ /* width: 200rpx;*/
@@ -332,5 +356,4 @@ function handleEdit(index) {
color: #3384DF; color: #3384DF;
font-weight: bold; font-weight: bold;
} }
</style> </style>

61
src/pages/business/CRM/plan/planEdit.vue
View File

@@ -16,11 +16,11 @@
<!-- 正文内容 --> <!-- 正文内容 -->
<view class="week-plan-title"> <view class="week-plan-title">
<view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view> <!-- <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
<view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view> <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
</view> </view>
<uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top"> <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">
<block v-for="(item, index) in OrdinalDate"> <view v-for="(item, index) in OrdinalDate">
<view class="white-bg" :class="index==0?'white-bg-2':'white-bg-3'"> <view class="white-bg" :class="index==0?'white-bg-2':'white-bg-3'">
<view class="w-b-title" @click="handleExpand(index)"> <view class="w-b-title" @click="handleExpand(index)">
{{ weekPlanFormData[item] }} {{ WeekCN[index] }} {{ weekPlanFormData[item] }} {{ WeekCN[index] }}
@@ -29,7 +29,8 @@
</text> </text>
</view> </view>
<view v-show="expandFlag[index]" class="form-con"> <!--v-show="expandFlag[index]"-->
<view class="form-con" :class="{'show': expandFlag[index], 'hidden': !expandFlag[index]}">
<uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays"> <uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays">
<view class="form-picker"> <view class="form-picker">
<picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)"> <picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)">
@@ -41,13 +42,13 @@
</view> </view>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays"> <uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays">
<uni-easyinput type="textarea" autoHeight v-model="weekPlanFormData[getEventField(index)]" <uni-easyinput type="textarea" v-model="weekPlanFormData[getEventField(index)]"
placeholder="请输入" class="form-texarea"/> placeholder="请输入" class="form-texarea"/>
</uni-forms-item> </uni-forms-item>
</view> </view>
</view> </view>
</block> </view>
</uni-forms> </uni-forms>
</view> </view>
@@ -62,7 +63,6 @@ import {useRoute} from "vue-router"
import {useMessage} from "@/utils/message"; import {useMessage} from "@/utils/message";
import {onLoad} from "@dcloudio/uni-app"; import {onLoad} from "@dcloudio/uni-app";
import {updateWeekPlanList, addPlan} from "@/api/crm/plan/updatePlan"; import {updateWeekPlanList, addPlan} from "@/api/crm/plan/updatePlan";
import {getUserInfo} from "@/api/crm/plan/getPlan";
import {getDate} from "@/utils/datetime"; import {getDate} from "@/utils/datetime";
import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils"; import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils";
@@ -127,17 +127,10 @@ const workDays = 5;
// const instance = getCurrentInstance().proxy; // const instance = getCurrentInstance().proxy;
let instance = null; let instance = null;
// 初始化创建任务 // 初始化创建任务
let initCreate = (params)=>{ let initCreate = (params) => {
const {itemList, selectIndex} = params; const {itemList, selectIndex} = params;
// 获取用户信息 console.log(route.path, `：创建${itemList[selectIndex]}计划`);
getUserInfo().then(res => { title.value = "创建周计划";
userInfo.value = res.user;
console.log(route.path, "：用户信息获取成功");
}).catch(err => {
console.warn(err, "用户信息获取失败")
});
console.log(route.path,`：创建${itemList[selectIndex]}计划`);
title.value="创建周计划";
currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月 currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月
currentEditDate.value.weekNum = getCurrentWeekNum() + selectIndex; // 取巧做法，当期周则selectIndex为0，下周则selectIndex为1，用加法处理 currentEditDate.value.weekNum = getCurrentWeekNum() + selectIndex; // 取巧做法，当期周则selectIndex为0，下周则selectIndex为1，用加法处理
const week = getWeek2(itemList[selectIndex]); // 获取本周/下周一周日期 const week = getWeek2(itemList[selectIndex]); // 获取本周/下周一周日期
@@ -147,11 +140,11 @@ let initCreate = (params)=>{
const {year, month} = week; const {year, month} = week;
weekPlanFormData.value.year = year; weekPlanFormData.value.year = year;
weekPlanFormData.value.month = month; weekPlanFormData.value.month = month;
for(let index in OrdinalDate){ for (let index in OrdinalDate) {
let dateField = getDateField(index); let dateField = getDateField(index);
weekPlanFormData.value[dateField] = week[dateField]; weekPlanFormData.value[dateField] = week[dateField];
// console.log(week[dateField]); // console.log(week[dateField]);
if(index>=workDays){ if (index >= workDays) {
let typeField = getTypeField(index); let typeField = getTypeField(index);
weekPlanFormData.value[typeField] = "法定假日"; // TODO: 换成更规范代码 weekPlanFormData.value[typeField] = "法定假日"; // TODO: 换成更规范代码
workTypeIndex.value[typeField] = WORK_TYPE.indexOf("法定假日"); workTypeIndex.value[typeField] = WORK_TYPE.indexOf("法定假日");
@@ -180,7 +173,7 @@ onLoad((options) => {
expandFlag.value[index] = editFields.includes(getTypeField(index)) || editFields.includes(getEventField(index)); expandFlag.value[index] = editFields.includes(getTypeField(index)) || editFields.includes(getEventField(index));
// console.log(index, expandFlag.value[index], "展开状态"); // console.log(index, expandFlag.value[index], "展开状态");
} }
}else{ } else {
initCreate(data.param); initCreate(data.param);
} }
@@ -203,7 +196,7 @@ function getEventField(index) {
} }
// 初始化校验规则 // 初始化校验规则
(function bindRules(){ (function bindRules() {
for (let i in WorkType) { for (let i in WorkType) {
if (i < workDays) { if (i < workDays) {
rules[getTypeField(i)] = { rules[getTypeField(i)] = {
@@ -253,25 +246,25 @@ const submitForm = async () => {
// console.log('表单数据:', weekPlanFormData.value); // console.log('表单数据:', weekPlanFormData.value);
// 这里可以添加提交到服务器的代码 // 这里可以添加提交到服务器的代码
if(!isAdd.value){ // 请求修改 if (!isAdd.value) { // 请求修改
let res = await updateWeekPlanList(weekPlanFormData.value).catch(err=>{ let res = await updateWeekPlanList(weekPlanFormData.value).catch(err => {
message.error('操作失败!'); message.error('操作失败!');
console.warn(err, "更新周计划失败"); console.warn(err, "更新周计划失败");
}) })
message.success('修改成功!'); message.success('修改成功!');
setTimeout(()=>{ setTimeout(() => {
const eventChannel = instance.getOpenerEventChannel(); const eventChannel = instance.getOpenerEventChannel();
eventChannel.emit('refreshData'); eventChannel.emit('refreshData');
uni.navigateBack() uni.navigateBack()
}, 500); }, 500);
}else{ // 请求新增 } else { // 请求新增
console.log(weekPlanFormData.value,"新增计划"); console.log(weekPlanFormData.value, "新增计划");
let res = await addPlan(weekPlanFormData.value).catch(err=>{ let res = await addPlan(weekPlanFormData.value).catch(err => {
message.error('操作失败!'); message.error('操作失败!');
console.error(err, "周计划新增失败"); console.error(err, "周计划新增失败");
}) })
message.success('保存成功!'); message.success('保存成功!');
setTimeout(()=>{ setTimeout(() => {
const eventChannel = instance.getOpenerEventChannel(); const eventChannel = instance.getOpenerEventChannel();
eventChannel.emit('refreshData'); eventChannel.emit('refreshData');
uni.navigateBack() uni.navigateBack()
@@ -279,8 +272,8 @@ const submitForm = async () => {
} }
} catch (err) { } catch (err) {
uni.showToast({ uni.showToast({
icon:'none', icon: 'none',
title:"请完善内容", title: "请完善内容",
duration: 1500 duration: 1500
}) })
console.log('表单验证失败:', err); console.log('表单验证失败:', err);
@@ -301,6 +294,7 @@ const submitForm = async () => {
.white-bg { .white-bg {
width: 690rpx; width: 690rpx;
margin: 0; margin: 0;
padding-bottom: 0;
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
} }
@@ -309,7 +303,7 @@ const submitForm = async () => {
} }
.white-bg.white-bg-3 { .white-bg.white-bg-3 {
border-top: 1rpx solid #E5E5E5; border-top: 1rpx solid #E5E5E5;
border-radius: 0 border-radius: 0
} }
@@ -320,10 +314,17 @@ const submitForm = async () => {
.form-con { .form-con {
padding: 30rpx 0 0; padding: 30rpx 0 0;
height: 500rpx;
overflow: hidden;
transition: height 0.3s;
} }
:deep(.form-con .uni-forms-item) { :deep(.form-con .uni-forms-item) {
margin-bottom: 22px !important; margin-bottom: 22px !important;
} }
.hidden{
height: 0;
}
</style> </style>

197
src/pages/business/CRM/plan/planView.vue
View File

@@ -1,3 +1,8 @@
<!--
* @author wangzhuo
* @update date 2025/9/18 19:38
* @description 所有人周计划查看
-->
<template> <template>
<view class="con-body"> <view class="con-body">
<view class="con-bg"> <view class="con-bg">
@@ -32,7 +37,7 @@
<uni-icons type="down" size="18"></uni-icons> <uni-icons type="down" size="18"></uni-icons>
</view> </view>
</picker> </picker>
<button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button> <!-- <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
</view> </view>
<!-- 分页部分 --> <!-- 分页部分 -->
@@ -42,22 +47,24 @@
<view class="white-bg" v-if="list.length"> <view class="white-bg" v-if="list.length">
<!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"--> <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
<view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;"> <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
{{ parseInt(searchValue.selectDate.substring(5, 7)) }}月 {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(5, 7) }}月
<span class="line"></span> <span class="line"></span>
{{searchValue.selectDate.substring(0, 4) }}年 {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(0, 4) }}年
</view> </view>
<uni-row class="demo-uni-row"> <uni-row class="demo-uni-row">
<uni-col :span="1"> <uni-col :span="1">
<view class="demo-uni-col right-radius">序号</view> <view class="demo-uni-col right-radius"></view>
</uni-col> </uni-col>
<uni-col :span="2"> <uni-col :span="2">
<view class="demo-uni-col left-radius">姓名</view> <view class="demo-uni-col left-radius">姓名</view>
</uni-col> </uni-col>
<!--日期 星期-->
<block v-for="(field, i) in OrdinalDate"> <block v-for="(field, i) in OrdinalDate">
<uni-col :span="3"> <uni-col :span="3">
<view class="demo-uni-col mar-left"> <view class="demo-uni-col mar-left" >
<text>{{ WeekShortCN[i] }}</text> <text>{{ WeekShortCN[i] }}</text>
<text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text> <text v-if="list[0][field]" class="font-bold">{{ list[0][field].substring(8) }}</text>
<text v-else class="font-bold">{{ getWeek(i) }}</text>
</view> </view>
</uni-col> </uni-col>
</block> </block>
@@ -80,7 +87,7 @@
:style="{ backgroundColor: COLOR_MAP[item[field]] }" :style="{ backgroundColor: COLOR_MAP[item[field]] }"
><!--@click="handleView(index, i)"--> ><!--@click="handleView(index, i)"-->
<text v-if="item[field]">{{ item[field] }}</text> <text v-if="item[field]">{{ item[field] }}</text>
<text v-else style="color: gray">暂无</text> <text v-else style="font-weight: 300; color: gray">暂无</text>
</view> </view>
</uni-col> </uni-col>
</block> </block>
@@ -94,32 +101,41 @@
</view> </view>
</view> </view>
</view> </view>
<closeable-modal closeTip=""
v-model="modalVisible"
:title="modalData.title"
:content="modalData.content"
:cancelBtn="modalData.showCancel"
confirmText="关闭"
@success="modalData.success"/>
</template> </template>
<script setup> <script setup>
import {ref, onMounted} from 'vue' import {ref, onMounted} from 'vue'
import customHeader from '@/components/customHeader.vue' import customHeader from '@/components/customHeader.vue'
import MescrollUni from 'mescroll-uni/mescroll-uni.vue'; import CloseableModal from "@/components/closeableModal.vue";
import {getNavBarPaddingTop} from '@/utils/system.js' import {getNavBarPaddingTop} from '@/utils/system.js'
import {getAllWeekPlanList} from "@/api/crm/plan/getPlan"; import {getAllWeekPlanList} from "@/api/crm/plan/getPlan";
import {AreaList, COLOR_MAP, OrdinalDate, WeekShortCN, WorkEvent, WorkType} from "./dataMap"; import {AreaList, COLOR_MAP, OrdinalDate, WeekShortCN, WorkEvent, WorkType} from "./dataMap";
import {getCurrentWeekNum} from "./dateTimeUtils"; import {getCurrentWeekNum, getWeek2} from "./dateTimeUtils";
import {getDate} from "@/utils/datetime"; import {getDate} from "@/utils/datetime";
import {getWeekPlanListByDate} from "@/api/crm/plan/getPlan"; import {getWeekPlanListByDate} from "@/api/crm/plan/getPlan";
import {onPullDownRefresh} from "@dcloudio/uni-app";
// const currentYear = new Date().getFullYear();
const currentMonth = new Date().getMonth() + 1;
const currentWeekNum = getCurrentWeekNum();
// 获取导航栏高度用于内容区域padding // 获取导航栏高度用于内容区域padding
const navBarPaddingTop = ref(0); const navBarPaddingTop = ref(0);
onMounted(() => { onMounted(() => {
navBarPaddingTop.value = getNavBarPaddingTop() * 2; navBarPaddingTop.value = getNavBarPaddingTop() * 2;
uni.showLoading({}) uni.showLoading({})
getPlanList().then(res=>{ getPlanList().then(res => {
let {total, rows} = res; let {total, rows} = res;
console.log(rows, "周计划数据获取成功") console.log(total, rows, "周计划数据获取成功")
list.value = rows; list.value = rows;
}).catch((err) => {
console.warn(err, "周计划数据获取失败")
}).finally(() => {
uni.hideLoading(); uni.hideLoading();
}) })
}) })
@@ -139,36 +155,38 @@ let searchValue = ref({
// 查询列表 // 查询列表
let list = ref([]); let list = ref([]);
const mescrollRef = ref(null); // const mescrollRef = ref(null);
const upOption = ref({ onPullDownRefresh(() => {
page: {num: 0, size: 10}, uni.showLoading();
noMoreSize: 5, getPlanList().then(res => {
empty: {tip: '~ 空空如也 ~'}, const {rows} = res;
textLoading: '加载中...', list.value = rows;
textNoMore: '已经到底了' console.log(rows,'刷新周计划成功');
}).finally(()=>{
uni.stopPullDownRefresh();
uni.hideLoading();
})
}); });
const downOption = ref({ // 查询当前周一周日期
auto: true, // const currentYear = new Date().getFullYear();
textInOffset: '下拉刷新', const currentWeekNum = getCurrentWeekNum();
textOutOffset: '释放更新', const aweek = getWeek2('本周');
textLoading: '刷新中...' const currentMonth = aweek.month;
console.log(currentWeekNum, '当前周数');
const getWeek = (i) => {
return aweek[OrdinalDate[i]].substring(7)
}
const queryParams = ref({
month: currentMonth,
date: currentWeekNum,
pageNum: 1,
pageSize: 10
}); });
let cssFlag = ref(false);//控制样式
// 获取数据列表 // 获取数据列表
const getPlanList = (month, date, pageIndex, pageSize) => { const getPlanList = () => {
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
// 查询参数 let {rows, total} = await getAllWeekPlanList(queryParams.value);
let queryParams = {
month: month ? month : currentMonth,
date: date ? date : currentWeekNum,
pageNum: pageIndex ? pageIndex : 1,
pageSize: pageSize ? pageSize : 10
}
let {rows, total} = await getAllWeekPlanList(queryParams);
resolve({ resolve({
rows, rows,
total total
@@ -187,20 +205,17 @@ let bindDateChange = (e) => {
let handleSearch = () => { let handleSearch = () => {
console.log(searchValue.value, '查询参数') console.log(searchValue.value, '查询参数')
uni.showLoading(); uni.showLoading();
getWeekPlanListByDate(searchValue.value).then(res=>{ getWeekPlanListByDate(searchValue.value).then(res => {
const {total, rows } = res; const {total, rows} = res;
list.value = rows; list.value = rows;
console.log(rows, '查询成功'); console.log(rows, '查询成功');
}).catch(err=>{ }).catch(err => {
console.warn(err,'数据获取失败'); console.warn(err, '数据获取失败');
}).finally(()=>{ }).finally(() => {
uni.hideLoading(); uni.hideLoading();
}) })
} }
const mescrollInit = (mescroll) => {
cssFlag.value = true;
mescrollRef.value = mescroll;
};
// 搜索区域变更 // 搜索区域变更
const bindPickerChange = (e) => { const bindPickerChange = (e) => {
// console.log('picker发送选择改变，携带值为', peopleIndex.value) // console.log('picker发送选择改变，携带值为', peopleIndex.value)
@@ -209,32 +224,43 @@ const bindPickerChange = (e) => {
// 查询 // 查询
handleSearch(); handleSearch();
} }
// 模态窗可见性
// 跳转到详情 const modalVisible = ref(false);
let handleDetail = (rowIndex, colIndex) => { // 模态框的配置内容
const modalData = ref({
title: null,
content: null,
showCancel: false,
success: console.log
});
const showCloseableModal = (param)=>{
modalVisible.value = true;
Object.assign(modalData.value, param);
console.log(modalData.value);
}
// 查看计划详情
const handleDetail = (rowIndex, colIndex) => {
let detail = list.value[rowIndex]; let detail = list.value[rowIndex];
let workDate = detail[OrdinalDate[colIndex]]; let workDate = detail[OrdinalDate[colIndex]];
let workType = detail[WorkType[colIndex]]; let workType = detail[WorkType[colIndex]];
let workEvent = detail[WorkEvent[colIndex]]; let workEvent = detail[WorkEvent[colIndex]];
if(workType && workEvent){ if (workType && workEvent) {
uni.showModal({ showCloseableModal({
title: `${workDate}\n${workType}`, title: `${workType}`,
content: `${workEvent}`, content: `姓名：${detail.userName}\n时间：${workDate}\n内容：${workEvent}`
confirmText: '关闭', });
showCancel: false, // uni.showModal({
maskClosable: true, // 允许点击蒙层关闭弹窗 // title: `${workDate}\n${workType}`,
success: function (res) { // content: `${workEvent}`,
if (res.confirm) { // confirmText: '关闭',
// showCancel: false,
// maskClosable: true, // 允许点击蒙层关闭弹窗
// success: console.log
// })
} else if (res.cancel) { } else {
}
}
})
}
else{
uni.showToast({ uni.showToast({
title: "暂无内容", title: "无计划内容",
icon: "none", icon: "none",
duration: 1500 duration: 1500
}) })
@@ -328,8 +354,9 @@ let handleDetail = (rowIndex, colIndex) => {
.demo-uni-col { .demo-uni-col {
height: 36px; height: 36px;
border-radius: 4px; border-radius: 4rpx;
background-color: #E7E7E7; /*background-color: #E7E7E7;*/
background-color: #e7e7e782;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
@@ -366,35 +393,17 @@ let handleDetail = (rowIndex, colIndex) => {
margin: 20rpx 0 0 0; margin: 20rpx 0 0 0;
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/); min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
);
/* #endif */ /* #endif */
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/); min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
);
/* #endif */ /* #endif */
//overflow-y: auto;
}
.white-bg.white-bg-2 {
margin-bottom: 20rpx;
}
.white-bg.white-bg-3 {
border-radius: 0
}
.white-bg .w-b-title {
color: #3384DF;
font-size: 38rpx;
}
.form-con {
padding: 30rpx 0 0;
} }
:deep(.form-con .uni-forms-item) { :deep(.form-con .uni-forms-item) {
margin-bottom: 22px !important; margin-bottom: 22px !important;
} }
/*.con-bg {
height: 420rpx;
}*/
</style> </style>

2
src/pages/deviceAuth/deviceAuth.vue
View File

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

2
src/pages/loading/loading.vue
View File

@@ -111,7 +111,7 @@ const getOSVesion = async()=>{
versionData.value = param; versionData.value = param;
let data = await versionCheck(param); let data = await versionCheck(param);
newVersion.value = data.verNumber; newVersion.value = data.verNumber;
downloadURL.value = data.downloadUrl || ''; downloadURL.value = data.downPageUrl || '';
// isForceUpdate 是否强制更新 1-是 2-否 // isForceUpdate 是否强制更新 1-是 2-否
let isForceUpdate = data.isForceUpdate; let isForceUpdate = data.isForceUpdate;

6
src/pages/login/login.vue
View File

@@ -264,9 +264,9 @@ const submitForm = () => {
// #ifdef H5 // #ifdef H5
//h5测试用 内网-sn123456 //h5测试用 内网-sn123456
//公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' 529a5543-6957-401e-b090-13df6dee5429
//友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2'
param.uniqCode = 'f3fca83f-bf56-47f4-a98b-a602ed8bddee'; param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';
let res = await login(param); let res = await login(param);
userStore.login(res); userStore.login(res);
uni.switchTab({ url: '/pages/home/home' }) uni.switchTab({ url: '/pages/home/home' })
@@ -362,7 +362,9 @@ page{
.login-con .bg-h{ .login-con .bg-h{
background:url('@/static/images/login-txt.png') center bottom 10rpx no-repeat; background:url('@/static/images/login-txt.png') center bottom 10rpx no-repeat;
background-size:654rpx 121rpx; background-size:654rpx 121rpx;
/* #ifdef APP-PLUS */
width: 100vw; width: 100vw;
/* #endif */
height: calc(100vh - 10px) ; height: calc(100vh - 10px) ;
margin:0 auto; margin:0 auto;
} }