caozong
zcx 1 year ago
parent 052fcd60b8
commit 185163d326
  1. 2
      .env.production
  2. 4
      public/index.html
  3. 747
      src/views/sch/place/index copy.vue
  4. 21
      src/views/sch/place/index.vue
  5. 3
      src/views/zs/clue/ClueForm/components/MapDialog.vue
  6. 4
      src/views/zs/clue/ClueForm/components/PlaceMap.vue
  7. 5
      src/views/zs/clue/ClueForm/index.vue
  8. 24
      src/views/zs/clue/columns.js
  9. 72
      src/views/zs/clue/components/DistributeFormDialog.vue
  10. 1
      src/views/zs/clue/components/UploadDialog.vue
  11. 32
      src/views/zs/clue/index.vue
  12. 12
      src/views/zs/feedback/arrival.vue
  13. 10
      src/views/zs/feedback/follow.vue
  14. 33
      src/views/zs/sign/columns.js
  15. 2
      src/views/zs/sign/components/SignFormDialog.vue

@ -5,4 +5,4 @@ VUE_APP_TITLE = 开心学车管理系统
ENV = 'production' ENV = 'production'
# 开心学车管理系统/生产环境 # 开心学车管理系统/生产环境
VUE_APP_BASE_API = '/duima' VUE_APP_BASE_API = '/zhaosheng'

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

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

@ -145,6 +145,7 @@
</template> </template>
<!-- eslint-disable no-undef --> <!-- eslint-disable no-undef -->
<script> <script>
import AMap from 'AMap';
import { getMapData, addPlace, updatePlace, updateSchoolStatus } from '@/api/sch/place'; import { getMapData, addPlace, updatePlace, updateSchoolStatus } from '@/api/sch/place';
export default { export default {
name: 'Place', name: 'Place',
@ -212,10 +213,9 @@ export default {
}, },
methods: { methods: {
initMap() { initMap() {
window.onLoad = () => {
this.aMap = new AMap.Map('map', { this.aMap = new AMap.Map('map', {
zoom: this.zomm, zoom: this.zomm,
center: [117.226095, 31.814372], center: [121.448641, 31.2071],
zooms: [8, 18] zooms: [8, 18]
}); });
// //
@ -276,17 +276,16 @@ export default {
}); });
}); });
this.getPageData(); this.getPageData();
}; // this.importMap();
this.importMap();
}, },
// //
importMap() { // importMap() {
const url = 'https://webapi.amap.com/maps?v=1.4.15&key=0e62be0896c6b8d27d453445f0fb8bc4&callback=onLoad'; // const url = 'https://webapi.amap.com/maps?v=1.4.15&key=0e62be0896c6b8d27d453445f0fb8bc4&callback=onLoad';
var jsapi = document.createElement('script'); // var jsapi = document.createElement('script');
jsapi.charset = 'utf-8'; // jsapi.charset = 'utf-8';
jsapi.src = url; // jsapi.src = url;
document.head.appendChild(jsapi); // document.head.appendChild(jsapi);
}, // },
toggleSchool() { toggleSchool() {
this.showSchool = !this.showSchool; this.showSchool = !this.showSchool;
}, },

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

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

@ -76,6 +76,11 @@
<el-input v-model="clueForm.amountReceived" placeholder="请输入订单实收" /> <el-input v-model="clueForm.amountReceived" placeholder="请输入订单实收" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="clueForm.source == '抖音直播'" :span="24">
<el-form-item label="意向门店" prop="intentionAccountName">
<el-input v-model="clueForm.intentionAccountName" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="跟进人员" prop="followUser"> <el-form-item label="跟进人员" prop="followUser">
<el-select v-model="clueForm.followUser" style="width: 100%;" multiple clearable :disabled="admin != 'true' && clueForm.clueId != undefined"> <el-select v-model="clueForm.followUser" style="width: 100%;" multiple clearable :disabled="admin != 'true' && clueForm.clueId != undefined">

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

@ -1,6 +1,31 @@
<template> <template>
<el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog"> <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog" style="min-height: 400px;">
<el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="dialogForm.orderId"> <el-tabs v-model="activeTab" >
<el-tab-pane label="邀约信息" name="first" >
<div v-if="invitationForm.invitationId != undefined">
<el-form ref="invitationForm" :model="invitationForm" label-width="110px" :disabled="true">
<el-form-item label="姓名" prop="name">
<span>{{invitationForm.name}}</span>
</el-form-item>
<el-form-item label="联系方式" prop="phone">
<span>{{invitationForm.phone}}</span>
</el-form-item>
<el-form-item label="场地" prop="placeId">
<span>{{invitationForm.placeName}}</span>
</el-form-item>
<el-form-item label="约定时间" prop="invitationTime">
<span>{{invitationForm.invitationTime}}</span>
</el-form-item>
<el-form-item label="备注" prop="remark">
<span>{{invitationForm.remark}}</span>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="分发" name="second">
<el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="dialogForm.orderId != undefined">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="场地" prop="placeId"> <el-form-item label="场地" prop="placeId">
@ -29,7 +54,7 @@
<div style="max-height: 200px; overflow-y: auto;"> <div style="max-height: 200px; overflow-y: auto;">
<div v-for="item in feedbackDetail" :key="item.feedbackId"> <div v-for="item in feedbackDetail" :key="item.feedbackId">
<el-timeline-item :timestamp="item.updateTime == undefined ? item.createTime : item.updateTime" placement="top"> <el-timeline-item :timestamp="item.updateTime == undefined ? item.createTime : item.updateTime" placement="top">
<el-card> <el-card>
<div v-if="item.feedbackType == 1"> <div v-if="item.feedbackType == 1">
<div>是否联系<span style="font-size: 12px;">{{ item.isContact ? '已联系' : '未联系' }}</span></div> <div>是否联系<span style="font-size: 12px;">{{ item.isContact ? '已联系' : '未联系' }}</span></div>
<div>到场时间<span style="font-size: 12px;">{{ item.arrivalTime }}</span></div> <div>到场时间<span style="font-size: 12px;">{{ item.arrivalTime }}</span></div>
@ -51,15 +76,20 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer" :disabled="dialogForm.orderId"> <span slot="footer" class="dialog-footer" :disabled="dialogForm.orderId">
<el-button plain @click="(visible = false)">取消</el-button> <el-button plain @click="(visible = false)">取消</el-button>
<el-button v-jclick type="primary" :disabled="!canSubmit " @click="dialogFormSubmit()">确定</el-button> <el-button v-jclick type="primary" :disabled="!canSubmit || dialogForm.orderId != undefined" @click="dialogFormSubmit()">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { listFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder'; import { listFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder';
import { listFeedbackDetail } from '@/api/zs/feedbackDetail'; import { listFeedbackDetail } from '@/api/zs/feedbackDetail';
import { getInvitationByClue } from '@/api/zs/invitation';
import { getAllPlaces } from '@/api/sch/place'; import { getAllPlaces } from '@/api/sch/place';
import { getAllCoaches } from '@/api/sch/coach'; import { getAllCoaches } from '@/api/sch/coach';
@ -83,11 +113,23 @@ export default {
}, },
placeOptions: [], placeOptions: [],
coachOptions: [], coachOptions: [],
feedbackDetail: [] feedbackDetail: [],
invitationForm: {
invitationId:undefined,
clueId: undefined,
name: undefined,
phone: undefined,
address: undefined,
placeId: undefined,
invitationTime: undefined,
remark: undefined
},
activeTab: 'first'
}; };
}, },
methods: { methods: {
init (info = undefined) { init (info = undefined) {
this.activeTab = 'first'
this.getPlaces(); this.getPlaces();
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
@ -95,6 +137,8 @@ export default {
this.$refs['dialogForm'].resetFields(); this.$refs['dialogForm'].resetFields();
if (info) { if (info) {
this.dialogForm.clueId = info; this.dialogForm.clueId = info;
//线
this.getInvitationByClue(info);
// 线 // 线
this.getFeedbackOrder(info); this.getFeedbackOrder(info);
} }
@ -107,10 +151,28 @@ export default {
coachId: undefined, coachId: undefined,
copyUserList: [] copyUserList: []
}; };
this.feedbackDetail=[]
}, },
closeDialog () { closeDialog () {
this.$emit('update:dialog.batchUpdateVisible', false); this.$emit('update:dialog.batchUpdateVisible', false);
}, },
getInvitationByClue(clueId){
this.invitationForm = {
invitationId:undefined,
clueId: undefined,
name: undefined,
phone: undefined,
address: undefined,
placeId: undefined,
invitationTime: undefined,
remark: undefined
}
getInvitationByClue({ clueId: clueId }).then(resp => {
if (resp.code == 200 && resp.data) {
this.invitationForm = resp.data;
}
});
},
getFeedbackOrder (clueId) { getFeedbackOrder (clueId) {
listFeedbackOrder({ clueId: clueId }).then(resp => { listFeedbackOrder({ clueId: clueId }).then(resp => {
if (resp.code == 200 && resp.rows && resp.rows.length > 0) { if (resp.code == 200 && resp.rows && resp.rows.length > 0) {

@ -63,7 +63,6 @@ export default {
}, },
/** 下载模板操作 */ /** 下载模板操作 */
importTemplate() { 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 + '&dYData=' + this.dYData, {}, `clue_template_${new Date().getTime()}.xlsx`);
}, },
// //

@ -7,7 +7,7 @@
<el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleDYAddandUpdate(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(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(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, true)">抖音导入</el-button>
<el-button v-hasPermi="['zs:clue:export']" icon="el-icon-download" type="warning" @click="handleExport">导出</el-button> <el-button v-hasPermi="['zs:clue:export']" icon="el-icon-download" type="warning" @click="handleExport">导出</el-button>
@ -38,13 +38,13 @@
<el-table-column label="操作" fixed="right" align="left" min-width="200"> <el-table-column label="操作" fixed="right" align="left" min-width="200">
<template slot-scope="scope"> <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 ) && 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 != undefined && 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-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(scope.row)">分发</el-button> <el-button v-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(scope.row)">分发</el-button>
<el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:invitation']" type="text" @click.native.stop="handleInvitation(scope.row)">邀约</el-button> <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1) )" v-hasPermi="['zs:clue:invitation']" type="text" @click.native.stop="handleInvitation(scope.row)">邀约</el-button>
<el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a" @click.native.stop="handleSign(scope.row)">已登记</el-button> <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1) ) && scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a" @click.native.stop="handleSign(scope.row)">已登记</el-button>
<el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && !scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button> <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1) ) && !scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
<el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button> <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1) )" v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button>
<el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && !scope.row.state" v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button> <el-button v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1) ) && !scope.row.state" v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button>
<el-button v-if="quickSearch == 8" type="text" @click="handleViewZhuangDan(scope.row)"> 撞单信息</el-button> <el-button v-if="quickSearch == 8" type="text" @click="handleViewZhuangDan(scope.row)"> 撞单信息</el-button>
<!-- <el-button v-if="searchForm.quickSearch == 8" type="text" > 撞单信息</el-button> --> <!-- <el-button v-if="searchForm.quickSearch == 8" type="text" > 撞单信息</el-button> -->
</template> </template>
@ -298,9 +298,23 @@ export default {
}, },
// //
handleDistribute (item) { handleDistribute (item) {
this.$nextTick(() => {
if(item.feedbackStatus == 0){
this.$confirm('该学员未邀约,确定进行分发?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then((res) => {
this.$nextTick(() => {
this.$refs.distributeDialogForm.init(item.clueId);
});
});
} else {
this.$nextTick(() => {
this.$refs.distributeDialogForm.init(item.clueId); this.$refs.distributeDialogForm.init(item.clueId);
}); });
}
}, },
// //
handlePhone (item) { handlePhone (item) {
@ -331,7 +345,7 @@ export default {
}, },
// //
handleInvitation(item){ handleInvitation(item){
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.InvitationDialog.init(item) this.$refs.InvitationDialog.init(item)
}) })

@ -11,9 +11,19 @@
<el-form-item label="地址"> <el-form-item label="地址">
<span>{{ order.address }}</span> <span>{{ order.address }}</span>
</el-form-item> </el-form-item>
<el-form-item label="接待人"> <el-form-item label="邀约场地">
<span>{{ order.placeName }}</span>
</el-form-item>
<el-form-item label="邀约时间" v-if="order.invitationTime != undefined">
<span>{{ order.invitationTime }}</span>
</el-form-item>
<el-form-item label="邀约备注" prop="coachId" v-if="order.remark != undefined">
<span>{{ order.remark }}</span>
</el-form-item>
<el-form-item label="接待人" prop="coachId">
<span>{{ order.coachName }}</span> <span>{{ order.coachName }}</span>
</el-form-item> </el-form-item>
<el-divider></el-divider>
<el-form-item label="到场状态" prop="arrivalStatus"> <el-form-item label="到场状态" prop="arrivalStatus">
<el-radio-group v-model="form.arrivalStatus" size="small" :disabled="type != 'JDR'"> <el-radio-group v-model="form.arrivalStatus" size="small" :disabled="type != 'JDR'">
<el-radio :label="1">未到场</el-radio> <el-radio :label="1">未到场</el-radio>

@ -11,9 +11,19 @@
<el-form-item label="地址"> <el-form-item label="地址">
<span>{{ order.address }}</span> <span>{{ order.address }}</span>
</el-form-item> </el-form-item>
<el-form-item label="邀约场地">
<span>{{ order.placeName }}</span>
</el-form-item>
<el-form-item label="邀约时间" v-if="order.invitationTime != undefined">
<span>{{ order.invitationTime }}</span>
</el-form-item>
<el-form-item label="邀约备注" prop="coachId" v-if="order.remark != undefined">
<span>{{ order.remark }}</span>
</el-form-item>
<el-form-item label="接待人" prop="coachId"> <el-form-item label="接待人" prop="coachId">
<span>{{ order.coachName }}</span> <span>{{ order.coachName }}</span>
</el-form-item> </el-form-item>
<el-divider></el-divider>
<el-form-item label="是否联系" prop="isContact"> <el-form-item label="是否联系" prop="isContact">
<el-radio-group v-model="form.isContact" size="small" :disabled="type != 'JDR'"> <el-radio-group v-model="form.isContact" size="small" :disabled="type != 'JDR'">
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>

@ -21,14 +21,14 @@ export const defaultColumns = [{
visible: true, visible: true,
overflow: false overflow: false
}, },
{ // {
key: 3, // key: 3,
prop: 'offlineReceiverName', // prop: 'offlineReceiverName',
label: '线下接待人员', // label: '线下接待人员',
width: 140, // width: 140,
visible: true, // visible: true,
overflow: false // overflow: false
}, // },
{ {
key: 4, key: 4,
prop: 'zhuangDanName', prop: 'zhuangDanName',
@ -138,14 +138,15 @@ export const defaultColumns = [{
visible: true, visible: true,
overflow: true overflow: true
}, },
{ // {
key: 18, // key: 18,
prop: 'commission', // prop: 'commission',
label: '佣金明细', // label: '佣金明细',
width: 140, // width: 140,
visible: true, // visible: true,
overflow: true // overflow: true
}, { // },
{
key: 19, key: 19,
prop: 'memo', prop: 'memo',
label: '备注', label: '备注',

@ -488,7 +488,7 @@ export default {
}); });
}, },
handleSubmit() { handleSubmit() {
this.$confirm('提交后将进入审核阶段,是否提交确认提交?', '警告', { this.$confirm('提交后将进入审核结算阶段,是否提交确认提交?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

Loading…
Cancel
Save