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/api/crm/api_ys.js
View File

@@ -93,7 +93,7 @@ export function viewingMarketInfgetDetail(data) {
//市场信审核列表接口
export function approvalMarketInfget(data) {
return request.get({
url: 'app/informationMarketInformation/Approval',
url: '/crm/app/informationMarketInformation/Approval',
data
},{
isTransformResponse:false

2
src/api/crm/customer/getCustomer.js
View File

@@ -25,7 +25,7 @@ export function saveappCrmCusUserNew(params){
// 查询业务员名下所有的客户
export function SearchForAllCustomersSalesperson(params){
return request.get({
url: 'app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
url: '/crm/app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
data: params
},{isTransformResponse: false})
}

7
src/pages.json
View File

@@ -217,13 +217,6 @@
"navigationBarTitleText": "通用信息更新"
}
},
//选择客户（已更新）
{
"path": "pages/business/CRM/chooseCus",
"style": {
"navigationBarTitleText": "客户选择"
}
},
//选择客户人员（已更新）
{
"path": "pages/business/CRM/customerUserList",

170
src/pages/business/CRM/chooseCus.vue
View File

@@ -1,170 +0,0 @@
<template>
<view class="con-body">
<view >
<!-- 头部 -->
<customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
</customHeader>
<!-- 高度来避免头部遮挡 -->
<view class="top-height"></view>
<uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
@iconClick="iconClick">
</uni-easyinput>
<view class="inner-box">
<view class="list-cont">
<radio-group class="block" @change="radioChange">
<view class="item" v-for="(item, index) in dataList">
<radio class='radio' :value="index" ></radio>
<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
</view>
</radio-group>
</view>
</view>
</view>
</view>
</template>
<script setup>
import customHeader from '@/components/customHeader.vue'
import { getYsCustomerList } from '../../../api/crm/api_ys.js'
import { onMounted, reactive, ref, watch } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import { useMessage } from '../../../utils/message.js'
const message = useMessage();
//点击查询客户人员
const queryParams = ref({
cusName: '',
nickName:'',
pageNum: 1,
pageSize: 10
})
onMounted(() => {
})
onLoad(options => {
queryParams.value.cusName = options.cusName
})
const dataList = ref([])
//查询某一客户人员
let searchContent = ref('')
function iconClick() {
message.toast('点击了查询，当前内容：' + searchContent.value)
}
//监视查询的内容的变化
let queryCusForm = reactive({})
watch(searchContent,(newValue,oldValue)=>{
console.log("输入内容：",searchContent.value)
queryCusForm.cusName = searchContent.value
getYsCustomerList(queryCusForm).then(res=>{
dataList.value = res.rows
})
})
function radioChange(event) {
const selectedIndex = event.detail.value
let test = dataList.value[selectedIndex]
// 发送全局事件
uni.$emit('onCustomerSelected', test)
let cusName = test.cusName;//客户名称
let cusId = test.cusId;//客户ID
uni.navigateBack()//返回上一页
}
</script>
<style scoped lang="scss">
.con-body{
background: white;
}
/* Container for the checkbox group */
.checkbox-group.block {
width: 100%;
}
/* Each item row */
.itemClass {
display: flex;
align-items: center;
padding: 10rpx 0;
margin-left: 15rpx;
border-bottom: 1px solid #eee;
/* optional divider */
}
/* Checkbox styling */
.checkBoxClass {
margin-right: 12rpx;
}
/* Content container */
.clientClass {
flex: 1;
display: flex;
align-items: center;
flex-wrap: wrap;
font-size: 36rpx;
color: #333;
/* default text color */
}
/* Blue username text */
.blue-text {
/* or any blue you prefer */
margin-right: 5rpx;
}
.inner-box {
width: 100%;
padding: 10px;
box-sizing: border-box;
}
.list-cont {
width: 100%;
}
.block {
width: 100%;
}
.item {
display: flex;
align-items: center;
padding: 12px 0;
border-bottom: 1px solid #eee;
}
.radio {
margin-right: 12px;
transform: scale(0.9);
}
.name {
flex: 1;
font-size: 16px;
color: #333;
}
.checked {
color: #007AFF; /* 选中状态的颜色 */
}
</style>

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

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

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

@@ -17,7 +17,7 @@
<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"
<uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"
cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
@clear="clearSearchValue"
v-model="searchValue"
@@ -134,7 +134,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/mainOwner/view/viewMainOwnerDetail.vue
View File

@@ -135,7 +135,7 @@ function getCrmCusUserNewChangeOwnerList() {
<style scoped>
.con-bg{
background: white;
min-height: 100vh;
/* min-height: 100vh; */
}
.white-bg {

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

@@ -10,18 +10,18 @@
<!-- 正文内容 -->
<view>
<!-- 搜索 -->
<!-- <view class="search">-->
<!-- <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"-->
<!-- class="picker-bg">-->
<!-- <view class="picker">-->
<!-- <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"-->
<!-- size="18"></uni-icons>-->
<!-- <view>{{ defaultDate }}</view>-->
<!-- <uni-icons type="down" size="18"></uni-icons>-->
<!-- </view>-->
<!-- </picker>-->
<!-- <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
<!-- </view>-->
<view class="search">
<picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
class="picker-bg">
<view class="picker">
<uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
size="18"></uni-icons>
<view>{{ defaultDate }}</view>
<uni-icons type="down" size="18"></uni-icons>
</view>
</picker>
<button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
</view>
<!-- 分页部分 -->
<view class="white-bg margin-bottom20" v-for="(item, index) in list">

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)

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

@@ -2,34 +2,21 @@
<view class="con-body">
<view class="con-bg">
<!-- 头部 -->
<customHeader
ref="customHeaderRef"
:title="!searchShow?'走访查看':'走访搜索'"
:leftFlag="true"
:rightFlag="false"
@back="handleBack" :searchType="searchShow?1:undefined"
></customHeader>
<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>
<!-- 搜索 @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"
<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"
@@ -79,102 +66,17 @@
</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: ''
@@ -201,9 +103,10 @@ const downCallback = async (mescroll) => {
queryParams.pageNum = 1;
queryParams.pageSize = upOption.value.page.size;
//获取当前页的信息
const res = await getViewReportList(1, upOption.value.page.size)
const res = await getQueryVisistList(queryParams)
cssFlag.value = false;
list.value = res.rows;
mescroll.resetUpScroll();
}, 500);
} catch (error) {
mescroll.endErr();
@@ -219,52 +122,27 @@ const downCallback = async (mescroll) => {
const upCallback = async (mescroll) => {
try {
setTimeout(async () => {
const res = await getViewReportList(mescroll.num, mescroll.size, selValue.value,
inputval.value);
queryParams.pageNum = 1;
queryParams.pageSize = upOption.value.page.size;
const res = await getQueryVisistList(queryParams);
if (mescroll.num === 1) {
list.value = res.list;
list.value = res.rows;
} else {
list.value.push(...res.list);
list.value.push(...res.rows);
}
mescroll.endBySize(list.value.length, res.total);
mescroll.endBySize(res.rows.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
}
let res = await getQueryVisistList(param);
resolve({
list: res.rows,
total: res.total
});
});
}
const upOption = ref({
page: {num: 0, size: 10},
page: { num: 0, size: 10 },
noMoreSize: 5,
empty: {
tip: '~ 空空如也 ~',
icon: "../../static/images/mescroll-empty.png"
icon: "../../../../static/images/mescroll-empty.png"
},
textLoading: '加载中...',
textNoMore: '已经到底了'
@@ -284,12 +162,12 @@ function showDetail(item) {
})
}
// function handleSearch() {
// queryParams.inputval = searchValue.value
// downCallback(mescrollRef.value.mescroll);
// }
//点击查询方法，搜索当前报告信息
let searchValue = ref()
function handleSearch() {
queryParams.inputval = searchValue.value
downCallback(mescrollRef.value.mescroll);
}
</script>

12
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,10 +249,9 @@ function chooseRecord(e) {
.form-con {
/* #ifdef APP-PLUS */
height: calc(100vh - 95px) !important;
height: calc(100vh - 100px)
/* #endif */
/* #ifndef APP-PLUS */
height:calc(100vh - 68px) !important;
/* #endif */
}

2
src/pages/business/CRM/marketInformation/beCurrent.vue
View File

@@ -143,7 +143,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/marketInformation/beCurrentDetail.vue
View File

@@ -148,7 +148,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/marketInformation/competitor.vue
View File

@@ -340,7 +340,7 @@ const dynamicPlaceholder = computed(() => {
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/marketInformation/competitorDetail.vue
View File

@@ -348,7 +348,7 @@ const dynamicPlaceholder = computed(() => {
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/marketInformation/infomationView.vue
View File

@@ -244,7 +244,7 @@ const inputval = ref(''); // 搜索内容
noMoreSize: 5,
empty: {
tip: '~ 空空如也 ~',
icon: "../../static/images/mescroll-empty.png"
icon: "../../../../static/images/mescroll-empty.png"
},
textLoading: '加载中...',
textNoMore: '已经到底了'

4
src/pages/business/CRM/marketInformation/keyModelTasks.vue
View File

@@ -147,7 +147,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值
@@ -203,7 +203,7 @@
height: calc(120vh - 100px)
/* #endif */
/* #ifndef APP-PLUS */
height:calc(120vh - 80px)
height:calc(140vh - 80px)
/* #endif */
}

2
src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue
View File

@@ -152,7 +152,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/marketInformation/majorMatter.vue
View File

@@ -172,7 +172,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/marketInformation/majorMatterDetail.vue
View File

@@ -179,7 +179,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

18
src/pages/business/CRM/marketInformation/marketInformation.vue
View File

@@ -31,7 +31,7 @@
<view class="report-list">
<view class="title r-list">
<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
</view>
<view style="padding:0rpx 0 10rpx">
@@ -50,7 +50,7 @@
<view class="report-list">
<view class="title r-list">
<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
</view>
<view style="padding:0rpx 0 10rpx">
@@ -69,7 +69,7 @@
<view class="report-list">
<view class="title r-list">
<view class="r-left" style="font-size:38rpx;">{{ item.competitiveUnits }}</view>
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
</view>
<view style="padding:0rpx 0 10rpx">
@@ -88,7 +88,7 @@
<view class="report-list">
<view class="title r-list">
<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
</view>
<view style="padding:0rpx 0 10rpx">
@@ -109,7 +109,7 @@
<view class="report-list">
<view class="title r-list">
<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
</view>
<view style="padding:0rpx 0 10rpx">
@@ -127,7 +127,7 @@
<view class="report-list">
<view class="title r-list">
<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.state==='完成'}"
size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
</view>
<view style="padding:0rpx 0 10rpx">
@@ -237,7 +237,7 @@
noMoreSize: 5,
empty: {
tip: '~ 空空如也 ~',
icon: "../../static/images/mescroll-empty.png"
icon: "../../../../static/images/mescroll-empty.png"
},
textLoading: '加载中...',
textNoMore: '已经到底了'
@@ -493,4 +493,8 @@
.report-list .title {
display: flex;
}
.btn-blue {
background-color: #3384DF; /* 蓝色背景 */
color: #ffffff;
}
</style>

2
src/pages/business/CRM/marketInformation/marketInformationReview.vue
View File

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

5
src/pages/business/CRM/marketInformation/marketOpportunities.vue
View File

@@ -232,7 +232,8 @@
// 选择客户页面跳转
function chooseCustomer(){
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值
@@ -311,7 +312,7 @@
height: calc(120vh - 100px)
/* #endif */
/* #ifndef APP-PLUS */
height:calc(120vh - 80px)
height:calc(140vh - 80px)
/* #endif */
}

2
src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue
View File

@@ -244,7 +244,7 @@
// 选择客户页面跳转
function chooseCustomer(){
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url:'/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/marketInformation/personnelChanges.vue
View File

@@ -201,7 +201,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/marketInformation/personnelChangesDetail.vue
View File

@@ -202,7 +202,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/paymentCollection/addPaymentCollection.vue
View File

@@ -101,7 +101,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

2
src/pages/business/CRM/paymentCollection/index.vue
View File

@@ -110,7 +110,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/paymentCollection/paymentDetail.vue
View File

@@ -105,7 +105,7 @@
// 选择客户页面跳转
function chooseCustomer() {
uni.navigateTo({
url: '/pages/business/CRM/chooseCus'
url: '/pages/business/CRM/marketActivity/chooseCus'
})
}
//定义数据接收的值

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

@@ -17,7 +17,7 @@
<view class="top-height"></view>
<view class="week-plan-title">
<view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
<view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
<view v-if="weekNum">
{{ yearMonth }}
<view v-if="isThisWeek" style=" display: inline-block;">
@@ -54,10 +54,11 @@
</view>
</view>
</view>
<view class='bottom-spliter bg-gray'></view>
</block>
<!-- 底部加高度来避免tabbar遮挡 -->
<view class="bottom-height"></view>
<!-- <view class="bottom-height bg-gray"></view> -->
</view>
@@ -106,12 +107,12 @@ let getWorkEvent = (index) => {
const refreshPlanList = () => {
message.showLoading();
// 获取用户信息
getUserInfo().then(res => {
userInfo.value = res.user;
console.log(route.path, "：用户信息获取成功");
}).catch(err => {
console.warn(err, "用户信息获取失败")
});
// getUserInfo().then(res => {
// userInfo.value = res.user;
// console.log(route.path, "：用户信息获取成功");
// }).catch(err => {
// console.warn(err, "用户信息获取失败")
// });
// 获取周计划列表
getWeeklyPlanList(queryParams.value).then(res => {
const {rows} = res;
@@ -180,11 +181,11 @@ function handleCreate() {
handlePlanEdit({itemList, selectIndex: result.tapIndex}, true);
}).catch((err) => {
console.warn(err, "已存在周计划")
uni.showToast({
icon: 'error',
title: '已有本周或下周计划',
duration: 2000
})
// uni.showToast({
// icon: 'error',
// title: '已有本周或下周计划',
// duration: 2000
// })
})
// }else{ // 创建下周计划
// }
@@ -234,7 +235,7 @@ function handleEdit(index) {
// console.log(JSON.stringify(formData))
console.log(route.path, formData, "前往修改页面");
const editFields = [OrdinalDate[index], WorkType[index], WorkEvent[index]];
let userName = userInfo.value.nickName || userInfo.value.userName;
let userName = null; // userInfo.value.userName || userInfo.value.nickName;
handlePlanEdit({userName, formData, editFields}, false);
}
@@ -268,9 +269,14 @@ function handleEdit(index) {
}
.white-bg.white-bg-2 {
margin-bottom: 20rpx;
/* margin-bottom: 20rpx; */
}
.bottom-spliter{
height: 20rpx;
}
.bg-gray{
background-color: #f0f0f0;
}
.report-list .w-b-title .btn-edit {
background-color: #5C96F7;
}

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

@@ -4,7 +4,7 @@
<!-- 头部 -->
<customHeader ref="customHeaderRef" :title="title" :leftFlag="true" :rightFlag="true">
<template #right>
<view class="head-right" @click="submitForm" v-if="userInfo.nickName || userInfo.userName">
<view class="head-right" @click="submitForm">
<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
color="#B7D2FF"></uni-icons>
保存
@@ -16,7 +16,7 @@
<!-- 正文内容 -->
<view class="week-plan-title">
<view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
<view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
<view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
</view>
<uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">

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

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

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

@@ -266,7 +266,6 @@ const submitForm = () => {
//h5测试用 内网-sn123456
//公司外网 '9516053c-b441-465b-9781-06e7b8031811'
//友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2'
//8f9bbe3b-7f1d-4e7f-9734-6faa6b86350f
param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';
let res = await login(param);
userStore.login(res);
@@ -279,7 +278,7 @@ const submitForm = () => {
// 读取设备ID
safeSave.getSafeFile({ "key": "app_device_id" }, res3 => {
if (res3.code == 1) {
let deviceId = res3.data;
let deviceId = res3.data;//'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' //
// showAlert("读取成功=>"+deviceId);
param.uniqCode = deviceId;
console.log("param=>",param)