diff --git a/pages/market/clue/writing_followUp.vue b/pages/market/clue/writing_followUp.vue
index f97cd2b..faf9975 100644
--- a/pages/market/clue/writing_followUp.vue
+++ b/pages/market/clue/writing_followUp.vue
@@ -52,7 +52,7 @@
               <view v-if="!formData.follow_up_time" class="input-title" style="margin-right:14rpx;" @click="selectCon(`follow_up_time`)">点击选择
               </view>
               <view v-else class="input-title" style="margin-right:14rpx;" @click="selectCon(`follow_up_time`)">
-                {{ str_follow_up_time }}
+                {{ formData.follow_up_time }}
               </view>
             </view>
           </fui-form-item>
@@ -126,7 +126,7 @@
               <view v-if="!formData.schooltime" class="input-title" style="margin-right:14rpx;" @click="selectCon(`schooltime`)">点击选择
               </view>
               <view v-else class="input-title" style="margin-right:14rpx;" @click="selectCon(`schooltime`)">
-                {{ str_schooltime }}
+                {{ formData.schooltime }}
               </view>
             </view>
           </fui-form-item>
@@ -306,7 +306,7 @@
                 <view v-if="!formData.reminder_time" class="input-title" style="margin-right:14rpx;" @click="selectCon(`reminder_time`)">点击选择
                 </view>
                 <view v-else class="input-title" style="margin-right:14rpx;" @click="selectCon(`reminder_time`)">
-                  {{ str_reminder_time }}
+                  {{ formData.reminder_time }}
                 </view>
               </view>
             </fui-form-item>
@@ -338,7 +338,7 @@
 
 
     <!-- 年月日-选择时间 -->
-    <fui-date-picker :show="show_date" type="3" @change="change_date" @cancel="cancel_date"></fui-date-picker>
+    <fui-date-picker :show="show_date" type="5" @change="change_date" @cancel="cancel_date"></fui-date-picker>
 
     <!-- 下拉选择器 -->
     <fui-picker :linkage='linkage' :options="options" :layer="1" :show="show" @change="changeOptions"
@@ -349,6 +349,7 @@
 <script>
 import commonApi from '@/api/common.js';
 import marketApi from '@/api/market.js';
+import memberApi from '@/api/member.js';
 
 const rules = [{
   name: "mobile",
@@ -773,31 +774,29 @@ export default {
       switch (type) {
           //选择线索
         case 'sales_id':
-          this.options = this.options_source_channel
+          this.options = this.options_sales_id
           this.show = true
           this.linkage = true
           break;
-          //跟进人员
+          //基础表单->跟进人员
         case 'staff_id':
-          this.options = this.options_customer_source
+          this.options = this.options_staff_id
           this.show = true
           this.linkage = true
           break;
           //跟进时间
         case 'follow_up_time':
-          this.options = this.options_add_staff_id
-          this.show = true
-          this.linkage = true
+          this.show_date = true
           break;
           //购买力
         case 'purchasing_power':
-          this.options = this.options_entry_type
+          this.options = this.options_purchasing_power
           this.show = true
           this.linkage = true
           break;
           //认知理念
         case 'cognitive_concept':
-          this.options = this.options_staff_id
+          this.options = this.options_cognitive_concept
           this.show = true
           this.linkage = true
           break;
@@ -807,23 +806,50 @@ export default {
           break;
           //情感粘度
         case 'emotional_intensity':
-          this.show_date = true
+          this.options = this.options_emotional_intensity
+          this.show = true
+          this.linkage = true
           break;
           //意向分类
         case 'initial_customer_intent':
-          this.show_date = true
+          this.options = this.options_initial_customer_intent
+          this.show = true
+          this.linkage = true
           break;
           //意向度
         case 'initial_relationship_intent':
-          this.show_date = true
+          this.options = this.options_initial_relationship_intent
+          this.show = true
+          this.linkage = true
           break;
           //跟进类型
         case 'entry_type':
-          this.show_date = true
+          this.options = this.options_entry_type
+          this.show = true
+          this.linkage = true
+            //清空跟进任务->跟进人员
+            this.formData.follow_staff_id = ''
           break;
-          //跟进人员
+          //跟进任务->跟进人员
         case 'follow_staff_id':
-          this.show_date = true
+          if(!this.formData.entry_type){
+            uni.showToast({
+              title: '请先选择跟进类型',
+              icon: 'none'
+            })
+            return
+          }
+
+          if(this.formData.entry_type == 1){
+            //市场人员列表
+            this.options = this.options_follow_staff_id_sc
+          }else{
+            //销售人员列表
+            this.options = this.options_follow_staff_id_xs
+          }
+
+          this.show = true
+          this.linkage = true
           break;
           //跟进任务-跟进时间(跟进任务)
         case 'reminder_time':
@@ -837,25 +863,15 @@ export default {
       this.show = false
       let type = this.options_type
       switch (type) {
-          //来源渠道
-        case 'source_channel':
-          this.str_source_channel = e.text//选中的text值
-          this.formData.source_channel = e.value//选中value值
-          break;
           //选择线索
         case 'sales_id':
-          this.str_source_channel = e.text//选中的text值
-          this.formData.source_channel = e.value//选中value值
+          this.str_sales_id = e.text//选中的text值
+          this.formData.sales_id = e.value//选中value值
           break;
           //跟进人员
         case 'staff_id':
-          this.str_source_channel = e.text//选中的text值
-          this.formData.source_channel = e.value//选中value值
-          break;
-          //跟进时间
-        case 'follow_up_time':
-          this.str_source_channel = e.text//选中的text值
-          this.formData.source_channel = e.value//选中value值
+          this.str_staff_id = e.text//选中的text值
+          this.formData.staff_id = e.value//选中value值
           break;
           //购买力
         case 'purchasing_power':
@@ -864,11 +880,6 @@ export default {
           break;
           //认知理念
         case 'cognitive_concept':
-          this.str_source_channel = e.text//选中的text值
-          this.formData.source_channel = e.value//选中value值
-          break;
-          //可选上课时间
-        case 'schooltime':
           this.str_source_channel = e.text//选中的text值
           this.formData.source_channel = e.value//选中value值
           break;
@@ -896,19 +907,40 @@ export default {
           this.str_source_channel = e.text//选中的text值
           this.formData.source_channel = e.value//选中value值
           break;
-          //跟进任务-跟进时间(跟进任务)
-        case 'reminder_time':
-          this.str_source_channel = e.text//选中的text值
-          this.formData.source_channel = e.value//选中value值
-          break;
       }
     },
 
+    //关闭选择框
+    cancel() {
+      this.show = false
+    },
+
     //监听-时间选择器
     change_date(e) {
-      //跟进时间
+
       this.show_date = false
-      this.formData.follow_up_time = e.result ?? ''
+      //跟进时间
+      let type = this.options_type
+      console.log('时间选择器',type,e)
+      let val = (e.result ?? '')
+      if(val){
+        val = val + ':00'
+      }
+
+      switch (type) {
+          //跟进时间
+        case 'follow_up_time':
+          this.formData.follow_up_time  = val
+          break;
+          //可选上课时间
+        case 'schooltime':
+          this.formData.schooltime = val
+          break;
+          //跟进任务->跟进时间
+        case 'reminder_time':
+          this.formData.reminder_time = val
+          break;
+      }
     },
     //关闭时间选择器
     cancel_date() {