门店

.env.development

@@ -6,12 +6,12 @@
  # @Description: 
 ### 
 # 页面标题
-VUE_APP_TITLE = 寻驾招生管理系统
+VUE_APP_TITLE = 开心学车管理系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 寻驾招生管理系统/开发环境
+# 开心学车管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 JWL_API = ''

.env.production

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

.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",
@@ -59,8 +59,7 @@
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0",
+    "vuex": "3.6.0"
-    "webpack-dev-server": "^3.10.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
@@ -73,7 +72,6 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
-    "html-webpack-plugin": "^5.6.0",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.13",

public/index.html

@@ -95,10 +95,10 @@
     <script src="/loading/index.js"></script>
     <script type="text/javascript">
       window._AMapSecurityConfig = {
-        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab'
+        securityJsCode: 'e7783f9551b7b38e1f485f99cb7d986f'
       };
     </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=713d839ff505943b0f18e6df45f3b0dc&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.Geocoder,AMap.Scale"></script>
+    <script src="https://webapi.amap.com/maps?v=1.4.15&key=e92870cebfb5c7a9139f77bca1e7997a&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.Geocoder,AMap.Scale"></script>
   </body>
 </html>

src/api/question.js

@@ -10,7 +10,7 @@ import request from '@/utils/request';
 // 获取首页统计信息
 export function searchQuestion(param) {
   return request({
-    url: '/xunjia/tdQuestion/duima/list',
+    url: '/driver-api/tdQuestion/duima/list',
     method: 'get',
     params: param
   });
@@ -18,7 +18,7 @@ export function searchQuestion(param) {
 
 export function updateQuestion(data) {
   return request({
-    url: '/xunjia/tdQuestion/duima/update',
+    url: '/driver-api/tdQuestion/duima/update',
     method: 'put',
     data: data
   });
@@ -26,17 +26,10 @@ export function updateQuestion(data) {
 
 export function addQuestion(data) {
   return request({
-    url: '/xunjia/tdQuestion/duima/add',
+    url: '/driver-api/tdQuestion/duima/add',
     method: 'put',
     data: data
   });
 }
 
 
-export function uploadFile(data) {
-  return request({
-    url: '/xunjia/applet/tiku/question/upload',
-    method: 'post',
-    data: data
-  });
-}

src/api/sch/classType.js

@@ -51,11 +51,3 @@ export function cloneClassType(data) {
     data: data
   });
 }
-
-export function batchUpdateProfit(data) {
-  return request({
-    url: '/sch/classType/profit',
-    method: 'post',
-    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/sch/shop.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询抖音门店列表
+export function listShop(query) {
+  return request({
+    url: '/system/shop/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询抖音门店详细
+export function getShop(shopId) {
+  return request({
+    url: '/system/shop/' + shopId,
+    method: 'get'
+  })
+}
+
+// 新增抖音门店
+export function addShop(data) {
+  return request({
+    url: '/system/shop',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改抖音门店
+export function updateShop(data) {
+  return request({
+    url: '/system/shop',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除抖音门店
+export function delShop(shopId) {
+  return request({
+    url: '/system/shop/' + shopId,
+    method: 'delete'
+  })
+}

src/api/system/skill.js

@@ -7,15 +7,6 @@
  */
 import request from '@/utils/request'
 
-// 分页查询关键话术列表
-export function pageSkill(query) {
-  return request({
-    url: '/system/skill/page',
-    method: 'get',
-    params: query
-  })
-}
-
 // 查询关键话术列表
 export function listSkill(query) {
   return request({
@@ -66,12 +57,3 @@ export function delSkill(skillId) {
     method: 'delete'
   })
 }
-
-// 审核关键话术
-export function checkSkill(data) {
-  return request({
-    url: '/system/skill/check',
-    method: 'put',
-    data: data
-  })
-}

src/api/zs/clue.js

@@ -210,3 +210,11 @@ export function saveCluePlace(data) {
     data: data
   });
 }
+
+export function getFollowCount() {
+  return request({
+    url: `/zs/clue/follow/count`,
+    method: 'get'
+  });
+}
+

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,93 @@
+/*
+ * @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'
+  });
+}
+
+//查询接待人统计
+export function getCount(param){
+  return request({
+    url: '/zs/feedback/detail/count',
+    method: 'get',
+    params: param
+  })
+}
+
+
+//查询接待人接待详情
+export function getCountDetail(param){
+  return request({
+    url: '/zs/feedback/detail/count/detail',
+    method: 'get',
+    params: param
+  })
+}

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,22 +1,33 @@
+/*
+ * @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 {
+import { Message } from 'element-ui';
-  Message
-} from 'element-ui';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
-import {
+import { getToken } from '@/utils/auth';
-  getToken
+import { isRelogin } from '@/utils/request';
-} from '@/utils/auth';
-import {
-  isRelogin
-} from '@/utils/request';
 
 NProgress.configure({
   showSpinner: false
 });
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/question'];
+const whiteList = [
+  '/login',
+  '/auth-redirect',
+  '/bind',
+  '/register',
+  '/question',
+  '/clue/feedback/follow',
+  '/clue/feedback/arrival',
+  '/coach/count',
+  '/coach/count/detail'
+];
 
 router.beforeEach((to, from, next) => {
   NProgress.start();

src/router/index.js

@@ -29,14 +29,17 @@ import Layout from '@/layout';
  */
 
 // 公共路由
-export const constantRoutes = [{
+export const constantRoutes = [
+  {
     path: '/redirect',
     component: Layout,
     hidden: true,
-  children: [{
+    children: [
+      {
         path: '/redirect/:path(.*)',
         component: () => import('@/views/redirect')
-  }]
+      }
+    ]
   },
   {
     path: '/login',
@@ -53,6 +56,26 @@ export const constantRoutes = [{
     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: '/coach/count',
+    component: () => import('@/views/sch/coach/count'),
+    hidden: true
+  },
+  {
+    path: '/coach/count/detail',
+    component: () => import('@/views/sch/coach/count/detail'),
+    hidden: true
+  },
   {
     path: '/404',
     component: () => import('@/views/error/404'),
@@ -67,7 +90,8 @@ export const constantRoutes = [{
     path: '',
     component: Layout,
     redirect: 'index',
-  children: [{
+    children: [
+      {
         path: 'index',
         component: () => import('@/views/index'),
         name: 'Index',
@@ -76,7 +100,8 @@ export const constantRoutes = [{
           icon: 'dashboard',
           affix: true
         }
-  }]
+      }
+    ]
   },
   // {
   //   path: '/demo',
@@ -111,7 +136,8 @@ export const constantRoutes = [{
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
-  children: [{
+    children: [
+      {
         path: 'profile',
         component: () => import('@/views/system/user/profile/index'),
         name: 'Profile',
@@ -119,17 +145,20 @@ export const constantRoutes = [{
           title: '个人中心',
           icon: 'user'
         }
-  }]
+      }
+    ]
   }
 ];
 
 // 动态路由，基于用户权限动态去加载
-export const dynamicRoutes = [{
+export const dynamicRoutes = [
+  {
     path: '/system/user-auth',
     component: Layout,
     hidden: true,
     permissions: ['system:user:edit'],
-  children: [{
+    children: [
+      {
         path: 'role/:userId(\\d+)',
         component: () => import('@/views/system/user/authRole'),
         name: 'AuthRole',
@@ -137,14 +166,16 @@ export const dynamicRoutes = [{
           title: '分配角色',
           activeMenu: '/system/user'
         }
-  }]
+      }
+    ]
   },
   {
     path: '/system/role-auth',
     component: Layout,
     hidden: true,
     permissions: ['system:role:edit'],
-  children: [{
+    children: [
+      {
         path: 'user/:roleId(\\d+)',
         component: () => import('@/views/system/role/authUser'),
         name: 'AuthUser',
@@ -152,14 +183,16 @@ export const dynamicRoutes = [{
           title: '分配用户',
           activeMenu: '/system/role'
         }
-  }]
+      }
+    ]
   },
   {
     path: '/system/dict-data',
     component: Layout,
     hidden: true,
     permissions: ['system:dict:list'],
-  children: [{
+    children: [
+      {
         path: 'index/:dictId(\\d+)',
         component: () => import('@/views/system/dict/data'),
         name: 'Data',
@@ -167,14 +200,16 @@ export const dynamicRoutes = [{
           title: '字典数据',
           activeMenu: '/system/dict'
         }
-  }]
+      }
+    ]
   },
   {
     path: '/monitor/job-log',
     component: Layout,
     hidden: true,
     permissions: ['monitor:job:list'],
-  children: [{
+    children: [
+      {
         path: 'index',
         component: () => import('@/views/monitor/job/log'),
         name: 'JobLog',
@@ -182,14 +217,16 @@ export const dynamicRoutes = [{
           title: '调度日志',
           activeMenu: '/monitor/job'
         }
-  }]
+      }
+    ]
   },
   {
     path: '/zs/clue-form',
     component: Layout,
     hidden: true,
     permissions: ['zs:clue:add', 'zs:clue:edit'],
-  children: [{
+    children: [
+      {
         path: 'index/:clueId(\\d+)',
         component: () => import('@/views/zs/clue/ClueForm'),
         name: 'ClueForm',
@@ -197,7 +234,8 @@ export const dynamicRoutes = [{
           title: '线索详情',
           activeMenu: '/zs/clue'
         }
-  }]
+      }
+    ]
   }
 ];
 

src/views/index.vue

@@ -14,7 +14,7 @@
             </div>
           </el-card>
         </el-col> -->
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-card>
             <div slot="header">
               计划总结
@@ -27,9 +27,9 @@
               <div v-html="task" />
             </div>
           </el-card>
-        </el-col>
+        </el-col> -->
 
-        <el-col :span="6">
+        <el-col :span="12">
           <el-card>
             <div slot="header">团队业绩概况</div>
             <div class="card-panel">
@@ -50,7 +50,7 @@
           </el-card>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span="12">
           <el-card>
             <div slot="header">转化率</div>
             <div class="card-panel">
@@ -86,7 +86,7 @@
       <el-row :gutter="40" class="panel-group" style="margin-bottom: 20px"> -->
 
         <!-- 考勤信息 -->
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-card>
             <div slot="header">打卡异常信息</div>
             <div class="card-panel">
@@ -104,7 +104,7 @@
               </el-carousel>
             </div>
           </el-card>
-        </el-col>
+        </el-col> -->
       </el-row>
 
       <!-- 成交数排行榜  -->
@@ -236,12 +236,12 @@ export default {
         this.user = response.data
       })
     },
-    getCheckin() {
+    // getCheckin() {
-      getCheckin().then((resp) => {
+    //   getCheckin().then((resp) => {
-        this.checkin_datas = resp.data
+    //     this.checkin_datas = resp.data
-        this.countNum = Math.ceil(this.checkin_datas.length / 5)
+    //     this.countNum = Math.ceil(this.checkin_datas.length / 5)
-      })
+    //   })
-    },
+    // },
     handleEditTask(type) {
       this.taskType = type
       if (type === 2) {
@@ -399,7 +399,7 @@ export default {
     .card-panel-description {
       float: right;
       font-weight: bold;
-      margin: 26px 0px;
+      margin: 26px;
       margin-left: 0px;
 
       .card-panel-text {

src/views/login.vue

@@ -1,18 +1,17 @@
 <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">
+          <wxlogin v-if="!code && activeName === 'wx'" appid="wxc9e106a4afd2b9dd" :scope="'snsapi_login'" :theme="'black'" redirect_uri="https://xueche.kxxc.top/login" :href="href">
           </wxlogin>
-          <!-- <div id="wxcode" v-if="!code && activeName === 'wx'"></div> -->
+   
-          <!-- 绑定手机号框 -->
           <div v-else v-loading="loading">
             <WxCode v-if="codeShow" :code="code" :openId="openId" />
           </div>
         </el-tab-pane>
-        <el-tab-pane label="账号密码" name="password" style="height:200px">
+        <el-tab-pane label="短信验证码" name="password" style="height:200px">
           <Password v-if="activeName === 'password'" />
         </el-tab-pane>
       </el-tabs>
@@ -91,7 +90,7 @@ export default {
       var obj = new WxLogin({
         self_redirect: true,
         id: "wxcode", // 页面显示二维码的容器id
-        appid: "wx203f734baa9c9845", // 微信官方提供的测试id
+        appid: "wxc9e106a4afd2b9dd", // 微信官方提供的测试id
         scope: "snsapi_login",
         redirect_uri: "https://xueche.ahduima.com/login", // 微信官方中的测试地址
         state: "bind",

src/views/question/components/QuestionAddForm.vue

@@ -1,14 +1,7 @@
 <template>
   <el-dialog title="试题" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="900px" @close="closeDialog">
     <div>
-      <el-form
+      <el-form ref="dialogForm" :model="dialogForm" :rules="dataRule" label-position="left" @keyup.enter.native="dialogFormSubmit()">
-        ref="dialogForm"
-        :model="dialogForm"
-        :rules="dataRule"
-        label-width="80px"
-        label-position="left"
-        @keyup.enter.native="dialogFormSubmit()"
-      >
         <el-row>
           <el-col :span="24">
             <el-form-item label="题目" prop="question">
@@ -16,7 +9,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row>
           <el-col :span="12">
             <el-form-item label="选项A" prop="question">
               <el-input v-model="dialogForm.chooseA" maxlength="200" placeholder="请输入" clearable />
@@ -28,7 +21,7 @@
           </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row>
           <el-col :span="12">
             <el-form-item label="选项C" prop="question">
               <el-input v-model="dialogForm.chooseC" maxlength="200" placeholder="请输入" clearable />
@@ -40,7 +33,7 @@
           </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row>
           <el-col :span="12">
             <el-form-item label="选项E" prop="question">
               <el-input v-model="dialogForm.chooseE" maxlength="200" placeholder="请输入" clearable />
@@ -52,7 +45,7 @@
           </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row>
           <el-col :span="12">
             <el-form-item label="选项G" prop="question">
               <el-input v-model="dialogForm.chooseG" maxlength="200" placeholder="请输入" clearable />
@@ -70,11 +63,11 @@
           <el-col :span="24">
             <el-form-item label="科目" prop="subject">
               <span v-if="dialogForm.subject == 1">科一</span>
-              <span v-else-if="dialogForm.subject == 4">科四</span>
+              <span v-if="dialogForm.subject == 4">科四</span>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row>
           <el-col :span="8">
             <el-form-item label="精选500题" prop="isVip">
               <el-radio-group v-model="dialogForm.isVip" size="small">
@@ -139,25 +132,11 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-form-item label="题目图片" prop="imageUrl">
-            <el-upload
-              action="#"
-              accept=".png,.jpg,.jpeg,.gif"
-              :limit="1"
-              :http-request="handleImport"
-              :on-exceed="handleExceed"
-              :show-file-list="false"
-            >
-              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" style="width: 200px;">
-              <i v-else class="el-icon-plus" />
-            </el-upload>
-          </el-form-item>
-        </el-row>
       </el-form>
+
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button plain @click="visible = false">取消</el-button>
+      <el-button plain @click="(visible=false)">取消</el-button>
       <el-button v-jclick type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
@@ -218,7 +197,7 @@ export default {
     dialogFormSubmit () {
       this.$refs.dialogForm.validate((valid) => {
         if (valid) {
-          addQuestion(this.dialogForm).then((response) => {
+          updateQuestion(this.dialogForm).then(response => {
             if (response.code == 200) {
               this.$modal.msgSuccess('修改成功');
               // this.visible = true;
@@ -226,20 +205,6 @@ export default {
           });
         }
       });
-    },
-    handleImport(opt) {
-      const data = new FormData();
-      data.append('file', opt.file);
-      // 上传
-      // api.upload(data).then(resp => {
-      //   if (resp.code == 200) {
-      //     this.$modal.msgSuccess('文件上传成功');
-      //     this.dialogForm.imageUrl = resp.data;
-      //   }
-      // });
-    },
-    handleExceed(files) {
-      this.handleImport({ file: files[0] });
     }
   }
 };

src/views/question/components/QuestionForm.vue

@@ -6,40 +6,21 @@
           <el-col :span="24">
             <el-form-item label="题目" prop="question">
               <div>{{ dialogForm.question }}</div>
-              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" width="200" alt="" />
+              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" width="100" alt="">
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-form-item label="替换图片">
-            <el-upload
-              action="#"
-              accept=".png,.jpg,.jpeg,.gif"
-              :limit="1"
-              :http-request="handleImport"
-              :on-exceed="handleExceed"
-              :show-file-list="false"
-            >
-              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" style="width: 300px" />
-              <i v-else class="el-icon-plus" />
-            </el-upload>
-          </el-form-item>
-        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="选项" prop="question">
-              <span v-if="dialogForm.chooseA"
+              <span v-if="dialogForm.chooseA">A:{{ dialogForm.chooseA }}<span>
-                >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
+              </span></span></el-form-item>
-              ></el-form-item
-            >
           </el-col>
         </el-row>
         <el-row>
@@ -123,17 +104,18 @@
           </el-col>
         </el-row>
       </el-form>
+
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button plain @click="visible = false">取消</el-button>
+      <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, uploadFile } from '@/api/question';
+import { updateQuestion } from '@/api/question';
-// import axios from 'axios';
+
 export default {
   data() {
     return {
@@ -164,7 +146,6 @@ export default {
         // this.$refs['dialogForm'].resetFields();
         if (info) {
           this.dialogForm = this.deepClone(info);
-          this.fileUrl = info.imageUrl;
         }
       });
     },
@@ -187,7 +168,7 @@ export default {
     dialogFormSubmit() {
       this.$refs.dialogForm.validate((valid) => {
         if (valid) {
-          updateQuestion(this.dialogForm).then((response) => {
+          updateQuestion(this.dialogForm).then(response => {
             if (response.code == 200) {
               this.$modal.msgSuccess('修改成功');
               this.$emit('update');
@@ -196,32 +177,6 @@ export default {
           });
         }
       });
-    },
-    handleImport(opt) {
-      const data = new FormData();
-      data.append('file', opt.file);
-      // axios({
-      //   method: 'post',
-      //   url: 'http://xj.ahduima.com/xunjia/tiku/question/upload',
-      //   data: data
-      // }).then((resp) => {
-      //   console.log(resp.data);
-      //   if (resp.data.code == 200) {
-      //     this.$modal.msgSuccess('文件上传成功');
-      //     this.dialogForm.imageUrl = resp.data.msg;
-      //   }
-      //   console.log(this.dialogForm)
-      // });
-      // 上传
-      uploadFile(data).then(resp => {
-        if (resp.code == 200) {
-          this.$modal.msgSuccess('文件上传成功');
-          this.dialogForm.imageUrl = resp.msg;
-        }
-      });
-    },
-    handleExceed(files) {
-      this.handleImport({ file: files[0] });
     }
   }
 };

src/views/question/index.vue

@@ -16,9 +16,6 @@
           </el-radio-group>
         </el-form-item>
       </el-row>
-      <el-form-item>
-        <el-checkbox v-model="queryParams.isWatermark" :label="true">是否有水印</el-checkbox>
-      </el-form-item>
       <el-form-item label="题目">
         <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width:400px" @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -26,6 +23,7 @@
         <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>
 
@@ -60,11 +58,6 @@
           {{ row.carTypeId == 1001 ? '小车' : '摩托车' }}
         </template>
       </el-table-column>
-      <el-table-column label="图片" align="center" min-width="200">
-        <template slot-scope="{ row }">
-          <img :src="row.imageUrl" alt="" width="80px" srcset="">
-        </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>
@@ -75,6 +68,7 @@
     <!-- <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>
 
@@ -86,8 +80,7 @@ import QuestionAddForm from './components/QuestionAddForm.vue';
 export default {
   name: 'Question',
   components: {
-    QuestionForm,
+    QuestionForm, QuestionAddForm
-    QuestionAddForm
   },
   data () {
     return {
@@ -113,7 +106,7 @@ export default {
     /** 查询文件列表 */
     getList () {
       this.loading = true;
-      searchQuestion(this.queryParams).then((response) => {
+      searchQuestion(this.queryParams).then(response => {
         this.tableList = response.data;
         // this.total = response.total;
         this.loading = false;
@@ -122,7 +115,7 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery () {
-      if (this.queryParams.question || (this.queryParams.isWatermark != undefined && this.queryParams.isWatermark)) {
+      if (this.queryParams.question) {
         this.getList();
       } else {
         this.$modal.msgWarning('请输入题目');
@@ -142,10 +135,7 @@ export default {
     handleAdd (item) {
       this.dialogAddVisible = true;
       this.$nextTick(() => {
-        this.$refs.dialogAddForm.init({
+        this.$refs.dialogAddForm.init(item);
-          subject: this.queryParams.subject,
-          carTypeId: this.queryParams.carTypeId
-        });
       });
     }
   }

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/classType/components/ProfitSettingDialog.vue

@@ -1,155 +0,0 @@
-<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">
-                <el-form-item label="利润类型" prop="profitType">
-                    <el-radio-group v-model="dialogForm.profitType" @change="profitTypeChange">
-                        <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="profitParam">
-                    <el-input v-show="dialogForm.profitType != 3" v-model="dialogForm.profitParam" maxlength="100"
-                        placeholder="请输入" clearable />
-                 <div v-show="dialogForm.profitType == 3" style="text-align: center;">
-                    <el-table :data="dialogForm.profitParamVOList" stripe border>
-                        <el-table-column label="下限" >
-                            <template slot-scope="scope">
-                                <el-form-item :prop="'profitParamVOList.' + scope.$index + '.min'" :rules="dataRule['min']">
-                                <el-input v-model="scope.row.min" placeholder="请输入" clearable type="number" />
-                                </el-form-item>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="上限" >
-                            <template slot-scope="scope">
-                                <el-form-item :prop="'profitParamVOList.' + scope.$index + '.max'" :rules="dataRule['max']">
-                                <el-input v-model="scope.row.max" placeholder="请输入" clearable type="number" />
-                                </el-form-item>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="利润" >
-                            <template slot-scope="scope">
-                                <el-form-item :prop="'profitParamVOList.' + scope.$index + '.profit'" :rules="dataRule['profit']">
-                                <el-input v-model="scope.row.profit" placeholder="请输入" clearable type="number" />
-                                </el-form-item>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="操作" fixed="right" width="130">
-                            <template slot-scope="scope">
-                                <el-button @click="handleProfitParamDelete(scope.$index)">删除</el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                    <el-button plain @click="handleAddProfitParam">新增</el-button>
-                </div>
-                </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 { batchUpdateProfit } from '@/api/sch/classType';
-
-export default {
-    name: 'ProfitSettingDialog',
-    data() {
-        return {
-            visible: false,
-            canSubmit: true,
-            dialogForm: {
-                typeIds: undefined,
-                profitType: 1,
-                profitParam: undefined,
-                remark: undefined,
-                profitParamVOList: [{
-                min: 0,
-                max: undefined,
-                profit: undefined
-            }]
-            },
-            dataRule: {
-                profitType: [{ required: true, message: '利润类型不能为空', trigger: 'blur' }],
-                min: [{ required: true, message: '上限不能为空', trigger: 'blur' }],
-                max: [{ required: true, message: '下限不能为空', trigger: 'blur' }],
-                profit: [{ required: true, message: '利润不能为空', trigger: 'blur' }]
-
-            }
-        };
-    },
-    methods: {
-        init(info = undefined) {
-            // debugger
-            this.visible = true;
-            this.canSubmit = true;
-            this.$nextTick(() => {
-                this.resetDialogForm();
-                this.$refs['dialogForm'].resetFields();
-                if (info) {
-                    this.dialogForm = { ...this.dialogForm, ...info };
-                }
-            });
-        },
-        resetDialogForm() {
-            this.dialogForm = {
-                typeIds: undefined,
-                profitType: 1,
-                profitParam: undefined,
-                remark: undefined,
-                profitParamVOList: []
-            };
-        },
-        closeDialog() {
-            this.$emit('update:dialogVisible', false);
-        },
-        handleAddProfitParam() {
-            this.dialogForm.profitParamVOList.push({
-                min: 0,
-                max: undefined,
-                profit: undefined
-            });
-        },
-        handleProfitParamDelete(index) {
-            console.log(index);
-            this.dialogForm.profitParamVOList.splice(index, 1);
-        },
-        profitTypeChange(type) {
-            if (type == 3) {
-                this.dialogForm.profitParamVOList.push({
-                    min: 0,
-                    max: undefined,
-                    profit: undefined
-                });
-            } else {
-                this.$set(this.dialogForm, "profitParamVOList", []);
-            }
-        },
-        // 表单提交
-        dialogFormSubmit() {
-            this.$refs.dialogForm.validate((valid) => {
-                if (valid) {
-                    this.canSubmit = false;
-                    // 校验完成，调接口
-                    batchUpdateProfit(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/classType/index.vue

@@ -3,50 +3,39 @@
     <el-row :gutter="20">
       <el-col :span="6">
         <div class="head-container">
-          <el-input v-model="searchName" placeholder="请输入驾校名称" clearable prefix-icon="el-icon-search"
+          <el-input v-model="searchName" placeholder="请输入驾校名称" clearable prefix-icon="el-icon-search" style="margin-bottom: 20px" />
-            style="margin-bottom: 20px" />
         </div>
         <div class="head-container" style="max-height: 700px;overflow-y: auto">
-          <el-tree ref="tree" :data="schoolOption.filter(item => item.label.includes(searchName))" accordion node-key="id"
+          <el-tree ref="tree" :data="schoolOption.filter(item => item.label.includes(searchName))" accordion node-key="id" :default-expanded-keys="selectNodes.map(item => item.id)" @node-click="handleNodeClick" />
-            :default-expanded-keys="selectNodes.map(item => item.id)" @node-click="handleNodeClick" />
         </div>
       </el-col>
       <el-col :span="18">
         <el-row :gutter="20">
           <el-form ref="queryForm" :model="queryParams" :inline="true">
             <el-form-item>
-              <el-input v-model="queryParams.typeName" placeholder="请输入班型名称" clearable style="width: 240px"
+              <el-input v-model="queryParams.typeName" placeholder="请输入班型名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
-                @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-select v-model="queryParams.licenseType" clearable placeholder="选择驾照类型">
-                <el-option v-for="item in licenseTypeOption" :key="item.dictValue" :label="item.dictLabel"
+                <el-option v-for="item in licenseTypeOption" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" />
-                  :value="item.dictValue" />
               </el-select>
             </el-form-item>
             <el-form-item>
               <el-select v-model="queryParams.status" placeholder="班型状态" clearable>
-                <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel"
+                <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-                  :value="dict.dictValue" />
               </el-select>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-              <el-button v-hasPermi="['sch:classType:add']" type="primary" icon="el-icon-plus"
+              <el-button v-hasPermi="['sch:classType:add']" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
-                @click="handleAdd">新增</el-button>
+              <el-button v-hasPermi="['sch:classType:remove']" type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete">删除</el-button>
-              <el-button v-hasPermi="['sch:classType:remove']" type="danger" icon="el-icon-delete" :disabled="multiple"
+              <el-button v-hasPermi="['sch:classType:clone']" type="primary" icon="el-icon-copy" :disabled="multiple" @click="handleClone">克隆</el-button>
-                @click="handleDelete">删除</el-button>
-              <el-button v-hasPermi="['sch:classType:clone']" type="primary" icon="el-icon-copy" :disabled="multiple"
-                @click="handleClone">克隆</el-button>
-              <el-button v-hasPermi="['sch:classType:profit']" type="primary" :disabled="multiple"
-                @click="handleProfit()">利润配置</el-button>
             </el-form-item>
           </el-form>
         </el-row>
 
-        <el-table v-loading="loading.tableLoading" :data="tableDataList" stripe border
+        <el-table v-loading="loading.tableLoading" :data="tableDataList" stripe border @selection-change="handleSelectionChange">
-          @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
 
           <el-table-column type="index" width="50" />
@@ -58,14 +47,6 @@
           <el-table-column label="报价" prop="currentPrice" width="60" />
           <el-table-column label="底价" prop="minPrice" width="60" />
           <el-table-column label="描述" prop="description" min-width="200" show-overflow-tooltip />
-          <el-table-column label="利润类型" prop="profitType" min-width="100">
-            <template slot-scope="scope">
-              <span v-if="scope.row.profitType == 1">底价</span>
-              <span v-else-if="scope.row.profitType == 2">比例</span>
-              <span v-else>固定</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="利润参数" prop="profitParamShow" min-width="200" show-overflow-tooltip />
           <el-table-column label="状态" prop="status" :formatter="statusFormat" width="80" />
           <el-table-column label="创建时间" width="160">
             <template slot-scope="scope">
@@ -74,20 +55,18 @@
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="130">
             <template slot-scope="scope">
-              <el-button v-hasPermi="['sch:classType:edit']" type="text" icon="el-icon-edit"
+              <el-button v-hasPermi="['sch:classType:edit']" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-                @click="handleUpdate(scope.row)">修改</el-button>
+              <el-button v-hasPermi="['sch:classType:remove']" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-              <el-button v-hasPermi="['sch:classType:remove']" type="text" icon="el-icon-delete"
+
-                @click="handleDelete(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getPageList" />
-          @pagination="getPageList" />
       </el-col>
     </el-row>
 
-    <el-dialog title="班型设置" :visible.sync="modalVisible" width="600px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="班型设置" :visible.sync="modalVisible" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="modalForm" :model="modalForm" :rules="modalRules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -111,8 +90,7 @@
           <el-col :span="12">
             <el-form-item label="驾照类型" prop="licenseType">
               <el-select v-model="modalForm.licenseType" placeholder="选择驾照类型">
-                <el-option v-for="item in licenseTypeOption" :key="item.dictValue" :label="item.dictLabel"
+                <el-option v-for="item in licenseTypeOption" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" />
-                  :value="item.dictValue" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -162,56 +140,11 @@
           <el-col :span="12">
             <el-form-item label="状态" prop="currentPrice">
               <el-radio-group v-model="modalForm.status">
-                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
-                }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-form-item label="利润类型" prop="profitType">
-            <el-radio-group v-model="modalForm.profitType" @change="profitTypeChange">
-              <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="profitParam">
-            <el-input v-show="modalForm.profitType != 3" v-model="modalForm.profitParam" maxlength="100" placeholder="请输入"
-              clearable />
-            <div v-show="modalForm.profitType == 3" style="text-align: center;">
-              <el-table :data="modalForm.profitParamVOList" stripe border>
-                <el-table-column label="下限">
-                  <template slot-scope="scope">
-                    <el-form-item :prop="'profitParamVOList.' + scope.$index + '.min'" :rules="modalRules['min']">
-                      <el-input v-model="scope.row.min" placeholder="请输入" clearable type="number" />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="上限">
-                  <template slot-scope="scope">
-                    <el-form-item :prop="'profitParamVOList.' + scope.$index + '.max'" :rules="modalRules['max']">
-                      <el-input v-model="scope.row.max" placeholder="请输入" clearable type="number" />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="利润">
-                  <template slot-scope="scope">
-                    <el-form-item :prop="'profitParamVOList.' + scope.$index + '.profit'" :rules="modalRules['profit']">
-                      <el-input v-model="scope.row.profit" placeholder="请输入" clearable type="number" />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" width="130">
-                  <template slot-scope="scope">
-                    <el-button @click="handleProfitParamDelete(scope.$index)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button plain @click="handleAddProfitParam">新增</el-button>
-            </div>
-          </el-form-item>
-        </el-row>
         <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="是否克隆到场地" prop="currentPrice">
@@ -225,8 +158,7 @@
         </el-row> -->
         <el-row>
           <el-form-item label="描述" prop="description">
-            <el-input v-model="modalForm.description" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+            <el-input v-model="modalForm.description" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入描述" />
-              placeholder="请输入描述" />
           </el-form-item>
         </el-row>
       </el-form>
@@ -253,9 +185,6 @@
         <el-button @click="cloneOpen = false">取 消</el-button>
       </div>
     </el-dialog>
-
-    <!-- 利润配置表 -->
-    <ProfitSettingDialog ref="ProfitSettingDialog" @refreshDataList="getPageList" />
   </div>
 </template>
 
@@ -263,13 +192,9 @@
 import { getClassTypeTableList, updateClassType, insertClassType, deleteClassType, cloneClassType } from '@/api/sch/classType';
 import { validateMoney } from '@/utils/validate';
 import { getMapData } from '@/api/sch/place';
-import ProfitSettingDialog from './components/ProfitSettingDialog.vue';
 
 export default {
   name: 'Classtype',
-  components: {
-    ProfitSettingDialog
-  },
   data() {
     return {
       searchName: '',
@@ -313,10 +238,7 @@ export default {
           required: true,
           message: '场地不为空',
           trigger: 'change'
-        },
+        }
-        min: [{ required: true, message: '上限不能为空', trigger: 'blur' }],
-                max: [{ required: true, message: '下限不能为空', trigger: 'blur' }],
-                profit: [{ required: true, message: '利润不能为空', trigger: 'blur' }]
       },
       schoolOption: [],
       placeOption: [],
@@ -394,7 +316,7 @@ export default {
     // 新增
     handleAdd() {
       if (this.selectNodes.length < 1) {
-        this.$message.error('请选择左侧驾校或场地');
+        this.msgError('请选择左侧驾校或场地');
         return;
       }
       this.resetForm('modalForm');
@@ -413,10 +335,7 @@ export default {
         orderMinPrice: undefined,
         enterMinPrice: undefined,
         companyMinPrice: undefined,
-        employeeMinPrice: undefined,
+        employeeMinPrice: undefined
-        profitType: 1,
-        profitParam: undefined,
-        profitParamVOList: []
       };
 
       if (this.selectNodes.length > 1) {
@@ -544,38 +463,6 @@ export default {
           });
         }
       });
-    },
-    // 利润配置
-    handleProfit() {
-      const item = {
-        typeIds: this.ids,
-        profitType: 1,
-        profitParam: undefined
-      };
-      this.$nextTick(() => {
-        this.$refs.ProfitSettingDialog.init(item);
-      });
-    },
-    handleAddProfitParam() {
-        this.modalForm.profitParamVOList.push({
-            min: 0,
-            max: undefined,
-            profit: undefined
-        });
-    },
-    handleProfitParamDelete(index) {
-        console.log(index);
-        this.modalForm.profitParamVOList.splice(index, 1);
-    },
-    profitTypeChange(type) {
-      this.$set(this.modalForm, "profitParamVOList", []);
-        if (type == 3) {
-            this.modalForm.profitParamVOList.push({
-                min: 0,
-                max: undefined,
-                profit: undefined
-            });
-        }
     }
   }
 };

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

@@ -0,0 +1,138 @@
+
+<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="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-item label="负责场地" prop="placeIdList">
+          <el-select v-model="dialogForm.placeIdList" multiple filterable  placeholder="请选择" clearable  size="small" style="width:100%">
+            <el-option v-for="(dict, index) in placeOptions" :key="index" :label="dict.name" :value="dict.placeId" />
+          </el-select>
+        </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,
+        placeIdList: null,
+        placeNames: null,
+        coachName: null,
+        phone: null,
+        openId: null
+      },
+      dataRule: {
+        // schoolId: [{ required: true, message: '所属驾校不能为空', trigger: 'blur' }],
+        placeIdList: [{ required: true, message: '负责场地不能为空', trigger: 'blur' }],
+        coachName: [{ required: true, message: '教练名不能为空', trigger: 'blur' }],
+        phone: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+        openId: [{ required: true, message: '微信openId不能为空', 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,
+        placeIdList: 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/count/detail.vue

@@ -0,0 +1,85 @@
+<!-- 接待人员详情页 -->
+<template>
+  <div class="app-container">
+    <el-form  ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px" label-position="top">
+      <el-form-item label="时间" prop="type">
+        <el-radio-group v-model="queryParams.type">
+          <el-radio label="1">今日接待</el-radio>
+          <el-radio label="2">本月接待</el-radio>
+        </el-radio-group>      
+      </el-form-item>
+      <el-form-item label="到场状态" prop="arrivalStatusList">
+        <el-checkbox-group v-model="queryParams.arrivalStatusList">
+            <el-checkbox :label="1">未到场</el-checkbox>
+            <el-checkbox :label="2">到场未成交</el-checkbox>
+            <el-checkbox :label="3">到场已成交</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+        <el-button type="primary" icon="el-icon-back" size="mini" @click="back">返回</el-button>
+
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="coachList">
+      <el-table-column type="index" width="50" align="center" />
+      <el-table-column label="学员姓名" align="center" prop="name" />
+      <el-table-column label="联系方式" align="center" prop="phone" />
+      <el-table-column label="到场状态" align="center" prop="arrivalStatus" >
+        <template scope="scope">
+          <el-tag v-if="scope.row.arrivalStatus == 1">未到场</el-tag>
+          <el-tag v-if="scope.row.arrivalStatus == 2">到场未成交</el-tag>
+          <el-tag v-if="scope.row.arrivalStatus == 3">到场已成交</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getCountDetail} from '@/api/zs/feedbackDetail';
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+     
+      // 总条数
+      total: 0,
+      // 教练表格数据
+      coachList: [],
+      // 查询参数
+      queryParams: {
+        type: null, // 1本日统计 2本月统计
+        coachId: null,
+        arrivalStatusList: undefined
+      }
+    };
+  },
+  created() {
+    this.queryParams.type = this.$route.query.type;
+    this.queryParams.coachId = this.$route.query.coachId
+    if(this.queryParams.arrivalStatusList == undefined){
+      this.queryParams.arrivalStatusList = [1,2]
+    }
+    this.getList()
+  },
+  methods: {
+    /** 查询教练列表 */
+    getList() {
+      this.loading = true;
+      getCountDetail(this.queryParams).then(resp=> {
+        if(resp.code == 200 && resp.data){
+          this.coachList = resp.data
+          this.loading = false
+        }
+      })
+    },
+    back(){
+      window.history.back()
+    }
+  }
+};
+</script>

src/views/sch/coach/count/index.vue

@@ -0,0 +1,91 @@
+<template>
+  <!-- 接待人统计页面 -->
+  <div class="app-container" style="max-width: 600px; margin: auto;">
+    <el-form  ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px" style="text-align: center;">
+      <el-form-item label="手机号" prop="phone">
+        <el-input v-model="queryParams.phone" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- <el-form-item label="验证码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入验证码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="getCount">查询</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-card class="box-card" v-if="show">
+      <div slot="header" class="clearfix" style="text-align: center;">
+        <span>接待统计</span>
+      </div>
+      <div>
+        <div><span>今日接到人数：{{countInfo.todayTotal == undefined ? 0 : countInfo.todayTotal}}</span></div>
+        <div><span>今日成交人数：{{countInfo.todaySuccess == undefined ? 0 : countInfo.todaySuccess}}</span></div>
+        <div><span>今日未成交人数：{{countInfo.todayUnSuccess == undefined ? 0 : countInfo.todayUnSuccess}}</span>
+          <router-link :to="'/coach/count/detail?coachId=' + coachId +'&type=1'" style="color: blue;"> 详情</router-link>
+        </div>
+      </div>
+      <el-divider></el-divider>
+      <div>
+        <div><span>本月接到人数：{{countInfo.monthTotal}}</span></div>
+        <div><span>本月成交人数：{{countInfo.monthSuccess}}</span></div>
+        <div><span>本月未成交人数：{{countInfo.monthUnSuccess}}</span> 
+          <router-link :to="'/coach/count/detail?coachId=' + coachId+'&type=2'" style="color: blue;"> 详情</router-link>
+        </div>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getCount} from '@/api/zs/feedbackDetail';
+
+export default {
+  name: 'Count',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 查询参数
+      queryParams: {
+        phone: null,
+        code: null
+      },
+      countInfo: {
+        todayTotal: 0,
+        todaySuccess: 0,
+        todayUnSuccess:0,
+        monthTotal: 0,
+        monthSuccess: 0,
+        monthUnSuccess:0
+      },
+      coachId: undefined,
+      show:false
+    };
+  },
+
+  methods: {
+    /** 查询统计结果 */
+    getCount() {
+      this.resetCount();
+      this.loading = true;
+      getCount(this.queryParams).then(resp => {
+        if(resp.code == 200 && resp.data ){
+          this.countInfo = resp.data;
+          this.coachId = resp.data.coachId;
+          this.show = true;
+        }
+      })
+    },
+    resetCount(){
+      this.countInfo= {
+        todayTotal: 0,
+        todaySuccess: 0,
+        todayUnSuccess:0,
+        monthTotal: 0,
+        monthSuccess: 0,
+        monthUnSuccess:0
+      }
+    }
+  }
+};
+</script>

src/views/sch/coach/index.vue

@@ -0,0 +1,153 @@
+<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="placeId">
+        <el-select v-model="queryParams.placeId" filterable placeholder="请选择" clearable value-key="placeId" size="small">
+          <el-option v-for="(dict, index) in placeOptions" :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="coachName" />
+      <el-table-column label="联系方式" align="center" prop="phone" />
+      <el-table-column label="负责场地" align="center" prop="placeNames" />
+      <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 copy.vue

@@ -0,0 +1,747 @@
+
+<template>
+  <div class="amap-page-container">
+    <div id="map" class="amap-cavans" />
+    <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'">
+      <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' : ''">
+          <el-card :body-style="{ padding: '10px' }">
+            <div slot="header" class="clearfix">
+              <div class="map-card-title">{{ school.schoolName }}</div>
+              <el-switch v-model="school.showInMap" v-hasPermi="['sch:place:edit']" class="add-icon" active-text="展示" inactive-text="隐藏" @change="changeSchoolStatus(school)" />
+            </div>
+            <el-button @click="handleClickSchool(school)">{{ `数据管理(${getCount(school.schoolId)})` }}</el-button>
+            <el-tooltip v-hasPermi="['sch:place:add']" content="新增场地" placement="left" effect="dark">
+              <el-button icon="el-icon-plus" class="add-place-btn" @click="handleInsertPlace(school.schoolId)" />
+            </el-tooltip>
+          </el-card>
+        </div>
+      </el-card>
+      <div class="asider-sub">
+        <el-tooltip content="放大" placement="left" effect="dark">
+          <el-button icon="el-icon-plus" class="is-circle" :disabled="zomm >= 18" @click="bigger" />
+        </el-tooltip>
+        <el-tooltip content="缩小" placement="left" effect="dark">
+          <el-button icon="el-icon-minus" class="is-circle" :disabled="zomm <= 8" @click="smaller" />
+        </el-tooltip>
+        <div class="mt10">
+          <el-tooltip content="驾校" placement="left" effect="dark">
+            <el-button icon="el-icon-school" class="is-circle" @click="toggleSchool" />
+          </el-tooltip>
+          <el-tooltip content="定位" placement="left" effect="dark">
+            <el-button icon="el-icon-help" class="is-circle" @click="geolocation" />
+          </el-tooltip>
+          <el-tooltip content="测距" placement="left" effect="dark">
+            <el-button icon="el-icon-thumb" class="is-circle" @click="ranging" />
+          </el-tooltip>
+          <el-tooltip content="分享" placement="left" effect="dark">
+            <el-button icon="el-icon-share" class="is-circle" />
+          </el-tooltip>
+        </div>
+      </div>
+    </div>
+    <el-card v-if="placeDialogShow" class="place-dialog" :body-style="{ padding: '10px' }">
+      <div slot="header" class="clearfix">
+        <div class="map-card-title">场地设置</div>
+        <el-tooltip content="取点" placement="right" effect="dark">
+          <el-button icon="el-icon-location" class="add-icon" @click="getPoint" />
+        </el-tooltip>
+      </div>
+      <el-form ref="placeForm" :model="placeForm" label-width="70px">
+        <el-form-item label="所属驾校" prop="schoolId">
+          <el-select v-model="placeForm.schoolId" placeholder="请选择" clearable>
+            <el-option v-for="dict in schoolList" :key="dict.schoolId" :label="dict.schoolName" :value="dict.schoolId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="placeForm.name" placeholder="输入名称" />
+        </el-form-item>
+        <el-form-item label="旗子颜色" prop="flagColor">
+          <el-radio-group v-model="placeForm.flagColor">
+            <el-radio v-for="(item, index) in colorOptions" :key="index" :label="item">
+              <img :src="require(`@/assets/images/place/flag_${item}.png`)" width="20px">
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="地址" prop="address">
+          <el-input v-model="placeForm.address" placeholder="输入地址" />
+        </el-form-item>
+        <el-form-item label="经度" prop="lng">
+          <el-input v-model="placeForm.lng" placeholder="输入经度" />
+        </el-form-item>
+        <el-form-item label="纬度" prop="lat">
+          <el-input v-model="placeForm.lat" placeholder="输入纬度" />
+        </el-form-item>
+        <el-form-item label="所属区域" prop="area">
+          <el-select v-model="placeForm.area" placeholder="请选择" clearable size="small">
+            <el-option v-for="dict in areaOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input v-model="placeForm.phone" placeholder="输入电话" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="contact">
+          <el-input v-model="placeForm.contact" placeholder="输入负责人" />
+        </el-form-item>
+        <el-form-item label="是否推荐" prop="contact">
+          <el-radio v-model="placeForm.recommend" :label="true">是</el-radio>
+          <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-form-item>
+        <el-form-item style="text-align:right;">
+          <el-button v-hasPermi="['sch:place:edit']" type="primary" @click="onSubmit">保存</el-button>
+          <el-button @click="closePlaceDialog">取消</el-button>
+        </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)' }">
+      <div slot="header" class="clearfix">
+        <div class="map-card-title">
+          {{ placeListDialogTitle }}
+          <el-input v-model="tableSearch" placeholder="请输入搜索的内容" clearable />
+        </div>
+        <el-tooltip content="全屏" placement="top" effect="dark">
+          <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-tooltip>
+      </div>
+      <el-table :data="placeTableData" border stripe class="place-table-list" height="100%">
+        <el-table-column label="序号" type="index" fixed="left" width="50" />
+        <el-table-column prop="name" label="名称" min-width="100" />
+        <el-table-column prop="phone" label="电话" width="120" />
+        <el-table-column prop="contact" label="负责人" width="120" />
+        <el-table-column prop="address" label="地址" min-width="100" />
+        <el-table-column prop="lng" label="经度" width="110" />
+        <el-table-column prop="lat" label="纬度" width="110" />
+        <el-table-column prop="area" label="所属区域" width="110" />
+        <el-table-column label="展示" width="100">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.showInMap" v-hasPermi="['sch:place:edit']" @change="changePlaceStatus(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100">
+          <template slot-scope="scope">
+            <el-tooltip v-hasPermi="['sch:place:edit']" content="编辑" placement="top" effect="dark">
+              <el-button icon="el-icon-edit" type="primary" style="padding: 4px 8px;" @click="handleEditPlace(scope.row)" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </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>
+    <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 -->
+<script>
+import AMap from 'AMap';
+import { getMapData, addPlace, updatePlace, updateSchoolStatus } from '@/api/sch/place';
+export default {
+  name: 'Place',
+  data() {
+    return {
+      aMap: null,
+      zomm: 12,
+      showSchool: true,
+      isRanging: false,
+      aMapLocation: null,
+      aMouseTool: null,
+      searchBody: '',
+      placeSearch: null,
+      placeDialogShow: false,
+      isPointing: false,
+      placeForm: {
+        lat: undefined,
+        lng: undefined,
+        name: undefined,
+        address: undefined,
+        remark: undefined,
+        phone: undefined,
+        flagColor: 'red'
+      },
+      colorOptions: ['red', 'yellow', 'blue', 'green', 'purple', 'black'],
+      mapHelpText: '',
+      tipPostion: {
+        x: 0,
+        y: 0
+      },
+      geocoder: null,
+      locationMarker: null,
+      selectMarker: null,
+      placeListDialogShow: false,
+      placeListDialogTitle: '',
+      fullScreenPlaceList: false,
+      tableSearch: '',
+      tableData: [],
+      schoolList: [],
+      currentdeptId: undefined,
+      placeMarkerList: [],
+      areaOptions: []
+    };
+  },
+  computed: {
+    placeTableData: function () {
+      if (this.tableSearch) {
+        return this.tableData.filter((dataNews) => {
+          return (
+            dataNews.schoolId === this.currentdeptId &&
+            Object.keys(dataNews).some((key) => {
+              return String(dataNews[key]).toLowerCase().indexOf(this.tableSearch) > -1;
+            })
+          );
+        });
+      }
+      return this.tableData.filter((dataNews) => dataNews.schoolId === this.currentdeptId);
+    }
+  },
+  mounted() {
+    this.initMap();
+    this.getDicts('dm_area').then((response) => {
+      this.areaOptions = response.data;
+    });
+  },
+  methods: {
+    initMap() {
+      window.onLoad = () => {
+        this.aMap = new AMap.Map('map', {
+          zoom: this.zomm,
+          center: [117.226095, 31.814372],
+          zooms: [8, 18]
+        });
+        // 监听缩放
+        this.aMap.on('zoomend', () => {
+          this.zomm = this.aMap.getZoom();
+          this.$message('当前缩放等级:' + this.zomm);
+        });
+        // 监听点击
+        this.aMap.on('click', (ev) => {
+          if (this.isPointing) {
+            this.placeForm.lat = ev.lnglat.lat;
+            this.placeForm.lng = ev.lnglat.lng;
+            this.regeoCode();
+            if (this.selectMarker) {
+              this.selectMarker.setPosition([this.placeForm.lng, this.placeForm.lat]);
+            } else {
+              this.locationMarker.setPosition([this.placeForm.lng, this.placeForm.lat]);
+              this.aMap.add(this.locationMarker);
+            }
+            this.isPointing = false;
+          }
+        });
+        // 监听移动
+        this.aMap.on('mousemove', (ev) => {
+          if (this.isRanging) {
+            this.mapHelpText = '左键单击选点，双击/右键单击完成选点，再次点击测距按钮可退出测距模式，并清除测距结果';
+            this.tipPostion = {
+              x: ev.pixel.x,
+              y: ev.pixel.y
+            };
+          } else if (this.isPointing) {
+            this.mapHelpText = '点击地图添加标注';
+            this.tipPostion = {
+              x: ev.pixel.x,
+              y: ev.pixel.y
+            };
+          }
+        });
+        // 添加地图插件
+        AMap.plugin(['AMap.Scale', 'AMap.Geolocation', 'AMap.MouseTool', 'AMap.PlaceSearch', 'AMap.Autocomplete', 'AMap.Geocoder'], () => {
+          this.aMap.addControl(new AMap.Scale());
+          const geoLoca = new AMap.Geolocation({
+            showButton: false
+          });
+          this.aMapLocation = geoLoca;
+          this.aMap.addControl(geoLoca);
+          this.aMouseTool = new AMap.MouseTool(this.aMap);
+          const auto = new AMap.Autocomplete({
+            input: 'search' // 前端搜索框
+          });
+          this.placeSearch = new AMap.PlaceSearch({
+            map: this.aMap
+          });
+          AMap.event.addListener(auto, 'select', this.select);
+          this.geocoder = new AMap.Geocoder();
+          this.locationMarker = new AMap.Marker({
+            icon: require(`@/assets/images/place/flag_red.png`)
+          });
+        });
+        this.getPageData();
+      };
+      // this.importMap();
+    },
+    // 导入地图
+    // importMap() {
+    //   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;
+    //   document.head.appendChild(jsapi);
+    // },
+    toggleSchool() {
+      this.showSchool = !this.showSchool;
+    },
+    // 经纬度 -> 地址
+    regeoCode() {
+      this.geocoder.getAddress([this.placeForm.lng, this.placeForm.lat], (status, result) => {
+        if (status === 'complete' && result.regeocode) {
+          this.placeForm.address = result.regeocode.formattedAddress;
+        } else {
+          console.log('根据经纬度查询地址失败');
+        }
+      });
+    },
+    // 定位
+    geolocation() {
+      this.aMapLocation.getCurrentPosition();
+    },
+    // 测距
+    ranging() {
+      this.isPointing = false;
+      this.isRanging = !this.isRanging;
+      if (this.isRanging) {
+        this.aMap.setDefaultCursor('crosshair');
+        this.drawLine();
+      } else {
+        this.aMap.setDefaultCursor('default');
+        this.aMouseTool.close(true);
+      }
+    },
+    // 画线
+    drawLine() {
+      this.aMouseTool.rule({
+        startMarkerOptions: {
+          // 可缺省
+          icon: new AMap.Icon({
+            size: new AMap.Size(19, 31), // 图标大小
+            imageSize: new AMap.Size(19, 31),
+            image: 'https://webapi.amap.com/theme/v1.3/markers/b/start.png'
+          })
+        },
+        endMarkerOptions: {
+          // 可缺省
+          icon: new AMap.Icon({
+            size: new AMap.Size(19, 31), // 图标大小
+            imageSize: new AMap.Size(19, 31),
+            image: 'https://webapi.amap.com/theme/v1.3/markers/b/end.png'
+          }),
+          offset: new AMap.Pixel(-9, -31)
+        },
+        midMarkerOptions: {
+          // 可缺省
+          icon: new AMap.Icon({
+            size: new AMap.Size(19, 31), // 图标大小
+            imageSize: new AMap.Size(19, 31),
+            image: 'https://webapi.amap.com/theme/v1.3/markers/b/mid.png'
+          }),
+          offset: new AMap.Pixel(-9, -31)
+        },
+        lineOptions: {
+          // 可缺省
+          strokeStyle: 'solid',
+          strokeColor: '#FF33FF',
+          strokeOpacity: 1,
+          strokeWeight: 2
+        },
+        tmpLineOptions: {
+          strokeStyle: 'dashed',
+          strokeColor: '#FF33FF',
+          strokeOpacity: 1,
+          strokeWeight: 2
+        }
+      });
+    },
+    // 选择查询结果
+    select(e) {
+      this.placeSearch.setCity(e.poi.adcode);
+      this.placeSearch.search(e.poi.name); // 关键字查询查询
+    },
+    // 查询按钮/回车事件
+    submitSearch() {
+      this.placeSearch.search(this.searchBody);
+    },
+    // 缩放
+    bigger() {
+      this.zomm++;
+      this.aMap.setZoom(this.zomm);
+    },
+    smaller() {
+      this.zomm--;
+      this.aMap.setZoom(this.zomm);
+    },
+
+    // 点击数据管理
+    handleClickSchool(item) {
+      this.placeListDialogShow = true;
+      this.placeListDialogTitle = `数据管理 [${item.schoolName}]`;
+      this.currentdeptId = item.schoolId;
+    },
+    // 新增场地
+    handleInsertPlace(schoolId) {
+      if (this.selectMarker) {
+        this.selectMarker.setAnimation('AMAP_ANIMATION_NONE');
+        this.selectMarker = null;
+      }
+      this.placeDialogShow = true;
+      this.aMap.setDefaultCursor('default');
+      this.isRanging = false;
+      this.placeForm = {
+        lat: undefined,
+        lng: undefined,
+        name: undefined,
+        address: undefined,
+        remark: undefined,
+        phone: undefined,
+        schoolId: schoolId,
+        showInMap: true,
+        flagColor: 'red'
+      };
+    },
+    // 编辑场地
+    handleEditPlace(item) {
+      this.placeDialogShow = true;
+      this.aMap.setDefaultCursor('default');
+      if (this.selectMarker) {
+        this.selectMarker.setAnimation('AMAP_ANIMATION_NONE');
+      }
+      this.isRanging = false;
+      this.placeForm = Object.assign({}, item);
+      this.selectMarker = this.placeMarkerList.filter((marker) => marker.getExtData().placeId === item.placeId)[0];
+      this.selectMarker && this.selectMarker.setAnimation('AMAP_ANIMATION_BOUNCE');
+      this.aMap.setCenter([item.lng, item.lat]);
+    },
+    getPoint() {
+      this.isPointing = !this.isPointing;
+    },
+    // 保存
+    async onSubmit() {
+      // 保存接口
+      if (this.checkPlaceFormValidate()) {
+        // 先访问接口，返回id插入placeForm
+        const resp = this.savePlace(this.placeForm);
+        if (resp.code != 200) {
+          return;
+        } else {
+          this.$message.success('操作成功');
+        }
+        if (!this.placeForm.placeId && resp.data) {
+          this.$set(this.placeForm, 'placeId', resp.data);
+        }
+        // 移除选点用 的标记
+        this.aMap.remove(this.locationMarker);
+        // 根据form创建新marker 并添加到地图上
+        const tmpMarker = new AMap.Marker({
+          map: this.aMap,
+          position: [this.placeForm.lng, this.placeForm.lat],
+          icon: require(`@/assets/images/place/flag_${this.placeForm.flagColor}.png`),
+          label: {
+            content: this.placeForm.name,
+            direction: 'right'
+          },
+          extData: this.placeForm
+        });
+        // 新marker事件
+        tmpMarker.on('click', this.handleClickMarker);
+        // 如果当前选择的marker点存在（编辑）
+        if (this.selectMarker) {
+          // 地图上 移除选择的点
+          this.aMap.remove(this.selectMarker);
+          this.selectMarker = null;
+        }
+        // 关闭场地弹窗
+        this.placeDialogShow = false;
+        this.isPointing = false;
+
+        // 场地列表 移除原列表中操作的场地数据
+        const tmpArr = this.tableData.filter((item) => item.placeId !== this.placeForm.placeId);
+        // 新增新的场地
+        tmpArr.push(this.placeForm);
+        // 重置场地数组
+        this.tableData = tmpArr;
+        // 地图marker列表 移除操作的原marker 添加新marker进数组
+        const tmpArr1 = this.placeMarkerList.filter((item) => item.getExtData().placeId !== this.placeForm.placeId);
+        tmpArr1.push(tmpMarker);
+        this.placeMarkerList = tmpArr1;
+      }
+    },
+    async savePlace(item) {
+      if (item.placeId) {
+        return updatePlace(item);
+      } else {
+        return addPlace(item);
+      }
+    },
+    checkPlaceFormValidate() {
+      const valid = [];
+      if (!this.placeForm.name) {
+        valid.push('名称');
+      }
+      if (!this.placeForm.address) {
+        valid.push('地址');
+      }
+      if (!this.placeForm.lng) {
+        valid.push('经度');
+      }
+      if (!this.placeForm.lat) {
+        valid.push('纬度');
+      }
+      if (!this.placeForm.phone) {
+        valid.push('电话');
+      }
+      if (valid.length == 0) {
+        return true;
+      } else {
+        this.$message.error(`请将以下填写完整: ${valid.join(',')}`);
+        return false;
+      }
+    },
+    // 关闭场地弹窗
+    closePlaceDialog() {
+      this.placeDialogShow = false;
+      this.isPointing = false;
+      this.aMap.remove(this.locationMarker);
+      if (this.selectMarker) {
+        this.selectMarker.setAnimation('AMAP_ANIMATION_NONE');
+        this.selectMarker = null;
+      }
+    },
+    handleClickMarker(ev) {
+      if (this.selectMarker) {
+        this.selectMarker.setAnimation('AMAP_ANIMATION_NONE');
+      }
+      this.placeForm = ev.target.getExtData();
+      this.placeDialogShow = true;
+      ev.target.setAnimation('AMAP_ANIMATION_BOUNCE');
+      this.selectMarker = ev.target;
+    },
+    getPageData() {
+      getMapData().then((resp) => {
+        if (resp.code == 200) {
+          this.schoolList = resp.data.schoolList;
+          this.tableData = resp.data.placeList;
+          this.currentdeptId = this.schoolList[0].schoolId;
+          this.createMarkersInMap();
+        }
+      });
+    },
+    getCount(schoolId) {
+      return this.tableData.filter((item) => item.schoolId === schoolId).length;
+    },
+    // 重置markers
+    resetMarkers() {
+      this.aMap.clearMap();
+      this.createMarkersInMap();
+    },
+    // 生成markers
+    createMarkersInMap() {
+      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 (!element.schoolShow || !element.showInMap) {
+          continue;
+        }
+        const tmpMarker = new AMap.Marker({
+          map: this.aMap,
+          position: [element.lng, element.lat],
+          icon: require(`@/assets/images/place/flag_${element.flagColor}.png`),
+          label: {
+            content: element.name,
+            direction: 'right'
+          },
+          extData: element
+        });
+        tmpMarker.on('click', this.handleClickMarker);
+        this.placeMarkerList.push(tmpMarker);
+      }
+    },
+    // 修改驾校状态
+    changeSchoolStatus(item) {
+      // 访问接口，成功后重置markers
+      updateSchoolStatus(item).then((resp) => {
+        if (resp.code == 200) {
+          this.$message.success('操作成功');
+          // this.aMap.clearMap()
+          // this.getPageData()
+          this.resetMarkers();
+        }
+      });
+    },
+    // 修改场地状态
+    async changePlaceStatus(item) {
+      const resp = await updatePlace(item);
+      if (resp.code == 200) {
+        this.resetMarkers();
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.amap-page-container {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.amap-cavans {
+  width: 100%;
+  height: 100%;
+}
+
+.asider {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 300px;
+  height: 100%;
+  transition: 0.3s;
+  z-index: 9;
+}
+
+.box-card {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+::v-deep .el-card__header {
+  padding: 10px 15px;
+}
+
+.clearfix {
+  display: flex;
+}
+
+.clearfix .map-card-title {
+  flex: 1;
+  line-height: 30px;
+}
+
+.clearfix .add-icon {
+  width: auto;
+  height: 30px;
+}
+
+.asider-sub {
+  position: absolute;
+  top: 40px;
+  left: -45px;
+  padding: 10px 10px 0 0;
+  z-index: 900;
+}
+
+.asider-sub .is-circle {
+  display: block;
+  margin: 0;
+  padding: 10px;
+  color: #464646;
+  border-radius: 0;
+  font-size: 16px;
+  box-shadow: 2px 2px 2px rgba(80, 80, 80, 0.67);
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+
+.hidden-school {
+  transform: translateX(300px);
+}
+
+.search-body {
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  width: 400px;
+}
+
+.add-place-btn {
+  float: right;
+  border: none;
+  font-size: 16px;
+  color: #409eff;
+}
+
+::v-deep .place-dialog {
+  position: absolute;
+  left: 20px;
+  top: 60px;
+  width: 350px;
+}
+
+.map-tip {
+  position: absolute;
+  left: 0;
+  top: 0;
+  max-width: 150px;
+  padding: 5px;
+  border-radius: 2px;
+  background: #000;
+  color: #fff;
+  opacity: 0.7;
+  font-size: 12px;
+  transition-duration: 1ms;
+}
+
+.circle {
+  position: absolute;
+  left: -8px;
+  top: -25px;
+  font-size: 24px;
+  color: red;
+  transition-duration: 1ms;
+}
+
+.place-dialog .el-form .el-form-item {
+  margin-bottom: 8px;
+}
+
+.place-list-dialog {
+  position: absolute;
+  top: 420px;
+  left: 0;
+  bottom: 0;
+  transition: 0.3s;
+  z-index: 151;
+  background: #e2e5ea;
+}
+
+.place-list-dialog .add-icon {
+  font-size: 18px;
+  border: none;
+}
+
+.hidden-place-list {
+  transform: translateY(100%);
+}
+
+.place-list-dialog .clearfix .map-card-title {
+  font-weight: bold;
+}
+
+.place-list-dialog .clearfix .map-card-title .el-input {
+  margin-left: 20px;
+  width: 240px;
+}
+
+.actived-school {
+  border: 2px solid #409eff !important;
+}
+
+::v-deep .el-radio__label {
+  vertical-align: middle;
+}
+</style>

src/views/sch/place/index.vue

@@ -7,13 +7,10 @@
     </el-input>
     <div class="asider" :class="showSchool ? '' : 'hidden-school'">
       <el-card class="box-card" :body-style="{ flex: 1, 'overflow-y': 'scroll', padding: 0 }">
-        <div style="margin:10px;"> 
-          <el-input v-model="searchValue" placeholder="请输入驾校名" ></el-input>
-        </div>
         <div slot="header" class="clearfix">
           <div class="map-card-title">驾校列表</div>
         </div>
-        <div v-for="school in schoolList.filter(item => (searchValue == undefined || item.schoolName.includes(searchValue)))" :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>
@@ -148,6 +145,7 @@
 </template>
 <!-- eslint-disable no-undef -->
 <script>
+import AMap from 'AMap';
 import { getMapData, addPlace, updatePlace, updateSchoolStatus } from '@/api/sch/place';
 export default {
   name: 'Place',
@@ -189,8 +187,7 @@ export default {
       schoolList: [],
       currentdeptId: undefined,
       placeMarkerList: [],
-      areaOptions: [],
+      areaOptions: []
-      searchValue: undefined
     };
   },
   computed: {
@@ -216,10 +213,9 @@ export default {
   },
   methods: {
     initMap() {
-      window.onLoad = () => {
         this.aMap = new AMap.Map('map', {
           zoom: this.zomm,
-          center: [117.226095, 31.814372],
+          center: [121.448641, 31.2071],
           zooms: [8, 18]
         });
         // 监听缩放
@@ -280,17 +276,16 @@ export default {
           });
         });
         this.getPageData();
-      };
+      // this.importMap();
-      this.importMap();
     },
     // 导入地图
-    importMap() {
+    // importMap() {
-      const url = 'https://webapi.amap.com/maps?v=1.4.15&key=0e62be0896c6b8d27d453445f0fb8bc4&callback=onLoad';
+    //   const url = 'https://webapi.amap.com/maps?v=1.4.15&key=0e62be0896c6b8d27d453445f0fb8bc4&callback=onLoad';
-      var jsapi = document.createElement('script');
+    //   var jsapi = document.createElement('script');
-      jsapi.charset = 'utf-8';
+    //   jsapi.charset = 'utf-8';
-      jsapi.src = url;
+    //   jsapi.src = url;
-      document.head.appendChild(jsapi);
+    //   document.head.appendChild(jsapi);
-    },
+    // },
     toggleSchool() {
       this.showSchool = !this.showSchool;
     },

src/views/sch/shop/index.vue

@@ -0,0 +1,338 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="店铺名称" prop="shopName">
+        <el-input
+          v-model="queryParams.shopName"
+          placeholder="请输入店铺名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区域" prop="area">
+        <el-input
+          v-model="queryParams.area"
+          placeholder="请输入区域"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="城市" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          placeholder="请输入城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系人" prop="contacts">
+        <el-input
+          v-model="queryParams.contacts"
+          placeholder="请输入联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注名" prop="remarkName">
+        <el-input
+          v-model="queryParams.remarkName"
+          placeholder="请输入备注名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注id" prop="remarkId">
+        <el-input
+          v-model="queryParams.remarkId"
+          placeholder="请输入备注id"
+          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
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:shop:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:shop:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:shop:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:shop:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="shopList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="门店id 和抖音门店id 一致" align="center" prop="shopId" />
+      <el-table-column label="店铺名称" align="center" prop="shopName" />
+      <el-table-column label="门店品类" align="center" prop="shopType" />
+      <el-table-column label="主营类目" align="center" prop="businessCategory" />
+      <el-table-column label="区域" align="center" prop="area" />
+      <el-table-column label="城市" align="center" prop="city" />
+      <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column label="联系人" align="center" prop="contacts" />
+      <el-table-column label="营业状态" align="center" prop="status" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注名" align="center" prop="remarkName" />
+      <el-table-column label="备注id" align="center" prop="remarkId" />
+      <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-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:shop:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:shop:remove']"
+          >删除</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="shopName">
+          <el-input v-model="form.shopName" placeholder="请输入店铺名称" />
+        </el-form-item>
+        <el-form-item label="主营类目" prop="businessCategory">
+          <el-input v-model="form.businessCategory" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="区域" prop="area">
+          <el-input v-model="form.area" placeholder="请输入区域" />
+        </el-form-item>
+        <el-form-item label="城市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入城市" />
+        </el-form-item>
+        <el-form-item label="地址" prop="address">
+          <el-input v-model="form.address" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="contacts">
+          <el-input v-model="form.contacts" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注名" prop="remarkName">
+          <el-input v-model="form.remarkName" placeholder="请输入备注名" />
+        </el-form-item>
+        <el-form-item label="备注id" prop="remarkId">
+          <el-input v-model="form.remarkId" placeholder="请输入备注id" />
+        </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 { listShop, getShop, delShop, addShop, updateShop } from "@/api/sch/shop";
+
+export default {
+  name: "Shop",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 抖音门店表格数据
+      shopList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        shopName: null,
+        shopType: null,
+        businessCategory: null,
+        area: null,
+        city: null,
+        address: null,
+        contacts: null,
+        status: null,
+        remarkName: null,
+        remarkId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询抖音门店列表 */
+    getList() {
+      this.loading = true;
+      listShop(this.queryParams).then(response => {
+        this.shopList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        shopId: null,
+        shopName: null,
+        shopType: null,
+        businessCategory: null,
+        area: null,
+        city: null,
+        address: null,
+        contacts: null,
+        status: "0",
+        remark: null,
+        remarkName: null,
+        remarkId: 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.shopId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加抖音门店";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const shopId = row.shopId || this.ids
+      getShop(shopId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改抖音门店";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.shopId != null) {
+            updateShop(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addShop(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const shopIds = row.shopId || this.ids;
+      this.$modal.confirm('是否确认删除抖音门店编号为"' + shopIds + '"的数据项？').then(function() {
+        return delShop(shopIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/shop/export', {
+        ...this.queryParams
+      }, `shop_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/config/index.vue

@@ -21,7 +21,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button v-hasPermi="['system:config:add']" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
@@ -38,7 +38,7 @@
         <el-button v-hasPermi="['system:config:remove']" type="danger" plain icon="el-icon-refresh" size="mini" @click="handleRefreshCache">刷新缓存</el-button>
       </el-col>
       <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -60,7 +60,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-hasPermi="['system:config:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button v-hasPermi="['system:config:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+          <!-- <el-button v-hasPermi="['system:config:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>

src/views/system/dept/index.vue

@@ -79,13 +79,13 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="所属区域" prop="areaList">
               <el-select v-model="form.areaList" placeholder="请选择" filterable multiple>
                 <el-option label="区域1" :value="1" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="备注">
               <el-input v-model="form.remark" placeholder="请输入" type="textarea" :autosize="{ minRows: 3 }" />

src/views/system/dictData/index.vue

@@ -19,7 +19,7 @@
           </template>
         </el-row>
 
-        <el-table v-loading="loading" :data="dataList"  size="mini">
+        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" size="mini">
           <el-table-column label="字典标签" align="center" prop="dictLabel" />
           <!-- <el-table-column label="字典编码" align="center" prop="dictValue" /> -->
           <el-table-column label="字典排序" align="center" prop="dictSort" />
@@ -275,12 +275,11 @@ export default {
     },
     // 字典模板状态修改
     handleStatusChange(row) {
-      debugger
-      console.log(row)
       let text = row.status === true ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.dictLabel + '"标签吗？').
+      this.$modal
-      then(function () {
+        .confirm('确认要"' + text + '""' + row.dictLabel + '"标签吗？')
-        return changeDictDataStatus(dictCodes);
+        .then(function () {
+          return changeDictDataStatus(row.dictCode, row.status);
         })
         .then((resp) => {
           if (resp.code == 200) {

src/views/system/employee/index.vue

@@ -158,24 +158,25 @@
               </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">
+        <el-row>
-            <el-form-item label="小程序权限">
+          <el-col :span="24">
-              <el-radio-group v-model="form.hasStudent">
+            <el-form-item label="数据权限" prop="openId">
-                <el-radio :label="true">开通</el-radio>
+            <el-radio-group v-model="form.dataScope">
-                <el-radio :label="false">关闭</el-radio>
+              <el-radio :label="1">全部数据</el-radio>
-              </el-radio-group>
+              <!-- <el-radio :label="2">部门数据</el-radio> -->
-            </el-form-item>
+              <el-radio :label="3">个人数据</el-radio>
-          </el-col> -->
-        <!-- <el-col :span="12">
-            <el-form-item label="管理系统权限">
-              <el-radio-group v-model="form.hasSys">
-                <el-radio :label="true">开通</el-radio>
-                <el-radio :label="false">关闭</el-radio>
             </el-radio-group>
             </el-form-item>
-          </el-col> -->
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -397,7 +398,8 @@ export default {
         areaList: [],
         weight: undefined,
         count: true,
-        signPlace: undefined
+        signPlace: undefined,
+        dataScope: 3// 默认个人数据
       };
       this.resetForm('form');
     },
@@ -466,6 +468,8 @@ export default {
         type: 'warning'
       }).then(function () {
         // 走释放线索逻辑，并禁用该用户
+        empAPi.delete(row.employeeId);
+        this.getList();
       }).then(() => {
         this.msgSuccess('注销成功！');
       });
@@ -486,8 +490,10 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function () {
+      }).then(() => {
         // 检查一下，如果被使用，提示不可删除
+        empAPi.delete(row.employeeId);
+        this.getList();
       }).then(() => {
         this.msgSuccess('删除成功！');
       });

src/views/system/skill/index.vue

@@ -1,8 +1,8 @@
 <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="question">
+      <el-form-item label="关键词" prop="skillKey">
-        <el-input v-model="queryParams.question" placeholder="请输入关键词" clearable @keyup.enter.native="handleQuery" />
+        <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>
@@ -12,8 +12,7 @@
 
     <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"
+        <el-button v-hasPermi="['system:skill:add']" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-          @click="handleAdd">新增</el-button>
       </el-col>
 
       <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
@@ -21,49 +20,30 @@
 
     <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="question" />
-      <el-table-column label="答案" align="center" prop="content" >
-        <template slot-scope="scope">
-          <p v-html="scope.row.content"></p>
-        </template>
-      </el-table-column>
       <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"
+          <el-button v-hasPermi="['system:skill:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-            @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>
-          <el-button v-hasPermi="['system:skill:remove']" size="mini" type="text" icon="el-icon-delete"
-            @click="handleDelete(scope.row)">删除</el-button>
-            <el-button v-if="scope.row.status == 1" v-hasPermi="['system:skill:check']" size="mini" type="text" icon="el-icon-edit"
-            @click="handleUpdate(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 v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-      @pagination="getList" />
 
     <!-- 添加或修改关键话术对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <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="question">
+        <el-form-item label="关键词" prop="skillKey">
-          <el-input v-model="form.question" placeholder="请输入" />
+          <el-input v-model="form.skillKey" placeholder="请输入关键词" />
-        </el-form-item>
-        <el-form-item label="关键词">
-          <el-select v-model="form.keyList" placeholder="请选择" style="width: 100%;" multiple>
-            <el-option v-for="dict in dict.type.dm_skill_key" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select> 
         </el-form-item>
-        <el-form-item label="答案" prop="content">
+        <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 v-if="form.status == 0 || form.status == 3 " type="primary" @click="submitForm(0)">保 存</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button v-if="form.status == 0 || form.status == 3 " type="primary" @click="submitForm(1)">提 交</el-button>
-        <el-button v-if="form.status == 1 " type="primary" @click="checkSkill(2)">通 过</el-button>
-        <el-button v-if="form.status == 1 " type="primary" @click="checkSkill(3)">驳 回</el-button>
-
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -71,11 +51,10 @@
 </template>
 
 <script>
-import { pageSkill,listSkill, getSkill, delSkill, addSkill, updateSkill,checkSkill } from '@/api/system/skill';
+import { listSkill, getSkill, delSkill, addSkill, updateSkill } from '@/api/system/skill';
 
 export default {
   name: 'Skill',
-  dicts: ['dm_skill_key'],
   data () {
     return {
       // 遮罩层
@@ -101,18 +80,16 @@ export default {
         pageNum: 1,
         pageSize: 10,
         deptId: null,
-        question: null,
+        skillKey: null,
-        content: null,
+        content: null
-        
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        question: [{ required: true, message: '关键词不能为空', trigger: 'blur' }],
+        skillKey: [{ required: true, message: '关键词不能为空', trigger: 'blur' }],
         content: [{ required: true, message: '话术内容不能为空', trigger: 'blur' }]
-      },
+      }
-      skillOptions:[]
     };
   },
   created () {
@@ -122,7 +99,7 @@ export default {
     /** 查询关键话术列表 */
     getList () {
       this.loading = true;
-      pageSkill(this.queryParams).then(response => {
+      listSkill(this.queryParams).then(response => {
         this.skillList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -139,9 +116,7 @@ export default {
         skillId: null,
         deptId: null,
         skillKey: null,
-        content: null,
+        content: null
-        status: 0,
-        keyList: []
       };
       this.resetForm('form');
     },
@@ -165,7 +140,7 @@ export default {
     handleAdd () {
       this.reset();
       this.open = true;
-      this.title = '关键话术';
+      this.title = '添加关键话术';
     },
     /** 修改按钮操作 */
     handleUpdate (row) {
@@ -174,23 +149,22 @@ export default {
       getSkill(skillId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = '关键话术';
+        this.title = '修改关键话术';
       });
     },
     /** 提交按钮 */
-    submitForm(status) {
+    submitForm () {
-      this.form.status = status;
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.skillId != null) {
             updateSkill(this.form).then(response => {
-              this.$modal.msgSuccess('操作成功');
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
             addSkill(this.form).then(response => {
-              this.$modal.msgSuccess('操作成功');
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -198,13 +172,6 @@ export default {
         }
       });
     },
-    checkSkill(status){
-      checkSkill({skillId : this.form.skillId, status : status}).then(resp => {
-        this.$modal.msgSuccess('操作成功');
-        this.open = false;
-        this.getList();
-      });
-    },
     /** 删除按钮操作 */
     handleDelete (row) {
       const skillIds = row.skillId || this.ids;

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

@@ -64,8 +64,9 @@ export default {
         this.dialogMap = new AMap.Map('dialogMap', {
           zoom: 12,
           resizeEnable: true,
-          center: [117.283042, 31.86119]
+          center: [121.448641, 31.2071],
         });
+
         this.dialogMap.on('click', ev => {
           this.currentPoint.lat = ev.lnglat.lat;
           this.currentPoint.lng = ev.lnglat.lng;

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

@@ -76,9 +76,11 @@ export default {
       if (!this.amap) {
         this.amap = new AMap.Map('map', {
           zoom: 12,
-          center: [117.226095, 31.814372],
+          center: [121.448641, 31.2071],
           resizeEnable: true
         });
+        // this.aMap.setCity("上海")
+
         // 地图坐标点定位
 
         // this.getAllPlaces();

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

@@ -26,13 +26,12 @@
             <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>
         <el-button class="footer_button" @click="toBackClue">取 消</el-button>
-        <el-button class="footer_button" v-if="!clueForm.state" v-hasPermi="['zs:clue:discard']" type="primary" @click="handleDiscard()">释放</el-button>
-        <el-button type="primary" @click="handleSkill">关键话术</el-button>
-
       </div>
     </div>
     <el-divider />
@@ -42,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 filterable>
+                <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>
@@ -67,27 +66,37 @@
                 <el-input v-model="clueForm.weChat" placeholder="请输入微信号" />
               </el-form-item>
             </el-col>
-            <el-col :span="24" v-if="clueForm.source == '抖音直播'">
+            <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 :span="24" v-if="clueForm.source == '抖音直播'">
+            <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 v-if="clueForm.source == '抖音直播'" :span="24">
+              <el-form-item label="意向门店" prop="intentionAccountName">
+                <el-input v-model="clueForm.intentionAccountName" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="clueForm.source == '抖音直播'" :span="24">
+              <el-form-item label="门店地址" prop="intentionAccountAddress">
+                <el-input v-model="clueForm.intentionAccountAddress" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="跟进人员" prop="followUser">
-                <el-select 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" v-if="clueForm.source == '抖音直播'">
+              <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.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">
@@ -98,8 +107,8 @@
                 </el-select>
               </el-form-item>
 
-                <el-form-item label="意向状态" prop="intentionState" v-else>
+              <el-form-item v-else 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.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">
@@ -110,14 +119,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" v-if="clueForm.source == '抖音直播'">
+            <el-col v-if="clueForm.source == '抖音直播'" :span="24">
               <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-date-picker v-model="clueForm.writeOffTime" style="width: 100%;" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" type="date" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <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">
@@ -134,7 +143,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>
 
@@ -142,7 +151,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>
@@ -161,14 +170,14 @@
     <!-- </el-card> -->
 
     <MapDialog v-if="mapDialogVisible" ref="mapDialog" :dialog-visible="mapDialogVisible" @handleMapDialogPoint="handleMapDialogPoint" />
-
+    <!-- 关键话术 -->
     <SkillDialog ref="SkillDialog" />
 
   </div>
 </template>
 
 <script>
-import { getClueInfo, getConsultRecord, addClue, updateClue, discardClue} from '@/api/zs/clue';
+import { getClueInfo, getConsultRecord, addClue, updateClue } from '@/api/zs/clue';
 import empApi from '@/api/system/employee';
 import { getAllPlaces } from '@/api/sch/place';
 
@@ -197,7 +206,7 @@ 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: [], // 跟进人员
@@ -213,8 +222,8 @@ export default {
   },
   created () {
     // 获取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);
@@ -231,13 +240,12 @@ export default {
   methods: {
     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);
       }
@@ -260,22 +268,22 @@ 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 }).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 () {
@@ -286,8 +294,8 @@ export default {
     },
     // 处理地图弹框返回的点
     handleMapDialogPoint (point) {
-      console.log("handleMapDialogPoint")
+      console.log('handleMapDialogPoint');
-      console.log(point)
+      console.log(point);
       if (point) {
         this.handleMapCenter(point);
       }
@@ -324,24 +332,23 @@ export default {
           this.$refs.placeMap.handleMarkers(this.placeList);
         });
       }
-
     },
     // 表单提交
     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({
@@ -349,47 +356,28 @@ 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 () {
-      const obj = { path: "/zs/clue" };
+      const obj = { path: '/zs/clue' };
       this.$tab.closeOpenPage(obj);
     },
-     // 释放线索操作
-     handleDiscard() {
-      this.$confirm('是否确认释放该条线索（“' + this.clueForm.name + '/' + this.clueForm.phone + '”）到公海?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then((res) => {
-          discardClue(this.clueForm).then((resp) => {
-            if (resp && resp.code === 200) {
-              this.$message.success('释放成功');
-              this.toBackClue();
-            }
-          });
-        })
-        .catch(function () { });
-    },
-    // 关键性话术
     handleSkill () {
       this.$nextTick(() => {
         this.$refs.SkillDialog.init();
       });
-    },
+    }
 
   }
 };

src/views/zs/clue/columns.js

@@ -93,14 +93,14 @@ export const defaultColumns = [{
   visible: true,
   overflow: false
 },
-  {
+// {
-    key: 12,
+//   key: 12,
-    prop: 'offlineReceiverName',
+//   prop: 'offlineReceiverName',
-    label: '线下接待人员',
+//   label: '线下接待人员',
-    width: 140,
+//   width: 140,
-    visible: true,
+//   visible: true,
-    overflow: false
+//   overflow: false
-  },
+// },
 {
   key: 13,
   prop: 'clueMemo',
@@ -132,5 +132,21 @@ export const defaultColumns = [{
   width: 140,
   visible: true,
   overflow: true
+},
+{
+  key: 17,
+  prop: 'intentionAccountName',
+  label: '意向门店',
+  width: 140,
+  visible: true,
+  overflow: true
+},{
+  key: 18,
+  prop: 'intentionAccountAddress',
+  label: '门店地址',
+  width: 140,
+  visible: true,
+  overflow: true
 }
+
 ];

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

@@ -119,7 +119,7 @@ export default {
         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' },
+        amountReceived: { required: true, message: '订单实收不为空', trigger: 'blur,change' }
 
 
       },

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

@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <el-dialog :title="title" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+      @close="closeDialog" style="min-height: 400px;">
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="邀约信息" name="first">
+          <el-table v-loading="loading" :data="invitationRecords" border>
+            <el-table-column label="操作时间" prop="createTime" width="140" />
+            <el-table-column label="邀约场地" prop="placeName" min-width="200" />
+            <el-table-column label="约定时间" prop="invitationTime" width="120" />
+            <el-table-column label="备注" prop="remark" min-width="200" />
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="分发信息" name="second">
+          <el-table v-loading="loading" :data="distributeRecords" border>
+            <el-table-column label="操作时间" prop="distributeTime" width="140" />
+            <el-table-column label="分发场地" prop="placeName" min-width="200" />
+            <!-- <el-table-column label="接待人" prop="invitationTime" min-width="120" /> -->
+            <el-table-column label="接待人" prop="coachName" min-width="120" />
+            <el-table-column label="操作" fixed="right" min-width="100">
+              <template slot-scope="scope">
+                <el-button size="mini" v-if="scope.$index == 0 && isEdit" type="text" icon="el-icon-edit"
+                  @click="handleEdit(scope.row)">修改</el-button>
+                <el-button size="mini" type="text"
+                  @click="handleFeedback(scope.row)">反馈信息</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+
+      <span slot="footer" class="dialog-footer" >
+        <el-button v-jclick type="primary" :disabled="!isAdd" @click="handleAdd()">新增</el-button>
+        <el-button plain @click="(visible = false)">取消</el-button>
+      </span>
+    </el-dialog>
+    <DistributeFormDialog ref="DistributeFormDialog" @refreshDataList="getFeedbackOrder" />
+    <FeedbackDialog ref="FeedbackDialog" />
+
+  </div>
+</template>
+<script>
+import { listFeedbackOrder } from '@/api/zs/feedbackOrder';
+import { getInvitationByClue } from '@/api/zs/invitation';
+import DistributeFormDialog from './DistributeFormDialog.vue';
+import FeedbackDialog from './FeedbackDialog.vue';
+
+export default {
+  name: 'DistributeDialog',
+  components: {
+    DistributeFormDialog, FeedbackDialog
+  },
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      loading: false,
+      placeOptions: [],
+      coachOptions: [],
+      feedbackDetail: [],
+      activeTab: 'first',
+      invitationRecords: [],
+      clueInfo: undefined,
+      distributeRecords: [],
+      isAdd: false,
+      isEdit: true,
+      title: '分发'
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.activeTab = 'first';
+      // this.getPlaces();
+      this.visible = true;
+      this.isAdd = false;
+      this.isEdit = true;
+      this.title = '邀约';
+      this.$nextTick(() => {
+        if (info) {
+          this.clueInfo = info;
+          if (info.feedbackStatus > 2) {
+            this.isEdit = false;
+          }
+          if (info.feedbackStatus == 1 || info.feedbackStatus == 5 || info.feedbackStatus == 6) {
+            this.isAdd = true;
+          }
+          // 查询线索的邀约情况
+          this.getInvitationByClue();
+          // 查询该线索的分发a情况
+          this.getFeedbackOrder();
+          this.title = this.title + '【' + (info.name == null ? '' : info.name) + '  ' + info.phone + '】';
+        }
+      });
+    },
+    closeDialog() {
+      this.$emit('update:dialog.batchUpdateVisible', false);
+    },
+    getInvitationByClue() {
+      getInvitationByClue({ clueId: this.clueInfo.clueId }).then(resp => {
+        if (resp.code == 200 && resp.data) {
+          this.invitationRecords = resp.data;
+        }
+      });
+    },
+    getFeedbackOrder() {
+      listFeedbackOrder({ clueId: this.clueInfo.clueId }).then(resp => {
+        if (resp.code == 200 && resp.rows && resp.rows.length > 0) {
+          this.distributeRecords = resp.rows.filter(item => item.feedbackStatus != 0);
+        }
+      });
+    },
+    handleFeedback(item) {
+      this.$nextTick(() => {
+        this.$refs.FeedbackDialog.init(item.orderId);
+      });
+    },
+    handleAdd() {
+      const item = {
+        placeId: undefined,
+        clueId: this.clueInfo.clueId,
+        coachId: undefined,
+        copyUserList: []
+      };
+      this.handleEdit(item);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.DistributeFormDialog.init(item);
+      });
+    }
+  }
+};
+</script>
+

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,118 @@
 <template>
-  <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog">
+  <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px"
+    @close="closeDialog" style="min-height: 400px;">
     <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px">
       <el-row>
         <el-col :span="24">
-          <el-form-item label="场地" prop="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-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 plain @click="closeDialog">取消</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>
-import { getCluePlaceList, saveCluePlace } from '@/api/zs/clue';
+import { updateFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder';
+
+
 import { getAllPlaces } from '@/api/sch/place';
+import { getAllCoaches } from '@/api/sch/coach';
 
 export default {
   name: 'DistributeFormDialog',
-
   data() {
     return {
       visible: false,
       canSubmit: true,
-      dialogForm: {},
+      dialogForm: {
-      oldForm: {},
+        placeId: undefined,
+        clueId: undefined,
+        coachId: undefined,
+        copyUserList: []
+      },
       rules: {
-        newPlaceList: {
+        placeId: { required: true, message: '场地不能为空', trigger: 'blur, change' },
-          required: true,
+        coachId: { required: true, message: '教练不能为空', trigger: 'blur, change' }
-          message: '场地不能为空不能为空',
-          trigger: 'blur'
-        }
       },
-      placeOptions: []
+      placeOptions: [],
+      coachOptions: [],
+      feedbackDetail: []
     };
   },
   methods: {
     init(info = undefined) {
-      this.getPlaces()
+      this.getPlaces();
       this.visible = true;
       this.$nextTick(() => {
         this.resetDialogForm();
         this.$refs['dialogForm'].resetFields();
         if (info) {
-
+          this.dialogForm = { ...info };
-          this.dialogForm.clueId = info;
+          if (this.dialogForm.placeId){
-          //查询该线索的分发情况
+            this.getCoaChes(this.dialogForm.placeId);
-          this.getDistributePlaces(info);
+          }
         }
       });
     },
     resetDialogForm() {
       this.dialogForm = {
-        oldPlaceList: [],
+        placeId: undefined,
-        newPlaceList: [],
+        clueId: undefined,
-        placeIdList: [],
+        coachId: undefined,
-        clueId: undefined
+        copyUserList: []
       };
-      this.oldForm = {}
+      this.feedbackDetail = []
     },
     closeDialog() {
       this.$emit('update:dialog.batchUpdateVisible', false);
-    },
+      this.visible = 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)
+          if (this.dialogForm.orderId) {
+            // 校验完成，调接口
+            updateFeedbackOrder(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('分发成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
+              })
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          } else {
             // 校验完成，调接口
-          saveCluePlace(this.dialogForm)
+            addFeedbackOrder(this.dialogForm)
               .then((resp) => {
                 this.canSubmit = true;
                 if (resp.code == 200) {
@@ -101,16 +125,21 @@ export default {
                 this.canSubmit = true;
               });
           }
+        }
       });
     },
     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>
 
-  

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

@@ -0,0 +1,53 @@
+<template>
+    <el-dialog title="反馈" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+        @close="closeDialog" style="min-height: 400px;">
+        <el-timeline :reverse="true">
+            <el-timeline-item v-for="(item, index) in feedbackDetail" :key="index" :timestamp="item.updateTime" placement="top">
+                <div v-if="item.feedbackType == 1">
+                    <div>是否联系：<span>{{ item.isContact ? '已联系' : '未联系' }}</span></div>
+                    <div>到场时间：<span>{{ item.arrivalTime }}</span></div>
+                    <div>备注：<span>{{ item.remark }}</span></div>
+                </div>
+                <div v-if="item.feedbackType == 2">
+                    <div>到场状态：<span v-if="item.arrivalStatus == 1">未到场</span>
+                        <span v-if="item.arrivalStatus == 2">到场未成交</span>
+                        <span v-if="item.arrivalStatus == 3">到场已成交</span>
+                    </div>
+                    <div> 备注：<span>{{ item.remark }}</span></div>
+                </div>
+            </el-timeline-item>
+        </el-timeline>
+    </el-dialog>
+</template>
+<script>
+import { listFeedbackDetail } from '@/api/zs/feedbackDetail';
+
+export default {
+    name: 'FeedbackDialog',
+    data() {
+        return {
+            visible: false,
+            feedbackDetail: [],
+        };
+    },
+    methods: {
+        init(info = undefined) {
+            this.visible = true;
+            this.$nextTick(() => {
+                this.getFeedbackDetail(info);
+            });
+        },
+        closeDialog() {
+            this.$emit('update:dialog.batchUpdateVisible', false);
+        },
+        getFeedbackDetail(orderId) {
+            listFeedbackDetail({ orderId: orderId }).then(resp => {
+                this.feedbackDetail = resp.rows;
+            });
+        }
+
+    }
+};
+</script>
+  
+  

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

@@ -0,0 +1,43 @@
+<template>
+  <el-dialog title="跟进统计" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="500px" min-height="500">
+    <div>
+      <el-form ref="dialogForm" :model="dialogForm" label-width="110px" >
+        <el-form-item label="今日跟进线索数" prop="name">
+          <span>{{dialogForm.total}}</span>
+        </el-form-item>
+        <el-form-item v-for="item in dialogForm.intentionCountList" :label="item.label"  >
+          <span>{{item.num}}</span>
+        </el-form-item>
+      </el-form>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getFollowCount } from '@/api/zs/clue';
+export default {
+  name: 'FollowCountDialog',
+  data() {
+    return {
+      visible: false,
+      publicList: [],
+      dialogForm:{}
+    };
+  },
+  methods: {
+    init() {
+      this.visible = true;
+      this.getCount();
+    },
+    getCount() {
+      this.loading = true;
+      getFollowCount().then((resp) => {
+        if (resp && resp.code === 200) {
+          this.dialogForm = resp.data;
+          this.loading = false;
+        }
+      });
+    },
+  }
+};
+</script>
+

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

@@ -0,0 +1,39 @@
+<template>
+      <el-dialog title="跟进记录" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px">
+        <FollowRecord v-if="clueId" :clue-id="clueId" />
+       </el-dialog>
+  </template>
+  <script>
+  import FollowRecord from '../ClueForm/components/FollowRecord.vue';
+  export default {
+    name: 'FollowInfoDialog',
+    components: {
+        FollowRecord
+    },
+    data() {
+      return {
+        visible: false,
+        title: undefined,
+        clueId: undefined
+      };
+    },
+    methods: {
+      init(info = undefined) {
+        this.$nextTick(() => {
+            this.visible = true;
+          if (info) {
+            this.clueId = info;
+          }
+        });
+      }
+    }
+  };
+  </script>
+  
+  <style scoped>
+  .el-divider--vertical {
+    height: 15em !important;
+  }
+  </style>
+      
+      

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

@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <el-dialog :title="title" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+      @close="closeDialog">
+      <div>
+        <el-table v-loading="loading" :data="invitationRecords" border>
+          <el-table-column label="操作时间" prop="createTime" width="140" />
+          <el-table-column label="邀约场地" prop="placeName" width="200" />
+          <el-table-column label="约定时间" prop="invitationTime" width="120" />
+          <el-table-column label="备注" prop="remark" width="200" />
+          <el-table-column label="操作" fixed="right" width="80">
+            <template slot-scope="scope">
+              <el-button size="mini" v-if="scope.$index == 0 && isEdit" type="text" icon="el-icon-edit"
+                @click="handleEdit(scope.row)">修改</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button v-jclick type="primary" :disabled="!isAdd" @click="handleAdd()">新增</el-button>
+        <el-button plain @click="closeDialog">关闭</el-button>
+      </span>
+    </el-dialog>
+    <InvitationFormDialog ref="InvitationFormDialog" @refreshDataList="getInvitationRecord" />
+  </div>
+</template>
+<script>
+import { getInvitationByClue } from '@/api/zs/invitation';
+import InvitationFormDialog from './InvitationFormDialog.vue';
+
+export default {
+  name: 'InvitationDialog',
+  components: {
+    InvitationFormDialog
+  },
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      placeOptions: [],
+      isEdit: true,
+      invitationRecords: [],
+      clueId: undefined,
+      loading: false,
+      title: undefined,
+      clueInfo: undefined,
+      isAdd: false
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.visible = true;
+      this.title = "邀约";
+      this.isAdd = false;
+      this.isEdit = true;
+      this.clueInfo = undefined;
+      this.$nextTick(() => {
+        if (info) {
+          this.clueInfo = info;
+          if (info.feedbackStatus >= 2) {
+            this.isEdit = false;
+          }
+          if (info.feedbackStatus == 0 || info.feedbackStatus == 5 || info.feedbackStatus == 6) {
+            this.isAdd = true;
+          }
+          if (info.clueId) {
+            this.clueId = info.clueId;
+            this.getInvitationRecord();
+          }
+          this.title = this.title + '【' + (info.name == null ? '' : info.name) + '  ' + info.phone + '】';
+        }
+      });
+    },
+    closeDialog() {
+      this.visible = false;
+      // this.$emit('update:dialog.batchUpdateVisible', false);
+      this.$emit('refreshDataList');
+    },
+    getInvitationRecord() {
+      getInvitationByClue({ clueId: this.clueId }).then(resp => {
+        if (resp.data) {
+          this.invitationRecords = resp.data;
+          if (this.invitationRecords && this.invitationRecords.length > 0) {
+            this.dialogForm = this.invitationRecords[0];
+          }
+        }
+      });
+    },
+    handleAdd() {
+      const invitation = {
+        invitationId: undefined,
+        clueId: this.clueInfo.clueId,
+        name: this.clueInfo.name,
+        phone: this.clueInfo.phone,
+        address: this.clueInfo.address,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
+      };
+      this.handleEdit(invitation);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.InvitationFormDialog.init(item)
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.el-divider--vertical {
+  height: 15em !important;
+}
+</style>
+    
+    

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

@@ -0,0 +1,162 @@
+<template>
+  <el-dialog title="邀约" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="500px"
+    @close="closeDialog">
+    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="!isEdit">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="姓名" prop="name">
+            <el-input v-model="dialogForm.name" placeholder="请输入姓名" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="联系方式" prop="phone">
+            <el-input v-model="dialogForm.phone" placeholder="请输入联系方式" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="场地" prop="placeId">
+            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;">
+              <el-option v-for="dict in placeOptions" :key="dict.placeId" :label="dict.name" :value="dict.placeId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="约定时间" prop="invitationTime">
+            <el-date-picker clearable v-model="dialogForm.invitationTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+              format="yyyy-MM-dd HH:mm" placeholder="请选择约定时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dialogForm.remark" type="textarea" placeholder="请输入" />
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button plain @click="(visible = false)">取消</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit || !isEdit" @click="dialogFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { addInvitation, updateInvitation } from '@/api/zs/invitation';
+import { getAllPlaces } from '@/api/sch/place';
+
+export default {
+  name: 'InvitationFormDialog',
+
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {
+        invitationId: undefined,
+        clueId: undefined,
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
+      },
+      rules: {
+        name: { required: true, message: '姓名不能为空', trigger: 'blur' },
+        phone: { required: true, message: '姓名不能为空', trigger: 'blur' },
+        placeId: { required: true, message: '场地不能为空', trigger: 'blur' },
+        invitationTime: { required: true, message: '约定时间不能为空', trigger: 'blur' }
+
+      },
+      placeOptions: [],
+      isEdit: true,
+      invitationRecords: []
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.visible = true;
+      this.getPlaces()
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm = { ...info }
+        }
+      });
+    },
+    resetDialogForm() {
+      this.dialogForm = {
+        invitationId: undefined,
+        clueId: undefined,
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
+      };
+      this.isEdit = true;
+    },
+    closeDialog() {
+      this.$emit('update:dialog.batchUpdateVisible', false);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.InvitationDialog.init(item)
+      })
+    },
+    // 表单提交
+    dialogFormSubmit() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          this.canSubmit = false;
+          if (this.dialogForm.invitationId) {
+            // 校验完成，调接口
+            updateInvitation(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('修改成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
+              })
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          } else {
+            // 校验完成，调接口
+            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>
+
+<style scoped>
+.el-divider--vertical {
+  height: 15em !important;
+}
+</style>
+    
+    

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

@@ -7,12 +7,15 @@
       <el-form-item label="意向状态:" label-width="90px">
         <DMRadio v-model="searchForm.intentionState" :list="intentionOptions" all-text="全部" @change="$emit('search')" />
       </el-form-item>
+      <el-form-item label="反馈状态:" label-width="90px">
+        <DMRadio v-model="searchForm.feedbackStatus" :list="feedbackTagOptions" all-text="全部" @change="$emit('search')" />
+      </el-form-item>
       <el-row>
         <el-form-item label="姓名/联系方式">
           <el-input v-model="searchForm.name" placeholder="姓名/联系方式" clearable style="width: 200px" />
         </el-form-item>
         <el-form-item label="线索来源">
-          <el-select v-model="searchForm.source" placeholder="选择线索来源" filterable clearable>
+          <el-select v-model="searchForm.source" placeholder="选择线索来源" clearable>
             <el-option v-for="dict in sourceOptions" :key="dict.dictValue" :value="dict.dictValue" />
           </el-select>
         </el-form-item>
@@ -66,12 +69,19 @@ export default {
         { value: 5, label: '今日跟踪' },
         { value: 6, label: '过期线索' },
         { value: 7, label: '相关线索' },
-        { value: 8, label: '撞单线索' },
+        { value: 8, label: '撞单线索' }
-        { value: 9, label: '待分配' }
       ],
       intentionOptions: [],
       createDateRange: [],
-      nextDateRange: []
+      nextDateRange: [],
+      feedbackTagOptions: [
+        { value: 0, label: '待邀约' },
+        { value: 1, label: '待分发' },
+        { value: 2, label: '待跟进' },
+        { value: 3, label: '待到场' },
+        { value: 4, label: '未到场' },
+        { value: 5, label: '到场未成交' },
+        { value: 6, label: '到场已成交' }]
     };
   },
   watch: {

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

@@ -6,30 +6,17 @@
  * @Description:
 -->
 <template>
-  <el-dialog title="话术" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px" height="700">
+  <el-dialog title="话术" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="700px" height="700">
     <div>
-      <!-- 问题 -->
+      <!-- 搜索框 -->
-      <el-input v-model="queryParams.searchValue" placeholder="请输入问题" clearable @keyup.enter.native="queryAnswer"  style="margin-bottom: 10px;"/>
+      <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-checkbox-group v-model="queryParams.keyList" @change="queryAnswer">
-            <el-checkbox v-for="(item, index) in dict.type.dm_skill_key" :key="index" :label="item.value" style="margin: 2px;" border>{{item.label}}</el-checkbox>
-        </el-checkbox-group>
 
       <!-- 话术内容 -->
       <el-card class="box-card">
 
         <div class="text item">
-          <ul v-for="item in skillInfo">
-            <li>
-              <span style="font-style: italic; font-size: 16px; font-weight: bold; margin-right: 5px;">Q:</span><span>{{item.question}}</span>
-             
-            </li>
-            <li>
-              <span style="font-style: italic; font-size: 16px; font-weight: bold; margin-right: 5px;">A:</span><span v-html="item.content"></span>
-            </li>
-            <el-divider></el-divider>
-          </ul>
           <span v-html="content" />
         </div>
       </el-card>
@@ -37,23 +24,16 @@
   </el-dialog>
 </template>
 <script>
-import { listSkill,getSkillKey, getSkill } from '@/api/system/skill';
+import { getSkillKey, getSkill } from '@/api/system/skill';
 export default {
   name: 'SkillDialog',
-  dicts: ['dm_skill_key'],
   data () {
     return {
       visible: false,
       loading: true,
       keyOptions: [],
       content: undefined,
-      skillId: undefined,
+      skillId: undefined
-      queryParams:{
-        searchValue: undefined,
-        keyList: [],
-        status: 2
-      },
-      skillInfo:[]
     };
   },
   methods: {
@@ -68,16 +48,16 @@ export default {
         }
       });
     },
-    queryAnswer(){
+    selectKey (item) {
-      console.log(this.queryParams)
+      if (item) {
-      this.skillInfo = []
+        getSkill(item).then((resp) => {
-      listSkill(this.queryParams).then((resp) => {
           if (resp && resp.code === 200) {
-            this.skillInfo = resp.data;
+            this.content = resp.data.content;
           }
         });
       }
     }
+  }
 };
 </script>
 

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

@@ -63,7 +63,6 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      debugger
       this.download('zs/clue/importTemplate?ydtData=' + this.ydtData + '&dYData=' + this.dYData, {}, `clue_template_${new Date().getTime()}.xlsx`);
     },
     // 文件上传中处理

src/views/zs/clue/index.vue

@@ -1,49 +1,86 @@
 <template>
   <div class="app-container">
-    <SearchForm v-show="showSearch" ref="SearchForm" :user-options="userOptions" :source-options="sourceOptions" @search="_getTableList" />
+    <SearchForm v-show="showSearch" ref="SearchForm" :user-options="userOptions" :source-options="sourceOptions"
+      @search="_getTableList" />
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleAddandUpdate(undefined)">新增</el-button>
+        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary"
-        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleDYAddandUpdate(undefined)">抖音新增</el-button>
+          @click="handleAddandUpdate(undefined)">新增</el-button>
+        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary"
+          @click="handleDYAddandUpdate(undefined)">抖音新增</el-button>
 
-        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false,false)">导入</el-button>
+        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning"
-        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(true, false)">一点通导入</el-button>
+          @click="handleImport(false, false)">导入</el-button>
-        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false, true)">抖音导入</el-button>
+        <!-- <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(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:export']" icon="el-icon-download" type="warning"
-        <el-button v-hasPermi="['zs:clue:edit']" icon="el-icon-edit" type="primary" :disabled="multiple" @click="handleBatChUpdate()">批量修改</el-button>
+          @click="handleExport">导出</el-button>
+        <el-button v-hasPermi="['zs:clue:edit']" icon="el-icon-edit" type="primary" :disabled="multiple"
+          @click="handleBatChUpdate()">批量修改</el-button>
         <el-button type="primary" @click="handlePublicClue">公海</el-button>
         <el-button type="primary" @click="handleSkill">关键话术</el-button>
+        <el-button type="primary" @click="handleFollowCount">跟进统计</el-button>
 
       </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"
-        <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" />
+          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>
+          <el-tag effect="dark" style="border: none" :color="tagColorMap[row.intentionState]">{{ row.intentionState
+          }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" fixed="right" align="left" min-width="200">
         <template slot-scope="scope">
           <!-- <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.source == '抖音直播'" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleDYAddandUpdate(scope.row)">编辑</el-button> -->
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
+          <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>
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
-          <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>
+            v-hasPermi="['zs:clue:edit']" type="text" style="color: red;"
-          <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>
+            @click.native.stop="handleAddandUpdate(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>
+          <el-button v-hasPermi="['zs:clue:distribute']" type="text"
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1  ) && !scope.row.state" v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button>
+            @click.native.stop="handleDistribute(scope.row)">分发</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
+            v-hasPermi="['zs:clue:invitation']" type="text"
+            @click.native.stop="handleInvitation(scope.row)">邀约</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && scope.row.state"
+            v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a"
+            @click.native.stop="handleSign(scope.row)">已登记</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && !scope.row.state"
+            v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
+            v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && !scope.row.state"
+            v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button>
           <el-button v-if="quickSearch == 8" type="text" @click="handleViewZhuangDan(scope.row)"> 撞单信息</el-button>
+          <el-button type="text" @click="handleViewFollowInfo(scope.row)"> 跟进信息</el-button>
+
           <!-- <el-button v-if="searchForm.quickSearch == 8" type="text" > 撞单信息</el-button> -->
         </template>
       </el-table-column>
     </el-table>
-    <pagination :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize" :page-sizes="[10, 20, 30, 50, 100]" @pagination="_getTableList" />
+    <pagination :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+      :page-sizes="[10, 20, 30, 50, 100]" @pagination="_getTableList" />
     <!-- 批量修改 -->
     <BatchUpdateDialog ref="batchUpdateDialogForm" :options="options" @refreshDataList="_getTableList" />
     <!-- 公海  -->
@@ -53,16 +90,21 @@
     <!-- 登记弹框 -->
     <SignFormDialog ref="signDialogForm" :clue-info="clueInfo" />
     <!-- 分发 -->
-    <DistributeFormDialog ref="distributeDialogForm" @refreshDataList="_getTableList" />
+    <DistributeDialog ref="distributeDialog" @refreshDataList="_getTableList" />
     <!-- 撞单信息 -->
     <ZhuangDanDialog ref="zhuangDanDialog" />
     <!-- 备注编辑 -->
     <MemoFormDialog ref="memoDialog" @refreshDataList="_getTableList" />
     <!-- 抖音直播弹框 -->
     <DYClueFormDialog ref="DYClueFormDialog" @refreshDataList="_getTableList" />
-  <!-- 关键性话术 -->
+    <!-- 关键话术 -->
     <SkillDialog ref="SkillDialog" />
-
+    <!-- 邀约弹窗 -->
+    <InvitationDialog ref="InvitationDialog" @refreshDataList="_getTableList" />
+    <!-- 跟进统计弹窗 -->
+    <FollowCountDialog ref="FollowCountDialog" />
+    <!-- 跟进记录弹框 -->
+    <FollowInfoDialog ref="FollowInfoDialog" />
   </div>
 </template>
 
@@ -71,31 +113,34 @@ import SearchForm from './components/SearchForm.vue';
 import BatchUpdateDialog from './components/BatchUpdateDialog.vue';
 import PublicDialog from './components/PublicDialog.vue';
 import UploadDialog from './components/UploadDialog.vue';
-import DistributeFormDialog from './components/DistributeFormDialog.vue';
+import DistributeDialog from './components/DistributeDialog.vue';
 import SignFormDialog from '../sign/components/SignFormDialog.vue';
 import ZhuangDanDialog from './components/ZhuangDanDialog.vue';
 import MemoFormDialog from './components/MemoFormDialog.vue';
 import DYClueFormDialog from './components/DYClueFormDialog.vue';
 import SkillDialog from './components/SkillDialog.vue';
+import InvitationDialog from './components/InvitationDialog.vue';
+import FollowCountDialog from './components/FollowCountDialog.vue';
+import FollowInfoDialog from './components/FollowInfoDialog.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',
+  components: {
+    SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeDialog, ZhuangDanDialog, MemoFormDialog,
+    DYClueFormDialog, SkillDialog, InvitationDialog, FollowCountDialog, FollowInfoDialog
+  },
   beforeRouteEnter(to, from, next) {
     if (from.name == 'ClueForm') {
       next(vm => {
-        vm._getTableList()
+        vm._getTableList();
-      })
+      });
     } else {
-      next()
+      next();
     }
   },
-  components: {
-    SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeFormDialog, ZhuangDanDialog, MemoFormDialog,
-    DYClueFormDialog,SkillDialog
-  },
   data() {
     return {
       admin: localStorage.getItem('admin'),
@@ -125,6 +170,15 @@ export default {
         报名他校: '#afaeb0',
         无效线索: '#afaeb0'
       },
+      feedbackTagColorMap: {
+        0: '待邀约',
+        1: '待分发',
+        2: '待跟进',
+        3: '待到场',
+        4: '未到场',
+        5: '到场未成交',
+        6: '到场已成交'
+      },
       options: undefined,
       clueInfo: undefined,
       consultRecord: [],
@@ -151,7 +205,7 @@ export default {
     _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;
@@ -176,6 +230,11 @@ export default {
         this.$refs.DYClueFormDialog.init(info);
       });
     },
+    handleSkill() {
+      this.$nextTick(() => {
+        this.$refs.SkillDialog.init();
+      });
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       console.log(selection);
@@ -273,10 +332,21 @@ export default {
     },
     // 分发到场地
     handleDistribute(item) {
-
+      if (item.feedbackStatus == 0) {
+        this.$confirm('该学员未邀约，确定进行分发?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then((res) => {
           this.$nextTick(() => {
-        this.$refs.distributeDialogForm.init(item.clueId);
+            this.$refs.distributeDialog.init(item);
           });
+        });
+      } else {
+        this.$nextTick(() => {
+          this.$refs.distributeDialog.init(item);
+        });
+      }
     },
     // 外呼
     handlePhone(item) {
@@ -292,25 +362,37 @@ export default {
         // if(row.source == '抖音直播'){
         //   this.handleDYAddandUpdate(row);
         // } else {
-          this.handleAddandUpdate(row)
+        this.handleAddandUpdate(row);
         // }
       }
     },
     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);
         });
-
       }
     },
-    handleSkill() {
+    // 邀约
+    handleInvitation(item) {
       this.$nextTick(() => {
-        this.$refs.SkillDialog.init();
+        this.$refs.InvitationDialog.init(item)
+      });
+    },
+    // 跟进统计页面
+    handleFollowCount() {
+      this.$nextTick(() => {
+        this.$refs.FollowCountDialog.init()
       });
     },
+    // 查看跟进记录
+    handleViewFollowInfo (item) {
+      this.$nextTick(() => {
+        this.$refs.FollowInfoDialog.init(item.clueId);
+      });
+    }
   }
 };
 </script>

src/views/zs/feedback/arrival.vue

@@ -0,0 +1,138 @@
+<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.placeName }}</span>
+      </el-form-item>
+      <el-form-item label="邀约时间" v-if="order.invitationTime != undefined">
+        <span>{{ order.invitationTime }}</span>
+      </el-form-item>
+      <el-form-item label="邀约备注" prop="coachId" v-if="order.remark != undefined">
+        <span>{{ order.remark }}</span>
+      </el-form-item>
+      <el-form-item label="接待人" prop="coachId">
+        <span>{{ order.coachName }}</span>
+      </el-form-item>
+      <el-divider></el-divider>
+      <el-form-item label="到场状态" prop="arrivalStatus">
+        <el-radio-group v-model="form.arrivalStatus" size="small" :disabled="!isEdit">
+          <el-radio :label="1">未到场</el-radio>
+          <el-radio :label="2">到场未成交</el-radio>
+          <el-radio :label="3">到场已成交</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="!isEdit" />
+      </el-form-item>
+    </el-form>
+    <div v-if="isEdit" 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,
+      isEdit: false
+    };
+  },
+  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;
+        }
+        if (this.type == this.order.coachId) {
+          this.isEdit = true;
+        }
+        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,140 @@
+<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.placeName }}</span>
+      </el-form-item>
+      <el-form-item label="邀约时间" v-if="order.invitationTime != undefined">
+        <span>{{ order.invitationTime }}</span>
+      </el-form-item>
+      <el-form-item label="邀约备注" prop="coachId" v-if="order.remark != undefined">
+        <span>{{ order.remark }}</span>
+      </el-form-item>
+      <el-form-item label="接待人" prop="coachId">
+        <span>{{ order.coachName }}</span>
+      </el-form-item>
+      <el-divider></el-divider>
+      <el-form-item label="是否联系" prop="isContact">
+        <el-radio-group v-model="form.isContact" size="small" :disabled="!isEdit">
+          <el-radio :label="1">是</el-radio>
+          <el-radio :label="0">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="到场时间" prop="arrivalTime">
+        <el-date-picker v-model="form.arrivalTime" :disabled="!isEdit" clearable type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择到场时间" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" :disabled="!isEdit" type="textarea" placeholder="请输入内容" />
+      </el-form-item>
+    </el-form>
+    <div v-if="isEdit" 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,
+      isEdit: false
+    };
+  },
+  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;
+        }
+        if (this.type == this.order.coachId) {
+          this.isEdit = true;
+        }
+        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

@@ -21,14 +21,14 @@ export const defaultColumns = [{
     visible: true,
     overflow: false
   },
-  {
+  // {
-    key: 3,
+  //   key: 3,
-    prop: 'offlineReceiverName',
+  //   prop: 'offlineReceiverName',
-    label: '线下接待人员',
+  //   label: '线下接待人员',
-    width: 140,
+  //   width: 140,
-    visible: true,
+  //   visible: true,
-    overflow: false
+  //   overflow: false
-  },
+  // },
   {
     key: 4,
     prop: 'zhuangDanName',
@@ -138,14 +138,15 @@ export const defaultColumns = [{
     visible: true,
     overflow: true
   },
+  // {
+  //   key: 18,
+  //   prop: 'commission',
+  //   label: '佣金明细',
+  //   width: 140,
+  //   visible: true,
+  //   overflow: true
+  // },
    {
-    key: 18,
-    prop: 'commission',
-    label: '佣金明细',
-    width: 140,
-    visible: true,
-    overflow: true
-  }, {
     key: 19,
     prop: 'memo',
     label: '备注',
@@ -160,5 +161,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/SearchForm.vue

@@ -32,7 +32,7 @@
         </el-form-item>
 
         <el-form-item label="线索来源">
-          <el-select v-model="searchForm.source" placeholder="请选择" filterable clearable>
+          <el-select v-model="searchForm.source" placeholder="请选择" clearable>
             <el-option v-for="dict in options.sourceOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
           </el-select>
         </el-form-item>

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>
@@ -502,7 +488,7 @@ export default {
       });
     },
     handleSubmit() {
-      this.$confirm('提交后将进入审核阶段，是否提交确认提交?', '警告', {
+      this.$confirm('提交后将进入审核结算阶段，是否提交确认提交?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -629,35 +615,15 @@ export default {
     },
     priceChange() {
       // 计算驾校支付款  报名价格-班型底价
-      // if (this.modalForm.signClass && this.modalForm.signPrice) {
-      //   const minprice = this.classTypeOptions.find(
-      //     (item) => item.typeId == this.modalForm.signClass
-      //   ).minPrice;
-      //   if (minprice) {
-      //     this.$set(this.modalForm, 'schoolPay', this.modalForm.signPrice - minprice);
-      //   }
-      // } else {
-      //   this.$set(this.modalForm, 'schoolPay', undefined);
-      // }
-      this.$set(this.modalForm, 'schoolPay', undefined);
       if (this.modalForm.signClass && this.modalForm.signPrice) {
-        const classType = this.classTypeOptions.find(
+        const minprice = this.classTypeOptions.find(
           (item) => item.typeId == this.modalForm.signClass
-        );
+        ).minPrice;
-        if (classType.profitType == 1) {
+        if (minprice) {
-          // 底价
+          this.$set(this.modalForm, 'schoolPay', this.modalForm.signPrice - minprice);
-          this.$set(this.modalForm, 'schoolPay', this.modalForm.signPrice - classType.minPrice);
-        } else if (classType.profitType == 2) {
-          // 比例提成
-          this.$set(this.modalForm, 'schoolPay', this.modalForm.signPrice * Number(classType.profitParam));
-        } else {
-          // 固定值
-          classType.profitParamVOList.forEach(item => {
-            if (item.min <= this.modalForm.signPrice && item.max >= this.modalForm.signPrice) {
-              this.$set(this.modalForm, 'schoolPay', item.profit);
-            }
-          });
         }
+      } else {
+        this.$set(this.modalForm, 'schoolPay', undefined);
       }
     },
     getZhuangDanPeople(clueId) {

src/views/zs/sign/index.vue

@@ -21,17 +21,18 @@
         </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 v-if="row.checkState == 1" type="danger" size="mini">待审核</el-button>
           <el-button v-else-if="row.checkState == 2" type="success" size="mini">已审核</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="{row}">
           <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 v-if="row.checkState == 1" v-hasPermi="['zs:sign:check']" size="mini" type="text" @click="handleCheck(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 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>
@@ -43,10 +44,13 @@
     <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>
 
@@ -58,6 +62,7 @@ import SearchForm from './components/SearchForm.vue';
 import SignFormDialog from './components/SignFormDialog.vue';
 import { defaultColumns } from './columns.js';
 import UploadDialog from './components/UploadDialog.vue';
+import SettlementDialog from './components/SettlementDialog.vue';
 
 export default {
   name: 'Sign',
@@ -65,7 +70,8 @@ export default {
     SearchForm,
     CheckDialog,
     SignFormDialog,
-    UploadDialog
+    UploadDialog,
+    SettlementDialog
   },
   data() {
     return {
@@ -97,7 +103,8 @@ export default {
       dialog: {
         signVisible: false,
         checkVisible: false,
-        uploadVisible: false
+        uploadVisible: false,
+        settlementVisible: true
       },
       options: {
         userOptions: [],
@@ -225,6 +232,13 @@ export default {
       this.$nextTick(() => {
         this.$refs.checkDialogForm.init(item);
       });
+    },
+    //结算
+    handleSettlement(item){
+      this.dialog.settlementVisible = true
+      this.$nextTick(() => {
+        this.$refs.SettlementDialog.init(item);
+      })
     }
   }
 };

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,18 +33,18 @@ module.exports = {
     port: port,
     open: true,
     proxy: {
-      [process.env.VUE_APP_BASE_API + '/xunjia']: {
+      [process.env.VUE_APP_BASE_API + '/driver-api']: {
-        // target: `http://localhost:8889/driver-api/`,
+        // target: `http://118.31.23.45:8888/driver-api/`,
-        target: `https://xueche.ahduima.com/duima/xunjia/`,
+        target: `http://localhost:8888/driver-api/`,
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API + '/xunjia']: ''
+          ['^' + 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: `https://xueche.kxxc.top/duima/`,
-        // target: `http://localhost:8086`,
+        target: `http://localhost:8088`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''