1

api/apiRoute.js

@@ -53,6 +53,13 @@ export default {
     async common_getPersonnelCampus(data = {}) {
         return await http.get('/campus/getPersonnelCampus', data);
     },
+	
+	//获取全部校区
+	async common_getCampusesList(data = {}) {
+	    return await http.get('/campus/get_campuses_list', data);
+	},
+	
+	
     //公共端-忘记密码-通过短信验证码进行密码重置(学生/员工通用)
     async common_forgetPassword(data = {}) {
         return await http.post('/common/forgetPassword', data);

pages/market/clue/add_clues.vue

@@ -69,6 +69,27 @@
                   ></fui-input>
                 </view>
               </fui-form-item>
+			  
+			  <!--校区-->
+			  <fui-form-item
+			      label="校区"
+			      labelSize='26'
+			      prop=""
+			      background='#434544'
+			      labelColor='#fff'
+			      :bottomBorder='false'
+			  >
+			    <view class="input-title" style="margin-right:14rpx;">
+			      <view
+			          class="input-title"
+			          style="margin-right:14rpx;"
+			          @click="openCicker(`campus`)">
+			        {{ (formData.campus) ? picker_config.campus.text : '点击选择' }}
+			      </view>
+			    </view>
+			  </fui-form-item>
+			  
+			  
               <!--来源-->
               <fui-form-item
                   label="来源"
@@ -87,6 +108,7 @@
                   </view>
                 </view>
               </fui-form-item>
+			  
               <!--来源渠道-->
               <fui-form-item
                   v-if="formData.source == 1"
@@ -604,8 +626,9 @@ export default {
         staff_id:'',//人员ID
         distance:'',//距离
         optional_class_time:'',//可选上课时间
+		campus:''
       },
-
+		campus_list:[],
       //下拉选择器相关
       picker_input_name:'',//下拉组件的input_name
       picker_show:false,//下拉组件是否展示
@@ -713,7 +736,8 @@ export default {
     //初始化
     async init() {
       //获取登录用户信息
-      this.getUserInfo()
+      await this.getUserInfo()
+	  
       await this.getDict('source_channel')//获取字典-来源渠道
       await this.getDict('source')//获取字典-来源
       await this.getDict('purchasing_power')//获取字典-购买力
@@ -725,7 +749,31 @@ export default {
       // this.getStaffList()//获取人员列表
       // this.getAreaTree()//获取地区树形结构
     },
-
+	async get_campus_list(){
+
+		let res = await apiRoute.common_getCampusesList({})
+		if (res.code != 1) {
+		  uni.showToast({
+		    title: res.msg,
+		    icon: 'none'
+		  })
+		  return
+		}
+		
+		this.campus_list = res.data
+		
+		
+		let arr = []
+		this.campus_list.forEach((v,k)=>{
+		  arr.push({
+		    text: v.campus_name,
+		    value: v.id,
+		  })
+		})
+		
+		this.picker_config['campus'].options = arr
+		
+	},
     //获取用户信息
     async getUserInfo(){
       let res = await apiRoute.getPersonnelInfo({})
@@ -742,6 +790,8 @@ export default {
       this.formData.consultant = res.data.id//顾问id
       this.formData.staff_id = res.data.id//人员ID
       this.picker_config['consultant'].text = res.data.name//顾问名字
+	  
+	  await this.get_campus_list()//获取校区
     },
 
     //获取字典-课程id选择

pages/market/clue/clue_info.vue

@@ -90,7 +90,7 @@
 
         <view class="basic-message">附加信息</view>
         <view class="basic-message-div">
-          <view class="basic-message-div-txt">
+          <view class="basic-message-div-txt" @click="openViewOrder()">
             <view>已成交次数</view>
             <view>{{clientInfo.customerResource.cj_count || 0}}次</view>
           </view>

pages/market/clue/edit_clues.vue

@@ -230,6 +230,36 @@
 									v-model="formData.second_visit_status"></fui-textarea>
 							</view>
 						</fui-form-item>
+						
+						
+						
+						<!--状态-->
+						<fui-form-item
+						    label="资源有效状态"
+						    labelSize='26'
+						    prop="age"
+						    background='#434544'
+						    labelColor='#fff'
+						    :bottomBorder='false'>
+						  <view class="input-title" style="margin-right:14rpx;">
+						    <fui-radio-group name="radio" v-model="formData.efficacious" @change="changeEfficacious">
+						      <view class="fui-list__item" style="display: flex;justify-content: flex-end;">
+						        <fui-label>
+						          <view class="fui-align__center">
+						            <fui-radio :value="1" checked></fui-radio>
+						            <text class="fui-text">有效</text>
+						          </view>
+						        </fui-label>
+						        <fui-label :margin="['0','0','0','40rpx']">
+						          <view class="fui-align__center">
+						            <fui-radio :value="2"></fui-radio>
+						            <text class="fui-text">无效</text>
+						          </view>
+						        </fui-label>
+						      </view>
+						    </fui-radio-group>
+						  </view>
+						</fui-form-item>
 					</view>
 				</fui-form>
 			</view>
@@ -429,6 +459,7 @@
 					optional_class_time: '', //可选上课时间
 					first_visit_status: '', //一访情况
 					second_visit_status: '', //二访情况
+					efficacious:''
 				},
 
 				//下拉选择器相关
@@ -600,6 +631,7 @@
 					optional_class_time: sixSpeed.preferred_class_time || '', //可选上课时间
 					first_visit_status: sixSpeed.first_visit_status || '', //一访情况
 					second_visit_status: sixSpeed.second_visit_status || '', //二访情况
+					efficacious : sixSpeed.efficacious
 				}
 
 				this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time,
@@ -955,7 +987,10 @@
 					this.switchChange_type = 2
 				}
 			},
-
+			
+			changeEfficacious(e) {
+				this.formData.efficacious = e.detail.value
+			},
 			//性别选择器
 			changeSex(e) {
 				this.formData.gender = e.detail.value

pages/market/clue/index.vue

@@ -9,7 +9,7 @@
 			<view class="search_section">
 				<view class="item">
 					<view class="input_box" @click="openShowDrawer()">
-						<view class="input_box_text">用户名/手机号/时间范围</view>
+						<view class="input_box_text">校区/用户名/手机号/时间范围</view>
 					</view>
 					<view class="button" @click="openShowDrawer()">搜索</view>
 				</view>
@@ -22,12 +22,17 @@
 							</image>
 						</view>
 						<view class="card-text">{{ v.customerResource.name }}</view>
-						<!--            <view class="card-label">{{ v.is_status == 1 ? '试听' : '成交' }}</view>-->
+						           <view class="card-con-span">{{ v.customerResource.phone_number }}</view>
 					</view>
 					<view class="card-con">
 						首联系人：{{ v.customerResource.name }} <span
 							class="card-con-span">{{ v.customerResource.decision_maker }}</span>
 					</view>
+					
+					<view class="card-con">
+						来源渠道：{{ v.customerResource.source_channel }} <!-- <span
+							class="card-con-span">{{ v.customerResource.source_channel }}</span> -->
+					</view>
 					<view class="card-date">
 						<view class="card-con">
 							{{ $util.formatToDateTime((v.customerResource.updated_at || ''), 'm-d H:i') }}
@@ -71,7 +76,7 @@
 			<view class="search_section">
 				<view class="item">
 					<view class="input_box" @click="openShowDrawer()">
-						<view class="input_box_text">用户名/手机号/时间范围</view>
+						<view class="input_box_text">校区/用户名/手机号/时间范围</view>
 					</view>
 					<view class="button" @click="openShowDrawer()">搜索</view>
 				</view>
@@ -135,6 +140,18 @@
 				<view class="fui-title">筛选</view>
 				<scroll-view scroll-y style="height: 720rpx;">
 					<view class="drawer_box">
+						
+						<fui-list-cell>
+							<view class="item">
+								<view class="title">校区筛选</view>
+								<view class="input_box">
+									<fui-input :clearable="true" borderTop placeholder="校区筛选"
+										v-model="showDrawerForm.campus_name"></fui-input>
+								</view>
+							</view>
+						</fui-list-cell>
+						
+						
 						<fui-list-cell>
 							<view class="item">
 								<view class="title">时间筛选</view>
@@ -225,6 +242,7 @@
 					shared_at_str: '', //共享时间|开始时间(Y-m-d)-结束时间(Y-m-d)
 					phone_number: '', //客户资源表-手机号
 					name: '', //客户资源表-用户姓名
+					campus_name:'',
 				},
 				//数据列表
 				tableList_1: [], //表格数据
@@ -239,6 +257,7 @@
 					shared_at_str: '', //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
 					phone_number: '', //客户资源表-手机号
 					name: '', //客户资源表-用户姓名
+					campus_name:'',
 				},
 				//数据列表
 				tableList_2: [], //表格数据
@@ -259,6 +278,7 @@
 				//抽屉搜索条件展示窗相关
 				showDrawer: false, //是否展示|false=否
 				showDrawerForm: {
+					campus_name:'',
 					shared_at_str: '', //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
 					phone_number: '', //客户资源表-手机号
 					name: '', //客户资源表-用户姓名
@@ -493,11 +513,12 @@
 				this.showDrawerForm.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
 				this.showDrawerForm.phone_number = '' //客户资源表-手机号
 				this.showDrawerForm.name = '' //客户资源表-用户姓名
-
+				this.campus_name = ''
 				if (this.segmented_type == 1) {
 					this.filteredData_1.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
 					this.filteredData_1.phone_number = '' //客户资源表-手机号
 					this.filteredData_1.name = '' //客户资源表-用户姓名
+					this.filteredData_1.campus_name = ''
 
 					//我的客户
 					//重置为第一页
@@ -507,6 +528,7 @@
 					this.filteredData_2.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
 					this.filteredData_2.phone_number = '' //客户资源表-手机号
 					this.filteredData_2.name = '' //客户资源表-用户姓名
+					this.filteredData_2.campus_name = ''
 					//资源分配
 					//重置为第一页
 					await this.resetFilteredData_2()