提交 9e146e71 authored 作者: pengxiaohui's avatar pengxiaohui

feat: 优化大客户筛选地区和院校层次;跟进记录增加项目进度字段

上级 03e87f42
<template> <template>
<el-cascader :options="options" :props="props" clearable v-bind="$attrs" v-on="$listeners"></el-cascader> <el-cascader :options="options" :props="_props" clearable v-bind="$attrs" v-on="$listeners"></el-cascader>
</template> </template>
<script> <script>
...@@ -27,17 +27,27 @@ function codeToList(code, data) { ...@@ -27,17 +27,27 @@ function codeToList(code, data) {
export default { export default {
props: { props: {
props: { defaultProps: {
type: Object, type: Object,
default() { default() {
return { label: 'name', value: 'name', expandTrigger: 'hover' } return { label: 'name', value: 'name', expandTrigger: 'hover' }
} }
},
props: {
type: Object,
default() {
return {}
}
} }
}, },
data() { data() {
return { return {
_props: {},
options: AreaTreeData options: AreaTreeData
} }
},
created() {
this._props = Object.assign(this.defaultProps, this.props)
} }
} }
</script> </script>
<template> <template>
<el-cascader :options="options" :props="props" clearable v-bind="$attrs" v-on="$listeners"></el-cascader> <el-cascader :options="options" :props="_props" clearable v-bind="$attrs" v-on="$listeners"></el-cascader>
</template> </template>
<script> <script>
import { options } from './options.js' import { options } from './options.js'
export default { export default {
props: { props: {
props: { defaultProps: {
type: Object, type: Object,
default() { default() {
return { label: 'name', value: 'id', expandTrigger: 'hover' } return { label: 'name', value: 'id', expandTrigger: 'hover' }
} }
},
props: {
type: Object,
default() {
return {}
}
} }
}, },
data() { data() {
return { return {
_props: {},
options: options options: options
} }
},
created() {
this._props = Object.assign(this.defaultProps, this.props)
} }
} }
</script> </script>
\ No newline at end of file
...@@ -26,6 +26,20 @@ const communicationModeMap = { ...@@ -26,6 +26,20 @@ const communicationModeMap = {
3: '短信', 3: '短信',
4: '微信' 4: '微信'
} }
const projectStatusMap = {
101: '待接洽',
102: '初步接洽',
103: '内部立项',
104: '提出方案',
105: '协商方案细节',
106: '二级学院论证方案',
107: '初步通过方案',
108: '拟定合同',
109: '校级上会',
110: '校会通过',
111: '正式签署合同',
112: '已失效'
}
export default { export default {
name: 'Contact', name: 'Contact',
components: { AppList, CreateFollow }, components: { AppList, CreateFollow },
...@@ -82,6 +96,14 @@ export default { ...@@ -82,6 +96,14 @@ export default {
return communicationModeMap[row.communication_mode] return communicationModeMap[row.communication_mode]
} }
}, },
{
align: 'center',
prop: 'project_status',
label: '当前项目进展',
computed({ row }) {
return projectStatusMap[row.project_status]
}
},
{ {
align: 'center', align: 'center',
prop: 'created_by', prop: 'created_by',
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
</el-date-picker> </el-date-picker>
</template> </template>
<template v-slot:filter-region="{ params }"> <template v-slot:filter-region="{ params }">
<app-area v-model="params.region"></app-area> <app-area v-model="params.region" :props="{ checkStrictly: true }"></app-area>
</template> </template>
<template v-slot:filter-universityLevel="{ params }"> <template v-slot:filter-universityLevel="{ params }">
<app-university-level v-model="params.universityLevel" /> <app-university-level v-model="params.universityLevel" :props="{ checkStrictly: true }" />
</template> </template>
<template v-slot:filter-create-by="{ params }"> <template v-slot:filter-create-by="{ params }">
<app-user-search v-model="params.created_by" :options="{ clearable: true }"></app-user-search> <app-user-search v-model="params.created_by" :options="{ clearable: true }"></app-user-search>
...@@ -293,7 +293,7 @@ export default { ...@@ -293,7 +293,7 @@ export default {
if (params.universityLevel && params.universityLevel.length) { if (params.universityLevel && params.universityLevel.length) {
delete _params.universityLevel delete _params.universityLevel
_params.college_type = params.universityLevel[0] _params.college_type = params.universityLevel[0]
_params.college_level = params.universityLevel[1] _params.college_level = params.universityLevel[1] || ''
} else { } else {
delete _params.universityLevel delete _params.universityLevel
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论