朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 39a931154198013a477a92baa5c6a32c3c5e414c 2 个父辈 fe6cd12a 021dff2a master ... ExportOrder flightplan2.0 master_dev_markdown master_ffmTemp zhidan

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 5 个修改的文件 包含 279 行增加 和 4 行删除
... ... @@ -28,3 +28,5 @@ export const eldImportDeclare = params => { return http.postExcelData(`${baseSer
export const zfeldBatchDeclare = params => { return http.post(`${baseServiceURL2}/ExportWaybillDeclaration/eldBatchDeclare`, params); };
//总分单批量导入申报
export const zfeldImportDeclare = params => { return http.postExcelData(`${baseServiceURL2}/ExportWaybillDeclaration/eldImportDeclare`, params); };
//根据提运单统计信息
export const billNoStatistics = params => { return axios.get(`${baseServiceURL2}/ExportListDeclaration/billNoStatistics`, { params: params }); };
... ...
... ... @@ -112,6 +112,7 @@ import myTask from './views/technological/myTask.vue'
import definition from './views/technological/definition.vue'
//仓库场站管理
import WaybillRate from './views/deploy/waybillRate.vue'
import Tracker from './views/deploy/Tracker.vue'
import VehicleWaybill from './views/deploy/VehicleWaybill.vue'
import vehicle from './views/deploy/vehicle.vue'
... ... @@ -201,6 +202,7 @@ import satellite from "./views/deploy/satellite";
/*出口订单*/
import ExortOrder from './views/exportorder/Exportorder.vue'
import CustomerConfig from './views/exportorder/CustomerConfig.vue'
import ManagerWaybill from "./views/exportorder/ManagerWaybill.vue";
/*制单管理*/
import ZhiDan from './views/zhidan/zhidan.vue'
... ... @@ -236,7 +238,8 @@ let routes = [
iconCls: 'el-icon-collection',
children: [
{path: '/ExortOrder', component: ExortOrder, name: '出口订单'},
{path: '/CustomerConfig', component: CustomerConfig, name: '客户配置'}
{path: '/CustomerConfig', component: CustomerConfig, name: '客户配置'},
{path: '/ManagerWaybill', component: ManagerWaybill, name: '主单管理'}
]
},
{
... ... @@ -607,6 +610,7 @@ let routes = [
name: '仓库场站管理',
iconCls:'el-icon-goods',
children:[
{path:'/WaybillRate',component:WaybillRate,name:'费率设置'},
{path:'/Tracker',component:Tracker,name:'派单记录'},
{path:'/VehicleWaybill',component:VehicleWaybill,name:'车载运单'},
{path:'/vehicle',component:vehicle,name:'车辆定位'},
... ...
... ... @@ -24,6 +24,12 @@
</el-date-picker>
</div>
</el-form-item>
<el-form-item label="">
<el-select v-model="formInline.remark2" placeholder="付款状态">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getLists">查询</el-button>
</el-form-item>
... ... @@ -45,7 +51,6 @@
<el-button size="small" type="primary">导入运单</el-button>
</el-upload>
</el-form-item>
<el-button type="success" @click="exportToExcel">导出 Excel</el-button>
</el-form-item>
</el-form>
... ... @@ -128,6 +133,11 @@
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="feweight"
label="计费重量"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="vol"
label="体积"
show-overflow-tooltip>
... ... @@ -138,6 +148,20 @@
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="remark1"
label="应付"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="remark2"
label="付款状态"
show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.remark2==='1'" style="color: #5BB75B;font-weight: bolder">已付</span>
<span v-else style="font-weight: bolder;color: red">未付</span>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="100">
... ... @@ -226,12 +250,28 @@
<el-form-item label="毛重">
<el-input v-model="submitForm.weight" placeholder="毛重"></el-input>
</el-form-item>
<el-form-item label="计费重量">
<el-input v-model="submitForm.feweight" placeholder="计费重量"></el-input>
</el-form-item>
<el-form-item label="体积">
<el-input v-model="submitForm.vol" placeholder="体积"></el-input>
</el-form-item>
<el-form-item label="应收">
<el-input v-model="submitForm.charge" placeholder="应收"></el-input>
</el-form-item>
<el-form-item label="应付">
<el-input v-model="submitForm.remark1" placeholder="应付"></el-input>
</el-form-item>
<el-form-item label="付款状态">
<el-select v-model="submitForm.remark2" style="width: 157px">
<el-option
v-for="item in paystatus"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="危险品">
<el-select v-model="submitForm.isdangerous" style="width: 157px">
<el-option
... ... @@ -389,6 +429,7 @@
awba: '',
licenseno: '',
starttime: '',
remark2:'',
endtime: '',
pageNum: 1,
pageSize: 20
... ... @@ -445,10 +486,11 @@
relevance: "",
remark: "",
remark1: "",
remark2: "",
remark2: "0",
taketime: "",
vol: 0,
weight: 0
weight: 0,
feweight:0
},
dialogVisible: false,
PDdialogVisible: false,
... ... @@ -463,6 +505,15 @@
label: '是'
}
],
paystatus: [
{
value: "0",
label: '否'
}, {
value: "1",
label: '是'
}
],
textMap: {
update: '编辑',
create: '新增'
... ...
<template>
<div>费率配置</div>
</template>
<script>
export default {
data() {
return {
}
},
mounted() {
},
methods:{
}
}
</script>
... ...
<template>
<div>
<div>
<el-form :inline="true" :model="query" >
<el-form-item label="">
<el-input size="medium" v-model="query.billNo" placeholder="主输入主单号"></el-input>
</el-form-item>
<el-form-item width="200px" label="">
<div class="block">
<el-date-picker
style="background: none"
size="medium"
v-model="value2"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions">
</el-date-picker>
</div>
</el-form-item>
<el-form-item label="">
<el-button size="medium" @click="getList" type="primary">查询</el-button>
</el-form-item>
</el-form>
</div>
<div style="margin-bottom: 10px"><span style="color: red">合计：毛重：{{totalweight}}KG 净重：{{totalnetweight}}KG 清单数量：{{totalcount}}</span></div>
<div>
<el-table
:data="tableData"
border
style="width: 100%">
<el-table-column
prop="clientCode"
label="客户编码"
width="150">
</el-table-column>
<el-table-column
prop="billNo"
label="主单号"
width="150">
</el-table-column>
<el-table-column
prop="grossWeightSum"
label="毛重"
width="150">
</el-table-column>
<el-table-column
prop="netWeightSum"
label="净重"
width="150">
</el-table-column>
<el-table-column
prop="countBillNo"
label="清单数量"
width="150">
</el-table-column>
<el-table-column
prop="logisticsName"
label="物流企业名称"
width="150">
</el-table-column>
<el-table-column
prop="agentName"
label="申报企业名称"
width="150">
</el-table-column>
<el-table-column
prop="ebpName"
label="电商企业名称"
width="150">
</el-table-column>
<!--<el-table-column
fixed="right"
label="操作"
width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
</template>
</el-table-column>-->
</el-table>
</div>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="query.pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="query.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</template>
<script>
import {billNoStatistics} from '../../api/consigner/exportOrder';
export default {
data(){
return{
query:{
billNo:'',
startTime:'',
endTime:'',
pageNum:0,
pageSize:10,
},
totalweight:0,
totalnetweight:0,
totalcount:0,
total:0,
value2: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
tableData: []
}
},
methods: {
handleSizeChange(val) {
this.query.pageSize=val;
this.getList();
},
handleCurrentChange(val) {
this.query.pageNum=val;
this.getList();
},
/*handleClick(row) {
console.log(row);
},*/
getList(){
if(this.query.billNo==='' && this.value2===''){
return this.$message.error('请选择时间段')
}
if(this.query.billNo==='' && this.value2===null){
return this.$message.error('请选择时间段')
}
if(this.query.billNo===null && this.value2===''){
return this.$message.error('请选择时间段')
}
if(this.query.billNo===null && this.value2===null){
return this.$message.error('请选择时间段')
}
if(this.value2 !== null && this.value2 !== ""){
this.query.startTime = this.value2[0];
this.query.endTime = this.value2[1];
}
billNoStatistics(this.query).then((response) => {
const res = response.data;
if (res.code !== '200') {
return this.$message.error('获取消息收发记录，失败！')
}
if(res.data.list.length!==0){
const sumweight=res.data.list.reduce((acc, item) => acc + (item.grossWeightSum || 0), 0);
this.totalweight=Number(sumweight.toFixed(2));
//this.totalnetweight=res.data.list.reduce((acc, item) => acc + (item.netWeightSum || 0), 0);
const sum = res.data.list.reduce((acc, item) => acc + (item.netWeightSum || 0), 0);
this.totalnetweight=Number(sum.toFixed(2));
this.totalcount=res.data.list.reduce((acc, item) => acc + (item.countBillNo || 0), 0);
}
// 获取列表数据
this.tableData = res.data.list
// 获取列表的总记录数
this.total = res.data.total
this.$message.success('获取消息收发记录，成功！');
}).catch(error => {
// 关闭加载
this.$message.error(error.toString())
})
}
},
}
</script>
... ...