From 052fcd60b80bc63d6c3739b8a288363efdb06426 Mon Sep 17 00:00:00 2001
From: zcx <377075991@qq.com>
Date: Tue, 31 Oct 2023 17:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sch/coach/count/detail.vue                 | 10 ++++++++--
 src/views/system/employee/index.vue                  |  2 +-
 .../zs/clue/components/InvitationFormDialog.vue      |  2 +-
 src/views/zs/clue/components/SearchForm.vue          | 12 +++++++++++-
 src/views/zs/clue/index.vue                          |  4 ++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/views/sch/coach/count/detail.vue b/src/views/sch/coach/count/detail.vue
index 50be901..06d5adf 100644
--- a/src/views/sch/coach/count/detail.vue
+++ b/src/views/sch/coach/count/detail.vue
@@ -23,10 +23,16 @@
     </el-form>
 
     <el-table v-loading="loading" :data="coachList">
-      <el-table-column type="index" width="55" align="center" />
+      <el-table-column type="index" width="50" align="center" />
       <el-table-column label="学员姓名" align="center" prop="name" />
       <el-table-column label="联系方式" align="center" prop="phone" />
-      <el-table-column label="到场状态" align="center" prop="arrivalStatus" />
+      <el-table-column label="到场状态" align="center" prop="arrivalStatus" >
+        <template scope="scope">
+          <el-tag v-if="scope.row.arrivalStatus == 1">未到场</el-tag>
+          <el-tag v-if="scope.row.arrivalStatus == 2">到场未成交</el-tag>
+          <el-tag v-if="scope.row.arrivalStatus == 3">到场已成交</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
   </div>
diff --git a/src/views/system/employee/index.vue b/src/views/system/employee/index.vue
index 84d8219..82eb2dd 100644
--- a/src/views/system/employee/index.vue
+++ b/src/views/system/employee/index.vue
@@ -170,7 +170,7 @@
             <el-form-item label="数据权限" prop="openId">
             <el-radio-group v-model="form.dataScope">
               <el-radio :label="1">全部数据</el-radio>
-              <el-radio :label="2">部门数据</el-radio>
+              <!-- <el-radio :label="2">部门数据</el-radio> -->
               <el-radio :label="3">个人数据</el-radio>
             </el-radio-group>
             </el-form-item>
diff --git a/src/views/zs/clue/components/InvitationFormDialog.vue b/src/views/zs/clue/components/InvitationFormDialog.vue
index 6970af6..9cbc5a8 100644
--- a/src/views/zs/clue/components/InvitationFormDialog.vue
+++ b/src/views/zs/clue/components/InvitationFormDialog.vue
@@ -27,7 +27,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button plain @click="(visible = false)">取消</el-button>
-        <el-button v-jclick type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()">确定</el-button>
+        <el-button v-jclick type="primary" :disabled="!canSubmit || dialogForm.invitationId != undefined"  @click="dialogFormSubmit()">确定</el-button>
       </span>
     </el-dialog>
   </template>
diff --git a/src/views/zs/clue/components/SearchForm.vue b/src/views/zs/clue/components/SearchForm.vue
index 09f5fc8..849c46b 100644
--- a/src/views/zs/clue/components/SearchForm.vue
+++ b/src/views/zs/clue/components/SearchForm.vue
@@ -7,6 +7,9 @@
       <el-form-item label="意向状态:" label-width="90px">
         <DMRadio v-model="searchForm.intentionState" :list="intentionOptions" all-text="全部" @change="$emit('search')" />
       </el-form-item>
+      <el-form-item label="反馈状态:" label-width="90px">
+        <DMRadio v-model="searchForm.feedbackStatus" :list="feedbackTagOptions" all-text="全部" @change="$emit('search')" />
+      </el-form-item>
       <el-row>
         <el-form-item label="姓名/联系方式">
           <el-input v-model="searchForm.name" placeholder="姓名/联系方式" clearable style="width: 200px" />
@@ -70,7 +73,14 @@ export default {
       ],
       intentionOptions: [],
       createDateRange: [],
-      nextDateRange: []
+      nextDateRange: [],
+      feedbackTagOptions: [
+        { value: 0, label: '待邀约' },
+        { value: 1, label: '待分发' },
+        { value: 2, label: '待跟进' },
+        { value: 3, label: '待到场' },
+        { value: 4, label: '已到场' }
+    ],
     };
   },
   watch: {
diff --git a/src/views/zs/clue/index.vue b/src/views/zs/clue/index.vue
index 471078a..9ef96e6 100644
--- a/src/views/zs/clue/index.vue
+++ b/src/views/zs/clue/index.vue
@@ -39,7 +39,7 @@
         <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.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(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.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.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.indexOf(userId) != -1 ) && !scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
@@ -141,7 +141,7 @@ export default {
         0: '待邀约',
         1: '待分发',
         2: '待跟进',
-        3: '已跟进',
+        3: '待到场',
         4: '已到场',
         5: '退单'
       },