qiushanhe/dm-manage-web
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序优化

Browse Source
This commit is contained in:
qsh
2023-08-29 10:34:48 +08:00
parent 15622a2e5a
commit dd53612b39
8 changed files with 188 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/views/zs/clue/ClueForm/components/MapDialog.vue
View File

@@ -19,11 +19,12 @@ export default {
placeSearch: null,
currentPoint: undefined,
marker: null,
searchBody: undefined
}
searchBody: undefined,
geocoder: null
};
},
beforeDestroy() {
console.log("mapdialog----beforeDestroy")
console.log('mapdialog----beforeDestroy');
this.marker = null;
this.placeSearch = null;
@@ -31,23 +32,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() {
@@ -55,10 +56,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,
@@ -78,20 +79,19 @@ 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,11 +141,10 @@ 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('请在地图上选择位置后保存！');
}
@@ -153,8 +152,8 @@ export default {
closeDialog() {
this.$emit('update:mapDialogVisible', false);
}
},
}
}
};
</script>
<style scoped>
@@ -162,10 +161,11 @@ export default {
width: 100%;
height: 400px;
}
.search-body {
position: absolute;
top: 90px;
left: 25px;
width: 350px;
}
</style>
</style>

27
src/views/zs/clue/components/ClueFormDialog.vue
View File

@@ -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,7 +452,8 @@ export default {
// );
if (this.currentPoint.lng && this.currentPoint.lat) {
regeo({
key: 'f2f35d6adc4a16bb879d303cead56237',
// key: 'f2f35d6adc4a16bb879d303cead56237',
key: '0e62be0896c6b8d27d453445f0fb8bc4',
location: this.currentPoint.lng + ',' + this.currentPoint.lat
}).then((resp) => {
if (resp.status === '1') {
@@ -512,7 +513,8 @@ export default {
async getWalkingDistance(start, end) {
if (start && end) {
const resp = await walking({
key: 'f2f35d6adc4a16bb879d303cead56237',
// key: 'f2f35d6adc4a16bb879d303cead56237',
key: '0e62be0896c6b8d27d453445f0fb8bc4',
origin: start[0] + ',' + start[1],
destination: end[0] + ',' + end[1]
});
@@ -554,7 +556,8 @@ export default {
async querySearch(queryString, cb) {
if (queryString) {
const resp = await inputtips({
key: 'f2f35d6adc4a16bb879d303cead56237',
// key: 'f2f35d6adc4a16bb879d303cead56237',
key: '0e62be0896c6b8d27d453445f0fb8bc4',
keywords: queryString
});
cb(resp.tips);
@@ -577,9 +580,9 @@ export default {
}
}
};
</script>
<style lang="scss" scoped>
</script>
<style lang="scss" scoped>
.amap-cavans {
width: 100%;
height: 600px;
@@ -589,6 +592,7 @@ export default {
width: 100%;
height: 400px;
}
.address {
position: absolute;
left: 30px;
@@ -596,6 +600,7 @@ export default {
width: 400px;
background: #fff;
}
.box-card {
position: absolute;
right: 30px;
@@ -613,14 +618,17 @@ 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;
@@ -630,6 +638,5 @@ li {
.highlighted .addr {
color: #ddd;
}
}
</style>
}</style>

157
src/views/zs/sign/index.vue
View File

@@ -1,10 +1,10 @@
<template>
<div class="app-container">
<SearchForm v-show="showSearch" ref="SearchForm" @search="_getTableList" :options="options" />
<SearchForm v-show="showSearch" ref="SearchForm" :options="options" @search="_getTableList" />
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<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-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-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 type="success" size="mini" v-if="row.state">全款</el-button>
<el-button type="warning" size="mini" v-else>未全款</el-button>
<el-button v-if="row.state" type="success" size="mini">全款</el-button>
<el-button v-else type="warning" size="mini">未全款</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 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>
<el-button v-if="row.checkState == 1" type="danger" size="mini">待审核</el-button>
<el-button v-else-if="row.checkState == 2" type="success" size="mini">已审核</el-button>
<el-button v-else-if="row.checkState == 3" type="warning" size="mini">驳回</el-button>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="160">
<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 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(scope.row)">修改</el-button>
<el-button v-if="row.checkState == 1" v-hasPermi="['zs:sign:check']" size="mini" type="text" @click="handleCheck(scope.row)">审核</el-button>
<el-button v-hasPermi="['zs:sign:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -49,18 +49,15 @@
<UploadDialog v-if="dialog.uploadVisible" />
</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'
import { defaultColumns } from './columns.js';
import UploadDialog from './components/UploadDialog.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';
export default {
name: 'Sign',
@@ -68,7 +65,7 @@ export default {
SearchForm,
CheckDialog,
SignFormDialog,
UploadDialog,
UploadDialog
},
data() {
return {
@@ -76,7 +73,7 @@ export default {
userId: localStorage.getItem('userId'),
searchForm: {
pageNum: 1,
pageSize: 10,
pageSize: 10
},
loading: false,
columns: [],
@@ -88,12 +85,12 @@ export default {
percentageOptions: [
{
value: '驾校已结算',
label: '驾校已结算',
label: '驾校已结算'
},
{
value: '提成已发放',
label: '提成已发放',
},
label: '提成已发放'
}
],
areaOptions: [],
showSearch: true,
@@ -109,32 +106,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;
@@ -142,16 +139,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;
});
},
/** 导出按钮操作 */
@@ -159,46 +156,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(
@@ -207,33 +204,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>
<style rel="stylesheet/scss" lang="scss">
this.$refs.checkDialogForm.init(item);
});
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss">
.el-table .cell {
box-sizing: border-box;
overflow: hidden;
@@ -256,4 +253,4 @@ export default {
line-height: 25px;
}
</style>