From 2aabff2e90beae402d46a84f311e1ac9f9f9efc7 Mon Sep 17 00:00:00 2001
From: zcx <377075991@qq.com>
Date: Mon, 4 Dec 2023 11:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=96=E9=9F=B3=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue                           |  24 +-
 src/views/login.vue                           |   9 +-
 src/views/system/config/index.vue             |   6 +-
 src/views/zs/clue/ClueForm/index.vue          |   7 +-
 src/views/zs/clue/columns.js                  |   8 +
 .../zs/clue/components/DistributeDialog.vue   | 134 +++++++++
 .../clue/components/DistributeFormDialog.vue  | 193 ++++---------
 .../zs/clue/components/FeedbackDialog.vue     |  53 ++++
 .../zs/clue/components/InvitationDialog.vue   | 117 ++++++++
 .../clue/components/InvitationFormDialog.vue  | 254 ++++++++++--------
 src/views/zs/clue/components/SearchForm.vue   |   5 +-
 src/views/zs/clue/index.vue                   | 159 ++++++-----
 src/views/zs/feedback/arrival.vue             |  12 +-
 src/views/zs/feedback/follow.vue              |  14 +-
 14 files changed, 641 insertions(+), 354 deletions(-)
 create mode 100644 src/views/zs/clue/components/DistributeDialog.vue
 create mode 100644 src/views/zs/clue/components/FeedbackDialog.vue
 create mode 100644 src/views/zs/clue/components/InvitationDialog.vue

diff --git a/src/views/index.vue b/src/views/index.vue
index af8a7e1..1bf0d8b 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -14,7 +14,7 @@
             </div>
           </el-card>
         </el-col> -->
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-card>
             <div slot="header">
               计划总结
@@ -27,9 +27,9 @@
               <div v-html="task" />
             </div>
           </el-card>
-        </el-col>
+        </el-col> -->
 
-        <el-col :span="6">
+        <el-col :span="12">
           <el-card>
             <div slot="header">团队业绩概况</div>
             <div class="card-panel">
@@ -50,7 +50,7 @@
           </el-card>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span="12">
           <el-card>
             <div slot="header">转化率</div>
             <div class="card-panel">
@@ -86,7 +86,7 @@
       <el-row :gutter="40" class="panel-group" style="margin-bottom: 20px"> -->
 
         <!-- 考勤信息 -->
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-card>
             <div slot="header">打卡异常信息</div>
             <div class="card-panel">
@@ -104,7 +104,7 @@
               </el-carousel>
             </div>
           </el-card>
-        </el-col>
+        </el-col> -->
       </el-row>
 
       <!-- 成交数排行榜  -->
@@ -236,12 +236,12 @@ export default {
         this.user = response.data
       })
     },
-    getCheckin() {
-      getCheckin().then((resp) => {
-        this.checkin_datas = resp.data
-        this.countNum = Math.ceil(this.checkin_datas.length / 5)
-      })
-    },
+    // getCheckin() {
+    //   getCheckin().then((resp) => {
+    //     this.checkin_datas = resp.data
+    //     this.countNum = Math.ceil(this.checkin_datas.length / 5)
+    //   })
+    // },
     handleEditTask(type) {
       this.taskType = type
       if (type === 2) {
diff --git a/src/views/login.vue b/src/views/login.vue
index c969032..20b7801 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -4,15 +4,14 @@
       <h3 class="title">开心学车管理系统</h3>
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="微信扫码" name="wx" style="height:200px">
-          <wxlogin v-if="!code && activeName === 'wx'" appid="wx203f734baa9c9845" :scope="'snsapi_login'" :theme="'black'" redirect_uri="https://xueche.ahduima.com/login" :href="href">
+          <wxlogin v-if="!code && activeName === 'wx'" appid="wxc9e106a4afd2b9dd" :scope="'snsapi_login'" :theme="'black'" redirect_uri="https://xueche.kxxc.top/login" :href="href">
           </wxlogin>
-          <!-- <div id="wxcode" v-if="!code && activeName === 'wx'"></div> -->
-          <!-- 绑定手机号框 -->
+   
           <div v-else v-loading="loading">
             <WxCode v-if="codeShow" :code="code" :openId="openId" />
           </div>
         </el-tab-pane>
-        <el-tab-pane label="账号密码" name="password" style="height:200px">
+        <el-tab-pane label="短信验证码" name="password" style="height:200px">
           <Password v-if="activeName === 'password'" />
         </el-tab-pane>
       </el-tabs>
@@ -91,7 +90,7 @@ export default {
       var obj = new WxLogin({
         self_redirect: true,
         id: "wxcode", // 页面显示二维码的容器id
-        appid: "wx203f734baa9c9845", // 微信官方提供的测试id
+        appid: "wxc9e106a4afd2b9dd", // 微信官方提供的测试id
         scope: "snsapi_login",
         redirect_uri: "https://xueche.ahduima.com/login", // 微信官方中的测试地址
         state: "bind",
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index c5efb3a..27f8ca0 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -21,7 +21,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button v-hasPermi="['system:config:add']" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
@@ -38,7 +38,7 @@
         <el-button v-hasPermi="['system:config:remove']" type="danger" plain icon="el-icon-refresh" size="mini" @click="handleRefreshCache">刷新缓存</el-button>
       </el-col>
       <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -60,7 +60,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-hasPermi="['system:config:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button v-hasPermi="['system:config:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+          <!-- <el-button v-hasPermi="['system:config:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/zs/clue/ClueForm/index.vue b/src/views/zs/clue/ClueForm/index.vue
index 63f1f69..97376ec 100644
--- a/src/views/zs/clue/ClueForm/index.vue
+++ b/src/views/zs/clue/ClueForm/index.vue
@@ -81,6 +81,11 @@
                 <el-input v-model="clueForm.intentionAccountName" placeholder="请输入" />
               </el-form-item>
             </el-col>
+            <el-col v-if="clueForm.source == '抖音直播'" :span="24">
+              <el-form-item label="门店地址" prop="intentionAccountAddress">
+                <el-input v-model="clueForm.intentionAccountAddress" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="跟进人员" prop="followUser">
                 <el-select v-model="clueForm.followUser" style="width: 100%;" multiple clearable :disabled="admin != 'true' && clueForm.clueId != undefined">
@@ -116,7 +121,7 @@
             </el-col>
             <el-col v-if="clueForm.source == '抖音直播'" :span="24">
               <el-form-item label="核销时间" prop="writeOffTime">
-                <el-date-picker v-model="clueForm.writeOffTime" style="width: 100%;" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
+                <el-date-picker v-model="clueForm.writeOffTime" style="width: 100%;" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" type="date" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
diff --git a/src/views/zs/clue/columns.js b/src/views/zs/clue/columns.js
index 454b934..9b58a2b 100644
--- a/src/views/zs/clue/columns.js
+++ b/src/views/zs/clue/columns.js
@@ -140,5 +140,13 @@ export const defaultColumns = [{
   width: 140,
   visible: true,
   overflow: true
+},{
+  key: 18,
+  prop: 'intentionAccountAddress',
+  label: '门店地址',
+  width: 140,
+  visible: true,
+  overflow: true
 }
+
 ];
diff --git a/src/views/zs/clue/components/DistributeDialog.vue b/src/views/zs/clue/components/DistributeDialog.vue
new file mode 100644
index 0000000..a699bea
--- /dev/null
+++ b/src/views/zs/clue/components/DistributeDialog.vue
@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <el-dialog :title="title" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+      @close="closeDialog" style="min-height: 400px;">
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="邀约信息" name="first">
+          <el-table v-loading="loading" :data="invitationRecords" border>
+            <el-table-column label="操作时间" prop="createTime" width="140" />
+            <el-table-column label="邀约场地" prop="placeName" min-width="200" />
+            <el-table-column label="约定时间" prop="invitationTime" width="120" />
+            <el-table-column label="备注" prop="remark" min-width="200" />
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="分发信息" name="second">
+          <el-table v-loading="loading" :data="distributeRecords" border>
+            <el-table-column label="操作时间" prop="distributeTime" width="140" />
+            <el-table-column label="分发场地" prop="placeName" min-width="200" />
+            <!-- <el-table-column label="接待人" prop="invitationTime" min-width="120" /> -->
+            <el-table-column label="接待人" prop="coachName" min-width="120" />
+            <el-table-column label="操作" fixed="right" min-width="100">
+              <template slot-scope="scope">
+                <el-button size="mini" v-if="scope.$index == 0 && isEdit" type="text" icon="el-icon-edit"
+                  @click="handleEdit(scope.row)">修改</el-button>
+                <el-button size="mini" type="text"
+                  @click="handleFeedback(scope.row)">反馈信息</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+
+      <span slot="footer" class="dialog-footer" >
+        <el-button v-jclick type="primary" :disabled="!isAdd" @click="handleAdd()">新增</el-button>
+        <el-button plain @click="(visible = false)">取消</el-button>
+      </span>
+    </el-dialog>
+    <DistributeFormDialog ref="DistributeFormDialog" @refreshDataList="getFeedbackOrder" />
+    <FeedbackDialog ref="FeedbackDialog" />
+
+  </div>
+</template>
+<script>
+import { listFeedbackOrder } from '@/api/zs/feedbackOrder';
+import { getInvitationByClue } from '@/api/zs/invitation';
+import DistributeFormDialog from './DistributeFormDialog.vue';
+import FeedbackDialog from './FeedbackDialog.vue';
+
+export default {
+  name: 'DistributeDialog',
+  components: {
+    DistributeFormDialog, FeedbackDialog
+  },
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      loading: false,
+      placeOptions: [],
+      coachOptions: [],
+      feedbackDetail: [],
+      activeTab: 'first',
+      invitationRecords: [],
+      clueInfo: undefined,
+      distributeRecords: [],
+      isAdd: false,
+      isEdit: true,
+      title: '分发'
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.activeTab = 'first';
+      // this.getPlaces();
+      this.visible = true;
+      this.isAdd = false;
+      this.isEdit = true;
+      this.title = '邀约';
+      this.$nextTick(() => {
+        if (info) {
+          this.clueInfo = info;
+          if (info.feedbackStatus > 2) {
+            this.isEdit = false;
+          }
+          if (info.feedbackStatus == 1 || info.feedbackStatus == 5 || info.feedbackStatus == 6) {
+            this.isAdd = true;
+          }
+          // 查询线索的邀约情况
+          this.getInvitationByClue();
+          // 查询该线索的分发a情况
+          this.getFeedbackOrder();
+          this.title = this.title + '【' + (info.name == null ? '' : info.name) + '  ' + info.phone + '】';
+        }
+      });
+    },
+    closeDialog() {
+      this.$emit('update:dialog.batchUpdateVisible', false);
+    },
+    getInvitationByClue() {
+      getInvitationByClue({ clueId: this.clueInfo.clueId }).then(resp => {
+        if (resp.code == 200 && resp.data) {
+          this.invitationRecords = resp.data;
+        }
+      });
+    },
+    getFeedbackOrder() {
+      listFeedbackOrder({ clueId: this.clueInfo.clueId }).then(resp => {
+        if (resp.code == 200 && resp.rows && resp.rows.length > 0) {
+          this.distributeRecords = resp.rows.filter(item => item.feedbackStatus != 0);
+        }
+      });
+    },
+    handleFeedback(item) {
+      this.$nextTick(() => {
+        this.$refs.FeedbackDialog.init(item.orderId);
+      });
+    },
+    handleAdd() {
+      const item = {
+        placeId: undefined,
+        clueId: this.clueInfo.clueId,
+        coachId: undefined,
+        copyUserList: []
+      };
+      this.handleEdit(item);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.DistributeFormDialog.init(item);
+      });
+    }
+  }
+};
+</script>
+
diff --git a/src/views/zs/clue/components/DistributeFormDialog.vue b/src/views/zs/clue/components/DistributeFormDialog.vue
index 0af3f2c..fffd037 100644
--- a/src/views/zs/clue/components/DistributeFormDialog.vue
+++ b/src/views/zs/clue/components/DistributeFormDialog.vue
@@ -1,35 +1,12 @@
 <template>
-  <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog" style="min-height: 400px;">
-    <el-tabs v-model="activeTab" >
-
-    <el-tab-pane label="邀约信息" name="first" >
-      <div v-if="invitationForm.invitationId != undefined">
-        <el-form ref="invitationForm" :model="invitationForm"  label-width="110px" :disabled="true">
-        <el-form-item label="姓名" prop="name">
-          <span>{{invitationForm.name}}</span>
-        </el-form-item>
-        <el-form-item label="联系方式" prop="phone">
-          <span>{{invitationForm.phone}}</span>
-        </el-form-item>
-        <el-form-item label="场地" prop="placeId">
-          <span>{{invitationForm.placeName}}</span>
-        </el-form-item>
-        <el-form-item label="约定时间" prop="invitationTime">
-          <span>{{invitationForm.invitationTime}}</span>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <span>{{invitationForm.remark}}</span>
-        </el-form-item>
-      </el-form>
-      </div>
-      
-    </el-tab-pane>
-    <el-tab-pane label="分发" name="second">
-      <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="dialogForm.orderId != undefined">
+  <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px"
+    @close="closeDialog" style="min-height: 400px;">
+    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px">
       <el-row>
         <el-col :span="24">
           <el-form-item label="场地" prop="placeId">
-            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;" @change="getCoaChes">
+            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;"
+              @change="getCoaChes">
               <el-option v-for="dict in placeOptions" :key="dict.placeId" :label="dict.name" :value="dict.placeId" />
             </el-select>
           </el-form-item>
@@ -43,52 +20,23 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="抄送" prop="copyUserList">
-            <el-select v-model="dialogForm.copyUserList" filterable multiple placeholder="请选择" clearable style="width: 100%;">
+            <el-select v-model="dialogForm.copyUserList" filterable multiple placeholder="请选择" clearable
+              style="width: 100%;">
               <el-option v-for="dict in coachOptions" :key="dict.coachId" :label="dict.coachName" :value="dict.coachId" />
             </el-select>
           </el-form-item>
         </el-col>
-
-        <el-col :span="24">
-          <el-form-item label="跟进信息">
-            <div style="max-height: 200px; overflow-y: auto;">
-              <div v-for="item in feedbackDetail" :key="item.feedbackId">
-                <el-timeline-item :timestamp="item.updateTime == undefined ? item.createTime : item.updateTime" placement="top">
-                    <el-card>
-                    <div v-if="item.feedbackType == 1">
-                      <div>是否联系：<span style="font-size: 12px;">{{ item.isContact ? '已联系' : '未联系' }}</span></div>
-                      <div>到场时间：<span style="font-size: 12px;">{{ item.arrivalTime }}</span></div>
-                      <div>备注：<span style="font-size: 12px;" v-html="item.remark" /></div>
-                    </div>
-                    <div v-if="item.feedbackType == 2">
-                      <div>状态：
-                        <span v-if="item.arrivalStatus == 1">未到场</span>
-                        <span v-if="item.arrivalStatus == 2">到场未成交</span>
-                        <span v-if="item.arrivalStatus == 3">到场已成交</span>
-                      </div>
-                      <div>备注：<span style="font-size: 12px;" v-html="item.remark" /></div>
-                    </div>
-                  </el-card>
-                </el-timeline-item>
-              </div>
-            </div>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
-    </el-tab-pane>
-  </el-tabs>
-                  
     <span slot="footer" class="dialog-footer" :disabled="dialogForm.orderId">
-      <el-button plain @click="(visible = false)">取消</el-button>
-      <el-button v-jclick type="primary" :disabled="!canSubmit || dialogForm.orderId != undefined" @click="dialogFormSubmit()">确定</el-button>
+      <el-button plain @click="closeDialog">取消</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit"
+        @click="dialogFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
 </template>
 <script>
-import { listFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder';
-import { listFeedbackDetail } from '@/api/zs/feedbackDetail';
-import { getInvitationByClue } from '@/api/zs/invitation';
+import { updateFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder';
 
 
 import { getAllPlaces } from '@/api/sch/place';
@@ -96,8 +44,7 @@ import { getAllCoaches } from '@/api/sch/coach';
 
 export default {
   name: 'DistributeFormDialog',
-
-  data () {
+  data() {
     return {
       visible: false,
       canSubmit: true,
@@ -113,112 +60,80 @@ export default {
       },
       placeOptions: [],
       coachOptions: [],
-      feedbackDetail: [],
-      invitationForm: {
-        invitationId:undefined,
-            clueId: undefined,
-            name: undefined,
-            phone: undefined,
-            address: undefined,
-            placeId: undefined,
-            invitationTime: undefined,
-            remark: undefined
-      },
-      activeTab: 'first'
+      feedbackDetail: []
     };
   },
   methods: {
-    init (info = undefined) {
-      this.activeTab = 'first'
+    init(info = undefined) {
       this.getPlaces();
       this.visible = true;
       this.$nextTick(() => {
         this.resetDialogForm();
         this.$refs['dialogForm'].resetFields();
         if (info) {
-          this.dialogForm.clueId = info;
-          //查询线索的邀约情况
-          this.getInvitationByClue(info);
-          // 查询该线索的分发情况
-          this.getFeedbackOrder(info);
+          this.dialogForm = { ...info };
+          if (this.dialogForm.placeId){
+            this.getCoaChes(this.dialogForm.placeId);
+          }
         }
       });
     },
-    resetDialogForm () {
+    resetDialogForm() {
       this.dialogForm = {
         placeId: undefined,
         clueId: undefined,
         coachId: undefined,
         copyUserList: []
       };
-      this.feedbackDetail=[]
+      this.feedbackDetail = []
     },
-    closeDialog () {
+    closeDialog() {
       this.$emit('update:dialog.batchUpdateVisible', false);
-    },
-    getInvitationByClue(clueId){
-      this.invitationForm = {
-        invitationId:undefined,
-            clueId: undefined,
-            name: undefined,
-            phone: undefined,
-            address: undefined,
-            placeId: undefined,
-            invitationTime: undefined,
-            remark: undefined
-      }
-      getInvitationByClue({ clueId: clueId }).then(resp => {
-        if (resp.code == 200 && resp.data) {
-          this.invitationForm = resp.data;
-        }
-      });
-    },
-    getFeedbackOrder (clueId) {
-      listFeedbackOrder({ clueId: clueId }).then(resp => {
-        if (resp.code == 200 && resp.rows && resp.rows.length > 0) {
-          this.dialogForm = resp.rows.filter(item => item.feedbackStatus != 0)[0];
-          if (this.dialogForm != undefined && this.dialogForm.placeId != undefined) {
-            this.getCoaChes(this.dialogForm.placeId);
-          }
-
-          if (this.dialogForm.orderId) {
-            this.getFeedbackDetail(this.dialogForm.orderId);
-          }
-        }
-      });
-    },
-    getFeedbackDetail (orderId) {
-      listFeedbackDetail({ orderId: orderId }).then(resp => {
-        this.feedbackDetail = resp.rows;
-      });
+      this.visible = false;
     },
     // 表单提交
-    dialogFormSubmit () {
+    dialogFormSubmit() {
       this.$refs.dialogForm.validate((valid) => {
         if (valid) {
           this.canSubmit = false;
-          // 校验完成，调接口
-          addFeedbackOrder(this.dialogForm)
-            .then((resp) => {
-              this.canSubmit = true;
-              if (resp.code == 200) {
-                this.$message.success('分发成功');
-                this.$emit('refreshDataList');
-                this.visible = false;
-              }
-            })
-            .catch(() => {
-              this.canSubmit = true;
-            });
+          if (this.dialogForm.orderId) {
+            // 校验完成，调接口
+            updateFeedbackOrder(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('分发成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
+              })
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          } else {
+            // 校验完成，调接口
+            addFeedbackOrder(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('分发成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
+              })
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          }
         }
       });
     },
-    getPlaces () {
+    getPlaces() {
       getAllPlaces({ status: '0' }).then((resp) => {
         this.placeOptions = resp.data;
       });
     },
-    getCoaChes (placeId) {
+    getCoaChes(placeId) {
       console.log(placeId);
       getAllCoaches({ placeId: placeId }).then(resp => {
         if (resp.code == 200) { this.coachOptions = resp.data; }
diff --git a/src/views/zs/clue/components/FeedbackDialog.vue b/src/views/zs/clue/components/FeedbackDialog.vue
new file mode 100644
index 0000000..ce676cc
--- /dev/null
+++ b/src/views/zs/clue/components/FeedbackDialog.vue
@@ -0,0 +1,53 @@
+<template>
+    <el-dialog title="反馈" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+        @close="closeDialog" style="min-height: 400px;">
+        <el-timeline :reverse="true">
+            <el-timeline-item v-for="(item, index) in feedbackDetail" :key="index" :timestamp="item.updateTime" placement="top">
+                <div v-if="item.feedbackType == 1">
+                    <div>是否联系：<span>{{ item.isContact ? '已联系' : '未联系' }}</span></div>
+                    <div>到场时间：<span>{{ item.arrivalTime }}</span></div>
+                    <div>备注：<span>{{ item.remark }}</span></div>
+                </div>
+                <div v-if="item.feedbackType == 2">
+                    <div>到场状态：<span v-if="item.arrivalStatus == 1">未到场</span>
+                        <span v-if="item.arrivalStatus == 2">到场未成交</span>
+                        <span v-if="item.arrivalStatus == 3">到场已成交</span>
+                    </div>
+                    <div> 备注：<span>{{ item.remark }}</span></div>
+                </div>
+            </el-timeline-item>
+        </el-timeline>
+    </el-dialog>
+</template>
+<script>
+import { listFeedbackDetail } from '@/api/zs/feedbackDetail';
+
+export default {
+    name: 'FeedbackDialog',
+    data() {
+        return {
+            visible: false,
+            feedbackDetail: [],
+        };
+    },
+    methods: {
+        init(info = undefined) {
+            this.visible = true;
+            this.$nextTick(() => {
+                this.getFeedbackDetail(info);
+            });
+        },
+        closeDialog() {
+            this.$emit('update:dialog.batchUpdateVisible', false);
+        },
+        getFeedbackDetail(orderId) {
+            listFeedbackDetail({ orderId: orderId }).then(resp => {
+                this.feedbackDetail = resp.rows;
+            });
+        }
+
+    }
+};
+</script>
+  
+  
\ No newline at end of file
diff --git a/src/views/zs/clue/components/InvitationDialog.vue b/src/views/zs/clue/components/InvitationDialog.vue
new file mode 100644
index 0000000..a7916ce
--- /dev/null
+++ b/src/views/zs/clue/components/InvitationDialog.vue
@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <el-dialog :title="title" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+      @close="closeDialog">
+      <div>
+        <el-table v-loading="loading" :data="invitationRecords" border>
+          <el-table-column label="操作时间" prop="createTime" width="140" />
+          <el-table-column label="邀约场地" prop="placeName" width="200" />
+          <el-table-column label="约定时间" prop="invitationTime" width="120" />
+          <el-table-column label="备注" prop="remark" width="200" />
+          <el-table-column label="操作" fixed="right" width="80">
+            <template slot-scope="scope">
+              <el-button size="mini" v-if="scope.$index == 0 && isEdit" type="text" icon="el-icon-edit"
+                @click="handleEdit(scope.row)">修改</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button v-jclick type="primary" :disabled="!isAdd" @click="handleAdd()">新增</el-button>
+        <el-button plain @click="closeDialog">关闭</el-button>
+      </span>
+    </el-dialog>
+    <InvitationFormDialog ref="InvitationFormDialog" @refreshDataList="getInvitationRecord" />
+  </div>
+</template>
+<script>
+import { getInvitationByClue } from '@/api/zs/invitation';
+import InvitationFormDialog from './InvitationFormDialog.vue';
+
+export default {
+  name: 'InvitationDialog',
+  components: {
+    InvitationFormDialog
+  },
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      placeOptions: [],
+      isEdit: true,
+      invitationRecords: [],
+      clueId: undefined,
+      loading: false,
+      title: undefined,
+      clueInfo: undefined,
+      isAdd: false
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.visible = true;
+      this.title = "邀约";
+      this.isAdd = false;
+      this.isEdit = true;
+      this.clueInfo = undefined;
+      this.$nextTick(() => {
+        if (info) {
+          this.clueInfo = info;
+          if (info.feedbackStatus >= 2) {
+            this.isEdit = false;
+          }
+          if (info.feedbackStatus == 0 || info.feedbackStatus == 5 || info.feedbackStatus == 6) {
+            this.isAdd = true;
+          }
+          if (info.clueId) {
+            this.clueId = info.clueId;
+            this.getInvitationRecord();
+          }
+          this.title = this.title + '【' + (info.name == null ? '' : info.name) + '  ' + info.phone + '】';
+        }
+      });
+    },
+    closeDialog() {
+      this.visible = false;
+      // this.$emit('update:dialog.batchUpdateVisible', false);
+      this.$emit('refreshDataList');
+    },
+    getInvitationRecord() {
+      getInvitationByClue({ clueId: this.clueId }).then(resp => {
+        if (resp.data) {
+          this.invitationRecords = resp.data;
+          if (this.invitationRecords && this.invitationRecords.length > 0) {
+            this.dialogForm = this.invitationRecords[0];
+          }
+        }
+      });
+    },
+    handleAdd() {
+      const invitation = {
+        invitationId: undefined,
+        clueId: this.clueInfo.clueId,
+        name: this.clueInfo.name,
+        phone: this.clueInfo.phone,
+        address: this.clueInfo.address,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
+      };
+      this.handleEdit(invitation);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.InvitationFormDialog.init(item)
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.el-divider--vertical {
+  height: 15em !important;
+}
+</style>
+    
+    
\ No newline at end of file
diff --git a/src/views/zs/clue/components/InvitationFormDialog.vue b/src/views/zs/clue/components/InvitationFormDialog.vue
index 9cbc5a8..8e2e12c 100644
--- a/src/views/zs/clue/components/InvitationFormDialog.vue
+++ b/src/views/zs/clue/components/InvitationFormDialog.vue
@@ -1,119 +1,132 @@
 <template>
-    <el-dialog title="邀约" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog">
-      <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="dialogForm.invitationId != undefined">
-        <el-form-item label="姓名" prop="name">
-          <el-input v-model="dialogForm.name" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="联系方式" prop="phone">
-          <el-input v-model="dialogForm.phone" placeholder="请输入联系方式" />
-        </el-form-item>
-        <el-form-item label="场地" prop="placeId">
-            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;" >
+  <el-dialog title="邀约" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="500px"
+    @close="closeDialog">
+    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="!isEdit">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="姓名" prop="name">
+            <el-input v-model="dialogForm.name" placeholder="请输入姓名" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="联系方式" prop="phone">
+            <el-input v-model="dialogForm.phone" placeholder="请输入联系方式" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="场地" prop="placeId">
+            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;">
               <el-option v-for="dict in placeOptions" :key="dict.placeId" :label="dict.name" :value="dict.placeId" />
             </el-select>
-        </el-form-item>
-        <el-form-item label="约定时间" prop="invitationTime">
-          <el-date-picker clearable
-            v-model="dialogForm.invitationTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm"
-            format="yyyy-MM-dd HH:mm"
-            placeholder="请选择约定时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="dialogForm.remark" type="textarea" placeholder="请输入" />
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button plain @click="(visible = false)">取消</el-button>
-        <el-button v-jclick type="primary" :disabled="!canSubmit || dialogForm.invitationId != undefined"  @click="dialogFormSubmit()">确定</el-button>
-      </span>
-    </el-dialog>
-  </template>
-    <script>
-  import { addInvitation, getInvitationByClue } from '@/api/zs/invitation';
-  import { getAllPlaces } from '@/api/sch/place';
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="约定时间" prop="invitationTime">
+            <el-date-picker clearable v-model="dialogForm.invitationTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+              format="yyyy-MM-dd HH:mm" placeholder="请选择约定时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dialogForm.remark" type="textarea" placeholder="请输入" />
+      </el-form-item>
+    </el-form>
 
-  export default {
-    name: 'InvitationFormDialog',
-  
-    data() {
-      return {
-        visible: false,
-        canSubmit: true,
-        dialogForm: {
-            invitationId: undefined,
-            clueId: undefined,
-            name: undefined,
-            phone: undefined,
-            address: undefined,
-            placeId: undefined,
-            invitationTime: undefined,
-            remark: undefined
-        },
-        rules: {
-          name: { required: true, message: '姓名不能为空', trigger: 'blur'},
-          phone: { required: true, message: '姓名不能为空', trigger: 'blur'},
-          placeId: { required: true, message: '场地不能为空', trigger: 'blur'},
-          placeId: { required: true, message: '场地不能为空', trigger: 'blur'},
-          invitationTime: { required: true, message: '约定时间不能为空', trigger: 'blur'}
+    <span slot="footer" class="dialog-footer">
+      <el-button plain @click="(visible = false)">取消</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit || !isEdit" @click="dialogFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { addInvitation, updateInvitation } from '@/api/zs/invitation';
+import { getAllPlaces } from '@/api/sch/place';
 
-        },
-        placeOptions:[]
+export default {
+  name: 'InvitationFormDialog',
+
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {
+        invitationId: undefined,
+        clueId: undefined,
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
+      },
+      rules: {
+        name: { required: true, message: '姓名不能为空', trigger: 'blur' },
+        phone: { required: true, message: '姓名不能为空', trigger: 'blur' },
+        placeId: { required: true, message: '场地不能为空', trigger: 'blur' },
+        invitationTime: { required: true, message: '约定时间不能为空', trigger: 'blur' }
+
+      },
+      placeOptions: [],
+      isEdit: true,
+      invitationRecords: []
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.visible = true;
+      this.getPlaces()
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm = { ...info }
+        }
+      });
+    },
+    resetDialogForm() {
+      this.dialogForm = {
+        invitationId: undefined,
+        clueId: undefined,
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
       };
+      this.isEdit = true;
+    },
+    closeDialog() {
+      this.$emit('update:dialog.batchUpdateVisible', false);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.InvitationDialog.init(item)
+      })
     },
-    methods: {
-       init(info = undefined) {
-        this.visible = true;
-        this.getPlaces()
-        this.$nextTick(() => {
-          this.resetDialogForm();
-          this.$refs['dialogForm'].resetFields();
-          if (info) {
-            this.dialogForm = {
-                invitationId: undefined,
-                clueId: info.clueId,
-                name: info.name,
-                phone: info.phone,
-                address: info.address,
-                placeId: undefined,
-                invitationTime: undefined,
-                remark: undefined
-            };
-            if(info.clueId){
-                getInvitationByClue({clueId:info.clueId}).then(resp => {
-                if(resp.data){
-                    this.dialogForm = resp.data;
-                } 
+    // 表单提交
+    dialogFormSubmit() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          this.canSubmit = false;
+          if (this.dialogForm.invitationId) {
+            // 校验完成，调接口
+            updateInvitation(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('修改成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
               })
-            }
-          }
-        });
-      },
-      resetDialogForm() {
-        this.dialogForm = {
-            invitationId:undefined,
-            clueId: undefined,
-            name: undefined,
-            phone: undefined,
-            address: undefined,
-            placeId: undefined,
-            invitationTime: undefined,
-            remark: undefined
-        };
-      },
-      closeDialog() {
-        this.$emit('update:dialog.batchUpdateVisible', false);
-      },
-      async getInvitationInfo(clueId){
-        l
-      },
-      // 表单提交
-      dialogFormSubmit() {
-        this.$refs.dialogForm.validate((valid) => {
-          if (valid) {
-            this.canSubmit = false;
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          } else {
             // 校验完成，调接口
             addInvitation(this.dialogForm)
               .then((resp) => {
@@ -128,15 +141,22 @@
                 this.canSubmit = true;
               });
           }
-        });
-      },
-      getPlaces () {
-        getAllPlaces({ status: '0' }).then((resp) => {
-            this.placeOptions = resp.data;
-        });
-      },
+        }
+      });
+    },
+    getPlaces() {
+      getAllPlaces({ status: '0' }).then((resp) => {
+        this.placeOptions = resp.data;
+      });
     }
-  };
-    </script>
+  }
+};
+</script>
+
+<style scoped>
+.el-divider--vertical {
+  height: 15em !important;
+}
+</style>
     
     
\ No newline at end of file
diff --git a/src/views/zs/clue/components/SearchForm.vue b/src/views/zs/clue/components/SearchForm.vue
index 849c46b..9e3109b 100644
--- a/src/views/zs/clue/components/SearchForm.vue
+++ b/src/views/zs/clue/components/SearchForm.vue
@@ -79,8 +79,9 @@ export default {
         { value: 1, label: '待分发' },
         { value: 2, label: '待跟进' },
         { value: 3, label: '待到场' },
-        { value: 4, label: '已到场' }
-    ],
+        { value: 4, label: '未到场' },
+        { value: 5, label: '到场未成交' },
+        { value: 6, label: '到场已成交' }]
     };
   },
   watch: {
diff --git a/src/views/zs/clue/index.vue b/src/views/zs/clue/index.vue
index f36f119..ebaf0a1 100644
--- a/src/views/zs/clue/index.vue
+++ b/src/views/zs/clue/index.vue
@@ -1,17 +1,24 @@
 <template>
   <div class="app-container">
-    <SearchForm v-show="showSearch" ref="SearchForm" :user-options="userOptions" :source-options="sourceOptions" @search="_getTableList" />
+    <SearchForm v-show="showSearch" ref="SearchForm" :user-options="userOptions" :source-options="sourceOptions"
+      @search="_getTableList" />
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleAddandUpdate(undefined)">新增</el-button>
-        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleDYAddandUpdate(undefined)">抖音新增</el-button>
+        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary"
+          @click="handleAddandUpdate(undefined)">新增</el-button>
+        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary"
+          @click="handleDYAddandUpdate(undefined)">抖音新增</el-button>
 
-        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false,false)">导入</el-button>
+        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning"
+          @click="handleImport(false, false)">导入</el-button>
         <!-- <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(true, false)">一点通导入</el-button> -->
-        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false, true)">抖音导入</el-button>
+        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning"
+          @click="handleImport(false, true)">抖音导入</el-button>
 
-        <el-button v-hasPermi="['zs:clue:export']" icon="el-icon-download" type="warning" @click="handleExport">导出</el-button>
-        <el-button v-hasPermi="['zs:clue:edit']" icon="el-icon-edit" type="primary" :disabled="multiple" @click="handleBatChUpdate()">批量修改</el-button>
+        <el-button v-hasPermi="['zs:clue:export']" icon="el-icon-download" type="warning"
+          @click="handleExport">导出</el-button>
+        <el-button v-hasPermi="['zs:clue:edit']" icon="el-icon-edit" type="primary" :disabled="multiple"
+          @click="handleBatChUpdate()">批量修改</el-button>
         <el-button type="primary" @click="handlePublicClue">公海</el-button>
         <el-button type="primary" @click="handleSkill">关键话术</el-button>
         <el-button type="primary" @click="handleFollowCount">跟进统计</el-button>
@@ -19,11 +26,14 @@
       </el-col>
       <right-toolbar :show-search.sync="showSearch" :columns="columns" @queryTable="_getTableList" />
     </el-row>
-    <el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange" @row-dblclick="handleRowClick" @cell-click="handleCellClick">
+    <el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange"
+      @row-dblclick="handleRowClick" @cell-click="handleCellClick">
       <el-table-column type="selection" width="50" align="center" />
       <template v-for="item in columns">
-        <el-table-column v-if="item.visible && item.prop != 'clueMemo'" :key="item.prop" :label="item.label" align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
-        <el-table-column v-if="item.visible && item.prop == 'clueMemo'" :key="item.prop" :label="item.label" align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
+        <el-table-column v-if="item.visible && item.prop != 'clueMemo'" :key="item.prop" :label="item.label"
+          align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
+        <el-table-column v-if="item.visible && item.prop == 'clueMemo'" :key="item.prop" :label="item.label"
+          align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
       </template>
       <el-table-column label="反馈状态" prop="feedbackStatus" sortable fixed="right" min-width="100">
         <template slot-scope="{ row }">
@@ -32,25 +42,43 @@
       </el-table-column>
       <el-table-column label="意向状态" prop="intentionState" sortable fixed="right" min-width="100">
         <template slot-scope="{ row }">
-          <el-tag effect="dark" style="border: none" :color="tagColorMap[row.intentionState]">{{ row.intentionState }}</el-tag>
+          <el-tag effect="dark" style="border: none" :color="tagColorMap[row.intentionState]">{{ row.intentionState
+          }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" fixed="right" align="left" min-width="200">
         <template slot-scope="scope">
           <!-- <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.source == '抖音直播'" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleDYAddandUpdate(scope.row)">编辑</el-button> -->
-          <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1) )" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
-          <el-button v-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(scope.row)">分发</el-button>
-          <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)  )" v-hasPermi="['zs:clue:invitation']" type="text" @click.native.stop="handleInvitation(scope.row)">邀约</el-button>            
-          <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)  ) && scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a" @click.native.stop="handleSign(scope.row)">已登记</el-button>
-          <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)  ) && !scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
-          <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)  )" v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button>
-          <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)  ) && !scope.row.state" v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
+            v-hasPermi="['zs:clue:edit']" type="text" style="color: red;"
+            @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
+          <el-button v-hasPermi="['zs:clue:distribute']" type="text"
+            @click.native.stop="handleDistribute(scope.row)">分发</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
+            v-hasPermi="['zs:clue:invitation']" type="text"
+            @click.native.stop="handleInvitation(scope.row)">邀约</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && scope.row.state"
+            v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a"
+            @click.native.stop="handleSign(scope.row)">已登记</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && !scope.row.state"
+            v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
+            v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && !scope.row.state"
+            v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button>
           <el-button v-if="quickSearch == 8" type="text" @click="handleViewZhuangDan(scope.row)"> 撞单信息</el-button>
           <!-- <el-button v-if="searchForm.quickSearch == 8" type="text" > 撞单信息</el-button> -->
         </template>
       </el-table-column>
     </el-table>
-    <pagination :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize" :page-sizes="[10, 20, 30, 50, 100]" @pagination="_getTableList" />
+    <pagination :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+      :page-sizes="[10, 20, 30, 50, 100]" @pagination="_getTableList" />
     <!-- 批量修改 -->
     <BatchUpdateDialog ref="batchUpdateDialogForm" :options="options" @refreshDataList="_getTableList" />
     <!-- 公海  -->
@@ -60,7 +88,7 @@
     <!-- 登记弹框 -->
     <SignFormDialog ref="signDialogForm" :clue-info="clueInfo" />
     <!-- 分发 -->
-    <DistributeFormDialog ref="distributeDialogForm" @refreshDataList="_getTableList" />
+    <DistributeDialog ref="distributeDialog" @refreshDataList="_getTableList" />
     <!-- 撞单信息 -->
     <ZhuangDanDialog ref="zhuangDanDialog" />
     <!-- 备注编辑 -->
@@ -70,7 +98,7 @@
     <!-- 关键话术 -->
     <SkillDialog ref="SkillDialog" />
     <!-- 邀约弹窗 -->
-    <InvitationFormDialog ref="InvitationDialog" @refreshDataList="_getTableList"/>
+    <InvitationDialog ref="InvitationDialog" @refreshDataList="_getTableList" />
     <!-- 跟进统计弹窗 -->
     <FollowCountDialog ref="FollowCountDialog" />
   </div>
@@ -81,13 +109,13 @@ import SearchForm from './components/SearchForm.vue';
 import BatchUpdateDialog from './components/BatchUpdateDialog.vue';
 import PublicDialog from './components/PublicDialog.vue';
 import UploadDialog from './components/UploadDialog.vue';
-import DistributeFormDialog from './components/DistributeFormDialog.vue';
+import DistributeDialog from './components/DistributeDialog.vue';
 import SignFormDialog from '../sign/components/SignFormDialog.vue';
 import ZhuangDanDialog from './components/ZhuangDanDialog.vue';
 import MemoFormDialog from './components/MemoFormDialog.vue';
 import DYClueFormDialog from './components/DYClueFormDialog.vue';
 import SkillDialog from './components/SkillDialog.vue';
-import InvitationFormDialog from './components/InvitationFormDialog.vue';
+import InvitationDialog from './components/InvitationDialog.vue';
 import FollowCountDialog from './components/FollowCountDialog.vue';
 
 import { defaultColumns } from './columns.js';
@@ -96,10 +124,10 @@ import empApi from '@/api/system/employee';
 export default {
   name: 'Clue',
   components: {
-    SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeFormDialog, ZhuangDanDialog, MemoFormDialog,
-    DYClueFormDialog, SkillDialog,InvitationFormDialog,FollowCountDialog
+    SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeDialog, ZhuangDanDialog, MemoFormDialog,
+    DYClueFormDialog, SkillDialog, InvitationDialog, FollowCountDialog
   },
-  beforeRouteEnter (to, from, next) {
+  beforeRouteEnter(to, from, next) {
     if (from.name == 'ClueForm') {
       next(vm => {
         vm._getTableList();
@@ -108,7 +136,7 @@ export default {
       next();
     }
   },
-  data () {
+  data() {
     return {
       admin: localStorage.getItem('admin'),
       userId: localStorage.getItem('userId'),
@@ -142,8 +170,9 @@ export default {
         1: '待分发',
         2: '待跟进',
         3: '待到场',
-        4: '已到场',
-        5: '退单'
+        4: '未到场',
+        5: '到场未成交',
+        6: '到场已成交'
       },
       options: undefined,
       clueInfo: undefined,
@@ -151,7 +180,7 @@ export default {
       quickSearch: 0
     };
   },
-  created () {
+  created() {
     const str = localStorage.getItem(`${this.$route.name}-table-columns`);
     this.columns = str ? JSON.parse(str) : defaultColumns;
     this._getClueCountBadge();
@@ -168,7 +197,7 @@ export default {
   },
   methods: {
     // 分页查询表格数据
-    _getTableList () {
+    _getTableList() {
       this.loading = true;
       const tempForm = this.$refs.SearchForm?.searchForm || {};
       this.quickSearch = tempForm.quickSearch;
@@ -180,36 +209,36 @@ export default {
       });
     },
     // 获取已过期线索数
-    async _getClueCountBadge () {
+    async _getClueCountBadge() {
       const resp = await getClueCountBadge();
       if (resp.code === 200) {
         this.expireCount = resp.data;
       }
     },
     // 新增或修改
-    handleAddandUpdate (info) {
+    handleAddandUpdate(info) {
       this.$router.push('/zs/clue-form/index/' + (info ? info.clueId : 0));
     },
     // 抖音新增
-    handleDYAddandUpdate (info) {
+    handleDYAddandUpdate(info) {
       this.$nextTick(() => {
         this.$refs.DYClueFormDialog.init(info);
       });
     },
-    handleSkill () {
+    handleSkill() {
       this.$nextTick(() => {
         this.$refs.SkillDialog.init();
       });
     },
     // 多选框选中数据
-    handleSelectionChange (selection) {
+    handleSelectionChange(selection) {
       console.log(selection);
       this.ids = selection.map((item) => item.clueId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     // 释放线索操作
-    handleDiscard (item) {
+    handleDiscard(item) {
       this.$confirm('是否确认释放该条线索（“' + item.name + '/' + item.phone + '”）到公海?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -226,7 +255,7 @@ export default {
         .catch(function () { });
     },
     // 删除
-    handleDelete (item) {
+    handleDelete(item) {
       this.$confirm('是否确认删除该条线索（“' + item.name + '/' + item.phone + '”）?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -243,13 +272,13 @@ export default {
         .catch(function () { });
     },
     // 导入
-    handleImport (ydtData, dYData) {
+    handleImport(ydtData, dYData) {
       this.$nextTick(() => {
         this.$refs.uploadDialogForm.init({ ydtData: ydtData, dYData: dYData });
       });
     },
     /** 导出按钮操作 */
-    handleExport () {
+    handleExport() {
       this.$confirm('是否确认导出所有学员信息项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -260,12 +289,12 @@ export default {
       });
     },
     // 公海按钮点击时间
-    handlePublicClue () {
+    handlePublicClue() {
       this.$nextTick(() => {
         this.$refs.publicDialogForm.init();
       });
     },
-    getEmployee () {
+    getEmployee() {
       empApi.getEmployee().then((resp) => {
         if (resp.code === 200) {
           this.userOptions = resp.data;
@@ -273,7 +302,7 @@ export default {
       });
     },
     // 批量修改
-    handleBatChUpdate () {
+    handleBatChUpdate() {
       this.options = {
         userOptions: this.userOptions
       };
@@ -284,7 +313,7 @@ export default {
       });
     },
     // 登记成交
-    async handleSign (item) {
+    async handleSign(item) {
       // 根据clueId查询登记信息
       let signInfo = {};
       this.clueInfo = item;
@@ -297,35 +326,33 @@ export default {
       });
     },
     // 分发到场地
-    handleDistribute (item) {
-
-      if(item.feedbackStatus == 0){
+    handleDistribute(item) {
+      if (item.feedbackStatus == 0) {
         this.$confirm('该学员未邀约，确定进行分发?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then((res) => {
-        this.$nextTick(() => {
-        this.$refs.distributeDialogForm.init(item.clueId);
-      });
-      });
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then((res) => {
+          this.$nextTick(() => {
+            this.$refs.distributeDialog.init(item);
+          });
+        });
       } else {
         this.$nextTick(() => {
-        this.$refs.distributeDialogForm.init(item.clueId);
-      });
+          this.$refs.distributeDialog.init(item);
+        });
       }
-      
     },
     // 外呼
-    handlePhone (item) {
+    handlePhone(item) {
 
     },
-    handleViewZhuangDan (item) {
+    handleViewZhuangDan(item) {
       this.$nextTick(() => {
         this.$refs.zhuangDanDialog.init(item.clueId);
       });
     },
-    handleRowClick (row) {
+    handleRowClick(row) {
       if (this.quickSearch != 8) {
         // if(row.source == '抖音直播'){
         //   this.handleDYAddandUpdate(row);
@@ -334,7 +361,7 @@ export default {
         // }
       }
     },
-    handleCellClick (row, column, cell, event) {
+    handleCellClick(row, column, cell, event) {
       // 如果点击的是备注的话 开始备注编辑框
       if (column.property == 'clueMemo') {
         console.log(row, column, cell, event);
@@ -344,15 +371,15 @@ export default {
       }
     },
     //邀约
-    handleInvitation(item){
-        this.$nextTick(() => {
+    handleInvitation(item) {
+      this.$nextTick(() => {
         this.$refs.InvitationDialog.init(item)
       })
 
     },
     //跟进统计页面
-    handleFollowCount(){
-      
+    handleFollowCount() {
+
       this.$nextTick(() => {
         this.$refs.FollowCountDialog.init()
       })
diff --git a/src/views/zs/feedback/arrival.vue b/src/views/zs/feedback/arrival.vue
index dba2cf1..648ff3e 100644
--- a/src/views/zs/feedback/arrival.vue
+++ b/src/views/zs/feedback/arrival.vue
@@ -25,17 +25,17 @@
       </el-form-item>
       <el-divider></el-divider>
       <el-form-item label="到场状态" prop="arrivalStatus">
-        <el-radio-group v-model="form.arrivalStatus" size="small" :disabled="type != 'JDR'">
+        <el-radio-group v-model="form.arrivalStatus" size="small" :disabled="!isEdit">
           <el-radio :label="1">未到场</el-radio>
           <el-radio :label="2">到场未成交</el-radio>
           <el-radio :label="3">到场已成交</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="type != 'JDR'" />
+        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="!isEdit" />
       </el-form-item>
     </el-form>
-    <div v-if="type === 'JDR'" style="text-align: center;">
+    <div v-if="isEdit" style="text-align: center;">
       <div style="text-align: center;">
         <el-button type="primary" @click="submitForm">提 交</el-button>
       </div>
@@ -63,7 +63,8 @@ export default {
       },
       order: {},
       orderId: undefined,
-      type: undefined
+      type: undefined,
+      isEdit: false
     };
   },
   created () {
@@ -88,6 +89,9 @@ export default {
         if (this.order.orderId) {
           this.form.orderId = this.order.orderId;
         }
+        if (this.type == this.order.coachId) {
+          this.isEdit = true;
+        }
         this.loading = false;
       });
     },
diff --git a/src/views/zs/feedback/follow.vue b/src/views/zs/feedback/follow.vue
index aa0c3a4..1175a75 100644
--- a/src/views/zs/feedback/follow.vue
+++ b/src/views/zs/feedback/follow.vue
@@ -25,19 +25,19 @@
       </el-form-item>
       <el-divider></el-divider>
       <el-form-item label="是否联系" prop="isContact">
-        <el-radio-group v-model="form.isContact" size="small" :disabled="type != 'JDR'">
+        <el-radio-group v-model="form.isContact" size="small" :disabled="!isEdit">
           <el-radio :label="1">是</el-radio>
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="到场时间" prop="arrivalTime">
-        <el-date-picker v-model="form.arrivalTime" :disabled="type != 'JDR'" clearable type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择到场时间" />
+        <el-date-picker v-model="form.arrivalTime" :disabled="!isEdit" clearable type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择到场时间" />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" :disabled="type != 'JDR'" type="textarea" placeholder="请输入内容" />
+        <el-input v-model="form.remark" :disabled="!isEdit" type="textarea" placeholder="请输入内容" />
       </el-form-item>
     </el-form>
-    <div v-if="type === 'JDR'" style="text-align: center;">
+    <div v-if="isEdit" style="text-align: center;">
       <div style="text-align: center;">
         <el-button type="primary" @click="submitForm">提 交</el-button>
       </div>
@@ -63,7 +63,8 @@ export default {
       },
       order: {},
       orderId: undefined,
-      type: undefined
+      type: undefined,
+      isEdit: false
     };
   },
   created () {
@@ -88,6 +89,9 @@ export default {
         if (this.order.orderId) {
           this.form.orderId = this.order.orderId;
         }
+        if (this.type == this.order.coachId) {
+          this.isEdit = true;
+        }
         this.loading = false;
       });
     },