反馈

.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'

.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",

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/school.js

@@ -39,11 +39,5 @@ export default {
       url: `/sch/school/${id}`,
       method: 'delete'
     });
-  },
-  createCode(id){
-    return request({
-      url: `/sch/school/create/${id}`,
-      method: 'post'
-    });
   }
 };

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/vip.js

@@ -1,39 +0,0 @@
-
-import request from '@/utils/request';
-
-// 查询车型列表
-export function getCarList(param) {
-  return request({
-    url: '/driver-api/tdSysUserMember/duima/car/list',
-    method: 'get',
-    params: param
-  });
-}
-
-// 查询会员列表
-export function getMemberList(param) {
-    return request({
-      url: '/driver-api/tdSysUserMember/duima/member/list',
-      method: 'get',
-      params: param
-    });
-  }
-
-
-  // 查询用户会员列表
-export function getUserMemberList(param) {
-    return request({
-      url: '/driver-api/tdSysUserMember/duima/user/member/list',
-      method: 'get',
-      params: param
-    });
-  }
-
-  //新增会员
-export function addUserMember(data) {
-  return request({
-    url: '/driver-api/tdSysUserMember/duima/user/member',
-    method: 'post',
-    data: data
-  });
-}

src/api/zs/feedback.js

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

src/api/zs/feedbackDetail.js

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

src/api/zs/feedbackOrder.js

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

src/layout/components/Sidebar/Logo.vue

@@ -27,7 +27,7 @@ export default {
   },
   data() {
     return {
-      title: '寻驾招生管理系统',
+      title: '莳松管理系统',
       logo: logoImg
     };
   },

src/permission.js

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

src/router/index.js

@@ -53,6 +53,16 @@ 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: '/404',
   component: () => import('@/views/error/404'),

src/views/index.vue

@@ -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,7 +1,7 @@
 <template>
   <div class="login">
     <div class="login-form">
-      <h3 class="title">寻驾招生管理系统</h3>
+      <h3 class="title">莳松管理系统</h3>
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="微信扫码" name="wx" style="height:200px">
           <wxlogin v-if="!code && activeName === 'wx'" appid="wx203f734baa9c9845" :scope="'snsapi_login'" :theme="'black'" redirect_uri="https://xueche.ahduima.com/login" :href="href">

src/views/question/components/QuestionAddForm.vue

@@ -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,47 +9,47 @@
             </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 />
-            </el-form-item>
+          </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="选项B" prop="question">
               <el-input v-model="dialogForm.chooseB" maxlength="200" placeholder="请输入" clearable />
-            </el-form-item>
+          </el-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 />
-            </el-form-item>
+          </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="选项D" prop="question">
               <el-input v-model="dialogForm.chooseD" maxlength="200" placeholder="请输入" clearable />
-            </el-form-item>
+          </el-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 />
-            </el-form-item>
+          </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="选项F" prop="question">
               <el-input v-model="dialogForm.chooseF" maxlength="200" placeholder="请输入" clearable />
-            </el-form-item>
+          </el-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 />
-            </el-form-item>
+          </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -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>
@@ -167,7 +146,7 @@
 import { addQuestion } from '@/api/question';
 
 export default {
-  data() {
+  data () {
     return {
       visible: false,
       canSubmit: true,
@@ -188,7 +167,7 @@ export default {
     };
   },
   methods: {
-    init(info = undefined) {
+    init (info = undefined) {
       // debugger
       this.visible = true;
       this.$nextTick(() => {
@@ -199,7 +178,7 @@ export default {
         }
       });
     },
-    resetDialogForm() {
+    resetDialogForm () {
       this.dialogForm = {
         questionId: undefined,
         isVip: 0,
@@ -211,14 +190,14 @@ export default {
         examKeys: undefined
       };
     },
-    closeDialog() {
+    closeDialog () {
       this.$emit('update:dialogVisible', false);
     },
     // 表单提交
-    dialogFormSubmit() {
+    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 v-if="dialogForm.chooseB">B:{{ dialogForm.chooseB }} </span>
-                }}<span>
+                <span v-if="dialogForm.chooseC">C:{{ dialogForm.chooseC }} </span>
-                  <span v-if="dialogForm.chooseB">B:{{ dialogForm.chooseB }} </span>
+                <span v-if="dialogForm.chooseD">D:{{ dialogForm.chooseD }}</span>
-                  <span v-if="dialogForm.chooseC">C:{{ dialogForm.chooseC }} </span>
+                <span v-if="dialogForm.chooseE">E:{{ dialogForm.chooseE }}</span>
-                  <span v-if="dialogForm.chooseD">D:{{ dialogForm.chooseD }}</span>
+                <span v-if="dialogForm.chooseF">F:{{ dialogForm.chooseF }}</span>
-                  <span v-if="dialogForm.chooseE">E:{{ dialogForm.chooseE }}</span>
+                <span v-if="dialogForm.chooseG">G:{{ dialogForm.chooseG }}</span>
-                  <span v-if="dialogForm.chooseF">F:{{ dialogForm.chooseF }}</span>
+              </span></span></el-form-item>
-                  <span v-if="dialogForm.chooseG">G:{{ dialogForm.chooseG }}</span>
-                </span></span
-              ></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

@@ -1,12 +1,11 @@
 <template>
-  <div class="app-container" style="text-align: center">
+  <div class="app-container" style="text-align:center">
     <el-form size="small" :inline="true" label-width="68px" @submit.native.prevent>
       <el-row :gutter="20">
         <el-form-item label="车型">
           <el-radio-group v-model="queryParams.carTypeId">
             <el-radio :label="1001">小车</el-radio>
             <el-radio :label="1002">摩托车</el-radio>
-            <el-radio :label="1003">货车</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="科目">
@@ -16,24 +15,22 @@
           </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-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width:400px" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="tableList" style="width: 80%; margin: auto" @row-click="handleEdit">
+    <el-table v-loading="loading" :data="tableList" style="width:80%;margin:auto" @row-click="handleEdit">
       <el-table-column type="index" width="55" align="center" />
       <el-table-column label="题目" align="center" prop="question" min-width="140" />
       <el-table-column label="选项" align="center" min-width="140">
-        <template slot-scope="{ row }">
+        <template slot-scope="{row}">
           <p v-if="row.chooseA">A:{{ row.chooseA }}</p>
           <p v-if="row.chooseB">B:{{ row.chooseB }}</p>
           <p v-if="row.chooseC">C:{{ row.chooseC }}</p>
@@ -45,26 +42,21 @@
       </el-table-column>
       <el-table-column label="答案" align="center" prop="trueAnswer" min-width="100" />
       <el-table-column label="科目" align="center" prop="subject" min-width="100">
-        <template slot-scope="{ row }">
+        <template slot-scope="{row}">
           <p v-if="row.subject == 1">科一</p>
           <p v-if="row.subject == 4">科四</p>
         </template>
       </el-table-column>
       <el-table-column label="是否新规" align="center" min-width="100">
-        <template slot-scope="{ row }">
+        <template slot-scope="{row}">
           {{ row.isNew ? '是' : '' }}
         </template>
       </el-table-column>
       <el-table-column label="车型" align="center" min-width="100">
-        <template slot-scope="{ row }">
+        <template slot-scope="{row}">
           {{ 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 +67,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,10 +79,9 @@ import QuestionAddForm from './components/QuestionAddForm.vue';
 export default {
   name: 'Question',
   components: {
-    QuestionForm,
+    QuestionForm, QuestionAddForm
-    QuestionAddForm
   },
-  data() {
+  data () {
     return {
       // 遮罩层
       loading: false,
@@ -106,14 +98,14 @@ export default {
       dialogAddVisible: false
     };
   },
-  created() {
+  created () {
     // this.getList();
   },
   methods: {
     /** 查询文件列表 */
-    getList() {
+    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;
@@ -121,31 +113,28 @@ export default {
     },
 
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery () {
-      if (this.queryParams.question || (this.queryParams.isWatermark != undefined && this.queryParams.isWatermark)) {
+      if (this.queryParams.question) {
         this.getList();
       } else {
-        this.$modal.msgWarning('请输入题目 ');
+        this.$modal.msgWarning('请输入题目');
       }
     },
     /** 重置按钮操作 */
-    resetQuery() {
+    resetQuery () {
       this.queryParams.question = '';
       this.handleQuery();
     },
-    handleEdit(item) {
+    handleEdit (item) {
       this.dialogVisible = true;
       this.$nextTick(() => {
         this.$refs.dialogForm.init(item);
       });
     },
-    handleAdd(item) {
+    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,39 +463,7 @@ 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
-            });
-        }
-    } 
   }
 };
 </script>

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

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

src/views/sch/coach/index.vue

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

src/views/sch/place/index.vue

@@ -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>
@@ -189,8 +186,7 @@ export default {
       schoolList: [],
       currentdeptId: undefined,
       placeMarkerList: [],
-      areaOptions: [],
+      areaOptions: []
-      searchValue: undefined
     };
   },
   computed: {

src/views/sch/school/index.vue

@@ -22,12 +22,6 @@
       <el-table-column label="负责人" prop="leader" />
       <el-table-column label="联系方式" prop="phone" />
       <el-table-column label="备注" prop="remark" />
-      <el-table-column label="小程序二维码" prop="jwlCodePath" >
-        <template slot-scope="scope">
-          <el-image v-if="scope.row.jwlCodePath != undefined" style="width: 100px; height: 100px"  :src="baseUrl + scope.row.jwlCodePath" ></el-image>
-          <el-button v-else v-hasPermi="['sch:school:create']" type="text" icon="el-icon-edit" @click="handleCreate(scope.row)">生成</el-button>
-        </template>
-      </el-table-column>
       <el-table-column label="创建时间" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -68,8 +62,7 @@ export default {
       loading: {
         tableLoading: false
       },
-      dialogVisible: false,
+      dialogVisible: false
-      baseUrl: process.env.VUE_APP_BASE_API
     };
   },
   created() {
@@ -108,14 +101,6 @@ export default {
         this.$refs.dialogForm.init(item);
       });
     },
-    handleCreate(item){
-      schoolApi.createCode(item.schoolId).then(resp => {
-        if (resp.code === 200) {
-            this.getPageList();
-            this.$modal.msgSuccess('生成成功');
-          }
-      })
-    },
     // 删除操作
     handleDelete(item) {
       this.$modal

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,13 +275,12 @@ 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) {
             this.$modal.msgSuccess(text + "成功");

src/views/system/employee/index.vue

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

src/views/system/skill/index.vue

@@ -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-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">
           <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,12 +51,11 @@
 </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 () {
-  data() {
     return {
       // 遮罩层
       loading: true,
@@ -101,96 +80,91 @@ 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() {
+  created () {
     this.getList();
   },
   methods: {
     /** 查询关键话术列表 */
-    getList() {
+    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;
       });
     },
     // 取消按钮
-    cancel() {
+    cancel () {
       this.open = false;
       this.reset();
     },
     // 表单重置
-    reset() {
+    reset () {
       this.form = {
         skillId: null,
         deptId: null,
         skillKey: null,
-        content: null,
+        content: null
-        status: 0,
-        keyList: []
       };
       this.resetForm('form');
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery () {
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
-    resetQuery() {
+    resetQuery () {
       this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
-    handleSelectionChange(selection) {
+    handleSelectionChange (selection) {
       this.ids = selection.map(item => item.skillId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd () {
       this.reset();
       this.open = true;
-      this.title = '关键话术';
+      this.title = '添加关键话术';
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate (row) {
       this.reset();
       const skillId = row.skillId || this.ids;
       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,15 +172,8 @@ export default {
         }
       });
     },
-    checkSkill(status){
-      checkSkill({skillId : this.form.skillId, status : status}).then(resp => {
-        this.$modal.msgSuccess('操作成功');
-        this.open = false;
-        this.getList();
-      });
-    },
     /** 删除按钮操作 */
-    handleDelete(row) {
+    handleDelete (row) {
       const skillIds = row.skillId || this.ids;
       this.$modal.confirm('是否确认删除关键话术编号为"' + skillIds + '"的数据项？').then(function () {
         return delSkill(skillIds);
@@ -216,7 +183,7 @@ export default {
       }).catch(() => { });
     },
     /** 导出按钮操作 */
-    handleExport() {
+    handleExport () {
       this.download('system/skill/export', {
         ...this.queryParams
       }, `skill_${new Date().getTime()}.xlsx`);

src/views/vip/components/VipForm.vue

@@ -1,113 +0,0 @@
-<template>
-  <el-dialog title="VIP" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="500px" @close="closeDialog">
-    <div>
-      <el-form ref="dialogForm" :model="dialogForm" :rules="dataRule"  @keyup.enter.native="dialogFormSubmit()">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="手机号" prop="phone">
-              <el-input v-model="dialogForm.phone" placeholder="请输入" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="车型" prop="carTypeId">
-              <el-select v-model="dialogForm.carTypeId" clearable placeholder="选择车型">
-                <el-option v-for="item in carOptions" :key="item.carTypeId" :label="item.carName" :value="item.carTypeId" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="会员" prop="memberId">
-              <el-select v-model="dialogForm.memberId" clearable placeholder="选择车型">
-                <el-option v-for="item in memberOptions.filter(item => item.carTypeId === dialogForm.carTypeId)" :key="item.memberId" :label="item.memberName" :value="item.memberId" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button plain @click="(visible = false)">取消</el-button>
-      <el-button v-jclick type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { addUserMember, getCarList, getMemberList } from '@/api/vip';
-
-export default {
-  name:"VipForm",
-  data() {
-    return {
-      visible: false,
-      canSubmit: true,
-      dialogForm: {
-        userId: undefined,
-        memberId: undefined,
-        phone: undefined
-      },
-      dataRule: {
-        phone: [{ required: true, message: '手机号不为空', trigger: 'blur' },
-        { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }],        carTypeId: [{ required: true, message: '车型不能为空', trigger: 'blur' }],
-        memberId: [{ required: true, message: '会员不能为空', trigger: 'blur' }]
-      },
-      carOptions:[],
-      memberOptions:[]
-    };
-  },
-  methods: {
-    init(info = undefined) {
-      // debugger
-      this.visible = true;
-      this.getCarList();
-      this.getMemberList();
-      this.$nextTick(() => {
-        this.resetDialogForm();
-        // this.$refs['dialogForm'].resetFields();
-        if (info) {
-          this.dialogForm = this.deepClone(info);
-        }
-      });
-    },
-    resetDialogForm() {
-      this.dialogForm = {
-        userId: undefined,
-        memberId: undefined,
-        phone: undefined
-      };
-    },
-    closeDialog() {
-      this.$emit('update:dialogVisible', false);
-    },
-    // 表单提交
-    dialogFormSubmit() {
-      this.$refs.dialogForm.validate((valid) => {
-        if (valid) {
-          addUserMember(this.dialogForm).then(response => {
-            if (response.code == 200) {
-              this.$modal.msgSuccess('新增成功');
-              this.$emit('update');
-              this.visible = false;
-            }
-          });
-        }
-      });
-    },
-    getCarList(){
-      getCarList().then(resp => {
-        this.carOptions = resp.data;
-      })
-    },
-    getMemberList(){
-      getMemberList().then(resp => {
-        this.memberOptions = resp.data
-      })
-    }
-  }
-};
-</script>

src/views/vip/index.vue

@@ -1,96 +0,0 @@
-<template>
-    <div class="app-container" >
-      <el-form size="small" :inline="true" label-width="68px" @submit.native.prevent>
-        <el-row :gutter="20">
-            <el-form-item label="手机号">
-                <el-input v-model="queryParams.phone" placeholder="请输入" clearable  @keyup.enter.native="handleQuery" />
-            </el-form-item>
-        </el-row>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
-  
-        </el-form-item>
-      </el-form>
-  
-      <el-table v-loading="loading" :data="tableList"  >
-        <el-table-column type="index" width="55" align="center" />
-        <el-table-column label="手机号" align="center" prop="phone" min-width="140" />
-        <el-table-column label="会员名" align="center" prop="memberName" min-width="140"/>
-        <el-table-column label="车型" align="center" prop="carName" min-width="100" />
-        <el-table-column label="科目" align="center" prop="subjects" min-width="100"/>
-        <el-table-column label="开始时间" align="center" prop="startDate" min-width="100"/>
-        <el-table-column label="结束时间" align="center" prop="endDate" min-width="100"/>
-
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <!-- <el-button size="mini" type="text" icon="el-icon-download" @click="handleEdit(scope.row)">编辑</el-button> -->
-          </template>
-        </el-table-column>
-      </el-table>
-  
-      <!-- <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-      <VipForm v-if="dialogVisible" ref="dialogForm" :dialog-visible="dialogVisible" @update="getList" />
-  
-    </div>
-  </template>
-  
-  <script>
-  import { getUserMemberList } from '@/api/vip';
-  import VipForm from './components/VipForm.vue'
-  
-  export default {
-    name: 'Vip',
-    components:{
-        VipForm
-    },
-    data() {
-      return {
-        // 遮罩层
-        loading: false,
-        // 总条数
-        total: 0,
-        tableList: [],
-        // 查询参数
-        queryParams: {
-            phone: undefined
-        },
-        dialogVisible: false,
-        dialogAddVisible: false
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询文件列表 */
-      getList() {
-        this.loading = true;
-        getUserMemberList(this.queryParams).then(response => {
-          this.tableList = response.data;
-          // this.total = response.total;
-          this.loading = false;
-        });
-      },
-  
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.queryParams.question = '';
-        this.handleQuery();
-      },
-
-      handleAdd(item) {
-        this.dialogVisible = true;
-        this.$nextTick(() => {
-          this.$refs.dialogForm.init(item);
-        });
-      }
-    }
-  };
-  </script>
-  

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,57 +66,57 @@
                 <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 :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">
                       {{ dict.dictValue }}
                     </span>
                   </el-option>
-                  
+
                 </el-select>
-                </el-form-item>
+              </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">
                       {{ dict.dictValue }}
                     </span>
                   </el-option>
-                  
+
                 </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" format="yyyy-MM-dd" type="date" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="下次跟进时间" prop="followTime">
-                <el-date-picker style="width: 100%;" v-model="clueForm.followTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
+                <el-date-picker v-model="clueForm.followTime" style="width: 100%;" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -134,7 +133,7 @@
             <!-- 跟进记录 -->
             <el-col :span="24" style="margin-top: 20px;">
               <el-form-item label="跟进记录" prop="clueMemo" label-position="top">
-                <FollowRecord v-if="clueId" :clueId="clueId" />
+                <FollowRecord v-if="clueId" :clue-id="clueId" />
               </el-form-item>
             </el-col>
 
@@ -142,7 +141,7 @@
           <el-col :span="16">
             <div>
               <el-col :span="24" class="mb20 plr20" style="position: relative">
-                <PlaceMap ref="placeMap" :placeList="placeList" />
+                <PlaceMap ref="placeMap" :place-list="placeList" />
                 <div class="address">
                   <el-form-item label="位置" prop="address" label-width="80px">
                     <el-input v-model="clueForm.address" placeholder="请输入位置" disabled>
@@ -161,14 +160,14 @@
     <!-- </el-card> -->
 
     <MapDialog v-if="mapDialogVisible" ref="mapDialog" :dialog-visible="mapDialogVisible" @handleMapDialogPoint="handleMapDialogPoint" />
-
+    <!-- 关键话术 -->
-    <SkillDialog ref="SkillDialog"/>
+    <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';
 
@@ -182,7 +181,7 @@ export default {
   components: {
     PlaceMap, FollowRecord, MapDialog, SkillDialog
   },
-  data() {
+  data () {
     return {
       admin: localStorage.getItem('admin'),
       userId: localStorage.getItem('userId'),
@@ -200,10 +199,10 @@ export default {
         address: { required: true, message: '位置不为空', trigger: 'blur' },
         intentionState: { required: true, message: '意向状态不为空', trigger: 'blur,change' }
       },
-      userOptions: [],//跟进人员
+      userOptions: [], // 跟进人员
-      sourceOptions: [],//线索来源
+      sourceOptions: [], // 线索来源
-      intentionOptions: [],//意向状态
+      intentionOptions: [], // 意向状态
-      placeList: [],//场地信息
+      placeList: [], // 场地信息
       mapDialogVisible: false,
       consultRecord: [],
       canSubmit: true,
@@ -211,10 +210,10 @@ export default {
       saveNext: false
     };
   },
-  created() {
+  created () {
-    //获取clueId
+    // 获取clueId
-    this.clueId = Number(this.$route.params.clueId)
+    this.clueId = Number(this.$route.params.clueId);
-    this.getAllPlaces()
+    this.getAllPlaces();
     this.getEmployee();
 
     this.getClueInfo(this.clueId);
@@ -229,20 +228,19 @@ export default {
   },
 
   methods: {
-    async getClueInfo(clueId) {
+    async getClueInfo (clueId) {
       this.resetForm();
-      if (clueId === 0)
+      if (clueId === 0) { return; }
-        return
+      this.saveNextShow = false;
-      this.saveNextShow = false
+      this.saveNext = false;
-      this.saveNext = false
       const resp = await getClueInfo(clueId);
       if (resp.code == 200) {
-        this.clueForm = { ...resp.data }
+        this.clueForm = { ...resp.data };
         this.handleMapCenter(this.clueForm);
         this.getConsultRecord(this.clueForm.phone);
       }
     },
-    resetForm() {
+    resetForm () {
       this.clueForm = {
         clueId: undefined,
         createTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}'),
@@ -260,52 +258,52 @@ export default {
         licenseType: undefined,
         lng: undefined,
         lat: undefined
-      }
+      };
 
       if (this.admin == 'false') {
-        this.clueForm.followUser.push(Number(this.userId))
+        this.clueForm.followUser.push(Number(this.userId));
       }
     },
     // 查询咨询记录
-    getConsultRecord(phone) {
+    getConsultRecord (phone) {
       getConsultRecord({ phone }).then((resp) => {
         if (resp && resp.code === 200 && resp.data) {
-          this.consultRecord = resp.data
+          this.consultRecord = resp.data;
           if (this.consultRecord && this.consultRecord.length > 0) {
-            this.clueForm.consultCount = this.consultRecord.length
+            this.clueForm.consultCount = this.consultRecord.length;
           }
         }
-      })
+      });
     },
-    //地图编辑弹框
+    // 地图编辑弹框
-    handleMapDialog() {
+    handleMapDialog () {
       this.mapDialogVisible = true;
       this.$nextTick(() => {
         this.$refs.mapDialog.initData(this.clueForm);
       });
     },
-    //处理地图弹框返回的点
+    // 处理地图弹框返回的点
-    handleMapDialogPoint(point) {
+    handleMapDialogPoint (point) {
-      console.log("handleMapDialogPoint")
+      console.log('handleMapDialogPoint');
-      console.log(point)
+      console.log(point);
       if (point) {
         this.handleMapCenter(point);
       }
     },
-    //删除当前地址
+    // 删除当前地址
-    handleRemovePosition() {
+    handleRemovePosition () {
       this.clueForm.lng = undefined;
       this.clueForm.lat = undefined;
       this.clueForm.address = undefined;
     },
-    //定位地图的中心点
+    // 定位地图的中心点
-    handleMapCenter(info) {
+    handleMapCenter (info) {
       this.$nextTick(() => {
         this.$refs.placeMap.setMapCenter(info);
       });
     },
     // 查询不能接收线索的员工
-    getEmployee() {
+    getEmployee () {
       empApi.getEmployee().then((resp) => {
         if (resp.code === 200) {
           this.userOptions = resp.data;
@@ -316,7 +314,7 @@ export default {
       });
     },
     // 查询场地信息
-    async getAllPlaces() {
+    async getAllPlaces () {
       const resp = await getAllPlaces({ status: '0' });
       if (resp.code == 200) {
         this.placeList = resp.data.filter((item) => item.schoolShow && item.showInMap);
@@ -324,24 +322,23 @@ export default {
           this.$refs.placeMap.handleMarkers(this.placeList);
         });
       }
-
     },
-    //表单提交
+    // 表单提交
-    clueSubmit() {
+    clueSubmit () {
       this.$refs.clueForm.validate(async (valid) => {
         if (valid) {
-          this.canSubmit = false
+          this.canSubmit = false;
-          let resp
+          let resp;
           if (this.clueForm.clueId) {
-            resp = await updateClue(this.clueForm)
+            resp = await updateClue(this.clueForm);
-            this.canSubmit = true
+            this.canSubmit = true;
             if (resp.code === 200) {
-              this.$message.success('修改成功')
+              this.$message.success('修改成功');
               this.toBackClue();
             }
           } else {
-            resp = await addClue(this.clueForm)
+            resp = await addClue(this.clueForm);
-            this.canSubmit = false
+            this.canSubmit = false;
             if (resp.code === 200) {
               if (resp.data && resp.data == 1) {
                 this.$message({
@@ -349,47 +346,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() {
+    toBackClue () {
-      const obj = { path: "/zs/clue" };
+      const obj = { path: '/zs/clue' };
       this.$tab.closeOpenPage(obj);
     },
-     // 释放线索操作
+    handleSkill () {
-     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

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

@@ -0,0 +1,112 @@
+<template>
+  <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog">
+    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="场地" prop="newPlaceList">
+            <span v-if="oldForm.placeNames">{{ oldForm.placeNames }}</span>
+
+            <el-select v-model="dialogForm.newPlaceList" filterable multiple placeholder="请选择" clearable style="width: 100%;">
+              <el-option v-for="dict in placeOptions" :key="dict.placeId" :label="dict.name" :value="dict.placeId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button plain @click="(visible = false)">取消</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { getCluePlaceList, saveCluePlace } from '@/api/zs/clue';
+import { getAllPlaces } from '@/api/sch/place';
+
+export default {
+  name: 'DistributeFormDialog',
+
+  data () {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {},
+      oldForm: {},
+      rules: {
+        newPlaceList: {
+          required: true,
+          message: '场地不能为空不能为空',
+          trigger: 'blur'
+        }
+      },
+      placeOptions: []
+    };
+  },
+  methods: {
+    init (info = undefined) {
+      this.getPlaces();
+      this.visible = true;
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm.clueId = info;
+          // 查询该线索的分发情况
+          this.getDistributePlaces(info);
+        }
+      });
+    },
+    resetDialogForm () {
+      this.dialogForm = {
+        oldPlaceList: [],
+        newPlaceList: [],
+        placeIdList: [],
+        clueId: undefined
+      };
+      this.oldForm = {};
+    },
+    closeDialog () {
+      this.$emit('update:dialog.batchUpdateVisible', false);
+    },
+    getDistributePlaces (clueId) {
+      getCluePlaceList({ clueId: clueId }).then(resp => {
+        if (resp.code == 200) {
+          this.oldForm = resp.data;
+          this.dialogForm.oldPlaceList = this.oldForm.placeIdList;
+          if (this.oldForm.placeIdList && this.oldForm.placeIdList) {
+            this.placeOptions = this.placeOptions.filter(item => this.oldForm.placeIdList.indexOf(item.placeId) == -1);
+          }
+        }
+      });
+    },
+    // 表单提交
+    dialogFormSubmit () {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          this.canSubmit = false;
+          this.dialogForm.placeIdList = this.dialogForm.oldPlaceList.concat(this.dialogForm.newPlaceList);
+          // 校验完成，调接口
+          saveCluePlace(this.dialogForm)
+            .then((resp) => {
+              this.canSubmit = true;
+              if (resp.code == 200) {
+                this.$message.success('分发成功');
+                this.$emit('refreshDataList');
+                this.visible = false;
+              }
+            })
+            .catch(() => {
+              this.canSubmit = true;
+            });
+        }
+      });
+    },
+    getPlaces () {
+      getAllPlaces({ status: '0' }).then((resp) => {
+        this.placeOptions = resp.data;
+      });
+    }
+  }
+};
+</script>
+

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

@@ -1,94 +1,142 @@
 <template>
   <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog">
-    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px">
+    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="dialogForm.orderId">
       <el-row>
         <el-col :span="24">
-          <el-form-item label="场地" prop="newPlaceList">
+          <el-form-item label="场地" prop="placeId">
-            <span v-if="oldForm.placeNames">{{oldForm.placeNames}}</span>
+            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;" @change="getCoaChes">
-
-            <el-select v-model="dialogForm.newPlaceList" filterable multiple placeholder="请选择" clearable style="width: 100%;">
               <el-option v-for="dict in placeOptions" :key="dict.placeId" :label="dict.name" :value="dict.placeId" />
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="接待人" prop="coachId">
+            <el-select v-model="dialogForm.coachId" filterable placeholder="请选择" clearable style="width: 100%;">
+              <el-option v-for="dict in coachOptions" :key="dict.coachId" :label="dict.coachName" :value="dict.coachId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="抄送" prop="copyUserList">
+            <el-select v-model="dialogForm.copyUserList" filterable multiple placeholder="请选择" clearable style="width: 100%;">
+              <el-option v-for="dict in coachOptions" :key="dict.coachId" :label="dict.coachName" :value="dict.coachId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="跟进信息">
+            <div style="max-height: 200px; overflow-y: auto;">
+              <div v-for="item in feedbackDetail" :key="item.feedbackId">
+                <el-timeline-item :timestamp="item.updateTime == undefined ? item.createTime : item.updateTime" placement="top">
+                  <el-card>
+                    <div v-if="item.feedbackType == 1">
+                      <div>是否联系：<span style="font-size: 12px;">{{ item.isContact ? '已联系' : '未联系' }}</span></div>
+                      <div>到场时间：<span style="font-size: 12px;">{{ item.arrivalTime }}</span></div>
+                      <div>备注：<span style="font-size: 12px;" v-html="item.remark" /></div>
+                    </div>
+                    <div v-if="item.feedbackType == 2">
+                      <div>状态：
+                        <span v-if="item.arrivalStatus == 1">未到场</span>
+                        <span v-if="item.arrivalStatus == 2">到场未成交</span>
+                        <span v-if="item.arrivalStatus == 3">到场已成交</span>
+                      </div>
+                      <div>备注：<span style="font-size: 12px;" v-html="item.remark" /></div>
+                    </div>
+                  </el-card>
+                </el-timeline-item>
+              </div>
+            </div>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
-    <span slot="footer" class="dialog-footer">
+    <span slot="footer" class="dialog-footer" :disabled="dialogForm.orderId">
       <el-button plain @click="(visible = false)">取消</el-button>
-      <el-button v-jclick type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()">确定</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit " @click="dialogFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
 </template>
-  <script>
+<script>
-import { getCluePlaceList, saveCluePlace } from '@/api/zs/clue';
+import { listFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder';
+import { listFeedbackDetail } from '@/api/zs/feedbackDetail';
+
 import { getAllPlaces } from '@/api/sch/place';
+import { getAllCoaches } from '@/api/sch/coach';
 
 export default {
   name: 'DistributeFormDialog',
 
-  data() {
+  data () {
     return {
       visible: false,
       canSubmit: true,
-      dialogForm: {},
+      dialogForm: {
-      oldForm: {},
+        placeId: undefined,
-      rules: {
+        clueId: undefined,
-        newPlaceList: {
+        coachId: undefined,
-          required: true,
+        copyUserList: []
-          message: '场地不能为空不能为空',
-          trigger: 'blur'
-        }
       },
-      placeOptions: []
+      rules: {
+        placeId: { required: true, message: '场地不能为空', trigger: 'blur, change' },
+        coachId: { required: true, message: '教练不能为空', trigger: 'blur, change' }
+      },
+      placeOptions: [],
+      coachOptions: [],
+      feedbackDetail: []
     };
   },
   methods: {
-    init(info = undefined) {
+    init (info = undefined) {
-      this.getPlaces()
+      this.getPlaces();
       this.visible = true;
       this.$nextTick(() => {
         this.resetDialogForm();
         this.$refs['dialogForm'].resetFields();
         if (info) {
-
           this.dialogForm.clueId = info;
-          //查询该线索的分发情况
+          // 查询该线索的分发情况
-          this.getDistributePlaces(info);
+          this.getFeedbackOrder(info);
         }
       });
     },
-    resetDialogForm() {
+    resetDialogForm () {
       this.dialogForm = {
-        oldPlaceList: [],
+        placeId: undefined,
-        newPlaceList: [],
+        clueId: undefined,
-        placeIdList: [],
+        coachId: undefined,
-        clueId: undefined
+        copyUserList: []
       };
-      this.oldForm = {}
     },
-    closeDialog() {
+    closeDialog () {
       this.$emit('update:dialog.batchUpdateVisible', false);
     },
-    getDistributePlaces(clueId) {
+    getFeedbackOrder (clueId) {
-      getCluePlaceList({ clueId: clueId }).then(resp => {
+      listFeedbackOrder({ clueId: clueId }).then(resp => {
-        if (resp.code == 200) {
+        if (resp.code == 200 && resp.rows && resp.rows.length > 0) {
-          this.oldForm = resp.data
+          this.dialogForm = resp.rows.filter(item => item.feedbackStatus != 0)[0];
-          this.dialogForm.oldPlaceList = this.oldForm.placeIdList;
+          if (this.dialogForm != undefined && this.dialogForm.placeId != undefined) {
-          if (this.oldForm.placeIdList && this.oldForm.placeIdList) {
+            this.getCoaChes(this.dialogForm.placeId);
-            this.placeOptions = this.placeOptions.filter(item => this.oldForm.placeIdList.indexOf(item.placeId) == -1)
+          }
+
+          if (this.dialogForm.orderId) {
+            this.getFeedbackDetail(this.dialogForm.orderId);
           }
         }
-
+      });
-      })
+    },
+    getFeedbackDetail (orderId) {
+      listFeedbackDetail({ orderId: orderId }).then(resp => {
+        this.feedbackDetail = resp.rows;
+      });
     },
     // 表单提交
-    dialogFormSubmit() {
+    dialogFormSubmit () {
       this.$refs.dialogForm.validate((valid) => {
         if (valid) {
           this.canSubmit = false;
-          this.dialogForm.placeIdList = this.dialogForm.oldPlaceList.concat(this.dialogForm.newPlaceList)
           // 校验完成，调接口
-          saveCluePlace(this.dialogForm)
+          addFeedbackOrder(this.dialogForm)
             .then((resp) => {
               this.canSubmit = true;
               if (resp.code == 200) {
@@ -103,14 +151,18 @@ export default {
         }
       });
     },
-    getPlaces() {
+    getPlaces () {
       getAllPlaces({ status: '0' }).then((resp) => {
         this.placeOptions = resp.data;
-
       });
     },
+    getCoaChes (placeId) {
+      console.log(placeId);
+      getAllCoaches({ placeId: placeId }).then(resp => {
+        if (resp.code == 200) { this.coachOptions = resp.data; }
+      });
+    }
   }
 };
-  </script>
+</script>
-  
+
-  

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

@@ -12,7 +12,7 @@
           <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,8 +66,7 @@ export default {
         { value: 5, label: '今日跟踪' },
         { value: 6, label: '过期线索' },
         { value: 7, label: '相关线索' },
-        { value: 8, label: '撞单线索' },
+        { value: 8, label: '撞单线索' }
-        { value: 9, label: '待分配' }
       ],
       intentionOptions: [],
       createDateRange: [],

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,14 +48,14 @@ 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;
           }
         });
+      }
     }
   }
 };

src/views/zs/clue/index.vue

@@ -18,12 +18,17 @@
       </el-col>
       <right-toolbar :show-search.sync="showSearch" :columns="columns" @queryTable="_getTableList" />
     </el-row>
-    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" border @row-dblclick="handleRowClick" @cell-click="handleCellClick">
+    <el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange" @row-dblclick="handleRowClick" @cell-click="handleCellClick">
       <el-table-column type="selection" width="50" align="center" />
       <template v-for="item in columns">
         <el-table-column v-if="item.visible && item.prop != 'clueMemo'" :key="item.prop" :label="item.label" align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
         <el-table-column v-if="item.visible && item.prop == 'clueMemo'" :key="item.prop" :label="item.label" align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
       </template>
+      <el-table-column label="反馈状态" prop="feedbackStatus" sortable fixed="right" min-width="100">
+        <template slot-scope="{ row }">
+          <el-tag effect="dark" style="border: none">{{ feedbackTagColorMap[row.feedbackStatus] }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="意向状态" prop="intentionState" sortable fixed="right" min-width="100">
         <template slot-scope="{ row }">
           <el-tag effect="dark" style="border: none" :color="tagColorMap[row.intentionState]">{{ row.intentionState }}</el-tag>
@@ -33,11 +38,11 @@
         <template slot-scope="scope">
           <!-- <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.source == '抖音直播'" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleDYAddandUpdate(scope.row)">编辑</el-button> -->
           <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1  )" v-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(scope.row)">分发</el-button>
+          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(scope.row)">分发</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1  ) && scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a" @click.native.stop="handleSign(scope.row)">已登记</el-button>
+          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a" @click.native.stop="handleSign(scope.row)">已登记</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1  ) && !scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
+          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && !scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1  )" v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button>
+          <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-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>
+          <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>
           <el-button v-if="quickSearch == 8" type="text" @click="handleViewZhuangDan(scope.row)"> 撞单信息</el-button>
           <!-- <el-button v-if="searchForm.quickSearch == 8" type="text" > 撞单信息</el-button> -->
         </template>
@@ -59,9 +64,9 @@
     <!-- 备注编辑 -->
     <MemoFormDialog ref="memoDialog" @refreshDataList="_getTableList" />
     <!-- 抖音直播弹框 -->
-    <DYClueFormDialog ref="DYClueFormDialog" @refreshDataList="_getTableList"/>
+    <DYClueFormDialog ref="DYClueFormDialog" @refreshDataList="_getTableList" />
-  <!-- 关键性话术 -->
+    <!-- 关键话术 -->
-    <SkillDialog ref="SkillDialog"/>
+    <SkillDialog ref="SkillDialog" />
 
   </div>
 </template>
@@ -83,20 +88,20 @@ import { getClueList, deleteClue, getClueCountBadge, discardClue, getSign, getCo
 import empApi from '@/api/system/employee';
 export default {
   name: 'Clue',
-  beforeRouteEnter(to, from, next) {
-    if (from.name == 'ClueForm') {
-      next(vm => {
-        vm._getTableList()
-      })
-    } else {
-      next()
-    }
-  },
   components: {
     SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeFormDialog, ZhuangDanDialog, MemoFormDialog,
-    DYClueFormDialog,SkillDialog
+    DYClueFormDialog, SkillDialog
   },
-  data() {
+  beforeRouteEnter (to, from, next) {
+    if (from.name == 'ClueForm') {
+      next(vm => {
+        vm._getTableList();
+      });
+    } else {
+      next();
+    }
+  },
+  data () {
     return {
       admin: localStorage.getItem('admin'),
       userId: localStorage.getItem('userId'),
@@ -125,13 +130,20 @@ export default {
         报名他校: '#afaeb0',
         无效线索: '#afaeb0'
       },
+      feedbackTagColorMap: {
+        0: '待分发',
+        1: '待跟进',
+        2: '已跟进',
+        3: '已到场',
+        4: '退单'
+      },
       options: undefined,
       clueInfo: undefined,
       consultRecord: [],
       quickSearch: 0
     };
   },
-  created() {
+  created () {
     const str = localStorage.getItem(`${this.$route.name}-table-columns`);
     this.columns = str ? JSON.parse(str) : defaultColumns;
     this._getClueCountBadge();
@@ -148,10 +160,10 @@ export default {
   },
   methods: {
     // 分页查询表格数据
-    _getTableList() {
+    _getTableList () {
       this.loading = true;
       const tempForm = this.$refs.SearchForm?.searchForm || {};
-      this.quickSearch = tempForm.quickSearch
+      this.quickSearch = tempForm.quickSearch;
       const params = { ...this.searchForm, ...tempForm };
       getClueList(params).then((response) => {
         this.tableList = response.rows;
@@ -160,31 +172,36 @@ export default {
       });
     },
     // 获取已过期线索数
-    async _getClueCountBadge() {
+    async _getClueCountBadge () {
       const resp = await getClueCountBadge();
       if (resp.code === 200) {
         this.expireCount = resp.data;
       }
     },
     // 新增或修改
-    handleAddandUpdate(info) {
+    handleAddandUpdate (info) {
       this.$router.push('/zs/clue-form/index/' + (info ? info.clueId : 0));
     },
-    //抖音新增
+    // 抖音新增
-    handleDYAddandUpdate(info){
+    handleDYAddandUpdate (info) {
       this.$nextTick(() => {
         this.$refs.DYClueFormDialog.init(info);
       });
     },
+    handleSkill () {
+      this.$nextTick(() => {
+        this.$refs.SkillDialog.init();
+      });
+    },
     // 多选框选中数据
-    handleSelectionChange(selection) {
+    handleSelectionChange (selection) {
       console.log(selection);
       this.ids = selection.map((item) => item.clueId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     // 释放线索操作
-    handleDiscard(item) {
+    handleDiscard (item) {
       this.$confirm('是否确认释放该条线索（“' + item.name + '/' + item.phone + '”）到公海?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -201,7 +218,7 @@ export default {
         .catch(function () { });
     },
     // 删除
-    handleDelete(item) {
+    handleDelete (item) {
       this.$confirm('是否确认删除该条线索（“' + item.name + '/' + item.phone + '”）?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -218,13 +235,13 @@ export default {
         .catch(function () { });
     },
     // 导入
-    handleImport(ydtData, dYData) {
+    handleImport (ydtData, dYData) {
       this.$nextTick(() => {
-        this.$refs.uploadDialogForm.init({ydtData: ydtData, dYData: dYData});
+        this.$refs.uploadDialogForm.init({ ydtData: ydtData, dYData: dYData });
       });
     },
     /** 导出按钮操作 */
-    handleExport() {
+    handleExport () {
       this.$confirm('是否确认导出所有学员信息项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -235,12 +252,12 @@ export default {
       });
     },
     // 公海按钮点击时间
-    handlePublicClue() {
+    handlePublicClue () {
       this.$nextTick(() => {
         this.$refs.publicDialogForm.init();
       });
     },
-    getEmployee() {
+    getEmployee () {
       empApi.getEmployee().then((resp) => {
         if (resp.code === 200) {
           this.userOptions = resp.data;
@@ -248,7 +265,7 @@ export default {
       });
     },
     // 批量修改
-    handleBatChUpdate() {
+    handleBatChUpdate () {
       this.options = {
         userOptions: this.userOptions
       };
@@ -259,7 +276,7 @@ export default {
       });
     },
     // 登记成交
-    async handleSign(item) {
+    async handleSign (item) {
       // 根据clueId查询登记信息
       let signInfo = {};
       this.clueInfo = item;
@@ -271,46 +288,39 @@ export default {
         this.$refs.signDialogForm.init(signInfo);
       });
     },
-    //分发到场地
+    // 分发到场地
-    handleDistribute(item) {
+    handleDistribute (item) {
-
       this.$nextTick(() => {
         this.$refs.distributeDialogForm.init(item.clueId);
       });
     },
-    //外呼
+    // 外呼
-    handlePhone(item) {
+    handlePhone (item) {
 
     },
-    handleViewZhuangDan(item) {
+    handleViewZhuangDan (item) {
       this.$nextTick(() => {
         this.$refs.zhuangDanDialog.init(item.clueId);
       });
     },
-    handleRowClick(row) {
+    handleRowClick (row) {
       if (this.quickSearch != 8) {
         // if(row.source == '抖音直播'){
         //   this.handleDYAddandUpdate(row);
         // } else {
-          this.handleAddandUpdate(row)
+        this.handleAddandUpdate(row);
         // }
       }
     },
-    handleCellClick(row, column, cell, event) {
+    handleCellClick (row, column, cell, event) {
-      //如果点击的是备注的话 开始备注编辑框
+      // 如果点击的是备注的话 开始备注编辑框
       if (column.property == 'clueMemo') {
-        console.log(row, column, cell, event)
+        console.log(row, column, cell, event);
         this.$nextTick(() => {
           this.$refs.memoDialog.init(row);
         });
-
       }
-    },
+    }
-    handleSkill() {
-      this.$nextTick(() => {
-        this.$refs.SkillDialog.init();
-      });
-    },
   }
 };
 </script>

src/views/zs/feedback/arrival.vue

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

src/views/zs/feedback/follow.vue

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

src/views/zs/feedback/index.vue

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

src/views/zs/sign/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/SignFormDialog.vue

@@ -629,35 +629,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) {

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: `https://jwl.ahduima.com/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.ahduima.com/duima/`,
-        // target: `http://localhost:8086`,
+        target: `http://localhost:8086`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''