Compare commits

..

No commits in common. 'master' and 'dev-zcx' have entirely different histories.

  1. 13
      .env.development
  2. 4
      .env.production
  3. 4
      .env.staging
  4. 8
      package.json
  5. BIN
      public/favicon.ico
  6. BIN
      public/favicon1.ico
  7. 12
      public/index.html
  8. BIN
      public/logo.png
  9. 42
      src/api/question.js
  10. 8
      src/api/sch/classType.js
  11. 6
      src/api/sch/school.js
  12. 77
      src/api/system/skill.js
  13. 39
      src/api/vip.js
  14. BIN
      src/assets/logo/logo.png
  15. BIN
      src/assets/logo/logo1.png
  16. BIN
      src/assets/logo/logo2.png
  17. 2
      src/layout/components/Sidebar/Logo.vue
  18. 2
      src/permission.js
  19. 105
      src/router/index.js
  20. 2
      src/views/index.vue
  21. 2
      src/views/login.vue
  22. 246
      src/views/question/components/QuestionAddForm.vue
  23. 228
      src/views/question/components/QuestionForm.vue
  24. 153
      src/views/question/index.vue
  25. 2
      src/views/register.vue
  26. 155
      src/views/sch/classType/components/ProfitSettingDialog.vue
  27. 153
      src/views/sch/classType/index.vue
  28. 29
      src/views/sch/place/index.vue
  29. 17
      src/views/sch/school/index.vue
  30. 11
      src/views/system/dictData/index.vue
  31. 226
      src/views/system/skill/index.vue
  32. 113
      src/views/vip/components/VipForm.vue
  33. 96
      src/views/vip/index.vue
  34. 46
      src/views/zs/clue/ClueForm/components/MapDialog.vue
  35. 71
      src/views/zs/clue/ClueForm/index.vue
  36. 24
      src/views/zs/clue/columns.js
  37. 23
      src/views/zs/clue/components/ClueFormDialog.vue
  38. 257
      src/views/zs/clue/components/DYClueFormDialog.vue
  39. 5
      src/views/zs/clue/components/SearchForm.vue
  40. 90
      src/views/zs/clue/components/SkillDialog.vue
  41. 22
      src/views/zs/clue/components/UploadDialog.vue
  42. 41
      src/views/zs/clue/index.vue
  43. 2
      src/views/zs/sign/components/SearchForm.vue
  44. 34
      src/views/zs/sign/components/SignFormDialog.vue
  45. 151
      src/views/zs/sign/index.vue
  46. 20
      vue.config.js

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

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

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

@ -1,8 +1,8 @@
{
"name": "river",
"version": "1.0.0",
"description": "寻驾招生管理系统",
"author": "寻驾招生",
"description": "莳松管理系统",
"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",
"webpack-dev-server": "^3.10.3"
"vuex": "3.6.0"
},
"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",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 137 KiB

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

@ -51,11 +51,3 @@ export function cloneClassType(data) {
data: data
});
}
export function batchUpdateProfit(data) {
return request({
url: '/sch/classType/profit',
method: 'post',
data: data
});
}

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

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

@ -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
});
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 KiB

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

@ -16,7 +16,7 @@ NProgress.configure({
showSpinner: false
});
const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/question'];
const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];
router.beforeEach((to, from, next) => {
NProgress.start();

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

@ -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 {

@ -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">

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

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

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

@ -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" />

@ -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>

@ -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"
style="margin-bottom: 20px" />
<el-input v-model="searchName" placeholder="请输入驾校名称" clearable prefix-icon="el-icon-search" 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"
:default-expanded-keys="selectNodes.map(item => item.id)" @node-click="handleNodeClick" />
<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" />
</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"
@keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.typeName" placeholder="请输入班型名称" clearable style="width: 240px" @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"
:value="item.dictValue" />
<el-option v-for="item in licenseTypeOption" :key="item.dictValue" :label="item.dictLabel" :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"
:value="dict.dictValue" />
<el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :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"
@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: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-button v-hasPermi="['sch:classType:add']" type="primary" icon="el-icon-plus" @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:clone']" type="primary" icon="el-icon-copy" :disabled="multiple" @click="handleClone">克隆</el-button>
</el-form-item>
</el-form>
</el-row>
<el-table v-loading="loading.tableLoading" :data="tableDataList" stripe border
@selection-change="handleSelectionChange">
<el-table v-loading="loading.tableLoading" :data="tableDataList" stripe border @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"
@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:edit']" type="text" icon="el-icon-edit" @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>
</template>
</el-table-column>
</el-table>
<pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getPageList" />
<pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @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"
:value="item.dictValue" />
<el-option v-for="item in licenseTypeOption" :key="item.dictValue" :label="item.dictLabel" :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>
<el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</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 }"
placeholder="请输入描述" />
<el-input v-model="modalForm.description" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" 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,
profitType: 1,
profitParam: undefined,
profitParamVOList: []
employeeMinPrice: undefined
};
if (this.selectNodes.length > 1) {
@ -544,38 +463,6 @@ export default {
});
}
});
},
//
handleProfit() {
const item = {
typeIds: this.ids,
profitType: 1,
profitParam: undefined
};
this.$nextTick(() => {
this.$refs.ProfitSettingDialog.init(item);
});
},
handleAddProfitParam() {
this.modalForm.profitParamVOList.push({
min: 0,
max: undefined,
profit: undefined
});
},
handleProfitParamDelete(index) {
console.log(index);
this.modalForm.profitParamVOList.splice(index, 1);
},
profitTypeChange(type) {
this.$set(this.modalForm, "profitParamVOList", []);
if (type == 3) {
this.modalForm.profitParamVOList.push({
min: 0,
max: undefined,
profit: undefined
});
}
}
}
};

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

@ -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,
baseUrl: process.env.VUE_APP_BASE_API
dialogVisible: false
};
},
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

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

@ -1,226 +0,0 @@
<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-input v-model="queryParams.question" placeholder="请输入关键词" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button v-hasPermi="['system:skill:add']" type="primary" plain icon="el-icon-plus" size="mini"
@click="handleAdd">新增</el-button>
</el-col>
<right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
</el-row>
<el-table v-loading="loading" :data="skillList" @selection-change="handleSelectionChange">
<el-table-column type="index" width="55" align="center" />
<el-table-column label="问题" align="center" prop="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" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button v-hasPermi="['system:skill:edit']" size="mini" type="text" icon="el-icon-edit"
@click="handleUpdate(scope.row)">修改</el-button>
<el-button v-hasPermi="['system:skill:remove']" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<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="getList" />
<!-- 添加或修改关键话术对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="问题" prop="question">
<el-input v-model="form.question" placeholder="请输入" />
</el-form-item>
<el-form-item label="关键词">
<el-select v-model="form.keyList" placeholder="请选择" style="width: 100%;" multiple>
<el-option v-for="dict in dict.type.dm_skill_key" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="答案" prop="content">
<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 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>
</div>
</template>
<script>
import { pageSkill,listSkill, getSkill, delSkill, addSkill, updateSkill,checkSkill } from '@/api/system/skill';
export default {
name: 'Skill',
dicts: ['dm_skill_key'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
skillList: [],
//
title: '',
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
deptId: null,
question: null,
content: null,
},
//
form: {},
//
rules: {
question: [{ required: true, message: '关键词不能为空', trigger: 'blur' }],
content: [{ required: true, message: '话术内容不能为空', trigger: 'blur' }]
},
skillOptions:[]
};
},
created() {
this.getList();
},
methods: {
/** 查询关键话术列表 */
getList() {
this.loading = true;
pageSkill(this.queryParams).then(response => {
this.skillList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
skillId: null,
deptId: null,
skillKey: null,
content: null,
status: 0,
keyList: []
};
this.resetForm('form');
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.skillId);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = '关键话术';
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const skillId = row.skillId || this.ids;
getSkill(skillId).then(response => {
this.form = response.data;
this.open = true;
this.title = '关键话术';
});
},
/** 提交按钮 */
submitForm(status) {
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.open = false;
this.getList();
});
} else {
addSkill(this.form).then(response => {
this.$modal.msgSuccess('操作成功');
this.open = false;
this.getList();
});
}
}
});
},
checkSkill(status){
checkSkill({skillId : this.form.skillId, status : status}).then(resp => {
this.$modal.msgSuccess('操作成功');
this.open = false;
this.getList();
});
},
/** 删除按钮操作 */
handleDelete(row) {
const skillIds = row.skillId || this.ids;
this.$modal.confirm('是否确认删除关键话术编号为"' + skillIds + '"的数据项?').then(function () {
return delSkill(skillIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess('删除成功');
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
this.download('system/skill/export', {
...this.queryParams
}, `skill_${new Date().getTime()}.xlsx`);
}
}
};
</script>

@ -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>

@ -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>

@ -19,12 +19,11 @@ export default {
placeSearch: null,
currentPoint: undefined,
marker: null,
searchBody: undefined,
geocoder: null
};
searchBody: undefined
}
},
beforeDestroy() {
console.log('mapdialog----beforeDestroy');
console.log("mapdialog----beforeDestroy")
this.marker = null;
this.placeSearch = null;
@ -32,23 +31,23 @@ export default {
this.dialogMap = null;
},
mounted() {
console.log('mounted');
this.initData();
console.log("mounted")
this.initData()
},
created() {
console.log('created');
console.log("created")
},
methods: {
initData(point = undefined) {
console.log(point);
this.visible = true;
console.log(point)
this.visible = true
// this.searchBody = undefined
this.$nextTick(() => {
this.resetData();
if (point) {
this.currentPoint = point;
}
this.initMap();
this.initMap()
});
},
resetData() {
@ -56,10 +55,10 @@ export default {
this.dialogMap && this.marker && this.dialogMap.remove(this.marker);
this.marker = null;
// this.placeSearch = null;
this.searchBody = null;
this.searchBody = null
},
initMap() {
console.log('初始化地图');
console.log("初始化地图")
if (!this.dialogMap) {
this.dialogMap = new AMap.Map('dialogMap', {
zoom: 12,
@ -79,19 +78,20 @@ export default {
});
this.dialogMap.addControl(new AMap.Scale());
const auto = new AMap.Autocomplete({
input: 'search' //
});
input: 'search', //
})
this.placeSearch = new AMap.PlaceSearch({
map: this.dialogMap,
pageSize: 10, //
pageIndex: 1, //
autoFitView: true // 使 Marker
});
AMap.event.addListener(auto, 'select', this.select);
autoFitView: true, // 使 Marker
})
AMap.event.addListener(auto, 'select', this.select)
this.geocoder = new AMap.Geocoder();
}
this.initMapCenter();
},
//
initMapCenter() {
@ -127,7 +127,7 @@ export default {
}
});
},
//
//
regeoCode() {
this.geocoder.getAddress(
[this.currentPoint.lng, this.currentPoint.lat],
@ -141,10 +141,11 @@ export default {
},
handleMapSave() {
if (this.currentPoint.lat && this.currentPoint.lng) {
//
this.$emit('handleMapDialogPoint', this.currentPoint);
//
this.$emit("handleMapDialogPoint", this.currentPoint);
this.visible = false;
this.$emit('update:mapDialogVisible', false);
} else {
this.$message.error('请在地图上选择位置后保存!');
}
@ -152,8 +153,8 @@ export default {
closeDialog() {
this.$emit('update:mapDialogVisible', false);
}
}
};
},
}
</script>
<style scoped>
@ -161,7 +162,6 @@ export default {
width: 100%;
height: 400px;
}
.search-body {
position: absolute;
top: 90px;

@ -30,9 +30,6 @@
<!-- :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 />
@ -47,7 +44,7 @@
</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 style="width: 100%;" v-model="clueForm.source" placeholder="请选择" clearable>
<el-option v-for="dict in sourceOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
</el-select>
</el-form-item>
@ -67,16 +64,6 @@
<el-input v-model="clueForm.weChat" placeholder="请输入微信号" />
</el-form-item>
</el-col>
<el-col :span="24" v-if="clueForm.source == '抖音直播'">
<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-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">
@ -86,34 +73,16 @@
</el-col>
<el-col :span="24">
<el-form-item label="意向状态" prop="intentionState" v-if="clueForm.source == '抖音直播'">
<el-form-item label="意向状态" prop="intentionState">
<el-select style="width: 100%;" v-model="clueForm.intentionState" placeholder="请选择" clearable>
<el-option v-for="dict in intentionOptions.filter(item => item.remark == undefined || item.remark == '抖音')" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue">
<el-option v-for="dict in intentionOptions" :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 label="意向状态" prop="intentionState" v-else>
<el-select style="width: 100%;" v-model="clueForm.intentionState" placeholder="请选择" clearable>
<el-option v-for="dict in intentionOptions.filter(item => item.remark == undefined || item.remark == '正常')" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue">
<i class="el-icon-star-on" :style="dict.cssClass" />
<span style="float: right; color: #8492a6; font-size: 13px">
{{ dict.dictValue }}
</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="clueForm.source == '抖音直播'">
<el-form-item label="核销时间" prop="writeOffTime">
<el-date-picker style="width: 100%;" v-model="clueForm.writeOffTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="下次跟进时间" prop="followTime">
@ -162,25 +131,22 @@
<MapDialog v-if="mapDialogVisible" ref="mapDialog" :dialog-visible="mapDialogVisible" @handleMapDialogPoint="handleMapDialogPoint" />
<SkillDialog ref="SkillDialog"/>
</div>
</template>
<script>
import { getClueInfo, getConsultRecord, addClue, updateClue, discardClue} from '@/api/zs/clue';
import empApi from '@/api/system/employee';
import { getAllPlaces } from '@/api/sch/place';
import { getClueInfo, getConsultRecord, addClue, updateClue, } from '@/api/zs/clue'
import empApi from '@/api/system/employee'
import { getAllPlaces } from '@/api/sch/place'
import PlaceMap from './components/PlaceMap.vue';
import FollowRecord from './components/FollowRecord.vue';
import MapDialog from './components/MapDialog.vue';
import SkillDialog from '../components/SkillDialog.vue';
export default {
name: 'ClueForm',
components: {
PlaceMap, FollowRecord, MapDialog, SkillDialog
PlaceMap, FollowRecord, MapDialog
},
data() {
return {
@ -366,30 +332,7 @@ export default {
toBackClue() {
const obj = { path: "/zs/clue" };
this.$tab.closeOpenPage(obj);
},
// 线
handleDiscard() {
this.$confirm('是否确认释放该条线索(“' + this.clueForm.name + '/' + this.clueForm.phone + '”)到公海?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then((res) => {
discardClue(this.clueForm).then((resp) => {
if (resp && resp.code === 200) {
this.$message.success('释放成功');
this.toBackClue();
}
});
})
.catch(function () { });
},
//
handleSkill() {
this.$nextTick(() => {
this.$refs.SkillDialog.init();
});
},
}
};

@ -108,29 +108,5 @@ export const defaultColumns = [{
width: 140,
visible: true,
overflow: true
},
{
key: 14,
prop: 'goodName',
label: '商品名称',
width: 140,
visible: true,
overflow: true
},
{
key: 15,
prop: 'amountReceived',
label: '订单实收',
width: 140,
visible: true,
overflow: true
},
{
key: 16,
prop: 'writeOffTime',
label: '核销时间',
width: 140,
visible: true,
overflow: true
}
];

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

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

@ -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: 9, label: '待分配' }
{ value: 8, label: '撞单线索' }
],
intentionOptions: [],
createDateRange: [],

@ -1,90 +0,0 @@
<!--
* @Author: riverQiu
* @Date: 2023-10-14 13:21:37
* @LastEditors: riverQiu
* @LastEditTime: 2023-10-15 00:55:44
* @Description:
-->
<template>
<el-dialog title="话术" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px" height="700">
<div>
<!-- 问题 -->
<el-input v-model="queryParams.searchValue" placeholder="请输入问题" clearable @keyup.enter.native="queryAnswer" style="margin-bottom: 10px;"/>
<!-- 关键词 -->
<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>
</div>
</el-dialog>
</template>
<script>
import { listSkill,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,
queryParams:{
searchValue: undefined,
keyList: [],
status: 2
},
skillInfo:[]
};
},
methods: {
init () {
this.visible = true;
this.getSkillKeyOption();
},
getSkillKeyOption () {
getSkillKey().then((resp) => {
if (resp && resp.code === 200) {
this.keyOptions = resp.data;
}
});
},
queryAnswer(){
console.log(this.queryParams)
this.skillInfo = []
listSkill(this.queryParams).then((resp) => {
if (resp && resp.code === 200) {
this.skillInfo = resp.data;
}
});
}
}
};
</script>
<style lang="scss" scoped>
.box-card {
width: 500px;
min-height: 100px;
}
</style>

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

@ -4,17 +4,11 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleAddandUpdate(undefined)">新增</el-button>
<el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleDYAddandUpdate(undefined)">抖音新增</el-button>
<el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false,false)">导入</el-button>
<el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(true, false)">一点通导入</el-button>
<el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false, true)">抖音导入</el-button>
<el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false)">导入</el-button>
<el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(true)">一点通导入</el-button>
<el-button v-hasPermi="['zs:clue:export']" icon="el-icon-download" type="warning" @click="handleExport">导出</el-button>
<el-button v-hasPermi="['zs:clue:edit']" icon="el-icon-edit" type="primary" :disabled="multiple" @click="handleBatChUpdate()">批量修改</el-button>
<el-button type="primary" @click="handlePublicClue">公海</el-button>
<el-button type="primary" @click="handleSkill">关键话术</el-button>
</el-col>
<right-toolbar :show-search.sync="showSearch" :columns="columns" @queryTable="_getTableList" />
</el-row>
@ -31,7 +25,6 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="left" min-width="200">
<template slot-scope="scope">
<!-- <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.source == '抖音直播'" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleDYAddandUpdate(scope.row)">编辑</el-button> -->
<el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
<el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(scope.row)">分发</el-button>
<el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a" @click.native.stop="handleSign(scope.row)">已登记</el-button>
@ -58,10 +51,6 @@
<ZhuangDanDialog ref="zhuangDanDialog" />
<!-- 备注编辑 -->
<MemoFormDialog ref="memoDialog" @refreshDataList="_getTableList" />
<!-- 抖音直播弹框 -->
<DYClueFormDialog ref="DYClueFormDialog" @refreshDataList="_getTableList"/>
<!-- 关键性话术 -->
<SkillDialog ref="SkillDialog"/>
</div>
</template>
@ -75,8 +64,6 @@ import DistributeFormDialog from './components/DistributeFormDialog.vue';
import SignFormDialog from '../sign/components/SignFormDialog.vue';
import ZhuangDanDialog from './components/ZhuangDanDialog.vue';
import MemoFormDialog from './components/MemoFormDialog.vue';
import DYClueFormDialog from './components/DYClueFormDialog.vue';
import SkillDialog from './components/SkillDialog.vue';
import { defaultColumns } from './columns.js';
import { getClueList, deleteClue, getClueCountBadge, discardClue, getSign, getConsultRecord } from '@/api/zs/clue';
@ -93,8 +80,7 @@ export default {
}
},
components: {
SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeFormDialog, ZhuangDanDialog, MemoFormDialog,
DYClueFormDialog,SkillDialog
SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeFormDialog, ZhuangDanDialog, MemoFormDialog
},
data() {
return {
@ -170,12 +156,6 @@ export default {
handleAddandUpdate(info) {
this.$router.push('/zs/clue-form/index/' + (info ? info.clueId : 0));
},
//
handleDYAddandUpdate(info){
this.$nextTick(() => {
this.$refs.DYClueFormDialog.init(info);
});
},
//
handleSelectionChange(selection) {
console.log(selection);
@ -218,9 +198,9 @@ export default {
.catch(function () { });
},
//
handleImport(ydtData, dYData) {
handleImport(ydtData) {
this.$nextTick(() => {
this.$refs.uploadDialogForm.init({ydtData: ydtData, dYData: dYData});
this.$refs.uploadDialogForm.init(ydtData);
});
},
/** 导出按钮操作 */
@ -289,11 +269,7 @@ export default {
},
handleRowClick(row) {
if (this.quickSearch != 8) {
// if(row.source == ''){
// this.handleDYAddandUpdate(row);
// } else {
this.handleAddandUpdate(row)
// }
}
},
handleCellClick(row, column, cell, event) {
@ -305,12 +281,7 @@ export default {
});
}
},
handleSkill() {
this.$nextTick(() => {
this.$refs.SkillDialog.init();
});
},
}
}
};
</script>

@ -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>

@ -332,7 +332,7 @@ export default {
});
},
getPlaces(schoolId) {
getAllPlaces({ schoolId: schoolId, status: '0' , showInMap : true}).then((resp) => {
getAllPlaces({ schoolId: schoolId, status: '0' }).then((resp) => {
this.placeOptions = resp.data;
});
},
@ -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
);
if (classType.profitType == 1) {
//
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);
}
});
).minPrice;
if (minprice) {
this.$set(this.modalForm, 'schoolPay', this.modalForm.signPrice - minprice);
}
} else {
this.$set(this.modalForm, 'schoolPay', undefined);
}
},
getZhuangDanPeople(clueId) {

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

@ -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,10 @@ module.exports = {
port: port,
open: true,
proxy: {
[process.env.VUE_APP_BASE_API + '/xunjia']: {
// target: `http://localhost:8889/driver-api/`,
target: `https://xueche.ahduima.com/duima/xunjia/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API + '/xunjia']: ''
}
},
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `https://xueche.ahduima.com/duima/`,
// target: `http://localhost:8086`,
// target: `https://xueche.ahduima.com/duima/`,
target: `http://localhost:8086`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
@ -105,12 +97,10 @@ module.exports = {
config
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [
{
.use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}
])
}])
.end();
config.optimization.splitChunks({
chunks: 'all',

Loading…
Cancel
Save