结算

Reviewed-on: http://114.55.169.15:3000/qiushanhe/dm-manage-web/pulls/15

.env.development

@@ -1,11 +1,20 @@
+###
+ # @Author: riverQiu
+ # @Date: 2023-08-16 22:04:23
+ # @LastEditors: riverQiu
+ # @LastEditTime: 2023-08-18 23:22:27
+ # @Description: 
+### 
 # 页面标题
-VUE_APP_TITLE = 莳松管理系统
+VUE_APP_TITLE = 开心学车管理系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 莳松管理系统/开发环境
+# 开心学车管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
+JWL_API = ''
+
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 莳松管理系统
+VUE_APP_TITLE = 开心学车管理系统
 
 # 生产环境配置
 ENV = 'production'
 
-# 莳松管理系统/生产环境
+# 开心学车管理系统/生产环境
 VUE_APP_BASE_API = '/duima'

.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 莳松管理系统
+VUE_APP_TITLE = 开心学车管理系统
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 莳松管理系统/测试环境
+# 开心学车管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

package.json

@@ -1,8 +1,8 @@
 {
   "name": "river",
   "version": "1.0.0",
-  "description": "莳松管理系统",
+  "description": "开心学车管理系统",
-  "author": "莳松",
+  "author": "开心学车",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",

public/index.html

@@ -95,10 +95,10 @@
     <script src="/loading/index.js"></script>
     <script type="text/javascript">
       window._AMapSecurityConfig = {
-        securityJsCode:'420463f2f8c849ab78b9d29548aff7d3',
+        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab'
-    }
+      };
-</script>
+    </script>
-<script src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
+    <script src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
-<script src="https://webapi.amap.com/maps?v=1.4.15&key=ec6b7ebe38f7ff27126f7088d87a9091&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.Geocoder,AMap.Scale"></script>
+    <script src="https://webapi.amap.com/maps?v=1.4.15&key=713d839ff505943b0f18e6df45f3b0dc&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.Geocoder,AMap.Scale"></script>
-</body>
+  </body>
 </html>

src/api/question.js

@@ -0,0 +1,35 @@
+/*
+ * @Author: riverQiu
+ * @Date: 2023-08-17 20:30:56
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-08-19 00:26:04
+ * @Description:
+ */
+import request from '@/utils/request';
+
+// 获取首页统计信息
+export function searchQuestion(param) {
+  return request({
+    url: '/driver-api/tdQuestion/duima/list',
+    method: 'get',
+    params: param
+  });
+}
+
+export function updateQuestion(data) {
+  return request({
+    url: '/driver-api/tdQuestion/duima/update',
+    method: 'put',
+    data: data
+  });
+}
+
+export function addQuestion(data) {
+  return request({
+    url: '/driver-api/tdQuestion/duima/add',
+    method: 'put',
+    data: data
+  });
+}
+
+

src/api/sch/coach.js

@@ -0,0 +1,59 @@
+/*
+ * @Author: riverQiu
+ * @Date: 2023-10-07 17:14:32
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-10-10 17:00:57
+ * @Description:教练接口
+ */
+import request from '@/utils/request';
+
+// 查询教练列表
+export function listCoach(query) {
+  return request({
+    url: '/sch/coach/list',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询教练详细
+export function getCoach(coachId) {
+  return request({
+    url: '/sch/coach/' + coachId,
+    method: 'get'
+  });
+}
+
+// 新增教练
+export function addCoach(data) {
+  return request({
+    url: '/sch/coach',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改教练
+export function updateCoach(data) {
+  return request({
+    url: '/sch/coach',
+    method: 'put',
+    data: data
+  });
+}
+
+// 删除教练
+export function delCoach(coachId) {
+  return request({
+    url: '/sch/coach/' + coachId,
+    method: 'delete'
+  });
+}
+
+export function getAllCoaches(query){
+  return request({
+    url: '/sch/coach/all',
+    method: 'get',
+    params: query
+  });
+}

src/api/system/skill.js

@@ -0,0 +1,59 @@
+/*
+ * @Author: riverQiu
+ * @Date: 2023-10-14 00:31:37
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-10-15 00:37:52
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 查询关键话术列表
+export function listSkill(query) {
+  return request({
+    url: '/system/skill/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询关键话术详细
+export function getSkill(skillId) {
+  return request({
+    url: '/system/skill/' + skillId,
+    method: 'get'
+  })
+}
+
+
+export function getSkillKey() {
+  return request({
+    url: '/system/skill/key',
+    method: 'get'
+  })
+}
+
+// 新增关键话术
+export function addSkill(data) {
+  return request({
+    url: '/system/skill',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改关键话术
+export function updateSkill(data) {
+  return request({
+    url: '/system/skill',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除关键话术
+export function delSkill(skillId) {
+  return request({
+    url: '/system/skill/' + skillId,
+    method: 'delete'
+  })
+}

src/api/zs/feedback.js

@@ -0,0 +1,51 @@
+/*
+ * @Author: riverQiu
+ * @Date: 2023-10-07 17:14:38
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-10-07 17:14:44
+ * @Description: 线索反馈接口
+ */
+import request from '@/utils/request';
+
+// 查询线索反馈列表
+export function listFeedback(query) {
+  return request({
+    url: '/zs/feedback/list',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询线索反馈详细
+export function getFeedback(feedbackId) {
+  return request({
+    url: '/zs/feedback/' + feedbackId,
+    method: 'get'
+  });
+}
+
+// 新增线索反馈
+export function addFeedback(data) {
+  return request({
+    url: '/zs/feedback',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改线索反馈
+export function updateFeedback(data) {
+  return request({
+    url: '/zs/feedback',
+    method: 'put',
+    data: data
+  });
+}
+
+// 删除线索反馈
+export function delFeedback(feedbackId) {
+  return request({
+    url: '/zs/feedback/' + feedbackId,
+    method: 'delete'
+  });
+}

src/api/zs/feedbackDetail.js

@@ -0,0 +1,74 @@
+/*
+ * @Author: riverQiu
+ * @Date: 2023-10-11 20:48:02
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-10-11 20:57:06
+ * @Description:
+ */
+/*
+ * @Author: riverQiu
+ * @Date: 2023-10-10 16:08:39
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-10-10 16:10:06
+ * @Description: 反馈单
+ */
+import request from '@/utils/request';
+
+// 查询线索反馈列表
+export function listFeedbackDetail(query) {
+  return request({
+    url: '/zs/feedback/detail/list',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询线索反馈详细
+export function getFeedbackDetail(feedbackId) {
+  return request({
+    url: '/zs/feedback/detail/' + feedbackId,
+    method: 'get'
+  });
+}
+
+export function getFeedbackDetailInfo(query){
+  return request({
+    url: '/zs/feedback/detail/info',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询线索反馈详细
+export function getFeedbackDetailByClueId(clueId) {
+  return request({
+    url: '/zs/feedback/detail/' + clueId,
+    method: 'get'
+  });
+}
+
+// 新增线索反馈
+export function addFeedbackDetail(data) {
+  return request({
+    url: '/zs/feedback/detail',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改线索反馈
+export function updateFeedbackDetail(data) {
+  return request({
+    url: '/zs/feedback/detail',
+    method: 'put',
+    data: data
+  });
+}
+
+// 删除线索反馈
+export function delFeedbackDetail(feedbackId) {
+  return request({
+    url: '/zs/feedback/detail/' + feedbackId,
+    method: 'delete'
+  });
+}

src/api/zs/feedbackOrder.js

@@ -0,0 +1,59 @@
+/*
+ * @Author: riverQiu
+ * @Date: 2023-10-10 16:08:39
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-10-10 16:10:06
+ * @Description: 反馈单
+ */
+import request from '@/utils/request';
+
+// 查询线索反馈列表
+export function listFeedbackOrder(query) {
+  return request({
+    url: '/zs/feedback/order/list',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询线索反馈详细
+export function getFeedbackOrder(feedbackId) {
+  return request({
+    url: '/zs/feedback/order/' + feedbackId,
+    method: 'get'
+  });
+}
+
+// 查询线索反馈详细
+export function getFeedbackOrderByClueId(clueId) {
+  return request({
+    url: '/zs/feedback/order/' + clueId,
+    method: 'get'
+  });
+}
+
+// 新增线索反馈
+export function addFeedbackOrder(data) {
+  return request({
+    url: '/zs/feedback/order',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改线索反馈
+export function updateFeedbackOrder(data) {
+  return request({
+    url: '/zs/feedback/order',
+    method: 'put',
+    data: data
+  });
+}
+
+// 删除线索反馈
+export function delFeedbackOrder(feedbackId) {
+  return request({
+    url: '/zs/feedback/order/' + feedbackId,
+    method: 'delete'
+  });
+}

src/api/zs/invitation.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询邀约列表
+export function listInvitation(query) {
+  return request({
+    url: '/zs/invitation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询邀约详细
+export function getInvitation(invitationId) {
+  return request({
+    url: '/zs/invitation/' + invitationId,
+    method: 'get'
+  })
+}
+
+// 查询邀约详细
+export function getInvitationByClue(query) {
+  return request({
+    url: '/zs/invitation/clue',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增邀约
+export function addInvitation(data) {
+  return request({
+    url: '/zs/invitation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改邀约
+export function updateInvitation(data) {
+  return request({
+    url: '/zs/invitation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除邀约
+export function delInvitation(invitationId) {
+  return request({
+    url: '/zs/invitation/' + invitationId,
+    method: 'delete'
+  })
+}

src/layout/components/Sidebar/Logo.vue

@@ -27,7 +27,7 @@ export default {
   },
   data() {
     return {
-      title: '莳松管理系统',
+      title: '开心学车管理系统',
       logo: logoImg
     };
   },

src/permission.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: riverQiu
+ * @Date: 2023-08-16 22:04:23
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-10-11 22:17:43
+ * @Description:
+ */
 import router from './router';
 import store from './store';
 import {
@@ -16,7 +23,7 @@ NProgress.configure({
   showSpinner: false
 });
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/question', '/clue/feedback/follow', '/clue/feedback/arrival'];
 
 router.beforeEach((to, from, next) => {
   NProgress.start();

src/router/index.js

@@ -37,28 +37,43 @@ export const constantRoutes = [{
     path: '/redirect/:path(.*)',
     component: () => import('@/views/redirect')
   }]
-  },
+},
-  {
+{
   path: '/login',
   component: () => import('@/views/login'),
   hidden: true
-  },
+},
-  {
+{
   path: '/register',
   component: () => import('@/views/register'),
   hidden: true
-  },
+},
-  {
+{
+  path: '/question',
+  component: () => import('@/views/question'),
+  hidden: true
+},
+{
+  path: '/clue/feedback/follow',
+  component: () => import('@/views/zs/feedback/follow'),
+  hidden: true
+},
+{
+  path: '/clue/feedback/arrival',
+  component: () => import('@/views/zs/feedback/arrival'),
+  hidden: true
+},
+{
   path: '/404',
   component: () => import('@/views/error/404'),
   hidden: true
-  },
+},
-  {
+{
   path: '/401',
   component: () => import('@/views/error/401'),
   hidden: true
-  },
+},
-  {
+{
   path: '',
   component: Layout,
   redirect: 'index',
@@ -72,36 +87,36 @@ export const constantRoutes = [{
       affix: true
     }
   }]
-  },
+},
-  // {
+// {
-  //   path: '/demo',
+//   path: '/demo',
-  //   component: Layout,
+//   component: Layout,
-  //   redirect: 'noredirect',
+//   redirect: 'noredirect',
-  //   meta: {
+//   meta: {
-  //     title: 'Demo',
+//     title: 'Demo',
-  //     icon: 'xx'
+//     icon: 'xx'
-  //   },
+//   },
-  //   children: [{
+//   children: [{
-  //       path: '/base-page',
+//       path: '/base-page',
-  //       component: () => import('@/views/demo/basePage/index'),
+//       component: () => import('@/views/demo/basePage/index'),
-  //       name: 'BasePage',
+//       name: 'BasePage',
-  //       meta: {
+//       meta: {
-  //         title: 'BasePage',
+//         title: 'BasePage',
-  //         icon: 'xx'
+//         icon: 'xx'
-  //       }
+//       }
-  //     },
+//     },
-  //     {
+//     {
-  //       path: '/base-components',
+//       path: '/base-components',
-  //       component: () => import('@/views/demo/baseComponents/index'),
+//       component: () => import('@/views/demo/baseComponents/index'),
-  //       name: 'BaseComponents',
+//       name: 'BaseComponents',
-  //       meta: {
+//       meta: {
-  //         title: 'BaseComponents',
+//         title: 'BaseComponents',
-  //         icon: 'xx'
+//         icon: 'xx'
-  //       }
+//       }
-  //     }
+//     }
-  //   ]
+//   ]
-  // },
+// },
-  {
+{
   path: '/user',
   component: Layout,
   hidden: true,
@@ -115,7 +130,7 @@ export const constantRoutes = [{
       icon: 'user'
     }
   }]
-  }
+}
 ];
 
 // 动态路由，基于用户权限动态去加载
@@ -133,8 +148,8 @@ export const dynamicRoutes = [{
       activeMenu: '/system/user'
     }
   }]
-  },
+},
-  {
+{
   path: '/system/role-auth',
   component: Layout,
   hidden: true,
@@ -148,8 +163,8 @@ export const dynamicRoutes = [{
       activeMenu: '/system/role'
     }
   }]
-  },
+},
-  {
+{
   path: '/system/dict-data',
   component: Layout,
   hidden: true,
@@ -163,8 +178,8 @@ export const dynamicRoutes = [{
       activeMenu: '/system/dict'
     }
   }]
-  },
+},
-  {
+{
   path: '/monitor/job-log',
   component: Layout,
   hidden: true,
@@ -178,8 +193,8 @@ export const dynamicRoutes = [{
       activeMenu: '/monitor/job'
     }
   }]
-  },
+},
-  {
+{
   path: '/zs/clue-form',
   component: Layout,
   hidden: true,
@@ -193,7 +208,7 @@ export const dynamicRoutes = [{
       activeMenu: '/zs/clue'
     }
   }]
-  }
+}
 ];
 
 // 防止连续点击多次路由报错

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <div class="login-form">
-      <h3 class="title">莳松管理系统</h3>
+      <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">

src/views/question/components/QuestionAddForm.vue

@@ -0,0 +1,211 @@
+<template>
+  <el-dialog title="试题" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="900px" @close="closeDialog">
+    <div>
+      <el-form ref="dialogForm" :model="dialogForm" :rules="dataRule" label-position="left" @keyup.enter.native="dialogFormSubmit()">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="题目" prop="question">
+              <el-input v-model="dialogForm.question" maxlength="200" placeholder="请输入题目" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="选项A" prop="question">
+              <el-input v-model="dialogForm.chooseA" maxlength="200" placeholder="请输入" clearable />
+          </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选项B" prop="question">
+              <el-input v-model="dialogForm.chooseB" maxlength="200" placeholder="请输入" clearable />
+          </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="选项C" prop="question">
+              <el-input v-model="dialogForm.chooseC" maxlength="200" placeholder="请输入" clearable />
+          </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选项D" prop="question">
+              <el-input v-model="dialogForm.chooseD" maxlength="200" placeholder="请输入" clearable />
+          </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="选项E" prop="question">
+              <el-input v-model="dialogForm.chooseE" maxlength="200" placeholder="请输入" clearable />
+          </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选项F" prop="question">
+              <el-input v-model="dialogForm.chooseF" maxlength="200" placeholder="请输入" clearable />
+          </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="选项G" prop="question">
+              <el-input v-model="dialogForm.chooseG" maxlength="200" placeholder="请输入" clearable />
+          </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="答案" prop="trueAnswer">
+              <el-input v-model="dialogForm.trueAnswer" maxlength="200" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="科目" prop="subject">
+              <span v-if="dialogForm.subject == 1">科一</span>
+              <span v-if="dialogForm.subject == 4">科四</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="精选500题" prop="isVip">
+              <el-radio-group v-model="dialogForm.isVip" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="精选600题" prop="isVip2">
+              <el-radio-group v-model="dialogForm.isVip2" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否易错题" prop="isError">
+              <el-radio-group v-model="dialogForm.isError" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否新规" prop="isNew">
+              <el-radio-group v-model="dialogForm.isNew" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否密卷1" prop="isExam1">
+              <el-radio-group v-model="dialogForm.isExam1" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否密卷2" prop="isExam2">
+              <el-radio-group v-model="dialogForm.isExam2" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col :span="24">
+            <el-form-item label="考点" prop="examKeys">
+              <el-input v-model="dialogForm.examKeys" maxlength="200" placeholder="请输入考点" clearable />
+              <span style="color:red;">包含多个考点,以英文";"分割！</span>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="答题技巧" prop="skillInfo">
+              <el-input v-model="dialogForm.skillInfo" maxlength="200" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+    </div>
+    <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>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { addQuestion } from '@/api/question';
+
+export default {
+  data () {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {
+        questionId: undefined,
+        isVip: 0,
+        isVip2: 0,
+        isError: 0,
+        isNew: 0,
+        isExam1: 0,
+        isExam2: 0,
+        examKeys: undefined
+      },
+      dataRule: {
+        schoolName: [{ required: true, message: '驾校名称不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+      }
+    };
+  },
+  methods: {
+    init (info = undefined) {
+      // debugger
+      this.visible = true;
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        // this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm = this.deepClone(info);
+        }
+      });
+    },
+    resetDialogForm () {
+      this.dialogForm = {
+        questionId: undefined,
+        isVip: 0,
+        isVip2: 0,
+        isError: 0,
+        isNew: 0,
+        isExam1: 0,
+        isExam2: 0,
+        examKeys: undefined
+      };
+    },
+    closeDialog () {
+      this.$emit('update:dialogVisible', false);
+    },
+    // 表单提交
+    dialogFormSubmit () {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          updateQuestion(this.dialogForm).then(response => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess('修改成功');
+              // this.visible = true;
+            }
+          });
+        }
+      });
+    }
+  }
+};
+</script>

src/views/question/components/QuestionForm.vue

@@ -0,0 +1,183 @@
+<template>
+  <el-dialog title="试题" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px" @close="closeDialog">
+    <div>
+      <el-form ref="dialogForm" :model="dialogForm" :rules="dataRule" label-position="left" @keyup.enter.native="dialogFormSubmit()">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="题目" prop="question">
+              <div>{{ dialogForm.question }}</div>
+              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" width="100" alt="">
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="选项" prop="question">
+              <span v-if="dialogForm.chooseA">A:{{ dialogForm.chooseA }}<span>
+                <span v-if="dialogForm.chooseB">B:{{ dialogForm.chooseB }} </span>
+                <span v-if="dialogForm.chooseC">C:{{ dialogForm.chooseC }} </span>
+                <span v-if="dialogForm.chooseD">D:{{ dialogForm.chooseD }}</span>
+                <span v-if="dialogForm.chooseE">E:{{ dialogForm.chooseE }}</span>
+                <span v-if="dialogForm.chooseF">F:{{ dialogForm.chooseF }}</span>
+                <span v-if="dialogForm.chooseG">G:{{ dialogForm.chooseG }}</span>
+              </span></span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="答案" prop="trueAnswer">
+              <span>{{ dialogForm.trueAnswer }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="科目" prop="subject">
+              <span v-if="dialogForm.subject == 1">科一</span>
+              <span v-if="dialogForm.subject == 4">科四</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="精选500题" prop="isVip">
+              <el-radio-group v-model="dialogForm.isVip" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="精选600题" prop="isVip2">
+              <el-radio-group v-model="dialogForm.isVip2" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否易错题" prop="isError">
+              <el-radio-group v-model="dialogForm.isError" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否新规" prop="isNew">
+              <el-radio-group v-model="dialogForm.isNew" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否密卷1" prop="isExam1">
+              <el-radio-group v-model="dialogForm.isExam1" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否密卷2" prop="isExam2">
+              <el-radio-group v-model="dialogForm.isExam2" size="small">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col :span="24">
+            <el-form-item label="考点" prop="examKeys">
+              <el-input v-model="dialogForm.examKeys" maxlength="200" placeholder="请输入考点" clearable />
+              <span style="color:red;">包含多个考点,以英文";"分割！</span>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="答题技巧" prop="skillInfo">
+              <el-input v-model="dialogForm.skillInfo" maxlength="200" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+    </div>
+    <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>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { updateQuestion } from '@/api/question';
+
+export default {
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {
+        questionId: undefined,
+        isVip: 0,
+        isVip2: 0,
+        isError: 0,
+        isNew: 0,
+        isExam1: 0,
+        isExam2: 0,
+        examKeys: undefined
+      },
+      dataRule: {
+        schoolName: [{ required: true, message: '驾校名称不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+      }
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      // debugger
+      this.visible = true;
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        // this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm = this.deepClone(info);
+        }
+      });
+    },
+    resetDialogForm() {
+      this.dialogForm = {
+        questionId: undefined,
+        isVip: 0,
+        isVip2: 0,
+        isError: 0,
+        isNew: 0,
+        isExam1: 0,
+        isExam2: 0,
+        examKeys: undefined
+      };
+    },
+    closeDialog() {
+      this.$emit('update:dialogVisible', false);
+    },
+    // 表单提交
+    dialogFormSubmit() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          updateQuestion(this.dialogForm).then(response => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess('修改成功');
+              this.$emit('update');
+              // this.visible = true;
+            }
+          });
+        }
+      });
+    }
+  }
+};
+</script>

src/views/question/index.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="app-container" style="text-align:center">
+    <el-form size="small" :inline="true" label-width="68px" @submit.native.prevent>
+      <el-row :gutter="20">
+        <el-form-item label="车型">
+          <el-radio-group v-model="queryParams.carTypeId">
+            <el-radio :label="1001">小车</el-radio>
+            <el-radio :label="1002">摩托车</el-radio>
+            <el-radio :label="1003">货车</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="科目">
+          <el-radio-group v-model="queryParams.subject">
+            <el-radio :label="1">科一</el-radio>
+            <el-radio :label="4">科四</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-row>
+      <el-form-item label="题目">
+        <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width:400px" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="tableList" style="width:80%;margin:auto" @row-click="handleEdit">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="题目" align="center" prop="question" min-width="140" />
+      <el-table-column label="选项" align="center" min-width="140">
+        <template slot-scope="{row}">
+          <p v-if="row.chooseA">A:{{ row.chooseA }}</p>
+          <p v-if="row.chooseB">B:{{ row.chooseB }}</p>
+          <p v-if="row.chooseC">C:{{ row.chooseC }}</p>
+          <p v-if="row.chooseD">D:{{ row.chooseD }}</p>
+          <p v-if="row.chooseE">E:{{ row.chooseE }}</p>
+          <p v-if="row.chooseF">F:{{ row.chooseF }}</p>
+          <p v-if="row.chooseG">G:{{ row.chooseG }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="答案" align="center" prop="trueAnswer" min-width="100" />
+      <el-table-column label="科目" align="center" prop="subject" min-width="100">
+        <template slot-scope="{row}">
+          <p v-if="row.subject == 1">科一</p>
+          <p v-if="row.subject == 4">科四</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否新规" align="center" min-width="100">
+        <template slot-scope="{row}">
+          {{ row.isNew ? '是' : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="车型" align="center" min-width="100">
+        <template slot-scope="{row}">
+          {{ row.carTypeId == 1001 ? '小车' : '摩托车' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-download" @click="handleEdit(scope.row)">编辑</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
+    <QuestionForm v-if="dialogVisible" ref="dialogForm" :dialog-visible="dialogVisible" @update="getList" />
+    <QuestionAddForm v-if="dialogAddVisible" ref="dialogAddForm" :dialog-visible="dialogAddVisible" @update="getList" />
+
+  </div>
+</template>
+
+<script>
+import { searchQuestion } from '@/api/question';
+import QuestionForm from './components/QuestionForm.vue';
+import QuestionAddForm from './components/QuestionAddForm.vue';
+
+export default {
+  name: 'Question',
+  components: {
+    QuestionForm, QuestionAddForm
+  },
+  data () {
+    return {
+      // 遮罩层
+      loading: false,
+      // 总条数
+      total: 0,
+      tableList: [],
+      // 查询参数
+      queryParams: {
+        question: '',
+        carTypeId: 1001,
+        subject: 1
+      },
+      dialogVisible: false,
+      dialogAddVisible: false
+    };
+  },
+  created () {
+    // this.getList();
+  },
+  methods: {
+    /** 查询文件列表 */
+    getList () {
+      this.loading = true;
+      searchQuestion(this.queryParams).then(response => {
+        this.tableList = response.data;
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery () {
+      if (this.queryParams.question) {
+        this.getList();
+      } else {
+        this.$modal.msgWarning('请输入题目');
+      }
+    },
+    /** 重置按钮操作 */
+    resetQuery () {
+      this.queryParams.question = '';
+      this.handleQuery();
+    },
+    handleEdit (item) {
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs.dialogForm.init(item);
+      });
+    },
+    handleAdd (item) {
+      this.dialogAddVisible = true;
+      this.$nextTick(() => {
+        this.$refs.dialogAddForm.init(item);
+      });
+    }
+  }
+};
+</script>

src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">莳松管理系统</h3>
+      <h3 class="title">开心学车管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

src/views/sch/coach/components/CoachForm.vue

@@ -0,0 +1,136 @@
+
+<template>
+  <el-dialog title="接待人信息" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog">
+    <div>
+      <el-form ref="dialogForm" :model="dialogForm" :rules="dataRule" label-position="top" @keyup.enter.native="dialogFormSubmit()">
+        <el-form-item label="所属驾校" prop="schoolId">
+          <el-select v-model="dialogForm.schoolId" filterable placeholder="请选择" value-key="schoolId" clearable size="small" style="width:100%">
+            <el-option v-for="(dict, index) in schoolOptions" :key="index" :label="dict.schoolName" :value="dict.schoolId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属场地" prop="placeId">
+          <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable value-key="placeId" size="small" style="width:100%">
+            <el-option v-for="(dict, index) in placeOptions.filter(item => item.schoolId === dialogForm.schoolId)" :key="index" :label="dict.name" :value="dict.placeId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="接待人" prop="coachName">
+          <el-input v-model="dialogForm.coachName" placeholder="请输入教练名" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="phone">
+          <el-input v-model="dialogForm.phone" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="微信openid" prop="openId">
+          <el-input v-model="dialogForm.openId" placeholder="请输入微信openid" />
+        </el-form-item>
+      </el-form>
+
+    </div>
+    <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>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { addCoach, updateCoach } from '@/api/sch/coach';
+
+export default {
+  props: {
+    schoolOptions: {
+      type: Array,
+      default: []
+    },
+    placeOptions: {
+      type: Array,
+      default: []
+    }
+  },
+  data () {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {
+        coachId: null,
+        deptId: null,
+        schoolId: null,
+        placeId: null,
+        coachName: null,
+        phone: null,
+        openId: null
+      },
+      dataRule: {
+        schoolId: [{ required: true, message: '所属驾校不能为空', trigger: 'blur' }],
+        placeId: [{ required: true, message: '场地不能为空', trigger: 'blur' }],
+        coachName: [{ required: true, message: '教练名不能为空', trigger: 'blur' }],
+        phone: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }]
+
+      }
+    };
+  },
+  methods: {
+    init (info = undefined) {
+      // debugger
+      this.visible = true;
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm = this.deepClone(info);
+        }
+      });
+    },
+    resetDialogForm () {
+      this.dialogForm = {
+        coachId: null,
+        deptId: null,
+        schoolId: null,
+        placeId: null,
+        coachName: null,
+        phone: null,
+        openId: null
+      };
+    },
+    closeDialog () {
+      this.$emit('update:dialogVisible', false);
+    },
+    // 表单提交
+    dialogFormSubmit () {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          this.canSubmit = false;
+
+          if (this.dialogForm.coachId) {
+            // 校验完成，调接口
+            updateCoach(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 {
+            addCoach(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('保存成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
+              })
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          }
+        }
+      });
+    }
+  }
+};
+</script>

src/views/sch/coach/index.vue

@@ -0,0 +1,159 @@
+<template>
+  <div class="app-container">
+    <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
+      <el-form-item label="所属驾校" prop="schoolId">
+        <el-select v-model="queryParams.schoolId" filterable placeholder="请选择" value-key="schoolId" clearable size="small">
+          <el-option v-for="(dict, index) in schoolOptions" :key="index" :label="dict.schoolName" :value="dict.schoolId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属场地" prop="placeId">
+        <el-select v-model="queryParams.placeId" filterable placeholder="请选择" clearable value-key="placeId" size="small">
+          <el-option v-for="(dict, index) in placeOptions.filter(item => item.schoolId === queryParams.schoolId)" :key="index" :label="dict.name" :value="dict.placeId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="接待人" prop="coachName">
+        <el-input v-model="queryParams.coachName" placeholder="请输入" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="phone">
+        <el-input v-model="queryParams.phone" placeholder="请输入联系方式" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button v-hasPermi="['sch:coach:add']" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddAndUpdate(undefined)">新增</el-button>
+      </el-col>
+      <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table v-loading="loading" :data="coachList">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="所属驾校" align="center" prop="schoolName" />
+      <el-table-column label="所属场地" align="center" prop="placeName" />
+      <el-table-column label="接待人" align="center" prop="coachName" />
+      <el-table-column label="联系方式" align="center" prop="phone" />
+      <el-table-column label="微信openid" align="center" prop="openId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button v-hasPermi="['sch:coach:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleAddAndUpdate(scope.row)">修改</el-button>
+          <el-button v-hasPermi="['sch:coach:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改教练对话框 -->
+    <coach-form v-if="dialogVisible" ref="dialogForm" :dialog-visible="dialogVisible" :school-options="schoolOptions" :place-options="placeOptions" @refreshDataList="getList" />
+  </div>
+</template>
+
+<script>
+import { listCoach, getCoach, delCoach } from '@/api/sch/coach';
+import CoachForm from './components/CoachForm.vue';
+import schoolAPi from '@/api/sch/school';
+import { getAllPlaces } from '@/api/sch/place';
+
+export default {
+  name: 'Coach',
+  components: { CoachForm },
+  data () {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 教练表格数据
+      coachList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        schoolId: null,
+        placeId: null,
+        coachName: null,
+        phone: null
+      },
+      dialogVisible: false,
+      schoolOptions: [],
+      placeOptions: []
+    };
+  },
+  created () {
+    this.getSchools();
+    this.getPlaces();
+    this.getList();
+  },
+  methods: {
+    /** 查询教练列表 */
+    getList () {
+      this.loading = true;
+      listCoach(this.queryParams).then(response => {
+        this.coachList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel () {
+      this.open = false;
+      this.reset();
+    },
+    /** 搜索按钮操作 */
+    handleQuery () {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery () {
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    /** 新增或修改按钮操作 */
+    handleAddAndUpdate (item) {
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs.dialogForm.init(item);
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete (row) {
+      const coachIds = row.coachId || this.ids;
+      this.$modal.confirm('是否确认删除教练编号为"' + coachIds + '"的数据项？').then(function () {
+        return delCoach(coachIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess('删除成功');
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport () {
+      this.download('system/coach/export', {
+        ...this.queryParams
+      }, `coach_${new Date().getTime()}.xlsx`);
+    },
+    getSchools () {
+      schoolAPi.allList().then((resp) => {
+        this.schoolOptions = resp.data;
+      });
+    },
+    getPlaces () {
+      getAllPlaces({ status: '0', showInMap: true }).then((resp) => {
+        this.placeOptions = resp.data;
+      });
+    }
+  }
+};
+</script>

src/views/sch/place/index.vue

@@ -5,12 +5,12 @@
     <el-input id="search" v-model="searchBody" class="search-body" placeholder="请输入..." @keyup.enter.native="submitSearch">
       <el-button slot="append" icon="el-icon-search" @click="submitSearch" />
     </el-input>
-    <div class="asider" :class="showSchool ? '':'hidden-school'">
+    <div class="asider" :class="showSchool ? '' : 'hidden-school'">
-      <el-card class="box-card" :body-style="{ flex: 1,'overflow-y': 'scroll', padding: 0 }">
+      <el-card class="box-card" :body-style="{ flex: 1, 'overflow-y': 'scroll', padding: 0 }">
         <div slot="header" class="clearfix">
           <div class="map-card-title">驾校列表</div>
         </div>
-        <div v-for="school in schoolList" :key="school.schoolId" style="margin:10px;" :class="currentdeptId == school.schoolId?'actived-school':''">
+        <div v-for="school in schoolList" :key="school.schoolId" style="margin:10px;" :class="currentdeptId == school.schoolId ? 'actived-school' : ''">
           <el-card :body-style="{ padding: '10px' }">
             <div slot="header" class="clearfix">
               <div class="map-card-title">{{ school.schoolName }}</div>
@@ -94,7 +94,7 @@
           <el-radio v-model="placeForm.recommend" :label="false">否</el-radio>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="placeForm.remark" placeholder="输入备注" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" />
+          <el-input v-model="placeForm.remark" placeholder="输入备注" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
         </el-form-item>
         <el-form-item style="text-align:right;">
           <el-button v-hasPermi="['sch:place:edit']" type="primary" @click="onSubmit">保存</el-button>
@@ -102,7 +102,7 @@
         </el-form-item>
       </el-form>
     </el-card>
-    <el-card :class="placeListDialogShow ? '':'hidden-place-list'" class="place-list-dialog" :style="{ right: showSchool ? '300px' : '0', top : fullScreenPlaceList?'0px':'420px' }" :body-style="{ padding: '10px', height: 'calc(100% - 52px)' }">
+    <el-card :class="placeListDialogShow ? '' : 'hidden-place-list'" class="place-list-dialog" :style="{ right: showSchool ? '300px' : '0', top: fullScreenPlaceList ? '0px' : '420px' }" :body-style="{ padding: '10px', height: 'calc(100% - 52px)' }">
       <div slot="header" class="clearfix">
         <div class="map-card-title">
           {{ placeListDialogTitle }}
@@ -112,7 +112,7 @@
           <el-button icon="el-icon-full-screen" class="add-icon" @click="fullScreenPlaceList = !fullScreenPlaceList" />
         </el-tooltip>
         <el-tooltip content="关闭" placement="top" effect="dark">
-          <el-button icon="el-icon-close" class="add-icon" @click="() => { placeListDialogShow = false;fullScreenPlaceList = false }" />
+          <el-button icon="el-icon-close" class="add-icon" @click="() => { placeListDialogShow = false; fullScreenPlaceList = false }" />
         </el-tooltip>
       </div>
       <el-table :data="placeTableData" border stripe class="place-table-list" height="100%">
@@ -139,8 +139,8 @@
       </el-table>
     </el-card>
 
-    <div v-if="isPointing || isRanging" class="map-tip" :style="{ transform: 'translate3D(' + (tipPostion.x + 15) +'px,' + (tipPostion.y - 10) + 'px, 0)' }">{{ mapHelpText }}</div>
+    <div v-if="isPointing || isRanging" class="map-tip" :style="{ transform: 'translate3D(' + (tipPostion.x + 15) + 'px,' + (tipPostion.y - 10) + 'px, 0)' }">{{ mapHelpText }}</div>
-    <i v-if="isPointing" class="el-icon-s-flag circle" :style="{ transform: 'translate3D(' + tipPostion.x +'px,' + tipPostion.y + 'px, 0)' }" />
+    <i v-if="isPointing" class="el-icon-s-flag circle" :style="{ transform: 'translate3D(' + tipPostion.x + 'px,' + tipPostion.y + 'px, 0)' }" />
   </div>
 </template>
 <!-- eslint-disable no-undef -->
@@ -281,7 +281,7 @@ export default {
     },
     // 导入地图
     importMap() {
-      const url = 'https://webapi.amap.com/maps?v=1.4.15&key=f2f35d6adc4a16bb879d303cead56237&callback=onLoad';
+      const url = 'https://webapi.amap.com/maps?v=1.4.15&key=0e62be0896c6b8d27d453445f0fb8bc4&callback=onLoad';
       var jsapi = document.createElement('script');
       jsapi.charset = 'utf-8';
       jsapi.src = url;
@@ -477,7 +477,7 @@ export default {
       if (item.placeId) {
         return updatePlace(item);
       } else {
-        return addPlace(item)
+        return addPlace(item);
       }
     },
     checkPlaceFormValidate() {
@@ -546,7 +546,7 @@ export default {
       for (let i = 0; i < this.tableData.length; i++) {
         const element = this.tableData[i];
         const tempSchool = this.schoolList.filter((item) => item.schoolId === element.schoolId)[0];
-        if (!tempSchool.showInMap || !element.showInMap) {
+        if (!element.schoolShow || !element.showInMap) {
           continue;
         }
         const tmpMarker = new AMap.Marker({
@@ -739,6 +739,7 @@ export default {
 .actived-school {
   border: 2px solid #409eff !important;
 }
+
 ::v-deep .el-radio__label {
   vertical-align: middle;
 }

src/views/system/employee/index.vue

@@ -158,6 +158,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="微信openId" prop="openId">
+              <el-input v-model="form.openId" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <!-- <el-col :span="12">
@@ -205,7 +210,7 @@ import editor from '@/components/Editor';
 export default {
   name: 'Employee',
   components: { Treeselect, editor },
-  data() {
+  data () {
     return {
       // 遮罩层
       loading: true,
@@ -287,11 +292,11 @@ export default {
   },
   watch: {
     // 根据名称筛选部门树
-    deptName(val) {
+    deptName (val) {
       this.$refs.tree.filter(val);
     }
   },
-  created() {
+  created () {
     this.getList();
     this.getDeptTree();
     this._getRoleOptions();
@@ -323,7 +328,7 @@ export default {
   },
   methods: {
     /** 查询用户列表 */
-    getList() {
+    getList () {
       this.loading = true;
       empAPi.pageList(this.queryParams).then((response) => {
         this.userList = response.rows;
@@ -331,29 +336,29 @@ export default {
         this.loading = false;
       });
     },
-    _getRoleOptions() {
+    _getRoleOptions () {
       getRoleOptions().then((resp) => {
         this.roleOptions = resp.data;
       });
     },
     /** 查询部门下拉树结构 */
-    getDeptTree() {
+    getDeptTree () {
       deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
       });
     },
     // 筛选节点
-    filterNode(value, data) {
+    filterNode (value, data) {
       if (!value) return true;
       return data.label.indexOf(value) !== -1;
     },
     // 节点单击事件
-    handleNodeClick(data) {
+    handleNodeClick (data) {
       this.queryParams.orgId = data.id;
       this.getList();
     },
     // 用户状态修改
-    handleStatusChange(row) {
+    handleStatusChange (row) {
       const text = row.status === '0' ? '启用' : '停用';
       this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', '警告', {
         confirmButtonText: '确定',
@@ -375,12 +380,12 @@ export default {
         });
     },
     // 取消按钮
-    cancel() {
+    cancel () {
       this.open = false;
       this.reset();
     },
     // 表单重置
-    reset() {
+    reset () {
       this.form = {
         orgId: undefined,
         employeeName: undefined,
@@ -402,24 +407,24 @@ export default {
       this.resetForm('form');
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery () {
       this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */
-    resetQuery() {
+    resetQuery () {
       this.resetForm('queryForm');
       this.handleQuery();
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd () {
       this.reset();
       this.getDeptTree();
       this.open = true;
       this.title = '添加员工';
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate (row) {
       this.reset();
       this.getDeptTree();
       this.form = Object.assign({}, row);
@@ -427,7 +432,7 @@ export default {
       this.title = '修改员工';
     },
     /** 重置密码按钮操作 */
-    handleReset(row) {
+    handleReset (row) {
       resetUserPwd({ employeeId: row.employeeId }).then((response) => {
         if (response.code === 200) {
           this.msgSuccess('重置密码成功!');
@@ -435,7 +440,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm () {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.$set(this.form, 'deptId', this.$store.getters.schoolId);
@@ -459,7 +464,7 @@ export default {
         }
       });
     },
-    handleLogoff(row) {
+    handleLogoff (row) {
       this.$confirm('注销后将立即释放线索，并禁用该员工，是否确认注销?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -470,7 +475,7 @@ export default {
         this.msgSuccess('注销成功！');
       });
     },
-    handleRelease(row) {
+    handleRelease (row) {
       this.$confirm('是否立刻释放该员工拥有的线索?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -481,7 +486,7 @@ export default {
         this.msgSuccess('释放成功！');
       });
     },
-    handleRemove(row) {
+    handleRemove (row) {
       this.$confirm('是否删除该员工，建议只在数据错误时删除?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/system/skill/index.vue

@@ -0,0 +1,193 @@
+<template>
+  <div class="app-container">
+    <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
+      <el-form-item label="关键词" prop="skillKey">
+        <el-input v-model="queryParams.skillKey" placeholder="请输入关键词" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button v-hasPermi="['system:skill:add']" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-col>
+
+      <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table v-loading="loading" :data="skillList" @selection-change="handleSelectionChange">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="关键词" align="center" prop="skillKey" />
+      <el-table-column label="话术内容" align="center" prop="content" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button v-hasPermi="['system:skill:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button v-hasPermi="['system:skill:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改关键话术对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="关键词" prop="skillKey">
+          <el-input v-model="form.skillKey" placeholder="请输入关键词" />
+        </el-form-item>
+        <el-form-item label="话术内容">
+          <editor v-model="form.content" :min-height="192" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSkill, getSkill, delSkill, addSkill, updateSkill } from '@/api/system/skill';
+
+export default {
+  name: 'Skill',
+  data () {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 关键话术表格数据
+      skillList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: null,
+        skillKey: null,
+        content: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        skillKey: [{ required: true, message: '关键词不能为空', trigger: 'blur' }],
+        content: [{ required: true, message: '话术内容不能为空', trigger: 'blur' }]
+      }
+    };
+  },
+  created () {
+    this.getList();
+  },
+  methods: {
+    /** 查询关键话术列表 */
+    getList () {
+      this.loading = true;
+      listSkill(this.queryParams).then(response => {
+        this.skillList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel () {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset () {
+      this.form = {
+        skillId: null,
+        deptId: null,
+        skillKey: null,
+        content: null
+      };
+      this.resetForm('form');
+    },
+    /** 搜索按钮操作 */
+    handleQuery () {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery () {
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange (selection) {
+      this.ids = selection.map(item => item.skillId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd () {
+      this.reset();
+      this.open = true;
+      this.title = '添加关键话术';
+    },
+    /** 修改按钮操作 */
+    handleUpdate (row) {
+      this.reset();
+      const skillId = row.skillId || this.ids;
+      getSkill(skillId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = '修改关键话术';
+      });
+    },
+    /** 提交按钮 */
+    submitForm () {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.skillId != null) {
+            updateSkill(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSkill(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete (row) {
+      const skillIds = row.skillId || this.ids;
+      this.$modal.confirm('是否确认删除关键话术编号为"' + skillIds + '"的数据项？').then(function () {
+        return delSkill(skillIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess('删除成功');
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport () {
+      this.download('system/skill/export', {
+        ...this.queryParams
+      }, `skill_${new Date().getTime()}.xlsx`);
+    }
+  }
+};
+</script>

src/views/zs/clue/ClueForm/components/MapDialog.vue

@@ -19,11 +19,12 @@ export default {
       placeSearch: null,
       currentPoint: undefined,
       marker: null,
-      searchBody: undefined
+      searchBody: undefined,
-    }
+      geocoder: null
+    };
   },
   beforeDestroy() {
-    console.log("mapdialog----beforeDestroy")
+    console.log('mapdialog----beforeDestroy');
     this.marker = null;
     this.placeSearch = null;
 
@@ -31,23 +32,23 @@ export default {
     this.dialogMap = null;
   },
   mounted() {
-    console.log("mounted")
+    console.log('mounted');
-    this.initData()
+    this.initData();
   },
   created() {
-    console.log("created")
+    console.log('created');
   },
   methods: {
     initData(point = undefined) {
-      console.log(point)
+      console.log(point);
-      this.visible = true
+      this.visible = true;
       // this.searchBody = undefined
       this.$nextTick(() => {
         this.resetData();
         if (point) {
           this.currentPoint = point;
         }
-        this.initMap()
+        this.initMap();
       });
     },
     resetData() {
@@ -55,10 +56,10 @@ export default {
       this.dialogMap && this.marker && this.dialogMap.remove(this.marker);
       this.marker = null;
       // this.placeSearch = null;
-      this.searchBody = null
+      this.searchBody = null;
     },
     initMap() {
-      console.log("初始化地图")
+      console.log('初始化地图');
       if (!this.dialogMap) {
         this.dialogMap = new AMap.Map('dialogMap', {
           zoom: 12,
@@ -78,20 +79,19 @@ export default {
         });
         this.dialogMap.addControl(new AMap.Scale());
         const auto = new AMap.Autocomplete({
-          input: 'search', // 前端搜索框
+          input: 'search' // 前端搜索框
-        })
+        });
         this.placeSearch = new AMap.PlaceSearch({
           map: this.dialogMap,
           pageSize: 10, // 单页显示结果条数
           pageIndex: 1, // 页码
-          autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+          autoFitView: true // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-        })
+        });
-        AMap.event.addListener(auto, 'select', this.select)
+        AMap.event.addListener(auto, 'select', this.select);
         this.geocoder = new AMap.Geocoder();
       }
 
       this.initMapCenter();
-
     },
     // 初始化编辑地图的中心点
     initMapCenter() {
@@ -127,7 +127,7 @@ export default {
         }
       });
     },
-    //定位地址
+    // 定位地址
     regeoCode() {
       this.geocoder.getAddress(
         [this.currentPoint.lng, this.currentPoint.lat],
@@ -141,11 +141,10 @@ export default {
     },
     handleMapSave() {
       if (this.currentPoint.lat && this.currentPoint.lng) {
-        //通知父组件
+        // 通知父组件
-        this.$emit("handleMapDialogPoint", this.currentPoint);
+        this.$emit('handleMapDialogPoint', this.currentPoint);
         this.visible = false;
         this.$emit('update:mapDialogVisible', false);
-
       } else {
         this.$message.error('请在地图上选择位置后保存！');
       }
@@ -153,8 +152,8 @@ export default {
     closeDialog() {
       this.$emit('update:mapDialogVisible', false);
     }
-  },
+  }
-}
+};
 </script>
 
 <style scoped>
@@ -162,6 +161,7 @@ export default {
   width: 100%;
   height: 400px;
 }
+
 .search-body {
   position: absolute;
   top: 90px;

src/views/zs/clue/ClueForm/index.vue

@@ -26,6 +26,8 @@
             <el-checkbox v-model="saveNext" />
             <span class="ml5">保存后继续创建下一条</span>
           </template>
+          <el-button type="primary" @click="handleSkill">关键话术</el-button>
+
         </div>
         <!-- :disabled="!canSubmit" -->
         <el-button class="footer_button" :disabled="!canSubmit" type="primary" @click="clueSubmit">确 定</el-button>
@@ -39,12 +41,12 @@
           <el-col :span="8">
             <el-col :span="24">
               <el-form-item label="创建时间" prop="createTime">
-                <el-date-picker style="width: 100%;" v-model="clueForm.createTime" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" type="datetime" :disabled="admin!='true'" />
+                <el-date-picker v-model="clueForm.createTime" style="width: 100%;" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" type="datetime" :disabled="admin!='true'" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="线索来源" prop="source">
-                <el-select style="width: 100%;" v-model="clueForm.source" placeholder="请选择" clearable>
+                <el-select v-model="clueForm.source" style="width: 100%;" placeholder="请选择" clearable>
                   <el-option v-for="dict in sourceOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
               </el-form-item>
@@ -64,29 +66,57 @@
                 <el-input v-model="clueForm.weChat" placeholder="请输入微信号" />
               </el-form-item>
             </el-col>
+            <el-col v-if="clueForm.source == '抖音直播'" :span="24">
+              <el-form-item label="商品名称" prop="goodName">
+                <el-input v-model="clueForm.goodName" placeholder="请输入商品名称" />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="clueForm.source == '抖音直播'" :span="24">
+              <el-form-item label="订单实收" prop="amountReceived">
+                <el-input v-model="clueForm.amountReceived" placeholder="请输入订单实收" />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="跟进人员" prop="followUser">
-                <el-select style="width: 100%;" v-model="clueForm.followUser" multiple clearable :disabled="admin != 'true' && clueForm.clueId != undefined">
+                <el-select v-model="clueForm.followUser" style="width: 100%;" multiple clearable :disabled="admin != 'true' && clueForm.clueId != undefined">
                   <el-option v-for="dict in userOptions" :key="dict.id" :label="dict.name" :value="dict.id" />
                 </el-select>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="意向状态" prop="intentionState">
+              <el-form-item v-if="clueForm.source == '抖音直播'" label="意向状态" prop="intentionState">
-                <el-select style="width: 100%;" v-model="clueForm.intentionState" placeholder="请选择" clearable>
+                <el-select v-model="clueForm.intentionState" style="width: 100%;" placeholder="请选择" clearable>
-                  <el-option v-for="dict in intentionOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue">
+                  <el-option v-for="dict in intentionOptions.filter(item => item.remark == undefined || item.remark == '抖音')" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue">
                     <i class="el-icon-star-on" :style="dict.cssClass" />
                     <span style="float: right; color: #8492a6; font-size: 13px">
                       {{ dict.dictValue }}
                     </span>
                   </el-option>
+
                 </el-select>
               </el-form-item>
+
+              <el-form-item v-else label="意向状态" prop="intentionState">
+                <el-select v-model="clueForm.intentionState" style="width: 100%;" placeholder="请选择" clearable>
+                  <el-option v-for="dict in intentionOptions.filter(item => item.remark == undefined || item.remark == '正常')" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue">
+                    <i class="el-icon-star-on" :style="dict.cssClass" />
+                    <span style="float: right; color: #8492a6; font-size: 13px">
+                      {{ dict.dictValue }}
+                    </span>
+                  </el-option>
+
+                </el-select>
+              </el-form-item>
+            </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-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="下次跟进时间" prop="followTime">
-                <el-date-picker style="width: 100%;" v-model="clueForm.followTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
+                <el-date-picker v-model="clueForm.followTime" style="width: 100%;" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -103,7 +133,7 @@
             <!-- 跟进记录 -->
             <el-col :span="24" style="margin-top: 20px;">
               <el-form-item label="跟进记录" prop="clueMemo" label-position="top">
-                <FollowRecord v-if="clueId" :clueId="clueId" />
+                <FollowRecord v-if="clueId" :clue-id="clueId" />
               </el-form-item>
             </el-col>
 
@@ -111,7 +141,7 @@
           <el-col :span="16">
             <div>
               <el-col :span="24" class="mb20 plr20" style="position: relative">
-                <PlaceMap ref="placeMap" :placeList="placeList" />
+                <PlaceMap ref="placeMap" :place-list="placeList" />
                 <div class="address">
                   <el-form-item label="位置" prop="address" label-width="80px">
                     <el-input v-model="clueForm.address" placeholder="请输入位置" disabled>
@@ -130,25 +160,28 @@
     <!-- </el-card> -->
 
     <MapDialog v-if="mapDialogVisible" ref="mapDialog" :dialog-visible="mapDialogVisible" @handleMapDialogPoint="handleMapDialogPoint" />
+    <!-- 关键话术 -->
+    <SkillDialog ref="SkillDialog" />
 
   </div>
 </template>
 
 <script>
-import { getClueInfo, getConsultRecord, addClue, updateClue, } from '@/api/zs/clue'
+import { getClueInfo, getConsultRecord, addClue, updateClue } from '@/api/zs/clue';
-import empApi from '@/api/system/employee'
+import empApi from '@/api/system/employee';
-import { getAllPlaces } from '@/api/sch/place'
+import { getAllPlaces } from '@/api/sch/place';
 
 import PlaceMap from './components/PlaceMap.vue';
 import FollowRecord from './components/FollowRecord.vue';
 import MapDialog from './components/MapDialog.vue';
+import SkillDialog from '../components/SkillDialog.vue';
 
 export default {
   name: 'ClueForm',
   components: {
-    PlaceMap, FollowRecord, MapDialog
+    PlaceMap, FollowRecord, MapDialog, SkillDialog
   },
-  data() {
+  data () {
     return {
       admin: localStorage.getItem('admin'),
       userId: localStorage.getItem('userId'),
@@ -163,13 +196,13 @@ export default {
         createTime: { required: true, message: '创建时间不为空', trigger: 'blur,change' },
         consultTime: { required: true, message: '咨询时间不为空', trigger: 'blur,change' },
         source: { required: true, message: '线索来源不为空', trigger: 'blur,change' },
-        address: { required: true, message: '位置不为空', trigger: 'blur' },
+        // address: { required: true, message: '位置不为空', trigger: 'blur' },
         intentionState: { required: true, message: '意向状态不为空', trigger: 'blur,change' }
       },
-      userOptions: [],//跟进人员
+      userOptions: [], // 跟进人员
-      sourceOptions: [],//线索来源
+      sourceOptions: [], // 线索来源
-      intentionOptions: [],//意向状态
+      intentionOptions: [], // 意向状态
-      placeList: [],//场地信息
+      placeList: [], // 场地信息
       mapDialogVisible: false,
       consultRecord: [],
       canSubmit: true,
@@ -177,10 +210,10 @@ export default {
       saveNext: false
     };
   },
-  created() {
+  created () {
-    //获取clueId
+    // 获取clueId
-    this.clueId = Number(this.$route.params.clueId)
+    this.clueId = Number(this.$route.params.clueId);
-    this.getAllPlaces()
+    this.getAllPlaces();
     this.getEmployee();
 
     this.getClueInfo(this.clueId);
@@ -195,20 +228,19 @@ export default {
   },
 
   methods: {
-    async getClueInfo(clueId) {
+    async getClueInfo (clueId) {
       this.resetForm();
-      if (clueId === 0)
+      if (clueId === 0) { return; }
-        return
+      this.saveNextShow = false;
-      this.saveNextShow = false
+      this.saveNext = false;
-      this.saveNext = false
       const resp = await getClueInfo(clueId);
       if (resp.code == 200) {
-        this.clueForm = { ...resp.data }
+        this.clueForm = { ...resp.data };
         this.handleMapCenter(this.clueForm);
         this.getConsultRecord(this.clueForm.phone);
       }
     },
-    resetForm() {
+    resetForm () {
       this.clueForm = {
         clueId: undefined,
         createTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}'),
@@ -226,52 +258,52 @@ export default {
         licenseType: undefined,
         lng: undefined,
         lat: undefined
-      }
+      };
 
       if (this.admin == 'false') {
-        this.clueForm.followUser.push(Number(this.userId))
+        this.clueForm.followUser.push(Number(this.userId));
       }
     },
     // 查询咨询记录
-    getConsultRecord(phone) {
+    getConsultRecord (phone) {
       getConsultRecord({ phone }).then((resp) => {
         if (resp && resp.code === 200 && resp.data) {
-          this.consultRecord = resp.data
+          this.consultRecord = resp.data;
           if (this.consultRecord && this.consultRecord.length > 0) {
-            this.clueForm.consultCount = this.consultRecord.length
+            this.clueForm.consultCount = this.consultRecord.length;
           }
         }
-      })
+      });
     },
-    //地图编辑弹框
+    // 地图编辑弹框
-    handleMapDialog() {
+    handleMapDialog () {
       this.mapDialogVisible = true;
       this.$nextTick(() => {
         this.$refs.mapDialog.initData(this.clueForm);
       });
     },
-    //处理地图弹框返回的点
+    // 处理地图弹框返回的点
-    handleMapDialogPoint(point) {
+    handleMapDialogPoint (point) {
-      console.log("handleMapDialogPoint")
+      console.log('handleMapDialogPoint');
-      console.log(point)
+      console.log(point);
       if (point) {
         this.handleMapCenter(point);
       }
     },
-    //删除当前地址
+    // 删除当前地址
-    handleRemovePosition() {
+    handleRemovePosition () {
       this.clueForm.lng = undefined;
       this.clueForm.lat = undefined;
       this.clueForm.address = undefined;
     },
-    //定位地图的中心点
+    // 定位地图的中心点
-    handleMapCenter(info) {
+    handleMapCenter (info) {
       this.$nextTick(() => {
         this.$refs.placeMap.setMapCenter(info);
       });
     },
     // 查询不能接收线索的员工
-    getEmployee() {
+    getEmployee () {
       empApi.getEmployee().then((resp) => {
         if (resp.code === 200) {
           this.userOptions = resp.data;
@@ -282,7 +314,7 @@ export default {
       });
     },
     // 查询场地信息
-    async getAllPlaces() {
+    async getAllPlaces () {
       const resp = await getAllPlaces({ status: '0' });
       if (resp.code == 200) {
         this.placeList = resp.data.filter((item) => item.schoolShow && item.showInMap);
@@ -290,24 +322,23 @@ export default {
           this.$refs.placeMap.handleMarkers(this.placeList);
         });
       }
-
     },
-    //表单提交
+    // 表单提交
-    clueSubmit() {
+    clueSubmit () {
       this.$refs.clueForm.validate(async (valid) => {
         if (valid) {
-          this.canSubmit = false
+          this.canSubmit = false;
-          let resp
+          let resp;
           if (this.clueForm.clueId) {
-            resp = await updateClue(this.clueForm)
+            resp = await updateClue(this.clueForm);
-            this.canSubmit = true
+            this.canSubmit = true;
             if (resp.code === 200) {
-              this.$message.success('修改成功')
+              this.$message.success('修改成功');
               this.toBackClue();
             }
           } else {
-            resp = await addClue(this.clueForm)
+            resp = await addClue(this.clueForm);
-            this.canSubmit = false
+            this.canSubmit = false;
             if (resp.code === 200) {
               if (resp.data && resp.data == 1) {
                 this.$message({
@@ -315,23 +346,27 @@ export default {
                   type: 'warning'
                 });
               } else {
-                this.$message.success('新增成功')
+                this.$message.success('新增成功');
-
               }
               if (this.saveNext) {
-                this.canSubmit = true
+                this.canSubmit = true;
-                this.resetForm()
+                this.resetForm();
               } else {
                 this.toBackClue();
               }
             }
           }
         }
-      })
+      });
     },
-    toBackClue() {
+    toBackClue () {
-      const obj = { path: "/zs/clue" };
+      const obj = { path: '/zs/clue' };
       this.$tab.closeOpenPage(obj);
+    },
+    handleSkill () {
+      this.$nextTick(() => {
+        this.$refs.SkillDialog.init();
+      });
     }
 
   }

src/views/zs/clue/columns.js

@@ -5,108 +5,132 @@ export const defaultColumns = [{
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 1,
   prop: 'source',
   label: '线索来源',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 2,
   prop: 'name',
   label: '姓名',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 3,
   prop: 'phone',
   label: '联系方式',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 4,
   prop: 'weChat',
   label: '微信号',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 5,
   prop: 'address',
   label: '位置',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 6,
   prop: 'requirement',
   label: '学员诉求',
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 7,
   prop: 'licenseType',
   label: '咨询车型',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 8,
   prop: 'followTime',
   label: '下次跟进时间',
   width: 120,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 9,
   prop: 'firstFollowUserName',
   label: '首次跟进人员',
   width: 120,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 10,
   prop: 'followUserName',
   label: '跟进人员',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 11,
   prop: 'recentLook',
   label: '是否近期看场地',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 12,
   prop: 'offlineReceiverName',
   label: '线下接待人员',
   width: 140,
   visible: true,
   overflow: false
-  },
+},
-  {
+{
   key: 13,
   prop: 'clueMemo',
   label: '备注',
   width: 140,
   visible: true,
   overflow: true
-  }
+},
+{
+  key: 14,
+  prop: 'goodName',
+  label: '商品名称',
+  width: 140,
+  visible: true,
+  overflow: true
+},
+{
+  key: 15,
+  prop: 'amountReceived',
+  label: '订单实收',
+  width: 140,
+  visible: true,
+  overflow: true
+},
+{
+  key: 16,
+  prop: 'writeOffTime',
+  label: '核销时间',
+  width: 140,
+  visible: true,
+  overflow: true
+}
 ];

src/views/zs/clue/components/ClueFormDialog.vue

@@ -157,7 +157,7 @@
   </div>
 </template>
   <!-- eslint-disable no-undef -->
-  <script>
+<script>
 import { getFollowRecord } from '@/api/zs/clue';
 import { getClassTypes } from '@/api/tool/common';
 import { inputtips, regeo, walking } from '@/api/tool/map';
@@ -452,7 +452,8 @@ export default {
       // );
       if (this.currentPoint.lng && this.currentPoint.lat) {
         regeo({
-          key: 'f2f35d6adc4a16bb879d303cead56237',
+          // key: 'f2f35d6adc4a16bb879d303cead56237',
+          key: '0e62be0896c6b8d27d453445f0fb8bc4',
           location: this.currentPoint.lng + ',' + this.currentPoint.lat
         }).then((resp) => {
           if (resp.status === '1') {
@@ -512,7 +513,8 @@ export default {
     async getWalkingDistance(start, end) {
       if (start && end) {
         const resp = await walking({
-          key: 'f2f35d6adc4a16bb879d303cead56237',
+          // key: 'f2f35d6adc4a16bb879d303cead56237',
+          key: '0e62be0896c6b8d27d453445f0fb8bc4',
           origin: start[0] + ',' + start[1],
           destination: end[0] + ',' + end[1]
         });
@@ -554,7 +556,8 @@ export default {
     async querySearch(queryString, cb) {
       if (queryString) {
         const resp = await inputtips({
-          key: 'f2f35d6adc4a16bb879d303cead56237',
+          // key: 'f2f35d6adc4a16bb879d303cead56237',
+          key: '0e62be0896c6b8d27d453445f0fb8bc4',
           keywords: queryString
         });
         cb(resp.tips);
@@ -577,9 +580,9 @@ export default {
     }
   }
 };
-  </script>
+</script>
 
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 .amap-cavans {
   width: 100%;
   height: 600px;
@@ -589,6 +592,7 @@ export default {
   width: 100%;
   height: 400px;
 }
+
 .address {
   position: absolute;
   left: 30px;
@@ -596,6 +600,7 @@ export default {
   width: 400px;
   background: #fff;
 }
+
 .box-card {
   position: absolute;
   right: 30px;
@@ -613,14 +618,17 @@ export default {
 .el-divider--horizontal {
   margin: 6px 0;
 }
+
 li {
   padding: 6px;
+
   .name {
     font-size: 12px;
     line-height: 16px;
     text-overflow: ellipsis;
     overflow: hidden;
   }
+
   .addr {
     line-height: 16px;
     font-size: 10px;
@@ -630,6 +638,5 @@ li {
   .highlighted .addr {
     color: #ddd;
   }
-}
+}</style>
-</style>
 

src/views/zs/clue/components/DYClueFormDialog.vue

@@ -0,0 +1,257 @@
+
+<template>
+  <div style="margin-bottom: 50px">
+    <el-dialog title="抖音线索" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="700px" @close="visible = false">
+      <el-form ref="clueForm" :model="clueForm" :rules="rules" label-width="110px">
+        <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="创建时间" prop="createTime">
+                <el-date-picker style="width: 100%;" v-model="clueForm.createTime" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" type="datetime" :disabled="admin!='true'" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="线索来源" prop="source">
+                <el-select style="width: 100%;" v-model="clueForm.source" placeholder="请选择" clearable>
+                  <el-option v-for="dict in sourceOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="姓名" prop="name">
+                <el-input v-model="clueForm.name" placeholder="请输入姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系方式" prop="phone">
+                <el-input v-model="clueForm.phone" placeholder="请输入联系方式" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="商品名称" prop="goodName">
+                <el-input v-model="clueForm.goodName" placeholder="请输入微信号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="订单实收" prop="amountReceived">
+                <el-input v-model="clueForm.amountReceived" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="跟进人员" prop="followUser">
+                <el-select style="width: 100%;" v-model="clueForm.followUser" multiple clearable :disabled="admin != 'true' && clueForm.clueId != undefined">
+                  <el-option v-for="dict in userOptions" :key="dict.id" :label="dict.name" :value="dict.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="意向状态" prop="intentionState">
+                <el-select style="width: 100%;" v-model="clueForm.intentionState" placeholder="请选择" clearable>
+                  <el-option v-for="dict in intentionOptions.filter(item => item.remark == undefined || item.remark == '抖音')" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue">
+                    <i class="el-icon-star-on" :style="dict.cssClass" />
+                    <span style="float: right; color: #8492a6; font-size: 13px">
+                      {{ dict.dictValue }}
+                    </span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="核销时间" prop="writeOffTime">
+                <el-date-picker style="width: 100%;" v-model="clueForm.writeOffTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="下次跟进时间" prop="followTime">
+                <el-date-picker style="width: 100%;" v-model="clueForm.followTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="clueMemo">
+                <el-input v-model="clueForm.clueMemo" type="textarea" :rows="5" maxlength="10009" />
+              </el-form-item>
+            </el-col>
+            <!-- 跟进记录 -->
+            <el-col :span="24" style="margin-top: 20px;">
+              <el-form-item label="跟进记录" prop="clueMemo" label-position="top">
+                <FollowRecord v-if="clueId" :clueId="clueId" />
+              </el-form-item>
+            </el-col>
+        </el-row>
+      </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="clueSubmit()">确定</el-button>
+    </span>
+    </el-dialog>
+
+    
+  </div>
+</template>
+  <!-- eslint-disable no-undef -->
+  <script>
+import { getConsultRecord, addClue, updateClue, } from '@/api/zs/clue'
+import empApi from '@/api/system/employee'
+
+import FollowRecord from '../ClueForm/components/FollowRecord.vue';
+// import AMap from 'AMap';
+export default {
+  name: 'ClueForm',
+  components: {
+    FollowRecord
+  },
+  data() {
+    return {
+      admin: localStorage.getItem('admin'),
+      userId: localStorage.getItem('userId'),
+      clueId: undefined,
+      clueForm: {
+        followTime: undefined
+      },
+      rules: {
+        name: { required: true, message: '姓名不为空', trigger: 'blur' },
+        phone: [{ required: true, message: '联系方式不为空', trigger: 'blur' },
+        { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }],
+        createTime: { required: true, message: '创建时间不为空', trigger: 'blur,change' },
+        consultTime: { required: true, message: '咨询时间不为空', trigger: 'blur,change' },
+        source: { required: true, message: '线索来源不为空', trigger: 'blur,change' },
+        address: { required: true, message: '位置不为空', trigger: 'blur' },
+        intentionState: { required: true, message: '意向状态不为空', trigger: 'blur,change' },
+        goodName: { required: true, message: '商品名称不为空', trigger: 'blur,change' },        
+        amountReceived: { required: true, message: '订单实收不为空', trigger: 'blur,change' }
+
+
+      },
+      userOptions: [],//跟进人员
+      sourceOptions: [],//线索来源
+      intentionOptions: [],//意向状态
+      placeList: [],//场地信息
+      mapDialogVisible: false,
+      consultRecord: [],
+      canSubmit: true,
+      saveNextShow: true,
+      saveNext: false,
+      visible: false
+    };
+  },
+  created() {
+
+    this.getEmployee();
+
+    // 线索来源
+    this.getDicts('dm_source').then((response) => {
+      this.sourceOptions = response.data;
+    });
+    // 意向状态
+    this.getDicts('dm_intention_state').then((response) => {
+      this.intentionOptions = response.data.filter(item => item.remark == undefined || item.remark == '抖音');
+    });
+  },
+
+  methods: {
+    init(info){
+      this.canSubmit = true;
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        // this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.clueForm = this.deepClone(info);
+          if(this.clueForm.clueId){
+            this.clueId = this.clueForm.clueId
+            this.getConsultRecord(this.clueForm.phone);
+          }
+        }
+        this.visible = true;
+
+      });
+    },
+    resetDialogForm() {
+      this.clueForm = {
+        clueId: undefined,
+        createTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}'),
+        consultTime: undefined,
+        source: "抖音直播",
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        intentionState: undefined,
+        followInfo: undefined,
+        followTime: undefined,
+        followUser: [],
+        signupInfo: undefined,
+        requirement: undefined,
+        licenseType: undefined,
+        lng: undefined,
+        lat: undefined,
+        goodName: undefined,
+        amountReceived: undefined,
+        writeOffTime: undefined
+      }
+
+      if (this.admin == 'false') {
+        this.clueForm.followUser.push(Number(this.userId))
+      }
+    },
+    // 查询咨询记录
+    getConsultRecord(phone) {
+      getConsultRecord({ phone }).then((resp) => {
+        if (resp && resp.code === 200 && resp.data) {
+          this.consultRecord = resp.data
+          if (this.consultRecord && this.consultRecord.length > 0) {
+            this.clueForm.consultCount = this.consultRecord.length
+          }
+        }
+      })
+    },
+
+    // 查询不能接收线索的员工
+    getEmployee() {
+      empApi.getEmployee().then((resp) => {
+        if (resp.code === 200) {
+          this.userOptions = resp.data;
+          // this.userOptions = this.userOptions.filter((item) => {
+          //   return item.accept;
+          // });
+        }
+      });
+    },
+    //表单提交
+    clueSubmit() {
+      this.$refs.clueForm.validate(async (valid) => {
+        if (valid) {
+          this.canSubmit = false
+          let resp
+          if (this.clueForm.clueId) {
+            resp = await updateClue(this.clueForm)
+            this.canSubmit = true
+            if (resp.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('refreshDataList');
+              this.visible = false
+            }
+          } else {
+            resp = await addClue(this.clueForm)
+            this.canSubmit = false
+            if (resp.code === 200) {
+              if (resp.data && resp.data == 1) {
+                this.$message({
+                  message: resp.msg,
+                  type: 'warning'
+                });
+              } else {
+                this.$message.success('新增成功')
+
+              }
+              this.$emit('refreshDataList');
+              this.visible = false
+
+            }
+          }
+        }
+      })
+    },
+
+  }
+};
+</script>

src/views/zs/clue/components/DistributeFormDialog copy.vue

@@ -0,0 +1,112 @@
+<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">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="场地" prop="newPlaceList">
+            <span v-if="oldForm.placeNames">{{ oldForm.placeNames }}</span>
+
+            <el-select v-model="dialogForm.newPlaceList" filterable multiple 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-col>
+      </el-row>
+    </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>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { getCluePlaceList, saveCluePlace } from '@/api/zs/clue';
+import { getAllPlaces } from '@/api/sch/place';
+
+export default {
+  name: 'DistributeFormDialog',
+
+  data () {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {},
+      oldForm: {},
+      rules: {
+        newPlaceList: {
+          required: true,
+          message: '场地不能为空不能为空',
+          trigger: 'blur'
+        }
+      },
+      placeOptions: []
+    };
+  },
+  methods: {
+    init (info = undefined) {
+      this.getPlaces();
+      this.visible = true;
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm.clueId = info;
+          // 查询该线索的分发情况
+          this.getDistributePlaces(info);
+        }
+      });
+    },
+    resetDialogForm () {
+      this.dialogForm = {
+        oldPlaceList: [],
+        newPlaceList: [],
+        placeIdList: [],
+        clueId: undefined
+      };
+      this.oldForm = {};
+    },
+    closeDialog () {
+      this.$emit('update:dialog.batchUpdateVisible', false);
+    },
+    getDistributePlaces (clueId) {
+      getCluePlaceList({ clueId: clueId }).then(resp => {
+        if (resp.code == 200) {
+          this.oldForm = resp.data;
+          this.dialogForm.oldPlaceList = this.oldForm.placeIdList;
+          if (this.oldForm.placeIdList && this.oldForm.placeIdList) {
+            this.placeOptions = this.placeOptions.filter(item => this.oldForm.placeIdList.indexOf(item.placeId) == -1);
+          }
+        }
+      });
+    },
+    // 表单提交
+    dialogFormSubmit () {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          this.canSubmit = false;
+          this.dialogForm.placeIdList = this.dialogForm.oldPlaceList.concat(this.dialogForm.newPlaceList);
+          // 校验完成，调接口
+          saveCluePlace(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 () {
+      getAllPlaces({ status: '0' }).then((resp) => {
+        this.placeOptions = resp.data;
+      });
+    }
+  }
+};
+</script>
+

src/views/zs/clue/components/DistributeFormDialog.vue

@@ -1,94 +1,142 @@
 <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">
+    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="dialogForm.orderId">
       <el-row>
         <el-col :span="24">
-          <el-form-item label="场地" prop="newPlaceList">
+          <el-form-item label="场地" prop="placeId">
-            <span v-if="oldForm.placeNames">{{oldForm.placeNames}}</span>
+            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;" @change="getCoaChes">
-
-            <el-select v-model="dialogForm.newPlaceList" filterable multiple 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-col>
+        <el-col :span="24">
+          <el-form-item label="接待人" prop="coachId">
+            <el-select v-model="dialogForm.coachId" filterable 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="抄送" prop="copyUserList">
+            <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>
-    <span slot="footer" class="dialog-footer">
+    <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" @click="dialogFormSubmit()">确定</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit " @click="dialogFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
 </template>
-  <script>
+<script>
-import { getCluePlaceList, saveCluePlace } from '@/api/zs/clue';
+import { listFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder';
+import { listFeedbackDetail } from '@/api/zs/feedbackDetail';
+
 import { getAllPlaces } from '@/api/sch/place';
+import { getAllCoaches } from '@/api/sch/coach';
 
 export default {
   name: 'DistributeFormDialog',
 
-  data() {
+  data () {
     return {
       visible: false,
       canSubmit: true,
-      dialogForm: {},
+      dialogForm: {
-      oldForm: {},
+        placeId: undefined,
-      rules: {
+        clueId: undefined,
-        newPlaceList: {
+        coachId: undefined,
-          required: true,
+        copyUserList: []
-          message: '场地不能为空不能为空',
-          trigger: 'blur'
-        }
       },
-      placeOptions: []
+      rules: {
+        placeId: { required: true, message: '场地不能为空', trigger: 'blur, change' },
+        coachId: { required: true, message: '教练不能为空', trigger: 'blur, change' }
+      },
+      placeOptions: [],
+      coachOptions: [],
+      feedbackDetail: []
     };
   },
   methods: {
-    init(info = undefined) {
+    init (info = undefined) {
-      this.getPlaces()
+      this.getPlaces();
       this.visible = true;
       this.$nextTick(() => {
         this.resetDialogForm();
         this.$refs['dialogForm'].resetFields();
         if (info) {
-
           this.dialogForm.clueId = info;
-          //查询该线索的分发情况
+          // 查询该线索的分发情况
-          this.getDistributePlaces(info);
+          this.getFeedbackOrder(info);
         }
       });
     },
-    resetDialogForm() {
+    resetDialogForm () {
       this.dialogForm = {
-        oldPlaceList: [],
+        placeId: undefined,
-        newPlaceList: [],
+        clueId: undefined,
-        placeIdList: [],
+        coachId: undefined,
-        clueId: undefined
+        copyUserList: []
       };
-      this.oldForm = {}
     },
-    closeDialog() {
+    closeDialog () {
       this.$emit('update:dialog.batchUpdateVisible', false);
     },
-    getDistributePlaces(clueId) {
+    getFeedbackOrder (clueId) {
-      getCluePlaceList({ clueId: clueId }).then(resp => {
+      listFeedbackOrder({ clueId: clueId }).then(resp => {
-        if (resp.code == 200) {
+        if (resp.code == 200 && resp.rows && resp.rows.length > 0) {
-          this.oldForm = resp.data
+          this.dialogForm = resp.rows.filter(item => item.feedbackStatus != 0)[0];
-          this.dialogForm.oldPlaceList = this.oldForm.placeIdList;
+          if (this.dialogForm != undefined && this.dialogForm.placeId != undefined) {
-          if (this.oldForm.placeIdList && this.oldForm.placeIdList) {
+            this.getCoaChes(this.dialogForm.placeId);
-            this.placeOptions = this.placeOptions.filter(item => this.oldForm.placeIdList.indexOf(item.placeId) == -1)
-          }
           }
 
-      })
+          if (this.dialogForm.orderId) {
+            this.getFeedbackDetail(this.dialogForm.orderId);
+          }
+        }
+      });
+    },
+    getFeedbackDetail (orderId) {
+      listFeedbackDetail({ orderId: orderId }).then(resp => {
+        this.feedbackDetail = resp.rows;
+      });
     },
     // 表单提交
-    dialogFormSubmit() {
+    dialogFormSubmit () {
       this.$refs.dialogForm.validate((valid) => {
         if (valid) {
           this.canSubmit = false;
-          this.dialogForm.placeIdList = this.dialogForm.oldPlaceList.concat(this.dialogForm.newPlaceList)
           // 校验完成，调接口
-          saveCluePlace(this.dialogForm)
+          addFeedbackOrder(this.dialogForm)
             .then((resp) => {
               this.canSubmit = true;
               if (resp.code == 200) {
@@ -103,14 +151,18 @@ export default {
         }
       });
     },
-    getPlaces() {
+    getPlaces () {
       getAllPlaces({ status: '0' }).then((resp) => {
         this.placeOptions = resp.data;
-
       });
     },
+    getCoaChes (placeId) {
+      console.log(placeId);
+      getAllCoaches({ placeId: placeId }).then(resp => {
+        if (resp.code == 200) { this.coachOptions = resp.data; }
+      });
+    }
   }
 };
-  </script>
+</script>
-  
 

src/views/zs/clue/components/InvitationFormDialog.vue

@@ -0,0 +1,143 @@
+<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%;" @change="getCoaChes">
+              <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>
+      </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>
+      </span>
+    </el-dialog>
+  </template>
+    <script>
+  import { addInvitation, getInvitationByClue } from '@/api/zs/invitation';
+  import { getAllPlaces } from '@/api/sch/place';
+
+  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'}
+
+        },
+        placeOptions:[]
+      };
+    },
+    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;
+                } 
+              })
+            }
+          }
+        });
+      },
+      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;
+            // 校验完成，调接口
+            addInvitation(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 () {
+        getAllPlaces({ status: '0' }).then((resp) => {
+            this.placeOptions = resp.data;
+        });
+      },
+    }
+  };
+    </script>
+    
+    

src/views/zs/clue/components/SkillDialog.vue

@@ -0,0 +1,70 @@
+<!--
+ * @Author: riverQiu
+ * @Date: 2023-10-14 13:21:37
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2023-10-15 00:55:44
+ * @Description:
+-->
+<template>
+  <el-dialog title="话术" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="700px" height="700">
+    <div>
+      <!-- 搜索框 -->
+      <el-select v-model="skillId" placeholder="请选择关键词" filterable style="width: 90%;" @change="selectKey">
+        <el-option v-for="item in keyOptions" :key="item.skillId" :label="item.skillKey" :value="item.skillId" />
+      </el-select> <!-- 常用关键词 -->
+
+      <!-- 话术内容 -->
+      <el-card class="box-card">
+
+        <div class="text item">
+          <span v-html="content" />
+        </div>
+      </el-card>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getSkillKey, getSkill } from '@/api/system/skill';
+export default {
+  name: 'SkillDialog',
+  data () {
+    return {
+      visible: false,
+      loading: true,
+      keyOptions: [],
+      content: undefined,
+      skillId: undefined
+    };
+  },
+  methods: {
+    init () {
+      this.visible = true;
+      this.getSkillKeyOption();
+    },
+    getSkillKeyOption () {
+      getSkillKey().then((resp) => {
+        if (resp && resp.code === 200) {
+          this.keyOptions = resp.data;
+        }
+      });
+    },
+    selectKey (item) {
+      if (item) {
+        getSkill(item).then((resp) => {
+          if (resp && resp.code === 200) {
+            this.content = resp.data.content;
+          }
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.box-card {
+  width: 500px;
+  min-height: 100px;
+}
+</style>
+

src/views/zs/clue/components/UploadDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="title" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="400px">
-    <el-upload ref="upload" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?ydtData=' + ydtData" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+    <el-upload ref="upload" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?ydtData=' + ydtData+ '&dYData=' + dYData" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
       <i class="el-icon-upload" />
       <div class="el-upload__text">
         将文件拖到此处，或
@@ -28,6 +28,7 @@ export default {
       canSubmit: true,
       isUploading: true,
       ydtData: false,
+      dYData: false,
       title: '学员信息导入',
       upload: {
         // 是否禁用上传
@@ -40,19 +41,30 @@ export default {
     };
   },
   methods: {
-    init(info = false) {
+    init(info = {}) {
       this.visible = true;
       this.ydtData = false;
+      this.ydtData = false;
+      this.canSubmit = true;
       this.$nextTick(() => {
         if (info) {
-          this.ydtData = info;
+          this.ydtData = info.ydtData;
-          this.title = '一点通-' + this.title;
+          this.dYData = info.dYData;
+          if(this.ydtData){
+            this.title = "一点通" + this.title;
+
+          }
+          if(this.dYData){
+            this.title = "抖音" + this.title;
+
+          }
         }
       });
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('zs/clue/importTemplate?ydtData=' + this.ydtData, {}, `clue_template_${new Date().getTime()}.xlsx`);
+      debugger
+      this.download('zs/clue/importTemplate?ydtData=' + this.ydtData + '&dYData=' + this.dYData, {}, `clue_template_${new Date().getTime()}.xlsx`);
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {

src/views/zs/clue/index.vue

@@ -4,20 +4,31 @@
     <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:import']" icon="el-icon-upload" type="warning" @click="handleImport(false)">导入</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(true)">一点通导入</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: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-col>
       <right-toolbar :show-search.sync="showSearch" :columns="columns" @queryTable="_getTableList" />
     </el-row>
-    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" border @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" />
       </template>
+      <el-table-column label="反馈状态" prop="feedbackStatus" sortable fixed="right" min-width="100">
+        <template slot-scope="{ row }">
+          <el-tag effect="dark" style="border: none">{{ feedbackTagColorMap[row.feedbackStatus] }}</el-tag>
+        </template>
+      </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>
@@ -25,8 +36,10 @@
       </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.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-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>
           <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button>
@@ -51,7 +64,12 @@
     <ZhuangDanDialog ref="zhuangDanDialog" />
     <!-- 备注编辑 -->
     <MemoFormDialog ref="memoDialog" @refreshDataList="_getTableList" />
-
+    <!-- 抖音直播弹框 -->
+    <DYClueFormDialog ref="DYClueFormDialog" @refreshDataList="_getTableList" />
+    <!-- 关键话术 -->
+    <SkillDialog ref="SkillDialog" />
+    <!-- 邀约弹窗 -->
+    <InvitationFormDialog ref="InvitationDialog" @refreshDataList="_getTableList"/>
   </div>
 </template>
 
@@ -64,25 +82,29 @@ import DistributeFormDialog from './components/DistributeFormDialog.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 { defaultColumns } from './columns.js';
 import { getClueList, deleteClue, getClueCountBadge, discardClue, getSign, getConsultRecord } from '@/api/zs/clue';
 import empApi from '@/api/system/employee';
 export default {
   name: 'Clue',
-  beforeRouteEnter(to, from, next) {
+  components: {
+    SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeFormDialog, ZhuangDanDialog, MemoFormDialog,
+    DYClueFormDialog, SkillDialog,InvitationFormDialog
+  },
+  beforeRouteEnter (to, from, next) {
     if (from.name == 'ClueForm') {
       next(vm => {
-        vm._getTableList()
+        vm._getTableList();
-      })
+      });
     } else {
-      next()
+      next();
     }
   },
-  components: {
+  data () {
-    SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeFormDialog, ZhuangDanDialog, MemoFormDialog
-  },
-  data() {
     return {
       admin: localStorage.getItem('admin'),
       userId: localStorage.getItem('userId'),
@@ -111,13 +133,21 @@ export default {
         报名他校: '#afaeb0',
         无效线索: '#afaeb0'
       },
+      feedbackTagColorMap: {
+        0: '待邀约',
+        1: '待分发',
+        2: '待跟进',
+        3: '已跟进',
+        4: '已到场',
+        5: '退单'
+      },
       options: undefined,
       clueInfo: undefined,
       consultRecord: [],
       quickSearch: 0
     };
   },
-  created() {
+  created () {
     const str = localStorage.getItem(`${this.$route.name}-table-columns`);
     this.columns = str ? JSON.parse(str) : defaultColumns;
     this._getClueCountBadge();
@@ -134,10 +164,10 @@ export default {
   },
   methods: {
     // 分页查询表格数据
-    _getTableList() {
+    _getTableList () {
       this.loading = true;
       const tempForm = this.$refs.SearchForm?.searchForm || {};
-      this.quickSearch = tempForm.quickSearch
+      this.quickSearch = tempForm.quickSearch;
       const params = { ...this.searchForm, ...tempForm };
       getClueList(params).then((response) => {
         this.tableList = response.rows;
@@ -146,25 +176,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) {
+      this.$nextTick(() => {
+        this.$refs.DYClueFormDialog.init(info);
+      });
+    },
+    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: '取消',
@@ -181,7 +222,7 @@ export default {
         .catch(function () { });
     },
     // 删除
-    handleDelete(item) {
+    handleDelete (item) {
       this.$confirm('是否确认删除该条线索（“' + item.name + '/' + item.phone + '”）?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -198,13 +239,13 @@ export default {
         .catch(function () { });
     },
     // 导入
-    handleImport(ydtData) {
+    handleImport (ydtData, dYData) {
       this.$nextTick(() => {
-        this.$refs.uploadDialogForm.init(ydtData);
+        this.$refs.uploadDialogForm.init({ ydtData: ydtData, dYData: dYData });
       });
     },
     /** 导出按钮操作 */
-    handleExport() {
+    handleExport () {
       this.$confirm('是否确认导出所有学员信息项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -215,12 +256,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;
@@ -228,7 +269,7 @@ export default {
       });
     },
     // 批量修改
-    handleBatChUpdate() {
+    handleBatChUpdate () {
       this.options = {
         userOptions: this.userOptions
       };
@@ -239,7 +280,7 @@ export default {
       });
     },
     // 登记成交
-    async handleSign(item) {
+    async handleSign (item) {
       // 根据clueId查询登记信息
       let signInfo = {};
       this.clueInfo = item;
@@ -251,36 +292,45 @@ export default {
         this.$refs.signDialogForm.init(signInfo);
       });
     },
-    //分发到场地
+    // 分发到场地
-    handleDistribute(item) {
+    handleDistribute (item) {
-
       this.$nextTick(() => {
         this.$refs.distributeDialogForm.init(item.clueId);
       });
     },
-    //外呼
+    // 外呼
-    handlePhone(item) {
+    handlePhone (item) {
 
     },
-    handleViewZhuangDan(item) {
+    handleViewZhuangDan (item) {
       this.$nextTick(() => {
         this.$refs.zhuangDanDialog.init(item.clueId);
       });
     },
-    handleRowClick(row) {
+    handleRowClick (row) {
       if (this.quickSearch != 8) {
-        this.handleAddandUpdate(row)
+        // if(row.source == '抖音直播'){
+        //   this.handleDYAddandUpdate(row);
+        // } else {
+        this.handleAddandUpdate(row);
+        // }
       }
     },
-    handleCellClick(row, column, cell, event) {
+    handleCellClick (row, column, cell, event) {
-      //如果点击的是备注的话 开始备注编辑框
+      // 如果点击的是备注的话 开始备注编辑框
       if (column.property == 'clueMemo') {
-        console.log(row, column, cell, event)
+        console.log(row, column, cell, event);
         this.$nextTick(() => {
           this.$refs.memoDialog.init(row);
         });
-
       }
+    },
+    //邀约
+    handleInvitation(item){
+      this.$nextTick(() => {
+        this.$refs.InvitationDialog.init(item)
+      })
+
     }
   }
 };

src/views/zs/feedback/arrival.vue

@@ -0,0 +1,122 @@
+<template>
+  <div class="app-container" style="width:90%;margin:auto;">
+    <!-- 添加或修改线索反馈对话框 -->
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="学员姓名">
+        <span>{{ order.stuName }}</span>
+      </el-form-item>
+      <el-form-item label="联系方式">
+        <span>{{ order.phone }}</span>
+      </el-form-item>
+      <el-form-item label="地址">
+        <span>{{ order.address }}</span>
+      </el-form-item>
+      <el-form-item label="接待人">
+        <span>{{ order.coachName }}</span>
+      </el-form-item>
+      <el-form-item label="到场状态" prop="arrivalStatus">
+        <el-radio-group v-model="form.arrivalStatus" size="small" :disabled="type != 'JDR'">
+          <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-form-item>
+    </el-form>
+    <div v-if="type === 'JDR'" style="text-align: center;">
+      <div style="text-align: center;">
+        <el-button type="primary" @click="submitForm">提 交</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getFeedbackDetailInfo, addFeedbackDetail, updateFeedbackDetail } from '@/api/zs/feedbackDetail';
+
+import { getFeedbackOrder } from '@/api/zs/feedbackOrder';
+
+export default {
+  name: 'Follow',
+  data () {
+    return {
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      order: {},
+      orderId: undefined,
+      type: undefined
+    };
+  },
+  created () {
+    console.log(this.$route.query.no);
+    this.type = this.$route.query.type;
+    this.reset();
+    this.getFeedbackOrder(this.$route.query.no);
+    this.getFeedbackDetailInfo(this.$route.query.no);
+  },
+  methods: {
+    /** 查询线索反馈表单 */
+    getFeedbackOrder (orderId) {
+      this.loading = true;
+      getFeedbackOrder(orderId).then(response => {
+        this.order = response.data;
+        if (this.order.clueId) {
+          this.form.clueId = this.order.clueId;
+        }
+        if (this.order.coachId) {
+          this.form.coachId = this.order.coachId;
+        }
+        if (this.order.orderId) {
+          this.form.orderId = this.order.orderId;
+        }
+        this.loading = false;
+      });
+    },
+    /** 查询线索反馈表单 */
+    getFeedbackDetailInfo (orderId) {
+      this.loading = true;
+      getFeedbackDetailInfo({ orderId: orderId, feedbackType: 2 }).then(response => {
+        if (response.data) {
+          this.form = response.data;
+        }
+        this.loading = false;
+      });
+    },
+    // 表单重置
+    reset () {
+      this.form = {
+        feedbackId: null,
+        clueId: null,
+        feedbackType: 2,
+        coachId: null,
+        arrivalStatus: 1,
+        remark: null
+      };
+      this.resetForm('form');
+    },
+    /** 提交按钮 */
+    submitForm () {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.feedbackId != null) {
+            updateFeedbackDetail(this.form).then(response => {
+              this.$modal.msgSuccess('提交成功');
+            });
+          } else {
+            addFeedbackDetail(this.form).then(response => {
+              this.$modal.msgSuccess('提交成功');
+            });
+          }
+        }
+      });
+    }
+  }
+};
+</script>

src/views/zs/feedback/follow.vue

@@ -0,0 +1,126 @@
+<template>
+  <div class="app-container" style="width:90%;margin:auto;">
+    <!-- 添加或修改线索反馈对话框 -->
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="学员姓名">
+        <span>{{ order.stuName }}</span>
+      </el-form-item>
+      <el-form-item label="联系方式">
+        <span>{{ order.phone }}</span>
+      </el-form-item>
+      <el-form-item label="地址">
+        <span>{{ order.address }}</span>
+      </el-form-item>
+      <el-form-item label="接待人" prop="coachId">
+        <span>{{ order.coachName }}</span>
+      </el-form-item>
+      <el-form-item label="是否联系" prop="isContact">
+        <el-radio-group v-model="form.isContact" size="small" :disabled="type != 'JDR'">
+          <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-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" :disabled="type != 'JDR'" type="textarea" placeholder="请输入内容" />
+      </el-form-item>
+    </el-form>
+    <div v-if="type === 'JDR'" style="text-align: center;">
+      <div style="text-align: center;">
+        <el-button type="primary" @click="submitForm">提 交</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getFeedbackDetailInfo, addFeedbackDetail, updateFeedbackDetail } from '@/api/zs/feedbackDetail';
+
+import { getFeedbackOrder } from '@/api/zs/feedbackOrder';
+
+export default {
+  name: 'Follow',
+  data () {
+    return {
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      order: {},
+      orderId: undefined,
+      type: undefined
+    };
+  },
+  created () {
+    console.log(this.$route.query.no);
+    this.type = this.$route.query.type;
+    this.reset();
+    this.getFeedbackOrder(this.$route.query.no);
+    this.getFeedbackDetailInfo(this.$route.query.no);
+  },
+  methods: {
+    /** 查询线索反馈表单 */
+    getFeedbackOrder (orderId) {
+      this.loading = true;
+      getFeedbackOrder(orderId).then(response => {
+        this.order = response.data;
+        if (this.order.clueId) {
+          this.form.clueId = this.order.clueId;
+        }
+        if (this.order.coachId) {
+          this.form.coachId = this.order.coachId;
+        }
+        if (this.order.orderId) {
+          this.form.orderId = this.order.orderId;
+        }
+        this.loading = false;
+      });
+    },
+    /** 查询线索反馈表单 */
+    getFeedbackDetailInfo (orderId) {
+      this.loading = true;
+      getFeedbackDetailInfo({ orderId: orderId, feedbackType: 1 }).then(response => {
+        if (response.data) {
+          this.form = response.data;
+        }
+        this.loading = false;
+      });
+    },
+    // 表单重置
+    reset () {
+      this.form = {
+        feedbackId: null,
+        clueId: null,
+        feedbackType: 1,
+        coachId: null,
+        feedbackTime: null,
+        isContact: 0,
+        arrivalTime: null,
+        remark: null
+      };
+      this.resetForm('form');
+    },
+    /** 提交按钮 */
+    submitForm () {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.feedbackId != null) {
+            updateFeedbackDetail(this.form).then(response => {
+              this.$modal.msgSuccess('提交成功');
+            });
+          } else {
+            addFeedbackDetail(this.form).then(response => {
+              this.$modal.msgSuccess('提交成功');
+            });
+          }
+        }
+      });
+    }
+  }
+};
+</script>

src/views/zs/feedback/index.vue

@@ -0,0 +1,253 @@
+<template>
+  <div class="app-container">
+    <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
+      <el-form-item label="线索id" prop="clueId">
+        <el-input v-model="queryParams.clueId" placeholder="请输入线索id" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="教练id" prop="coachId">
+        <el-input v-model="queryParams.coachId" placeholder="请输入教练id" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="反馈时间" prop="feedbackTime">
+        <el-date-picker v-model="queryParams.feedbackTime" clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择反馈时间" />
+      </el-form-item>
+      <el-form-item label="是否联系" prop="isContact">
+        <el-input v-model="queryParams.isContact" placeholder="请输入是否联系" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="到场时间" prop="arrivalTime">
+        <el-date-picker v-model="queryParams.arrivalTime" clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择到场时间" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button v-hasPermi="['system:feedback:add']" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button v-hasPermi="['system:feedback:edit']" type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button v-hasPermi="['system:feedback:remove']" type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button v-hasPermi="['system:feedback:export']" type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
+    </el-row>
+
+    <el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="${comment}" align="center" prop="feedbackId" />
+      <el-table-column label="线索id" align="center" prop="clueId" />
+      <el-table-column label="反馈类型 1 跟进反馈 2 到场负反馈" align="center" prop="feedbackType" />
+      <el-table-column label="教练id" align="center" prop="coachId" />
+      <el-table-column label="反馈内容" align="center" prop="content" />
+      <el-table-column label="反馈时间" align="center" prop="feedbackTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d}') }}</span>
+        </template>00000000000000000000000
+      </el-table-column>
+      <el-table-column label="是否联系" align="center" prop="isContact" />
+      <el-table-column label="到场时间" align="center" prop="arrivalTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.arrivalTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="到场状态" align="center" prop="arrivalStatus" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button v-hasPermi="['system:feedback:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button v-hasPermi="['system:feedback:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改线索反馈对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="线索id" prop="clueId">
+          <el-input v-model="form.clueId" placeholder="请输入线索id" />
+        </el-form-item>
+        <el-form-item label="教练id" prop="coachId">
+          <el-input v-model="form.coachId" placeholder="请输入教练id" />
+        </el-form-item>
+        <el-form-item label="反馈内容">
+          <editor v-model="form.content" :min-height="192" />
+        </el-form-item>
+        <el-form-item label="反馈时间" prop="feedbackTime">
+          <el-date-picker v-model="form.feedbackTime" clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择反馈时间" />
+        </el-form-item>
+        <el-form-item label="是否联系" prop="isContact">
+          <el-input v-model="form.isContact" placeholder="请输入是否联系" />
+        </el-form-item>
+        <el-form-item label="到场时间" prop="arrivalTime">
+          <el-date-picker v-model="form.arrivalTime" clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择到场时间" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback } from '@/api/zs/feedback';
+
+export default {
+  name: 'Feedback',
+  data () {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 线索反馈表格数据
+      feedbackList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        clueId: null,
+        feedbackType: null,
+        coachId: null,
+        content: null,
+        feedbackTime: null,
+        isContact: null,
+        arrivalTime: null,
+        arrivalStatus: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created () {
+    this.getList();
+  },
+  methods: {
+    /** 查询线索反馈列表 */
+    getList () {
+      this.loading = true;
+      listFeedback(this.queryParams).then(response => {
+        this.feedbackList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel () {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset () {
+      this.form = {
+        feedbackId: null,
+        clueId: null,
+        feedbackType: null,
+        coachId: null,
+        content: null,
+        feedbackTime: null,
+        isContact: null,
+        arrivalTime: null,
+        arrivalStatus: 0,
+        remark: null
+      };
+      this.resetForm('form');
+    },
+    /** 搜索按钮操作 */
+    handleQuery () {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery () {
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange (selection) {
+      this.ids = selection.map(item => item.feedbackId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd () {
+      this.reset();
+      this.open = true;
+      this.title = '添加线索反馈';
+    },
+    /** 修改按钮操作 */
+    handleUpdate (row) {
+      this.reset();
+      const feedbackId = row.feedbackId || this.ids;
+      getFeedback(feedbackId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = '修改线索反馈';
+      });
+    },
+    /** 提交按钮 */
+    submitForm () {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.feedbackId != null) {
+            updateFeedback(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFeedback(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete (row) {
+      const feedbackIds = row.feedbackId || this.ids;
+      this.$modal.confirm('是否确认删除线索反馈编号为"' + feedbackIds + '"的数据项？').then(function () {
+        return delFeedback(feedbackIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess('删除成功');
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport () {
+      this.download('system/feedback/export', {
+        ...this.queryParams
+      }, `feedback_${new Date().getTime()}.xlsx`);
+    }
+  }
+};
+</script>

src/views/zs/sign/columns.js

@@ -160,5 +160,13 @@ export const defaultColumns = [{
     width: 140,
     visible: true,
     overflow: true
+  },
+  {
+    key: 21,
+    prop: 'settlementMoney',
+    label: '结算金额',
+    width: 140,
+    visible: true,
+    overflow: true
   }
 ];

src/views/zs/sign/components/CheckDialog/components/SignForm.vue

@@ -121,13 +121,15 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="12">
+      </el-row>
-                <el-form-item label="线下接待人员" prop="offlineReceiver">
+      <el-row>
-                  <el-select v-model="modalForm.offlineReceiver" multiple placeholder="请选择" clearable size="small" :disabled="!modalForm.signEdit || modalForm.clueId != undefined">
+        <el-col :span="12">
-                    <el-option v-for="dict in userOptions" :key="dict.id" :label="dict.name" :value="dict.id" />
+          <el-form-item label="撞单人员" prop="zhuangDanList">
+            <el-select v-model="modalForm.zhuangDanList" placeholder="请选择" clearable size="small">
+              <el-option v-for="(dict, index) in zhuangDanOptions" :key="index" :label="dict.consultUserName" :value="dict.consultUser" />
             </el-select>
           </el-form-item>
-              </el-col>-->
+        </el-col>
       </el-row>
 
       <el-row>

src/views/zs/sign/components/SettlementDialog.vue

@@ -0,0 +1,104 @@
+<template>
+    <!-- 结算对话框 -->
+    <el-dialog v-if="visible" v-loading="signLoading" title="结算" :visible.sync="visible" width="600px" append-to-body :close-on-click-modal="false" style>
+      <el-form ref="modalForm" :model="modalForm" :rules="modalRules" label-width="110px" >
+        <el-row>
+         
+          <!-- <el-col :span="24">
+            <el-form-item label="学员姓名" prop="name">
+              <el-input v-model="modalForm.name" :disabled="modalForm.clueId != undefined" />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="结算金额" prop="settlementMoney">
+              <el-input v-model="modalForm.settlementMoney" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span  slot="footer">
+        <el-button @click="visible = false">取 消</el-button>
+        <el-button type="primary" :disabled="!canSubmit" @click="handleSubmit">提 交</el-button>
+      </span>
+    </el-dialog>
+  </template>
+  
+  <script>
+  import {  updateSign } from '@/api/zs/sign';
+  import { validateMoney } from '@/utils/validate';
+    
+  export default {
+    name: 'SettlementDialog',
+    data() {
+      return {
+        admin: localStorage.getItem('admin'),
+        preUrl: process.env.VUE_APP_BASE_API,
+        userId: localStorage.getItem('userId'),
+        visible: false,
+        signLoading: false,
+        modalForm: {},
+        modalRules: {
+          settlementMoney: [{ required: true, message: '结算金额不为空', trigger: 'blur' },
+          { required: true, validator: validateMoney, trigger: 'blur' }]
+        },
+      };
+    },
+    methods: {
+      init(info = undefined) {
+        this.canSubmit = true;
+        this.$nextTick(() => {
+          this.resetForm('modalForm');
+          if (info && info.signId) {
+            this.modalForm = {... info}
+          } 
+          this.visible = true;
+        });
+      },
+      // 重置表单
+      resetForm() {
+        this.modalForm = {
+          signId: undefined,
+          settlementMoney: undefined,
+        };
+      },
+      handleSubmit() {
+        // 保存结算表
+        this.$refs.modalForm.validate((valid) => {
+          if (valid) {
+            this.canSubmit = false;
+              updateSign(this.modalForm).then((resp) => {
+                if (resp.code == 200) {
+                  this.$message.success('提交成功');
+                  this.visible = false;
+                  this.$emit('refreshDataList');
+                } else {
+                  this.canSubmit = true;
+                }
+              });
+          }
+        });
+      },
+      
+    }
+  };
+  </script>
+  
+  <style scoped>
+  .demo-image__item {
+    width: 100px;
+    height: 100px;
+    display: inline-block;
+  }
+  
+  .image-list-item {
+    width: 100%;
+    height: 100%;
+  }
+  
+  .el-upload--picture-card {
+    width: 100px !important;
+    height: 100px !important;
+  }
+  </style>
+  
+  

src/views/zs/sign/components/SignFormDialog.vue

@@ -124,13 +124,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="12">
-              <el-form-item label="线下接待人员" prop="offlineReceiver">
-                <el-select v-model="modalForm.offlineReceiver" multiple placeholder="请选择" clearable size="small" :disabled="modalForm.clueId != undefined">
-                  <el-option v-for="dict in userOptions" :key="dict.id" :label="dict.name" :value="dict.id" />
-                </el-select>
-              </el-form-item>
-          </el-col>-->
       </el-row>
 
       <el-row>
@@ -141,13 +134,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="admin == 'true'" :span="12">
-          <el-form-item label="佣金明细" prop="commission">
-            <el-select v-model="modalForm.commission" placeholder="请选择" clearable size="small">
-              <el-option v-for="(dict, index) in commissionOptions" :key="index" :label="dict.dictLabel" :value="dict.dictValue" />
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
 
       <el-row>
@@ -332,7 +318,7 @@ export default {
       });
     },
     getPlaces(schoolId) {
-      getAllPlaces({ schoolId: schoolId, status: '0' }).then((resp) => {
+      getAllPlaces({ schoolId: schoolId, status: '0' , showInMap : true}).then((resp) => {
         this.placeOptions = resp.data;
       });
     },

src/views/zs/sign/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <SearchForm v-show="showSearch" ref="SearchForm" @search="_getTableList" :options="options" />
+    <SearchForm v-show="showSearch" ref="SearchForm" :options="options" @search="_getTableList" />
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-plus" v-hasPermi="['zs:sign:add']" @click="handleAddAndUpdate(undefined)">新增</el-button>
+        <el-button v-hasPermi="['zs:sign:add']" type="primary" icon="el-icon-plus" @click="handleAddAndUpdate(undefined)">新增</el-button>
-        <el-button v-if="admin == 'true'" type="warning" v-hasPermi="['zs:sign:export']" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+        <el-button v-if="admin == 'true'" v-hasPermi="['zs:sign:export']" type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar :show-search.sync="showSearch" :columns="columns" @queryTable="_getTableList" />
     </el-row>
@@ -15,24 +15,25 @@
       <template v-for="item in columns">
         <el-table-column v-if="item.visible && item.prop === 'state'" :key="item.prop" :label="item.label" align="center" :width="item.width" :prop="item.prop">
           <template slot-scope="{row}">
-            <el-button type="success" size="mini" v-if="row.state">全款</el-button>
+            <el-button v-if="row.state" type="success" size="mini">全款</el-button>
-            <el-button type="warning" size="mini" v-else>未全款</el-button>
+            <el-button v-else type="warning" size="mini">未全款</el-button>
           </template>
         </el-table-column>
         <el-table-column v-else-if="item.visible" :key="item.prop" :label="item.label" align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
       </template>
-      <el-table-column align="center" width="100" fixed="right" label="审核状态">
+      <!-- <el-table-column align="center" width="100" fixed="right" label="审核状态">
         <template slot-scope="{row}">
-          <el-button type="danger" size="mini" v-if="row.checkState == 1">待审核</el-button>
+          <el-button v-if="row.checkState == 1" type="danger" size="mini">待审核</el-button>
-          <el-button type="success" size="mini" v-else-if="row.checkState == 2">已审核</el-button>
+          <el-button v-else-if="row.checkState == 2" type="success" size="mini">已审核</el-button>
-          <el-button type="warning" size="mini" v-else-if="row.checkState == 3">驳回</el-button>
+          <el-button v-else-if="row.checkState == 3" type="warning" size="mini">驳回</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" fixed="right" align="center" width="160">
-        <template slot-scope="scope">
+        <template slot-scope="{row}">
-          <el-button size="mini" type="text" v-hasPermi="['zs:sign:edit']" v-if="scope.row.signEdit" icon="el-icon-edit" @click="handleAddAndUpdate(scope.row)">修改</el-button>
+          <el-button v-show="row.checkState == 0 || row.checkState == 3" v-hasPermi="['zs:sign:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleAddAndUpdate(row)">修改</el-button>
-          <el-button size="mini" type="text" v-hasPermi="['zs:sign:check']" v-if="scope.row.checkState == 1 " @click="handleCheck(scope.row)">审核</el-button>
+          <!-- <el-button v-if="row.checkState == 1" v-hasPermi="['zs:sign:check']" size="mini" type="text" @click="handleCheck(row)">审核</el-button> -->
-          <el-button size="mini" type="text" v-hasPermi="['zs:sign:remove']" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+          <el-button v-if="row.checkState == 1" v-hasPermi="['zs:sign:settlement']" size="mini" type="text" @click="handleSettlement(row)">结算</el-button>
+          <el-button v-hasPermi="['zs:sign:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -43,24 +44,25 @@
     <SignFormDialog v-if="dialog.signVisible" ref="signDialogForm" :dialog-visible="dialog.signVisible" @refreshDataList="_getTableList" />
 
     <!-- 引入审核弹框  -->
-    <CheckDialog v-if="dialog.checkVisible" ref="checkDialogForm" :dialog-visible="dialog.checkVisible" @refreshDataList="_getTableList" />
+    <!-- <CheckDialog v-if="dialog.checkVisible" ref="checkDialogForm" :dialog-visible="dialog.checkVisible" @refreshDataList="_getTableList" /> -->
 
     <!-- 导入对话框 -->
     <UploadDialog v-if="dialog.uploadVisible" />
+
+    <!-- 结算对话框 -->
+    <SettlementDialog v-if="dialog.settlementVisible" ref="SettlementDialog" @refreshDataList="_getTableList"/>
   </div>
 </template>
 
-  
+<script>
-  
+import { getSignList, exportData, deleteSign } from '@/api/zs/sign';
-  <script>
+import empApi from '@/api/system/employee';
-import { getSignList, exportData, deleteSign } from '@/api/zs/sign'
+import CheckDialog from './components/CheckDialog';
-import empApi from '@/api/system/employee'
+import SearchForm from './components/SearchForm.vue';
-import CheckDialog from './components/CheckDialog'
+import SignFormDialog from './components/SignFormDialog.vue';
-import SearchForm from './components/SearchForm.vue'
-import SignFormDialog from './components/SignFormDialog.vue'
 import { defaultColumns } from './columns.js';
-import UploadDialog from './components/UploadDialog.vue'
+import UploadDialog from './components/UploadDialog.vue';
-
+import SettlementDialog from './components/SettlementDialog.vue';
 
 export default {
   name: 'Sign',
@@ -69,6 +71,7 @@ export default {
     CheckDialog,
     SignFormDialog,
     UploadDialog,
+    SettlementDialog
   },
   data() {
     return {
@@ -76,7 +79,7 @@ export default {
       userId: localStorage.getItem('userId'),
       searchForm: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
       loading: false,
       columns: [],
@@ -88,19 +91,20 @@ export default {
       percentageOptions: [
         {
           value: '驾校已结算',
-          label: '驾校已结算',
+          label: '驾校已结算'
         },
         {
           value: '提成已发放',
-          label: '提成已发放',
+          label: '提成已发放'
-        },
+        }
       ],
       areaOptions: [],
       showSearch: true,
       dialog: {
         signVisible: false,
         checkVisible: false,
-        uploadVisible: false
+        uploadVisible: false,
+        settlementVisible: true
       },
       options: {
         userOptions: [],
@@ -109,32 +113,32 @@ export default {
         moneyStateOptions: [],
         sourceOptions: []
       }
-    }
+    };
   },
   created() {
     const str = localStorage.getItem(`${this.$route.name}-table-columns`);
     this.columns = str ? JSON.parse(str) : defaultColumns;
-    //回款状态
+    // 回款状态
     this.getDicts('dm_money_state').then((response) => {
-      this.options.moneyStateOptions = response.data
+      this.options.moneyStateOptions = response.data;
-    })
+    });
-    //s所属区域
+    // s所属区域
     this.getDicts('dm_area').then((response) => {
-      this.options.areaOptions = response.data
+      this.options.areaOptions = response.data;
-    })
+    });
-    //s所属区域
+    // s所属区域
     this.getDicts('dm_source').then((response) => {
-      this.options.sourceOptions = response.data
+      this.options.sourceOptions = response.data;
-    })
+    });
-    this.getSchools()
+    this.getSchools();
-    this._getTableList()
+    this._getTableList();
-    this.getEmployee()
+    this.getEmployee();
   },
   methods: {
     // 搜索
     handleQuery() {
-      this.searchForm.pageNum = 1
+      this.searchForm.pageNum = 1;
-      this._getTableList()
+      this._getTableList();
     },
     _getTableList() {
       this.loading = true;
@@ -142,16 +146,16 @@ export default {
       const params = { ...this.searchForm, ...tempForm };
       getSignList(params).then(
         (response) => {
-          this.tableDataList = response.rows
+          this.tableDataList = response.rows;
-          this.total = response.total
+          this.total = response.total;
-          this.loading = false
+          this.loading = false;
         }
-      )
+      );
     },
     getSchools() {
       empApi.pageList().then((resp) => {
-        this.options.schoolOptions = resp.data
+        this.options.schoolOptions = resp.data;
-      })
+      });
     },
 
     /** 导出按钮操作 */
@@ -159,46 +163,46 @@ export default {
       this.$confirm('是否确认导出所有成交记录项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then((resp) => {
           const tempForm = this.$refs.SearchForm?.searchForm || {};
           this.download('zs/sign/export', tempForm, `登记信息_${new Date().getTime()}.xlsx`);
         })
-        .catch(function () { })
+        .catch(function () { });
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = '成交记录导入'
+      this.upload.title = '成交记录导入';
-      this.upload.open = true
+      this.upload.open = true;
     },
     /** 查询员工 */
     getEmployee() {
       empApi.getEmployee().then((resp) => {
         if (resp.code == 200) {
-          this.options.userOptions = resp.data
+          this.options.userOptions = resp.data;
         }
-      })
+      });
     },
     changeSort(val) {
       if (val.order) {
-        this.searchForm.orderName = val.prop
+        this.searchForm.orderName = val.prop;
         if (val.order == 'ascending') {
-          this.searchForm.orderType = 'asc'
+          this.searchForm.orderType = 'asc';
         } else {
-          this.searchForm.orderType = 'desc'
+          this.searchForm.orderType = 'desc';
         }
       } else {
-        this.searchForm.orderName = ''
+        this.searchForm.orderName = '';
-        this.searchForm.orderType = ''
+        this.searchForm.orderType = '';
       }
-      this.getPageList()
+      this.getPageList();
     },
     handleAddAndUpdate(item) {
-      this.dialog.signVisible = true
+      this.dialog.signVisible = true;
       this.$nextTick(() => {
-        this.$refs.signDialogForm.init(item)
+        this.$refs.signDialogForm.init(item);
-      })
+      });
     },
     handleDelete(item) {
       this.$confirm(
@@ -207,33 +211,40 @@ export default {
         {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         }
       )
         .then((res) => {
           deleteSign({ signId: item.signId }).then((resp) => {
             if (resp.code == 200) {
-              this.$message.success('删除成功')
+              this.$message.success('删除成功');
-              this.getPageList()
+              this.getPageList();
             } else {
-              //this.$message.error("删除失败:" + resp.msg);
+              // this.$message.error("删除失败:" + resp.msg);
             }
+          });
         })
-        })
+        .catch(function () { });
-        .catch(function () { })
     },
 
     handleCheck(item) {
-      this.dialog.checkVisible = true
+      this.dialog.checkVisible = true;
       this.$nextTick(() => {
-        this.$refs.checkDialogForm.init(item)
+        this.$refs.checkDialogForm.init(item);
+      });
+    },
+    //结算
+    handleSettlement(item){
+      this.dialog.settlementVisible = true
+      this.$nextTick(() => {
+        this.$refs.SettlementDialog.init(item);
       })
-    },
+    }
-  },
+  }
-}
+};
-  </script>
+</script>
 
-  <style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss">
 .el-table .cell {
   box-sizing: border-box;
   overflow: hidden;

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin');
 
-const name = process.env.VUE_APP_TITLE || '莳松管理系统'; // 网页标题
+const name = process.env.VUE_APP_TITLE || '开心学车管理系统'; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
@@ -33,10 +33,18 @@ module.exports = {
     port: port,
     open: true,
     proxy: {
+      [process.env.VUE_APP_BASE_API + '/driver-api']: {
+        target: `http://118.31.23.45:8888/driver-api/`,
+        // target: `http://localhost:8888/driver-api/`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API + '/driver-api']: ''
+        }
+      },
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://xueche.ahduima.com/duima/`,
-        target: `http://localhost:8086`,
+        target: `http://localhost:8088`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -97,10 +105,12 @@ module.exports = {
       config
         .plugin('ScriptExtHtmlWebpackPlugin')
         .after('html')
-        .use('script-ext-html-webpack-plugin', [{
+        .use('script-ext-html-webpack-plugin', [
+          {
             // `runtime` must same as runtimeChunk name. default is `runtime`
             inline: /runtime\..*\.js$/
-        }])
+          }
+        ])
         .end();
       config.optimization.splitChunks({
         chunks: 'all',