退件明细

This commit is contained in:
刘华勇 2025-05-08 16:19:57 +08:00
parent fabef33613
commit bcd4c01e50
5 changed files with 717 additions and 1 deletions

View File

@ -0,0 +1,33 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/returnItemDetails',
method: 'post',
data
})
}
export function del(id) {
return request({
url: 'api/returnItemDetails/' + id,
method: 'delete'
})
}
export function edit(data) {
return request({
url: 'api/returnItemDetails',
method: 'put',
data
})
}
export function downloadReturnItemDetails(params) {
return request({
url: 'api/returnItemDetails/download',
method: 'get',
params,
responseType: 'blob'
})
}

View File

@ -0,0 +1,269 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="客户名称" >
<el-input v-model="form.custName" style="width: 370px;"/>
</el-form-item>
<el-form-item label="客户编号" >
<el-input v-model="form.custNo" style="width: 370px;"/>
</el-form-item>
<el-form-item label="运单编号" >
<el-input v-model="form.waybillNo" style="width: 370px;"/>
</el-form-item>
<el-form-item label="转件运单编号" >
<el-input v-model="form.transferWaybillNo" style="width: 370px;"/>
</el-form-item>
<el-form-item label="业务类型" >
<el-input v-model="form.businessType" style="width: 370px;"/>
</el-form-item>
<el-form-item label="账单类型" >
<el-input v-model="form.billType" style="width: 370px;"/>
</el-form-item>
<el-form-item label="寄件网点" >
<el-input v-model="form.sendSite" style="width: 370px;"/>
</el-form-item>
<el-form-item label="寄件财务中心" >
<el-input v-model="form.sendFinanceCenter" style="width: 370px;"/>
</el-form-item>
<el-form-item label="运单录入时间" >
<el-input v-model="form.sendTime" style="width: 370px;"/>
</el-form-item>
<el-form-item label="退/转件申请时间" >
<el-input v-model="form.applyTime" style="width: 370px;"/>
</el-form-item>
<el-form-item label="退/转件确认时间" >
<el-input v-model="form.confirmTime" style="width: 370px;"/>
</el-form-item>
<el-form-item label="始发地" >
<el-input v-model="form.startPlace" style="width: 370px;"/>
</el-form-item>
<el-form-item label="退/转件网点" >
<el-input v-model="form.returnSite" style="width: 370px;"/>
</el-form-item>
<el-form-item label="退/转件财务中心" >
<el-input v-model="form.returnFinanceCenter" style="width: 370px;"/>
</el-form-item>
<el-form-item label="退转合并代理区" >
<el-input v-model="form.returnMergeAgentArea" style="width: 370px;"/>
</el-form-item>
<el-form-item label="目的地" >
<el-input v-model="form.destination" style="width: 370px;"/>
</el-form-item>
<el-form-item label="账单产生时间" >
<el-input v-model="form.billTime" style="width: 370px;"/>
</el-form-item>
<el-form-item label="业务发生时间" >
<el-input v-model="form.businessTime" style="width: 370px;"/>
</el-form-item>
<el-form-item label="费用类型" >
<el-input v-model="form.feeType" style="width: 370px;"/>
</el-form-item>
<el-form-item label="费用金额" >
<el-input v-model="form.feeAmount" style="width: 370px;"/>
</el-form-item>
<el-form-item label="问题件标识" >
<el-input v-model="form.problemFlag" style="width: 370px;"/>
</el-form-item>
<el-form-item label="修改时间" >
<el-input v-model="form.modifyTime" style="width: 370px;"/>
</el-form-item>
<el-form-item label="修改人" >
<el-input v-model="form.modifyPerson" style="width: 370px;"/>
</el-form-item>
<el-form-item label="修改网点" >
<el-input v-model="form.modifySite" style="width: 370px;"/>
</el-form-item>
<el-form-item label="始发省份" >
<el-input v-model="form.startProvince" style="width: 370px;"/>
</el-form-item>
<el-form-item label="目的省份" >
<el-input v-model="form.destinationProvince" style="width: 370px;"/>
</el-form-item>
<el-form-item label="算费时间" >
<el-input v-model="form.calculateTime" style="width: 370px;"/>
</el-form-item>
<el-form-item label="取消退/转件确认" >
<el-input v-model="form.cancelConfirm" style="width: 370px;"/>
</el-form-item>
<el-form-item label="算费描述" >
<el-input v-model="form.calculateDesc" style="width: 370px;"/>
</el-form-item>
<el-form-item label="锁账时间" >
<el-input v-model="form.lockTime" style="width: 370px;"/>
</el-form-item>
<el-form-item label="锁账标识" >
<el-input v-model="form.lockFlag" style="width: 370px;"/>
</el-form-item>
<el-form-item label="计费重量" >
<el-input v-model="form.calculateWeight" style="width: 370px;"/>
</el-form-item>
<el-form-item label="重量来源" >
<el-input v-model="form.weightSource" style="width: 370px;"/>
</el-form-item>
<el-form-item label="确认人" >
<el-input v-model="form.confirmPerson" style="width: 370px;"/>
</el-form-item>
<el-form-item label="确认时间" >
<el-input v-model="form.confirmTime1" style="width: 370px;"/>
</el-form-item>
<el-form-item label="确认网点" >
<el-input v-model="form.confirmSite" style="width: 370px;"/>
</el-form-item>
<el-form-item label="签收标识" >
<el-input v-model="form.signFlag" style="width: 370px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancel">取消</el-button>
<el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
</div>
</el-dialog>
</template>
<script>
import { add, edit } from '@/api/returnItemDetails'
export default {
props: {
isAdd: {
type: Boolean,
required: true
}
},
data() {
return {
loading: false, dialog: false,
form: {
id: '',
custName: '',
custNo: '',
waybillNo: '',
transferWaybillNo: '',
businessType: '',
billType: '',
sendSite: '',
sendFinanceCenter: '',
sendTime: '',
applyTime: '',
confirmTime: '',
startPlace: '',
returnSite: '',
returnFinanceCenter: '',
returnMergeAgentArea: '',
destination: '',
billTime: '',
businessTime: '',
feeType: '',
feeAmount: '',
problemFlag: '',
modifyTime: '',
modifyPerson: '',
modifySite: '',
startProvince: '',
destinationProvince: '',
calculateTime: '',
cancelConfirm: '',
calculateDesc: '',
lockTime: '',
lockFlag: '',
calculateWeight: '',
weightSource: '',
confirmPerson: '',
confirmTime1: '',
confirmSite: '',
signFlag: ''
},
rules: {
}
}
},
methods: {
cancel() {
this.resetForm()
},
doSubmit() {
this.loading = true
if (this.isAdd) {
this.doAdd()
} else this.doEdit()
},
doAdd() {
add(this.form).then(res => {
this.resetForm()
this.$notify({
title: '添加成功',
type: 'success',
duration: 2500
})
this.loading = false
this.$parent.init()
}).catch(err => {
this.loading = false
console.log(err.response.data.message)
})
},
doEdit() {
edit(this.form).then(res => {
this.resetForm()
this.$notify({
title: '修改成功',
type: 'success',
duration: 2500
})
this.loading = false
this.$parent.init()
}).catch(err => {
this.loading = false
console.log(err.response.data.message)
})
},
resetForm() {
this.dialog = false
this.$refs['form'].resetFields()
this.form = {
id: '',
custName: '',
custNo: '',
waybillNo: '',
transferWaybillNo: '',
businessType: '',
billType: '',
sendSite: '',
sendFinanceCenter: '',
sendTime: '',
applyTime: '',
confirmTime: '',
startPlace: '',
returnSite: '',
returnFinanceCenter: '',
returnMergeAgentArea: '',
destination: '',
billTime: '',
businessTime: '',
feeType: '',
feeAmount: '',
problemFlag: '',
modifyTime: '',
modifyPerson: '',
modifySite: '',
startProvince: '',
destinationProvince: '',
calculateTime: '',
cancelConfirm: '',
calculateDesc: '',
lockTime: '',
lockFlag: '',
calculateWeight: '',
weightSource: '',
confirmPerson: '',
confirmTime1: '',
confirmSite: '',
signFlag: ''
}
}
}
}
</script>
<style scoped>
</style>

View File

@ -0,0 +1,305 @@
<template>
<div class="app-container">
<!-- 导入 -->
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
width="400px"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
:headers="upload.headers"
:action="upload.url"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
accept=".xlsx, .xls"
method="get"
drag
>
<i class="el-icon-upload" />
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button
:loading="upload.isUploading"
type="primary"
@click="submitFileForm"
> </el-button
>
<el-button @click="upload.open = false; upload.isUploading = false"> </el-button>
</div>
</el-dialog>
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
</el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['admin','returnItemDetails:add']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add">新增</el-button>
</div>
<!-- 导入 -->
<div style="display: inline-block;">
<el-button
v-permission="['admin','shipmentDetail:add']"
size="mini"
class="filter-item"
type="primary"
icon="el-icon-plus"
@click="handleImport">导入寄件明细</el-button>
</div>
<!-- 导出 -->
<div style="display: inline-block;">
<el-button
:loading="downloadLoading"
size="mini"
class="filter-item"
type="warning"
icon="el-icon-download"
@click="download">导出</el-button>
</div>
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="主键ID"/>
<el-table-column prop="custName" label="客户名称"/>
<el-table-column prop="custNo" label="客户编号"/>
<el-table-column prop="waybillNo" label="运单编号"/>
<el-table-column prop="transferWaybillNo" label="转件运单编号"/>
<el-table-column prop="businessType" label="业务类型"/>
<el-table-column prop="billType" label="账单类型"/>
<el-table-column prop="sendSite" label="寄件网点"/>
<el-table-column prop="sendFinanceCenter" label="寄件财务中心"/>
<el-table-column prop="sendTime" label="运单录入时间"/>
<el-table-column prop="applyTime" label="退/转件申请时间"/>
<el-table-column prop="confirmTime" label="退/转件确认时间"/>
<el-table-column prop="startPlace" label="始发地"/>
<el-table-column prop="returnSite" label="退/转件网点"/>
<el-table-column prop="returnFinanceCenter" label="退/转件财务中心"/>
<el-table-column prop="returnMergeAgentArea" label="退转合并代理区"/>
<el-table-column prop="destination" label="目的地"/>
<el-table-column prop="billTime" label="账单产生时间"/>
<el-table-column prop="businessTime" label="业务发生时间"/>
<el-table-column prop="feeType" label="费用类型"/>
<el-table-column prop="feeAmount" label="费用金额"/>
<el-table-column prop="problemFlag" label="问题件标识"/>
<el-table-column prop="modifyTime" label="修改时间"/>
<el-table-column prop="modifyPerson" label="修改人"/>
<el-table-column prop="modifySite" label="修改网点"/>
<el-table-column prop="startProvince" label="始发省份"/>
<el-table-column prop="destinationProvince" label="目的省份"/>
<el-table-column prop="calculateTime" label="算费时间"/>
<el-table-column prop="cancelConfirm" label="取消退/转件确认"/>
<el-table-column prop="calculateDesc" label="算费描述"/>
<el-table-column prop="lockTime" label="锁账时间"/>
<el-table-column prop="lockFlag" label="锁账标识"/>
<el-table-column prop="calculateWeight" label="计费重量"/>
<el-table-column prop="weightSource" label="重量来源"/>
<el-table-column prop="confirmPerson" label="确认人"/>
<el-table-column prop="confirmTime1" label="确认时间"/>
<el-table-column prop="confirmSite" label="确认网点"/>
<el-table-column prop="signFlag" label="签收标识"/>
<el-table-column v-if="checkPermission(['admin','returnItemDetails:edit','returnItemDetails:del'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','returnItemDetails:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-popover
v-permission="['admin','returnItemDetails:del']"
:ref="scope.row.id"
placement="top"
width="180">
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
</el-popover>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<el-pagination
:total="total"
:current-page="page + 1"
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import { del, downloadReturnItemDetails } from '@/api/returnItemDetails'
import { getToken } from "@/utils/auth";
import { parseTime, downloadFile, parseDate } from '@/utils/index'
import eForm from './form'
export default {
components: { eForm },
mixins: [initData],
data() {
return {
upload: {
//
open: false,
//
title: "",
//
isUploading: false,
//
headers: { Authorization: "Bearer " + getToken() },
//
url: "/api/returnItemDetails/importReturnItemDetails"
},
delLoading: false,
queryTypeOptions: [
{ key: 'custName', display_name: '客户名称' },
{ key: 'custNo', display_name: '客户编号' },
{ key: 'waybillNo', display_name: '运单编号' },
{ key: 'transferWaybillNo', display_name: '转件运单编号' },
{ key: 'businessType', display_name: '业务类型' },
{ key: 'billType', display_name: '账单类型' },
{ key: 'returnSite', display_name: '退/转件网点' },
{ key: 'destinationProvince', display_name: '目的省份' }
]
}
},
created() {
this.$nextTick(() => {
this.init()
})
},
methods: {
checkPermission,
beforeInit() {
this.url = 'api/returnItemDetails'
const sort = 'id,desc'
this.params = { page: this.page, size: this.size, sort: sort }
const query = this.query
const type = query.type
const value = query.value
if (type && value) { this.params[type] = value }
return true
},
subDelete(id) {
this.delLoading = true
del(id).then(res => {
this.delLoading = false
this.$refs[id].doClose()
this.dleChangePage()
this.init()
this.$notify({
title: '删除成功',
type: 'success',
duration: 2500
})
}).catch(err => {
this.delLoading = false
this.$refs[id].doClose()
console.log(err.response.data.message)
})
},
add() {
this.isAdd = true
this.$refs.form.dialog = true
},
edit(data) {
this.isAdd = false
const _this = this.$refs.form
_this.form = {
id: data.id,
custName: data.custName,
custNo: data.custNo,
waybillNo: data.waybillNo,
transferWaybillNo: data.transferWaybillNo,
businessType: data.businessType,
billType: data.billType,
sendSite: data.sendSite,
sendFinanceCenter: data.sendFinanceCenter,
sendTime: data.sendTime,
applyTime: data.applyTime,
confirmTime: data.confirmTime,
startPlace: data.startPlace,
returnSite: data.returnSite,
returnFinanceCenter: data.returnFinanceCenter,
returnMergeAgentArea: data.returnMergeAgentArea,
destination: data.destination,
billTime: data.billTime,
businessTime: data.businessTime,
feeType: data.feeType,
feeAmount: data.feeAmount,
problemFlag: data.problemFlag,
modifyTime: data.modifyTime,
modifyPerson: data.modifyPerson,
modifySite: data.modifySite,
startProvince: data.startProvince,
destinationProvince: data.destinationProvince,
calculateTime: data.calculateTime,
cancelConfirm: data.cancelConfirm,
calculateDesc: data.calculateDesc,
lockTime: data.lockTime,
lockFlag: data.lockFlag,
calculateWeight: data.calculateWeight,
weightSource: data.weightSource,
confirmPerson: data.confirmPerson,
confirmTime1: data.confirmTime1,
confirmSite: data.confirmSite,
signFlag: data.signFlag
}
_this.dialog = true
},
//
download() {
this.beforeInit()
this.downloadLoading = true
downloadReturnItemDetails(this.params).then(result => {
downloadFile(result, 'ReturnItemDetails列表', 'xlsx')
this.downloadLoading = false
}).catch(() => {
this.downloadLoading = false
})
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "退件明细导入";
this.upload.open = true;
},
//
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
//
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
this.init();
},
//
submitFileForm() {
this.$refs.upload.submit();
},
}
}
</script>
<style scoped>
</style>

View File

@ -0,0 +1,110 @@
<template>
<div :class="className" :style="{height:height,width:width}"/>
</template>
<script>
import echarts from 'echarts'
require('echarts/theme/macarons') // echarts theme
import { debounce } from '@/utils'
import { del,calcShipmentFee, downloadShipmentDetail, getShipmentDetailTj } from '@/api/shipmentDetail'
const animationDuration = 6000
export default {
props: {
className: {
type: String,
default: 'chart'
},
width: {
type: String,
default: '100%'
},
height: {
type: String,
default: '300px'
}
},
data() {
return {
chart: null
}
},
mounted() {
this.initChart()
this.__resizeHandler = debounce(() => {
if (this.chart) {
this.chart.resize()
}
}, 100)
window.addEventListener('resize', this.__resizeHandler)
},
beforeDestroy() {
if (!this.chart) {
return
}
window.removeEventListener('resize', this.__resizeHandler)
this.chart.dispose()
this.chart = null
},
methods: {
initChart() {
getShipmentDetailTj().then(res => {
this.tjData = res
})
this.chart = echarts.init(this.$el, 'macarons')
this.chart.setOption({
tooltip: {
trigger: 'axis',
axisPointer: { //
type: 'shadow' // 线'line' | 'shadow'
}
},
grid: {
top: 10,
left: '2%',
right: '2%',
bottom: '3%',
containLabel: true
},
xAxis: [{
type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
axisTick: {
alignWithLabel: true
}
}],
yAxis: [{
type: 'value',
axisTick: {
show: false
}
}],
series: [{
name: 'pageA',
type: 'bar',
stack: 'vistors',
barWidth: '60%',
data: [79, 52, 200, 334, 390, 330, 220],
animationDuration
}, {
name: 'pageB',
type: 'bar',
stack: 'vistors',
barWidth: '60%',
data: [80, 52, 200, 334, 390, 330, 220],
animationDuration
}, {
name: 'pageC',
type: 'bar',
stack: 'vistors',
barWidth: '60%',
data: [30, 52, 200, 334, 390, 330, 220],
animationDuration
}]
})
}
}
}
</script>

View File

@ -76,7 +76,6 @@
<!-- 导入 -->
<div style="display: inline-block;">
<el-button
:loading="downloadLoading"
v-permission="['admin','shipmentDetail:add']"
size="mini"
class="filter-item"