java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

干线字段部分优化

dev
qb 4 days ago
parent
dd08adbfde
commit
581024a33d
4 changed files with 94 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/api/waybill/ChangeOrder.js
  2. 46
      src/option/finance/WaybillAudit.js
  3. 21
      src/option/waybill/WaybillOrderList.js
  4. 56
      src/views/waybill/ChangeOrder.vue

13
src/api/waybill/ChangeOrder.js
Unescape View File

@ -12,3 +12,16 @@ export const postFindUpdateWaybillList = data => {
data,
});
};
/**
* 导出
* @param {Object} data
* @returns
*/
export const postUpdateWaybillQualityExport = data => {
return request({
url: '/api/logpm-trunkline/openOrder/updateWaybillQualityExport',
method: 'post',
data,
});
};

46
src/option/finance/WaybillAudit.js
Unescape View File

@ -289,7 +289,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'freightFee',
@ -302,7 +301,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
// {
// prop: 'templateType',
@ -337,7 +335,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'warehouseFee',
@ -350,7 +347,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'warehouseManagementFee',
@ -363,7 +359,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'warehouseSortingFee',
@ -376,7 +371,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'warehouseOprationFee',
@ -389,7 +383,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryServiceFee',
@ -402,7 +395,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryFee',
@ -415,7 +407,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryHandlingFee',
@ -428,7 +419,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliverySortingFee',
@ -441,7 +431,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryUpfloorFee',
@ -454,7 +443,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryMoveFee',
@ -467,7 +455,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
// {
// prop: 'deliveryLine',
@ -491,7 +478,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryLineFee',
@ -504,7 +490,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'installFee',
@ -517,7 +502,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'insuranceFee',
@ -530,7 +514,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'claimingValue',
@ -543,7 +526,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'otherFee',
@ -556,7 +538,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'rebate',
@ -569,7 +550,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'thirdOperationFee',
@ -582,7 +562,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'shipperName',
@ -788,7 +767,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'dpay',
@ -801,7 +779,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'hpay',
@ -814,7 +791,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'ypay',
@ -827,7 +803,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
@ -841,7 +816,6 @@ export const columnList = [
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryTime',
@ -856,7 +830,7 @@ export const columnList = [
},
{
prop: 'signTime',
label: "签收时间",
label: '签收时间',
type: 1,
values: '',
width: '150',
@ -868,7 +842,7 @@ export const columnList = [
{
prop: 'signUserName',
label: "签收人",
label: '签收人',
type: 1,
values: '',
width: '150',
@ -880,7 +854,7 @@ export const columnList = [
{
prop: 'deliveryDriverName',
label: "配送司机",
label: '配送司机',
type: 1,
values: '',
width: '150',
@ -912,6 +886,20 @@ export const columnList = [
// sortable: true,
// head: false,
// },
{
prop: 'updateStatusName',
label: '改单状态',
type: 1,
values: '',
width: '130',
checkarr: [
{ label: '未改单', value: '0' },
{ label: '已改单', value: '1' },
],
fixed: false,
isshowSummary: false,
sortable: true,
},
{
prop: 'checkStatusName',
label: '审核状态',

21
src/option/waybill/WaybillOrderList.js
Unescape View File

@ -389,9 +389,9 @@ export const columnList = [
isshowSummary: true,
sortable: true,
}, */
/* {
prop: 'carrierName',
label: '总费用',
{
prop: 'installFee',
label: '安装费',
type: 1,
values: '',
width: '130',
@ -399,7 +399,7 @@ export const columnList = [
fixed: false,
isshowSummary: true,
sortable: true,
}, */
},
{
prop: 'claimingValue',
label: '申明价值',
@ -876,17 +876,20 @@ export const columnList = [
isshowSummary: false,
sortable: true,
}, */
/* {
prop: 'carrierName',
label: '冻结状态',
{
prop: 'updateStatusName',
label: '改单状态',
type: 1,
values: '',
width: '130',
checkarr: [],
checkarr: [
{ label: '未改单', value: '0' },
{ label: '已改单', value: '1' },
],
fixed: false,
isshowSummary: false,
sortable: true,
}, */
},
{
prop: 'checkStatusName',
label: '审核状态',

56
src/views/waybill/ChangeOrder.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<basic-container>
<div class="avue-crud">
<div class="avue-crud" v-loading="details.loadingObj.pageLoading">
<!-- 搜索模块 -->
<div v-h5uShow="!search">
<!-- 查询模块 -->
@ -56,7 +56,9 @@
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"></div>
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="Download" @click="handleExport">导出</el-button> -->
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
@ -212,9 +214,13 @@ import {
handleClearTableQuery,
} from '@/utils/util';
import { columnList, viewColumnList } from '@/option/waybill/ChangeOrder';
import { postFindUpdateWaybillList } from '@/api/waybill/ChangeOrder';
import {
postFindUpdateWaybillList,
postUpdateWaybillQualityExport,
} from '@/api/waybill/ChangeOrder';
import { useRouter } from 'vue-router';
import { ElMessage } from 'element-plus';
import { ElMessage, ElMessageBox } from 'element-plus';
import { exportExcel } from '@/utils/exportData';
// 获取路由实例
const $router = useRouter();
@ -265,6 +271,7 @@ const details = reactive<any>({
/** 列表加载loading */
list: false,
packageListLoading: false,
pageLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
@ -474,6 +481,47 @@ const handleGoWaybillDetails = ({ row }) => {
},
});
};
/** 导出 */
const handleExport = () => {
ElMessageBox.confirm('确认导出', '提示', {
type: 'warning',
}).then(async () => {
// try {
// details.loadingObj.pageLoading = true;
// const submitData = { ...details.query };
// // 开单时间
// if (getObjType(details.query.openTime) === 'array' && details.query.openTime.length > 0) {
// submitData.openTimeStartStr = details.query.openTime[0];
// submitData.openTimeEndStr = details.query.openTime[1];
// }
// // 申请时间
// if (getObjType(details.query.applyTime) === 'array' && details.query.applyTime.length > 0) {
// submitData.applyTimeStartStr = details.query.applyTime[0];
// submitData.applyTimeEndStr = details.query.applyTime[1];
// }
// // 审核时间
// if (getObjType(details.query.checkTime) === 'array' && details.query.checkTime.length > 0) {
// submitData.checkTimeStartStr = details.query.checkTime[0];
// submitData.checkTimeEndStr = details.query.checkTime[1];
// }
// const res = await postUpdateWaybillQualityExport(submitData);
// const { status, data } = res;
// if (status !== 200) return;
// downloadXls(data, '改单 - ' + new Date().getTime() + '.xlsx');
// } catch (error) {
// console.log('error :>> ', error);
// } finally {
// details.loadingObj.pageLoading = false;
// }
exportExcel(details.columnList, details.data, '改单 - ' + new Date().getTime());
});
};
</script>
<style scoped lang="scss">

Write Preview
Loading…
Cancel
Save