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

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

dev
马远东 4 days ago
parent
18b2151766 3cf9a43ed5
commit
4ed546b35f
4 changed files with 243 additions and 234 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. 11
      src/option/distribution/VehicleStowage.js
  2. 456
      src/option/finance/ReconciliationDepositSlip.js
  3. 4
      src/views/distribution/artery/truckLoadingDetails.vue
  4. 6
      src/views/waybill/FreezeOrder.vue

11
src/option/distribution/VehicleStowage.js
Unescape View File

@ -730,6 +730,17 @@ export const orderDetailColumnList = [
sortable: false,
head: false,
},
{
prop: 'trainNumber',
label: '客户车次号',
width: '130',
type: 1,
values: '',
checkarr: [],
fixed: true,
sortable: false,
head: false,
},
{
prop: 'waybillNo',
label: '运单号',

456
src/option/finance/ReconciliationDepositSlip.js
Unescape View File

@ -186,39 +186,39 @@ export const columnList = [
head: false,
isshowSummary: true,
},
{
prop: 'totalNum',
label: '货物品类',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNum',
label: '品类件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNum',
label: '干线品类单价',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'totalNum',
// label: '货物品类',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'totalNum',
// label: '品类件数',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'totalNum',
// label: '干线品类单价',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'totalWeight',
label: '总重量',
@ -482,18 +482,18 @@ export const columnList = [
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '配送专车费',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
// {
// prop: 'deliveryCrossingFee',
// label: '配送专车费',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// isshowSummary: true,
// },
{
prop: 'installFee',
label: '安装费',
@ -518,42 +518,42 @@ export const columnList = [
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '回扣',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '申明价值',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '保价费',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
// {
// prop: 'deliveryCrossingFee',
// label: '回扣',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// isshowSummary: true,
// },
// {
// prop: 'deliveryCrossingFee',
// label: '申明价值',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// isshowSummary: true,
// },
// {
// prop: 'deliveryCrossingFee',
// label: '保价费',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// isshowSummary: true,
// },
{
prop: 'shipperPerson',
label: '发货人',
@ -690,17 +690,17 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '送货时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'signNum',
// label: '送货时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'signTime',
label: '签收时间',
@ -712,28 +712,28 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '签收人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '配送司机',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'signNum',
// label: '签收人',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'signNum',
// label: '配送司机',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'syncFeeStatus',
label: '是否计算价格',
@ -958,39 +958,39 @@ export const columnListB = [
head: false,
isshowSummary: true,
},
{
prop: 'totalNum',
label: '货物品类',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNum',
label: '品类件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNum',
label: '干线品类单价',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'totalNum',
// label: '货物品类',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'totalNum',
// label: '品类件数',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'totalNum',
// label: '干线品类单价',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'totalWeight',
label: '总重量',
@ -1255,18 +1255,18 @@ export const columnListB = [
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '配送专车费',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
// {
// prop: 'deliveryCrossingFee',
// label: '配送专车费',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// isshowSummary: true,
// },
{
prop: 'installFee',
label: '安装费',
@ -1291,42 +1291,42 @@ export const columnListB = [
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '回扣',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '申明价值',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
{
prop: 'deliveryCrossingFee',
label: '保价费',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: true,
},
// {
// prop: 'deliveryCrossingFee',
// label: '回扣',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// isshowSummary: true,
// },
// {
// prop: 'deliveryCrossingFee',
// label: '申明价值',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// isshowSummary: true,
// },
// {
// prop: 'deliveryCrossingFee',
// label: '保价费',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// isshowSummary: true,
// },
{
prop: 'shipperPerson',
label: '发货人',
@ -1463,17 +1463,17 @@ export const columnListB = [
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '送货时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'signNum',
// label: '送货时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'signTime',
label: '签收时间',
@ -1485,28 +1485,28 @@ export const columnListB = [
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '签收人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signNum',
label: '配送司机',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'signNum',
// label: '签收人',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'signNum',
// label: '配送司机',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'syncFeeStatus',
label: '是否计算价格',

4
src/views/distribution/artery/truckLoadingDetails.vue
Unescape View File

@ -130,7 +130,9 @@
<el-tag
:class="{
sub: Number(slotProps.scope.row.scanStatus) === 1,
err: Number(slotProps.scope.row.scanStatus) === 2,
err:
Number(slotProps.scope.row.scanStatus) === 2 ||
Number(slotProps.scope.row.scanStatus) === 4,
primary: Number(slotProps.scope.row.scanStatus) === 3,
}"
>

6
src/views/waybill/FreezeOrder.vue
Unescape View File

@ -115,7 +115,7 @@ import {
} from '@/api/waybill/TemporaryStorageList';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
import { downloadXls, setNodeHeight, getHtmls, handleClearTableQuery } from '@/utils/util';
import { columnList, packageListColumnList } from '@/option/waybill/FreezeOrder';
import { columnList } from '@/option/waybill/TemporaryStorageList';
import { useRouter } from 'vue-router';
import print from '@/utils/print';
import { deepClone } from '@/utils/util';
@ -164,10 +164,6 @@ const details = reactive<any>({
/** 列表数据 */
haveDataData: [],
notHaveDataData: [],
/** 包明细表头 */
packageListColumnList: deepClone(packageListColumnList),
/** 包明细数据 */
packageListData: [],
/** 页面loading */
loadingObj: {
/** 列表加载loading */

Write Preview
Loading…
Cancel
Save