commit - 咨询备注

common/config/caimeiApi.js

@@ -308,6 +308,12 @@ const caimeiApi = {
             url:url
         })
     },
+    reLaunch:function(url){
+        //路由跳转:关闭当前页跳转到新页面	
+        uni.reLaunch({
+            url:url
+        })
+    },
     switchTabTo:function(url){
         //路由跳转:底部 tab页
         uni.switchTab({
@@ -409,6 +415,7 @@ module.exports = {
     isNumber: caimeiApi.isNumber,
     FormatMoney: caimeiApi.FormatMoney,
     navigateTo: caimeiApi.navigateTo,
+    reLaunch: caimeiApi.reLaunch,
     redirectTo: caimeiApi.redirectTo,
     switchTabTo: caimeiApi.switchTabTo,
     formatDate: caimeiApi.formatDate,

components/cm-module/cm-seller/cm-screen-drawer.vue

@@ -38,36 +38,40 @@
 								{{ category.className }}
 							</view>
 						</view>
-						<view class="drawer-main-name">小组</view>
-						<view class="drawer-main-brand clearfix">
-							<view
-								class="drawer-brand-list"
-								:class="isCheckedGroups ? 'checked' : ''"
-								@click="choiceGroupsAll"
-								>全部</view
-							> 
-							<view
-								class="drawer-brand-list"
-								:class="group.isChecked ? 'checked' : ''"
-								v-for="(group, index) in groups"
-								:key="index"
-								@click="choiceGroups(group, index)"
-							>
-								{{ group.leaderName }}
+						<template v-if="manager > 0">
+							<view class="drawer-main-name">小组</view>
+							<view class="drawer-main-brand clearfix">
+								<view
+									class="drawer-brand-list"
+									:class="isCheckedGroups ? 'checked' : ''"
+									@click="choiceGroupsAll"
+									>全部</view
+								> 
+								<view
+									class="drawer-brand-list"
+									:class="group.isChecked ? 'checked' : ''"
+									v-for="(group, index) in groups"
+									:key="index"
+									@click="choiceGroups(group, index)"
+								>
+									{{ group.leaderName }}
+								</view>
 							</view>
-						</view>
-						<view class="drawer-main-name" v-if="members.length>0">组员</view>
-						<view class="drawer-main-brand clearfix" v-if="members.length>0">
-							<view
-								class="drawer-brand-list"
-								:class="member.isChecked ? 'checked' : ''"
-								v-for="(member, index) in members"
-								:key="index"
-								@click="choiceMembers(member, index)"
-							>
-								{{ member.groupName }}
+						</template>
+						<template v-if="leaderId>0">
+							<view class="drawer-main-name" v-if="members.length>0">组员</view>
+							<view class="drawer-main-brand clearfix" v-if="members.length>0">
+								<view
+									class="drawer-brand-list"
+									:class="member.isChecked ? 'checked' : ''"
+									v-for="(member, index) in members"
+									:key="index"
+									@click="choiceMembers(member, index)"
+								>
+									{{ member.groupName }}
+								</view>
 							</view>
-						</view>
+						</template>
 					</view>
 				</scroll-view>
 				<view class="drawer-input btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
@@ -102,6 +106,8 @@ export default {
 			isShowClose: false,
 			dataList: [],
 			date: currentDate,
+			manager:0,
+			leaderId:0,
 			height: 0,
 			drawerH: 0 ,// 抽屉内部scrollview高度
 			categorys:[],
@@ -109,8 +115,8 @@ export default {
 			groups:[],
 			members:[],
 			queryData:{
-				startAddTime:this.getDate('start'),
-				endAddTime:this.getDate('end'),
+				startAddTime:'',
+				endAddTime:'',
 				consult:'',
 				leaderId:0,
 				groupId:0,
@@ -130,7 +136,10 @@ export default {
 		}
 	},
 	methods: {
-		getUserClubConsults() {
+		async getUserClubConsults() {
+			const userInfo = await this.$api.getStorage()
+			this.manager = userInfo.manager ? userInfo.manager : 0
+			this.leaderId = userInfo.leaderId ? userInfo.leaderId : 0
 			//查询咨询类别
 			this.UserService.getUserClubConsults()
 				.then(response => {
@@ -138,7 +147,12 @@ export default {
 						el.isChecked = false
 						return el
 					})
-					this.getUserClubTeams()
+					if(this.manager > 0){
+						this.getUserClubTeams()
+					}
+					if(this.leaderId > 0){
+						this.getUserClubTeamsRroups(this.leaderId)
+					}
 				})
 				.catch(error => {
 					console.log('=========>获取咨询类别列表失败')
@@ -153,7 +167,7 @@ export default {
 					})
 				})
 				.catch(error => {
-					console.log('=========>获取咨询类别列表失败')
+					console.log('=========>获取小组列表失败')
 				})
 		},
 		getUserClubTeamsRroups(leaderId) {
@@ -172,12 +186,16 @@ export default {
 			//选择分类
 			category.isChecked = !category.isChecked 
 			if (category.isChecked) {
-				this.checkedCategorysList.push(category.id)
+				if(!this.contains(this.checkedCategorysList,category.id)){
+					this.checkedCategorysList.push(category.id)
+				}
 			} else {
-				this.checkedCategorysList.splice(index, 1)
+				this.checkedCategorysList.splice(this.checkedCategorysList.indexOf(category.id),1)
 			}
 			this.queryData.consult = this.checkedCategorysList.join(',')
-			console.log('checkedBrandList', this.queryData.consult)
+		},
+		contains(arr, val) {// 校验
+			return arr.some(item => item === val)
 		},
 		choiceGroupsAll() {
 			// 点击选择全部小组
@@ -320,6 +338,8 @@ export default {
 				margin: 0 20rpx;
 				position: relative;
 				.input-text{
+					display: block;
+					height: 56rpx;
 					font-size: 26rpx;
 					color: #666666;
 				}

pages/seller/remarks/add-record.vue

@@ -112,7 +112,6 @@ export default {
 	onLoad(option) {
 		console.log(option)
 		if (option.type == 'edit') {
-			this.questionMan = option.questionMan
 			this.handleType = option.type
 			this.getUserClubConsults()
 			this.getUserRemarksVisitDetail(option.remarksId)
@@ -137,12 +136,14 @@ export default {
 			})
 			.then(response => {
 				let data = response.data
+				this.questionMan = data.questionMan
 				this.remarksParams.questionManId = data.questionManId
 				this.remarksParams.remarks = data.remarks.join('，')
 				this.remarksParams.remarksId = data.remarksId
 				this.remarksParams.fileList = data.fileList
 				this.remarksParams.imageList = data.imageList
-				this.checkedCategorysList = data.consult.split(',')
+				this.remarksParams.consult = data.consult
+				this.checkedCategorysList = data.consult.split(',').map(i => parseInt(i, 0))
 				this.categorys = this.categorys.map((el, index) => {
 					if(data.consult.includes(el.id)){
 						el.isChecked = true
@@ -188,14 +189,16 @@ export default {
 				params: JSON.stringify(this.remarksParams)
 			})
 			.then(response => {
-				this.$util.msg('添加成功', 2000, true, 'success')
+				this.$util.msg('保存成功', 2000, true, 'success')
 				let VisitorInfo = {
 						questionManId: this.remarksParams.questionManId,
 						questionMan: this.questionMan
 					}
 				this.$api.setStorage('VisitorInfo', VisitorInfo)
 				setTimeout(() => {
-					this.$api.redirectTo('/pages/seller/remarks/record-list')
+					uni.navigateBack({
+						delta: 1
+					})
 				}, 2000)
 			})
 			.catch(error => {
@@ -206,12 +209,16 @@ export default {
 			// 选择类别
 			category.isChecked = !category.isChecked
 			if (category.isChecked) {
-				this.checkedCategorysList.push(category.id)
+				if(!this.contains(this.checkedCategorysList,category.id)){
+					this.checkedCategorysList.push(category.id)
+				}
 			} else {
-				this.checkedCategorysList.splice(index, 1)
+				this.checkedCategorysList.splice(this.checkedCategorysList.indexOf(category.id),1)
 			}
 			this.remarksParams.consult = this.checkedCategorysList.join(',')
-			console.log('this.remarksParams.consult', this.remarksParams.consult)
+		},
+		contains(arr, val) {// 校验
+			return arr.some(item => item === val)
 		},
 		uploadFile(array) {
 			//上传资质文件
@@ -223,7 +230,6 @@ export default {
 					ossName: data.ossName
 				}
 				array.push(obj)
-				console.log('array', array)
 			}).catch(err=>{
                 console.log(err)
             })

pages/seller/remarks/add.vue

@@ -132,7 +132,8 @@ export default {
 			clubInfo: {},
 			userInfo: {},
 			checkedCategorysList:[],
-			categorys:[]
+			categorys:[],
+			isConfirmLoding:false
 		}
 	},
 	onLoad(option) {
@@ -179,7 +180,8 @@ export default {
 					this.remarksParams.imageList = data.imageList
 					if(this.handleType == 'edit'){
 						this.remarksParams.questionMan = data.questionMan
-						this.checkedCategorysList = data.consult.split(',')
+						this.remarksParams.consult = data.consult
+						this.checkedCategorysList = data.consult.split(',').map(i => parseInt(i, 0))
 						this.categorys = this.categorys.map((el, index) => {
 							if(data.consult.includes(el.id)){
 								el.isChecked = true
@@ -210,6 +212,7 @@ export default {
 		},
 		async editButtonConfim() {
 			//保存资料备注
+			if(this.isConfirmLoding){return}
 			const userInfo = await this.$api.getStorage()
 			if (this.remarksParams.questionMan == '') {
 				this.$util.msg('请输入咨询人姓名', 2000)
@@ -224,29 +227,38 @@ export default {
 				return
 			}
 			this.remarksParams.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+			this.isConfirmLoding = true
 			this.UserService.getUserClubRemarksSave({
 				params: JSON.stringify(this.remarksParams)
 			})
 				.then(response => {
-					this.$util.msg('添加成功', 3000, true, 'success')
+					this.$util.msg('保存成功', 3000, true, 'success')
+					this.isConfirmLoding = false
 					setTimeout(() => {
-						uni.navigateBack({ delta: 1 })
+						uni.navigateBack({
+							delta: 1
+						})
 					}, 1000)
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
+					this.isConfirmLoding = false
 				})
 		},
 		choiceCategorys(category,index){
 			// 选择类别
 			category.isChecked = !category.isChecked
 			if (category.isChecked) {
-				this.checkedCategorysList.push(category.id)
+				if(!this.contains(this.checkedCategorysList,category.id)){
+					this.checkedCategorysList.push(category.id)
+				}
 			} else {
-				this.checkedCategorysList.splice(index, 1)
+				this.checkedCategorysList.splice(this.checkedCategorysList.indexOf(category.id),1)
 			}
 			this.remarksParams.consult = this.checkedCategorysList.join(',')
-			console.log('this.remarksParams.consult', this.remarksParams.consult)
+		},
+		contains(arr, val) {// 校验
+			return arr.some(item => item === val)
 		},
 		uploadFile(array) {
 			//上传资质文件

pages/seller/remarks/customer-list.vue

@@ -153,6 +153,7 @@ export default {
 							el.ischecked = false
 							return el
 						})
+						this.questionManId = this.remarksList[0].questionManId
 						this.pullFlag = false
 						setTimeout(() => {
 							this.pullFlag = true

pages/seller/remarks/list.vue

@@ -8,7 +8,7 @@
 					   confirm-type="search" 
 					   v-model="listQuery.keyWord" 
 					   @input="onShowClose" 
-					   @confirm="GetProductListInfo" 
+					   @confirm="getUserClubRemarksList" 
 					   placeholder="搜索关键词"
 					   maxlength="16"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
@@ -34,7 +34,7 @@
 						</view>
 						<view class="tui-remarks-title-bot">
 							<view class="tui-remarks-text h">记录人：{{ remark.recordName }}</view>
-							<view class="tui-remarks-text y">管理员：{{ remark.leaderName ? remark.leaderName : '' }}</view>
+							<view class="tui-remarks-text y" v-if="listQuery.manager > 0">管理员：{{ remark.leaderName ? remark.leaderName : '' }}</view>
 						</view>
 					</view>
 					<view class="tui-remarks-name">
@@ -42,7 +42,7 @@
 							咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
 						</view>
 						<view class="tui-remarks-name-text y">
-							咨询类别：{{ remark.consult ? remark.consult : '无' }}
+							咨询类别：{{ remark.consultBack ? remark.consultBack : '无' }}
 						</view>
 					</view>
 					<view class="tui-remarks-content">
@@ -182,9 +182,9 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 			this.listQuery.manager = userInfo.manager ? userInfo.manager : 0
-			this.GetProductListInfo()
+			this.getUserClubRemarksList()
 		},
-		GetProductListInfo() {
+		getUserClubRemarksList() {
 			this.remarksList = []
 			this.listQuery.pageNum = 1
 			this.UserService.getUserClubRemarksList(this.listQuery)
@@ -276,7 +276,7 @@ export default {
 			this.listQuery.leaderId = data.leaderId
 			this.listQuery.groupId = data.groupId
 			console.log('确定筛选',this.listQuery)
-			this.GetProductListInfo()
+			this.getUserClubRemarksList()
 		},
 		showScreenDrawer(){
 			//显示筛选抽屉
@@ -297,7 +297,7 @@ export default {
 				.then(response => {
 					this.$util.msg('已删除', 2000, true, 'success')
 					setTimeout(() => {
-						this.GetProductListInfo()
+						this.getUserClubRemarksList()
 					}, 2000)
 				})
 				.catch(error => {
@@ -310,14 +310,14 @@ export default {
 			}else{					
 				this.isShowClose = false
 				this.listQuery.pageNum=1
-				this.GetProductListInfo()
+				this.getUserClubRemarksList()
 			}
 		},
 		delInputText(){//清除输入框内容
 			this.listQuery.keyWord = ''
 			this.isShowClose = false
 			this.listQuery.pageNum=1
-			this.GetProductListInfo()
+			this.getUserClubRemarksList()
 		},
 		hideMobel() {
 			this.modal = false
@@ -365,7 +365,7 @@ page {
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 1000;
+	z-index: 982;
 	.search-screen{
 		width: 152rpx;
 		height: 64rpx;
@@ -496,10 +496,10 @@ page {
 					-webkit-box-orient: vertical;
 					&.h{
 						padding-right: 24rpx;
-						border-right: 1px solid #E1E1E1;
 					}
 					&.y{
 						padding-left: 24rpx;
+						border-left: 1px solid #E1E1E1;
 					}
 				}
 			}
@@ -515,6 +515,7 @@ page {
 			margin-top: 20rpx;
 			.tui-remarks-name-text{
 				height: 48rpx;
+				box-sizing: border-box;
 				text-align: left;
 				font-size: $font-size-26;
 				color: #333333;
@@ -526,9 +527,11 @@ page {
 				line-clamp: 1;
 				-webkit-box-orient: vertical;
 				&.h{
+					width: 40%;
 					padding-right: 24rpx;
 				}
 				&.y{
+					width: 60%;
 					padding-left: 24rpx;
 				}
 			}

pages/seller/remarks/record-list.vue

@@ -51,7 +51,7 @@
 								咨询人：{{ remark.questionMan ? remark.questionMan : '' }}
 							</view>
 							<view class="tui-remarks-name-text y">
-								咨询类别：{{ remark.consult ? remark.consult : '无' }}
+								咨询类别：{{ remark.consultBack ? remark.consultBack : '无' }}
 							</view>
 						</view>
 						<view class="tui-remarks-content">
@@ -580,14 +580,23 @@ page {
 			margin-top: 20rpx;
 			.tui-remarks-name-text{
 				height: 48rpx;
+				box-sizing: border-box;
 				text-align: left;
 				font-size: $font-size-26;
 				color: #333333;
 				float: left;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				line-clamp: 1;
+				-webkit-box-orient: vertical;
 				&.h{
+					width: 40%;
 					padding-right: 24rpx;
 				}
 				&.y{
+					width: 60%;
 					padding-left: 24rpx;
 				}
 			}