diff --git a/src/pages/business/CRM/customer/changeCustomerOwner.vue b/src/pages/business/CRM/customer/changeCustomerOwner.vue index 1f5d820..5df8146 100644 --- a/src/pages/business/CRM/customer/changeCustomerOwner.vue +++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue @@ -23,55 +23,59 @@ /> - - + - - - - {{ item.cusName }} - - - - 客户人员名称 - {{ item.userName }} - - + + + + + {{ item.cusName }} + + + + 客户人员名称 + {{ item.userName }} + + + + + 性别 + {{ item.sex }} + + + + + 手机号 + {{ item.mobilePhone || item.iphone }} + + + + + 部门 + {{ item.userDept }} + + + + + 业务员认定等级 + {{ item.salesmanThinkLevel }} + + + - - 性别 - {{ item.sex }} - - - - 手机号 - {{ item.mobilePhone || item.iphone }} - - - - - 部门 - {{ item.userDept }} - - - - - 业务员认定等级 - {{ item.salesmanThinkLevel }} - - - - - + @@ -113,7 +117,7 @@ let handleSearch = () => { watch(searchValue, (newValue, oldValue) => { handleSearch() }) -let clearSearchValue = ()=>{ +let clearSearchValue = () => { searchValue.value = ''; } // 查询列表 @@ -151,7 +155,7 @@ const downCallback = async (mescroll) => { list.value = res.list; cssFlag.value = false; // 正确传递 total 参数 - mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); + mescroll.endSuccess(res.list.length, res.total >= mescroll.size); uni.hideLoading(); }, 500); @@ -173,7 +177,7 @@ const upCallback = async (mescroll) => { list.value.push(...res.list); } // 正确判断是否还有更多数据 - mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); + mescroll.endSuccess(res.list.length, res.total >= mescroll.size); uni.hideLoading(); }, 500); } catch (error) { @@ -203,10 +207,8 @@ const getList = (pageIndex, pageSize) => { let handleDetail = (item) => { uni.navigateTo({ url: "/pages/business/CRM/customer/components/customerUserEdit", - events: { - - }, - success(res){ + events: {}, + success(res) { res.eventChannel.emit('editCusData', {param: item, isAdd: false}) } }) @@ -216,8 +218,8 @@ let handleDetail = (item) => { let touchTimerId = null; // 开始触摸 -let handleTouchStart = (item)=>{ - touchTimerId = setTimeout(()=>{ +let handleTouchStart = (item) => { + touchTimerId = setTimeout(() => { // console.log(item, "长按客户人员项") handleChange(item) @@ -226,39 +228,39 @@ let handleTouchStart = (item)=>{ } // 结束触摸 -let handleTouchEnd = ()=>{ - if(touchTimerId !== null){ +let handleTouchEnd = () => { + if (touchTimerId !== null) { clearTimeout(touchTimerId); } } // 变更主归属人 -let handleChange = (item)=>{ +let handleChange = (item) => { uni.showModal({ title: '是否将该客户人员主的归属人变更为自己?', editable: true, placeholderText: '请输入变更理由', - success(res){ - if(res.confirm){ - if(res.content){ + success(res) { + if (res.confirm) { + if (res.content) { submissionOfChangeOfMainOwner({ userId: item.userId, userName: item.userName, reasonForChange: res.content - }).then(res=>{ - if(res.code===200){ + }).then(res => { + if (res.code === 200) { uni.showToast({ title: '操作成功' }) - }else{ + } else { uni.showToast({ title: '操作失败', icon: 'error' }) } }) - }else{ + } else { uni.showToast({ title: '操作失败!变更原因不能为空', icon: 'none' @@ -270,21 +272,21 @@ let handleChange = (item)=>{ } // 复制信息 -let handleCopyInfo=(item)=>{ +let handleCopyInfo = (item) => { const {cusName, userName, sex, iphone, mobilePhone, jobTelphone, userDept, salesmanThinkLevel} = item; -/* item = JSON.stringify({ - '客户名称':item.cusName, - '客户人员名称': item.userName, - '性别': item.sex, - '手机号': item.iphone || item.mobilePhone || item.jobTelphone, - '部门': item.userDept, - '业务员认定等级': item.salesmanThinkLevel} - ); - console.log(item, '复制信息');*/ + /* item = JSON.stringify({ + '客户名称':item.cusName, + '客户人员名称': item.userName, + '性别': item.sex, + '手机号': item.iphone || item.mobilePhone || item.jobTelphone, + '部门': item.userDept, + '业务员认定等级': item.salesmanThinkLevel} + ); + console.log(item, '复制信息');*/ uni.setClipboardData({ data: `客户名称:${cusName} 客户人员名称:${userName} -性别:${iphone||mobilePhone||jobTelphone} +性别:${iphone || mobilePhone || jobTelphone} 部门:${userDept} 业务员认定等级:${salesmanThinkLevel}`, success: function () { @@ -298,7 +300,7 @@ let handleCopyInfo=(item)=>{ } - \ No newline at end of file diff --git a/src/pages/business/CRM/customer/customerAdd.vue b/src/pages/business/CRM/customer/customerAdd.vue index f6f3a7a..4e07bde 100644 --- a/src/pages/business/CRM/customer/customerAdd.vue +++ b/src/pages/business/CRM/customer/customerAdd.vue @@ -179,7 +179,7 @@ @@ -435,6 +435,7 @@ let handleFunctionChange = (e) => { console.log(e.detail.value, '职能索引'); const {name} = functionalRequirementList[e.detail.value]; formData.value.functionalRequirements = name; + formData.value.function = name; getRecommendLevel(); } diff --git a/src/pages/business/CRM/customer/customerAudit.vue b/src/pages/business/CRM/customer/customerAudit.vue index 2fa806a..31f23eb 100644 --- a/src/pages/business/CRM/customer/customerAudit.vue +++ b/src/pages/business/CRM/customer/customerAudit.vue @@ -16,13 +16,13 @@ - + - - + + { // 防抖搜索 console.log(searchValue.value) if (timerId) clearTimeout(timerId); - uni.showLoading() timerId = setTimeout(async () => { - - cssFlag.value = true; - // let res = await getList(1, upOption.value.page.size) await downCallback(mescrollRef.value.mescroll); - - cssFlag.value = false; - uni.hideLoading(); clearTimeout(timerId); timerId = null; }, 500) @@ -138,6 +131,8 @@ const mescrollInit = (mescroll) => { // 下拉刷新 const downCallback = async (mescroll) => { try { + uni.showLoading(); + cssFlag.value = true; setTimeout(async () => { // 重置页码为第一页 const res = await getList(1, mescroll.size || upOption.page.size); @@ -145,6 +140,8 @@ const downCallback = async (mescroll) => { list.value = res.list; // 正确传递 total 参数 mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); + uni.hideLoading(); + cssFlag.value = false; }, 500); } catch (error) { console.log(error) @@ -162,6 +159,7 @@ const upCallback = async (mescroll) => { } else { list.value.push(...res.list); } + mescroll.endBySize(res.list.length, res.total); // 正确判断是否还有更多数据 mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); }, 500); @@ -218,7 +216,6 @@ let handleDetail = (item) => { /* #endif */ } - .scroll-h { /* #ifdef APP-PLUS */ height: calc(100vh - 120px); diff --git a/src/pages/business/CRM/customer/customerUserBelong.vue b/src/pages/business/CRM/customer/customerUserBelong.vue index 179491b..a4a5cbd 100644 --- a/src/pages/business/CRM/customer/customerUserBelong.vue +++ b/src/pages/business/CRM/customer/customerUserBelong.vue @@ -32,8 +32,8 @@ - + {{ item.cusName }} {{ item.nodeCode }} @@ -181,7 +181,8 @@ const upCallback = async (mescroll) => { list.value.push(...res.list); } // 正确判断是否还有更多数据 - mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); + mescroll.endBySize(res.list.length, res.total) + // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); }, 500); } catch (error) { console.log(error) diff --git a/src/pages/business/CRM/customer/selectCustomer.vue b/src/pages/business/CRM/customer/selectCustomer.vue index 88deb74..7126d19 100644 --- a/src/pages/business/CRM/customer/selectCustomer.vue +++ b/src/pages/business/CRM/customer/selectCustomer.vue @@ -33,10 +33,9 @@ + :class="index === selectIndex ? 'checked' : ''" + :checked="index === selectIndex" + :value="index+''"> @@ -118,7 +117,6 @@ let timerId = null; watch(searchValue, (newValue, oldValue) => { // console.log(`新值: ${newValue}, 旧值: ${oldValue}`); if(timerId) clearTimeout(timerId); - cssFlag.value = true; timerId = setTimeout(async ()=>{ handleSearch(); clearTimeout(timerId); @@ -130,7 +128,6 @@ watch(searchValue, (newValue, oldValue) => { const downCallback = async (mescroll) => { try { const res = await getList(1, upOption.value.page.size); - cssFlag.value = false; list.value = res.list; // 正确结束下拉刷新状态 mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size); @@ -163,9 +160,11 @@ const upCallback = async (mescroll) => { let handleSearch = async () => { // 触发下拉刷新以重新加载数据 if (mescrollRef.value) { + cssFlag.value = true; uni.showLoading() await downCallback(mescrollRef.value.mescroll); uni.hideLoading() + cssFlag.value = false; } } // 获取数据列表 @@ -181,12 +180,10 @@ const getList = async (pageIndex, pageSize) => { // 选中项的索引号 const selectIndex = ref(null); const radioChange = (e) => { - let {value} = e.detail; - let {index} = e.target.dataset; + let {value} = e.detail; // index // console.log(value); - // console.log(e.target.dataset); const eventChannel = instance.getOpenerEventChannel(); - eventChannel.emit('cuSelected', value); + eventChannel.emit('cuSelected', list.value[value]); uni.navigateBack() } diff --git a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue index ab67f9f..9a1bcc4 100644 --- a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue +++ b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue @@ -9,9 +9,9 @@ - - + + + diff --git a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue index 043ea67..9574355 100644 --- a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue +++ b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue @@ -1,6 +1,6 @@