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

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 3 days ago
parent
bf56fd8d03 9677940b89
commit
4f7063fccd
13 changed files with 188 additions and 59 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. 12
      src/option/reportforms/OrderAllTime.js
  4. 11
      src/option/reportforms/PackageAllTrunklineTimePageReport.js
  5. 2
      src/option/reportforms/PackageStartTimePageReport.js
  6. 37
      src/option/reportforms/PackageTransferTimePageReport.js
  7. 21
      src/option/waybill/WaybillOrderList.js
  8. 2
      src/utils/exportData.js
  9. 9
      src/views/basicdata/brand/ThreePartyMallManagement.vue
  10. 6
      src/views/basicdata/brand/basicClient.vue
  11. 7
      src/views/distribution/artery/TripartiteTransfer.vue
  12. 11
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  13. 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: '审核状态',

12
src/option/reportforms/OrderAllTime.js
Unescape View File

@ -324,4 +324,16 @@ export const columnList = [
head: false,
isshowSummary: true, //开启统计
},
{
prop: 'dayTime',
label: '标准时效(天)',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true, //开启统计
},
];

11
src/option/reportforms/PackageAllTrunklineTimePageReport.js
Unescape View File

@ -356,4 +356,15 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'hoursTime',
label: '标准时效(小时)',
type: 6,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
];

2
src/option/reportforms/PackageStartTimePageReport.js
Unescape View File

@ -119,7 +119,7 @@ export const columnList = [
},
{
prop: 'avgTime',
label: '平均发运时效',
label: '平均发运时效(小时)',
type: 1,
values: '',
width: '150',

37
src/option/reportforms/PackageTransferTimePageReport.js
Unescape View File

@ -47,6 +47,17 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'warehouseName',
label: '中转仓',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'brand',
label: '品牌',
@ -82,6 +93,18 @@ export const columnList = [
head: false,
isshowSummary: true, //开启统计
},
{
prop: 'noOutNum',
label: '未出库件数',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true, //开启统计
},
{
prop: 'outOnTimeNum',
label: '中转准时出库件数',
@ -94,6 +117,18 @@ export const columnList = [
head: false,
isshowSummary: true, //开启统计
},
{
prop: 'noOutOverNum',
label: '未出库超时件数',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true, //开启统计
},
{
prop: 'outOnTimeRate',
label: '中转准时出库率',
@ -107,7 +142,7 @@ export const columnList = [
},
{
prop: 'avgTime',
label: '平均中转时效',
label: '平均中转时效(小时)',
type: 1,
values: '',
width: '150',

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: '审核状态',

2
src/utils/exportData.js
Unescape View File

@ -7,7 +7,7 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') {
const headers = [];
const blackArr = ['序号', '复选框', '操作'];
const blackArr = ['序号', '复选框', '操作', '全选'];
const data = [];

9
src/views/basicdata/brand/ThreePartyMallManagement.vue
Unescape View File

@ -21,6 +21,7 @@
<div class="avue-crud__left"></div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="Download" @click="handleExportData" circle></el-button>
<el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
@ -134,6 +135,7 @@ import { downloadXls, handleClearTableQuery } from '@/utils/util';
import { useStore } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs';
import { exportExcel } from '@/utils/exportData';
const $router = useRouter(); //跳转
const $useStore = useStore(); //权限
const $route = useRoute(); //获取地址栏参数
@ -406,7 +408,7 @@ const handleSubmit = async () => {
}
};
// 删除
const ViewDelete = (row) => {
const ViewDelete = row => {
ElMessageBox.confirm('是否确认删除数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -423,6 +425,11 @@ const ViewDelete = (row) => {
})
.catch(() => {});
};
/** 导出表格 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '三方商场 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

6
src/views/basicdata/brand/basicClient.vue
Unescape View File

@ -68,6 +68,7 @@
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="Download" @click="handleExportData" circle></el-button>
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
@ -599,6 +600,7 @@ import { Base64 } from 'js-base64';
import dayjs from 'dayjs';
import { exportBlob } from '@/api/common';
import { downloadXls, handleClearTableQuery, setNodeHeight } from '@/utils/util';
import { exportExcel } from '@/utils/exportData';
export default {
components: {
@ -2004,6 +2006,10 @@ export default {
console.log(msgData, 'msgData');
this.$message.warning(msgData.msg || '上传失败');
},
/** 列表导出 */
handleExportData() {
exportExcel(this.columnList, this.data, '客户信息 - ' + new Date().getTime());
},
},
};
</script>

7
src/views/distribution/artery/TripartiteTransfer.vue
Unescape View File

@ -172,6 +172,7 @@
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="Download" @click="handleExportData" circle></el-button>
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
@ -508,6 +509,7 @@ import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
import { dateNow } from '@/utils/date';
import { exportExcelByDom } from '@/utils/export';
import print from '@/utils/print';
import { exportExcel } from '@/utils/exportData';
// 获取路由实例
const $router = useRouter();
@ -1513,6 +1515,11 @@ const handleSubmitSiginImg = async () => {
details.loadingObj.pageLoading = false;
}
};
/** 导出表格 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '三方中转 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

11
src/views/distribution/deliverylist/distributionDeliveryList.vue
Unescape View File

@ -699,7 +699,7 @@ export default {
getVehicleList(1, 10, '').then(res => {
const data = res.data.data;
let po = [];
data.records.forEach(item => {
data.forEach(item => {
let a = {
dictKey: item.id,
dictValue: item.vehicleNub,
@ -707,7 +707,7 @@ export default {
po.push(a);
});
this.vehicleData = po;
rv(res.data.data.records);
rv(res.data.data);
});
});
},
@ -716,8 +716,8 @@ export default {
getDriverList(1, 10, '').then(res => {
const data = res.data.data;
let po = [];
if (data.records?.length) {
data.records.forEach(item => {
data.forEach(item => {
let a = {
dictKey: item.id,
dictValue: item.name,
@ -725,8 +725,7 @@ export default {
po.push(a);
});
this.driverData = po;
rv(res.data.data.records);
}
rv(res.data.data);
});
});
},

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