dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
赵旭 2024-08-26 00:44:07 +08:00
commit d04ac251fe
8 changed files with 215 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/rescue/info.js
View File

@ -100,3 +100,13 @@ export function downloadOrder(params) {
responseType: 'blob'
})
}
export function exportManagement(params) {
return request({
url: '/system/rescueInfo/exportManagement',
method: 'get',
params,
responseType: 'blob'
})
}

19
src/views/company/staff/index.vue
View File

@ -2,6 +2,11 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-table-column label="序号" align="center">
<template scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-form-item label="姓名" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
@ -86,6 +91,9 @@
>新增
</el-button>
</el-col>
<!-- <el-col>-->
<!-- <el-button type="primary" @click="syncData">同步</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
:loading="exportLoading"
@ -171,6 +179,7 @@ import * as StaffApi from '@/api/company/staff'
import StaffForm from './form/StaffForm.vue'
import StaffChangeForm from './form/StaffChangeForm'
import StaffResetPassword from './form/StaffResetPassword'
import request from '@/utils/request'
export default {
name: 'Staff',
@ -314,7 +323,15 @@ export default {
} finally {
this.exportLoading = false
}
}
},
// syncData(){
// request({
// url: "/rescue/sync",
// methods: "get"
// }).then(res => {
// console.log(res)
// })
// }
}
}
</script>

12
src/views/rescue/customerDriverIndex.vue
View File

@ -336,9 +336,9 @@ import {
handleUpdate(row) {
const data = {
...row,
firstDriverIds: row.firstDriverIds.split(",").map(id => parseInt(id)),
secondDriverIds: row.secondDriverIds.split(",").map(id => parseInt(id)),
thirdDriverIds: row.thirdDriverIds.split(",").map(id => parseInt(id))
firstDriverIds: row.firstDriverIds ? row.firstDriverIds.split(",").map(id => parseInt(id)) : "",
secondDriverIds: row.secondDriverIds ? row.secondDriverIds.split(",").map(id => parseInt(id)) : "",
thirdDriverIds: row.thirdDriverIds ? row.thirdDriverIds.split(",").map(id => parseInt(id)) : ""
}
this.form = data
// console.log(this.form)
@ -351,9 +351,9 @@ import {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
this.form.firstDriverIds = this.form.firstDriverIds.join(",")
this.form.secondDriverIds = this.form.secondDriverIds.join(",")
this.form.thirdDriverIds = this.form.thirdDriverIds.join(",")
this.form.firstDriverIds = this.form.firstDriverIds ? this.form.firstDriverIds.join(",") : null
this.form.secondDriverIds = this.form.secondDriverIds ? this.form.secondDriverIds.join(",") : null
this.form.thirdDriverIds = this.form.thirdDriverIds ? this.form.thirdDriverIds.join(",") : null
edept_driver(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;

6
src/views/rescue/driverIndex.vue
View File

@ -683,14 +683,12 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
console.log(row)
this.reset()
this.form = row
this.form.realName = row.nickName
this.carfrom.carInfoList = !!row.carInfoList ? row.carInfoList : this.carfrom.carInfoList
this.carfrom.carInfoList = !row.carInfoList ? row.carInfoList : this.carfrom.carInfoList
this.open = true
this.title = '修改司机信息'
},
handleAuth(row) {
this.reset()
@ -706,7 +704,7 @@ export default {
this.$refs['carfrom'].validate(carValid => {
if (carValid) {
if (this.form.id != null) {
this.form.carInfoList = this.carfrom.carInfoList
this.form.carInfoList = this.carfrom.carInfoList.carType
updateDriver(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false

9
src/views/rescue/index.vue
View File

@ -100,7 +100,11 @@
</el-row>
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center">
<template scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="客户信息" align="center">
<el-table-column label="姓名" align="center" prop="connectionName" />
<el-table-column label="手机号" width="130" align="center" prop="connectionPhone" />
@ -167,7 +171,7 @@
<span v-else>{{ scope.row.setMoney/100 }}<i @click="editInfoFront(2,scope.$index)" class="el-icon-edit"></i></span>
</template>
</el-table-column>
<el-table-column label="实收金额(元)" align="center" prop="setMoney" >
<el-table-column label="实收金额(元)" width="150" align="center" prop="setMoney" >
<template slot-scope="scope">
<span>{{ scope.row.payMoney/100 }}</span>
</template>
@ -500,7 +504,6 @@ export default {
editInfoFront(type,index){
this.editType =type
this.editIdx =index
},
cancelRepayment(){
this.repaymentForm = {}

9
src/views/rescue/refuelRecord.vue
View File

@ -29,6 +29,11 @@
</el-row>
<el-table v-loading="loading" :data="refuelRecordList" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center">
<template scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="司机" align="center" prop="realName" />
<el-table-column label="车牌号" align="center" prop="rescueCarNum" />
<el-table-column label="加油数量(L)" align="center" prop="refuelNum" />
@ -154,8 +159,8 @@ export default {
getList() {
this.loading = true;
listRefuelRecord(this.queryParams).then(response => {
this.refuelRecordList = response.rows;
this.total = response.total;
this.refuelRecordList = response.data.records;
this.total = response.data.total;
this.loading = false;
});
},

8
src/views/rescue/rescueCarSpend.vue
View File

@ -91,7 +91,11 @@
<el-table v-loading="loading" :data="rescueCarSpendList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="id" />
<el-table-column label="序号" align="center">
<template scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="车牌号" align="center" prop="carNum" />
<el-table-column label="维修保养时间" align="center" prop="maintenanceTime" width="180">
<template slot-scope="scope">
@ -119,7 +123,7 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope">
<el-button
size="mini"

306
src/views/rescue/rescueCw.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="客户车牌号" prop="licenseNum">
<el-input
v-model="queryParams.licenseNum"
@ -25,25 +25,26 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="月份" prop="rescueStartMonth" >
<el-form-item label="月份" prop="rescueStartMonth">
<el-date-picker
v-model="queryParams.rescueStartMonth"
value-format="yyyy-MM"
type="month"
placeholder="选择月份">
placeholder="选择月份"
>
</el-date-picker>
</el-form-item>
<el-form-item label="收费类型" prop="feeType">
<el-select v-model="queryParams.feeType" placeholder="请选择收费类型" clearable>
<el-option
v-for="dict in dict.type.fee_type"
v-for="dict in this.getDictDatas(DICT_TYPE.FEE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="救援时间" prop="maintenanceTime" >
<el-form-item label="救援时间" prop="maintenanceTime">
<el-date-picker
v-model="time1"
type="daterange"
@ -53,63 +54,75 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions">
:picker-options="pickerOptions"
>
</el-date-picker>
</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="success"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-form-item>
</el-form>
<div style="margin-left: 52%;font-weight: bold">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<div style="display: flex;justify-content:right;font-weight: bold;font-size: 16px">
<span>
施救总金额：{{moneyManagementData.allMoney}} 元
施救总金额：{{ moneyManagementData.allMoney }} 元
</span>
<span style="margin-left: 3%">
出车次数：{{moneyManagementData.allNum}} 次
出车次数：{{ moneyManagementData.allNum }} 次
</span>
<span style="margin-left: 3%">
提成总金额：{{moneyManagementData.tcAll}} 元
提成总金额：{{ moneyManagementData.tcAll }} 元
</span>
<span style="margin-left: 3%">
燃油费小计：{{moneyManagementData.refuelMoney}} 元
燃油费小计：{{ moneyManagementData.refuelMoney }} 元
</span>
</div>
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column :span-method="objectSpanMethod" type="selection" width="55" align="center" />
<el-table-column label="客户车牌号" align="center" prop="licenseNum" />
<el-table-column label="司机" align="center" prop="driverName" />
<el-table-column label="车牌号" align="center" prop="diverCarNum" />
<el-table-column label="序号" align="center">
<template scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="客户车牌号" align="center" prop="licenseNum" width="180"/>
<el-table-column label="司机" align="center" prop="driverName" width="180"/>
<el-table-column label="车牌号" align="center" prop="diverCarNum" width="180"/>
<el-table-column label="救援时间" align="center" prop="rescueTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.rescueTime, '{y}-{m}-{d} {h}:{m}') }}</span>
</template>
</el-table-column>
<el-table-column label="收费类型" align="center" prop="feeType">
<el-table-column label="收费类型" align="center" prop="feeType" width="180">
<template slot-scope="scope">
<dict-tag :options="dict.type.fee_type" :value="scope.row.feeType"/>
<dict-tag :type="DICT_TYPE.FEE_TYPE" :value="scope.row.feeType"/>
</template>
</el-table-column>
<el-table-column label="施救金额(元)" align="center" prop="setMoney" />
<el-table-column label="过关费(元)" align="center" prop="checkpointMoney" />
<el-table-column label="应计提产值(元)" align="center" prop="upMoney" />
<el-table-column label="提成比例" align="center" prop="royaltyRatio" />
<el-table-column label="提成金额(元)" align="center" prop="royaltyMoney" />
<el-table-column label="放空公里数" align="center" prop="emptyingDistance" />
<el-table-column label="油补（元）" align="center" prop="oilSubsidy" />
<el-table-column label="施救金额(元)" align="center" prop="setMoney" width="180"/>
<el-table-column label="过关费(元)" align="center" prop="checkpointMoney" width="180"/>
<el-table-column label="应计提产值(元)" align="center" prop="upMoney" width="180"/>
<el-table-column label="提成比例" align="center" prop="royaltyRatio" width="180"/>
<el-table-column label="提成金额(元)" align="center" prop="royaltyMoney" width="180"/>
<el-table-column label="放空公里数" align="center" prop="emptyingDistance" width="180"/>
<el-table-column label="油补（元）" align="center" prop="oilSubsidy" width="180"/>
<el-table-column label="燃油费(元)" align="center" prop="fuelCost" />
<el-table-column label="每公里油耗(L)" align="center" prop="oilConsumption" />
<el-table-column label="工资（元）" align="center" prop="grossWages" />
<el-table-column label="燃油费(元)" align="center" prop="fuelCost" width="180"/>
<el-table-column label="每公里油耗(L)" align="center" prop="oilConsumption" width="180"/>
<el-table-column label="工资（元）" align="center" prop="grossWages" width="180"/>
</el-table>
@ -124,22 +137,24 @@
</template>
<script>
import {moneyManagement,moneyManagementData} from "@/api/rescue/info";
import { getmap } from "@/api/Map/map";
import Map from "../../components/Map/index"
import { moneyManagement, moneyManagementData,exportManagement } from '@/api/rescue/info'
import { getmap } from '@/api/Map/map'
import Map from '../../components/Map/index'
export default {
name: "Info",
dicts: ['dljy_type', 'fee_type', 'car_type', 'yes_no','jy_status','jy_order_status'],
name: 'Info',
dicts: ['dljy_type', 'fee_type', 'car_type', 'yes_no', 'jy_status', 'jy_order_status'],
data() {
return {
chooseDriverId:'',
rescueInfoId:'',
pickerOptions: null,
chooseDriverId: '',
rescueInfoId: '',
// 遮罩层
loading: true,
ztlist:[],
ztlist: [],
// 选中数组
ids: [],
time1:[],
time1: [],
// 非单个禁用
single: true,
// 非多个禁用
@ -151,15 +166,15 @@ export default {
// 道路救援模块表格数据
infoList: [],
// 弹出层标题
title: "",
title: '',
// 是否显示弹出层
open: false,
opens:false,
designateFlag:false,
zong:'',
repaymentForm:{},
repaymentOpen:false,
moneyManagementData:{},
opens: false,
designateFlag: false,
zong: '',
repaymentForm: {},
repaymentOpen: false,
moneyManagementData: {},
// 查询参数
queryParams: {
pageNo: 1,
@ -172,65 +187,65 @@ export default {
destinationInfo: null,
rescueStatus: null,
rescueAmount: null,
rescueStart:null,
rescueStart: null
},
// 表单参数
form: {},
driverList:[],
driverList: [],
// 表单校验
rules: {
connectionName: [
{ required: true, message: "联系人名称不能为空", trigger: "blur" }
{ required: true, message: '联系人名称不能为空', trigger: 'blur' }
],
connectionPhone: [
{ required: true, message: "联系人手机号不能为空", trigger: "blur" }
{ required: true, message: '联系人手机号不能为空', trigger: 'blur' }
],
licenseNum: [
{ required: true, message: "车牌号不能为空", trigger: "blur" }
{ required: true, message: '车牌号不能为空', trigger: 'blur' }
],
isAppointment: [
{ required: true, message: "是否为预约单不能为空", trigger: "change" }
{ required: true, message: '是否为预约单不能为空', trigger: 'change' }
],
rescueType: [
{ required: true, message: "救援类型 1拖车2送油3搭电4换台5扣车不能为空", trigger: "change" }
{ required: true, message: '救援类型 1拖车2送油3搭电4换台5扣车不能为空', trigger: 'change' }
],
carType: [
{ required: true, message: "车辆类型 大中小不能为空", trigger: "change" }
{ required: true, message: '车辆类型 大中小不能为空', trigger: 'change' }
],
rescuePosition: [
{ required: true, message: "救援地点 详细描述不能为空", trigger: "blur" }
{ required: true, message: '救援地点 详细描述不能为空', trigger: 'blur' }
],
feeType: [
{ required: true, message: "收费类型不能为空", trigger: "change" }
],
{ required: true, message: '收费类型不能为空', trigger: 'change' }
]
}
};
}
},
components:{
components: {
Map
},
created() {
this.getList();
this.getList()
},
methods: {
cancelRepayment(){
cancelRepayment() {
this.repaymentForm = {}
this.repaymentOpen = false
},
repaymentSubmit(){
this.$refs["repaymentForm"].validate(valid => {
repaymentSubmit() {
this.$refs['repaymentForm'].validate(valid => {
if (valid) {
returnOrder(this.repaymentForm).then(res=>{
this.$modal.msgSuccess("还款成功");
this.repaymentOpen = false;
returnOrder(this.repaymentForm).then(res => {
this.$modal.msgSuccess('还款成功')
this.repaymentOpen = false
this.repaymentForm = {}
this.getList();
this.getList()
})
}
});
})
},
repayment(data){
repayment(data) {
this.repaymentOpen = true
this.repaymentForm.rescueOrderId = data.rescueOrderId
},
@ -240,43 +255,43 @@ export default {
return {
rowspan: 2,
colspan: 1
};
}
} else {
return {
rowspan: 0,
colspan: 0
};
}
}
}
},
driverOk(){
driverOk() {
this.designateFlag = false
designateDriver(this.rescueInfoId,this.chooseDriverId).then(res=>{
this.$message.success("指派成功")
designateDriver(this.rescueInfoId, this.chooseDriverId).then(res => {
this.$message.success('指派成功')
this.getList()
})
},
/** 查询道路救援模块列表 */
getList() {
this.loading = true;
this.loading = true
moneyManagement(this.queryParams).then(response => {
this.infoList = response.rows;
this.total = response.total;
this.loading = false;
});
this.infoList = response.data.records
this.total = response.data.total
this.loading = false
})
moneyManagementData(this.queryParams).then(response => {
this.moneyManagementData = response.data;
});
this.moneyManagementData = response.data
})
},
getDriverList() {
getDriver().then(response => {
this.driverList = response.rows;
});
this.driverList = response.rows
})
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
this.open = false
this.reset()
},
// 表单重置
reset() {
@ -304,78 +319,77 @@ export default {
createBy: null,
updateTime: null,
updateBy: null
};
this.resetForm("form");
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
if (this.time1&&this.time1.length>0){
this.queryParams.rescueStart = this.time1[0];
this.queryParams.rescueEnd = this.time1[1];
if (this.time1 && this.time1.length > 0) {
this.queryParams.rescueStart = this.time1[0]
this.queryParams.rescueEnd = this.time1[1]
}
this.queryParams.pageNo = 1;
this.getList();
this.queryParams.pageNo = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.time1 =[]
this.resetForm("queryForm");
this.queryParams={}
this.handleQuery();
this.time1 = []
this.resetForm('queryForm')
this.queryParams = {}
this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加道路救援模块";
this.reset()
this.open = true
this.title = '添加道路救援模块'
},
pickDriver(row){
pickDriver(row) {
},
designateDriver(row){
designateDriver(row) {
this.designateFlag = true
this.rescueInfoId = row.id
this.getDriverList();
this.getDriverList()
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.reset()
const id = row.id || this.ids
getInfo(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改道路救援模块";
});
this.form = response.data
this.open = true
this.title = '修改道路救援模块'
})
},
handleMap(row){
handleMap(row) {
this.rescueInfoId = row.id
routeInfo(row.id).then(res=>{
routeInfo(row.id).then(res => {
this.ztlist = res.data
this.none(res.data)
})
getmap(row.id).then(res=>{
let datas =[]
res.data.forEach(it=>{
let temp =[it.longitude,it.latitude]
getmap(row.id).then(res => {
let datas = []
res.data.forEach(it => {
let temp = [it.longitude, it.latitude]
datas.push(temp)
})
this.$refs.mapComponent.initMap(datas)
})
this.opens = true;
this.opens = true
},
none(arr){
let sum = 0;
for(var i = 0;i<arr.length;i++){
sum += arr[i].distanceMeter;
none(arr) {
let sum = 0
for (var i = 0; i < arr.length; i++) {
sum += arr[i].distanceMeter
}
this.zong = sum
@ -383,45 +397,45 @@ export default {
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateInfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
});
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除道路救援模块编号为"' + ids + '"的数据项？').then(function() {
return delInfo(ids);
return delInfo(ids)
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('/system/rescueInfo/exportManagement', {
...this.queryParams
}, `救援财务报表_${new Date().getTime()}.xlsx`)
async handleExport() {
const data = await exportManagement(this.queryParams)
this.$download.excel(data, `救援财务报表_${new Date().getTime()}.xlsx`)
}
}
};
}
</script>
<style scoped>
.lang-for{
.lang-for {
width: 100%;
margin: 10px auto;
}