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

Merge branch 'pre-production'

master
pref_mail@163.com 2 months ago
parent
ae778eef11 66376d23f9
commit
0ffd4272d3
61 changed files with 713 additions and 1556 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. BIN
      public/favicon.png
  2. BIN
      public/faviconaa.png
  3. BIN
      public/img/Qrewm.png
  4. BIN
      public/img/bg/img-logo.png
  5. BIN
      public/img/bg/img-logoa.png
  6. BIN
      public/img/logo-login.png
  7. BIN
      public/img/p-logo.png
  8. BIN
      public/img/p-logoa.png
  9. 201
      src/option/aftersales/WorkorderTimeout.js
  10. 555
      src/option/aftersales/vueTvemp.js
  11. 10
      src/option/basicdata/basicClient.js
  12. 58
      src/option/basicdata/basicdataCarrier.js
  13. 10
      src/option/basicdata/basicdataCarrier2.js
  14. 188
      src/option/basicdata/basicdataCategory.js
  15. 76
      src/option/basicdata/basicdataCostCorrelation.js
  16. 111
      src/option/basicdata/basicdataCustomerBase.js
  17. 112
      src/option/basicdata/basicdataCustomerStore.js
  18. 4
      src/option/basicdata/basicdataDriverArtery.js
  19. 11
      src/option/basicdata/basicdataFreight.js
  20. 22
      src/option/basicdata/basicdataGoodsArea.js
  21. 28
      src/option/basicdata/basicdataGoodsShelf.js
  22. 26
      src/option/basicdata/basicdataStoreBrand.js
  23. 4
      src/option/basicdata/basicdataTeamStaff.js
  24. 57
      src/option/basicdata/basicdataTray.js
  25. 4
      src/option/basicdata/basicdataTripartiteMall.js
  26. 11
      src/option/basicdata/basicdataVehicle.js
  27. 153
      src/option/distribution/TripartiteTransfer.js
  28. 20
      src/option/distribution/VehicleArrivalManagement.js
  29. 31
      src/option/distribution/VehicleStowage.js
  30. 20
      src/option/distribution/zeroAdditionalRecording.js
  31. 17
      src/option/reportforms/OrderAllTime.js
  32. 35
      src/option/reportforms/PackageStartTimePageReport.js
  33. 11
      src/option/reportforms/PackageTransferTimePageReport.js
  34. 11
      src/option/storagecost/Traincostbreakdown.js
  35. 19
      src/page/index/logo.vue
  36. 22
      src/page/login/index.vue
  37. 8
      src/page/login/userlogin.vue
  38. 41
      src/views/aftersales/aftersalesWorkOrderend.vue
  39. 22
      src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
  40. 18
      src/views/cost/storagecost/Monthlyorderwarehousing.vue
  41. 11
      src/views/cost/storagecost/WarehouseMonthly.vue
  42. 45
      src/views/cost/storagecost/Warehouserentalmanagement.vue
  43. 7
      src/views/distribution/artery/VehicleArrivalManagement.vue
  44. 7
      src/views/distribution/artery/VehicleStowage.vue
  45. 8
      src/views/distribution/artery/abnormalList.vue
  46. 25
      src/views/distribution/artery/addTripartiteTransfer.vue
  47. 10
      src/views/distribution/inventory/CreateOrder.vue
  48. 5
      src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
  49. 10
      src/views/distribution/signfor/distributionSignforedt.vue
  50. 8
      src/views/finance/CustomerSettlement.vue
  51. 27
      src/views/finance/MerchantDepositSlip.vue
  52. 15
      src/views/finance/ReconciliationDepositSlip.vue
  53. 7
      src/views/finance/WaybillAudit.vue
  54. 4
      src/views/reportforms/PackageAllTrunklineTimePageReport.vue
  55. 7
      src/views/reportforms/PackageStartTimePageReport.vue
  56. 7
      src/views/reportforms/PackageTransferTimePageReport.vue
  57. 82
      src/views/waybill/ChangeOrder.vue
  58. 6
      src/views/waybill/CreateZeroOrder.vue
  59. 43
      src/views/waybill/WarehousingByTrainNumber.vue
  60. 8
      src/views/waybill/WaybillOrderList.vue
  61. 11
      src/views/waybill/orderPackageList.vue

BIN
public/favicon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
public/faviconaa.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

BIN
public/img/Qrewm.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
public/img/bg/img-logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
public/img/bg/img-logoa.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
public/img/logo-login.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
public/img/p-logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
public/img/p-logoa.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB

201
src/option/aftersales/WorkorderTimeout.js
Unescape View File

@ -1,106 +1,99 @@
export const columnList = [
// {
// prop: '',
// label: '复选框',
// type: 0,
// width: 55,
// fixed: true,
// },
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 55,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 55,
fixed: true,
},
{
prop: 'trainNumber',
label: '车次号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationCode',
label: '预约单号',
type: 13,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingTime',
label: '签收复核时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'sjsigningTime',
label: '司机签收时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'driverName',
label: '司机姓名',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'vehicleName',
label: '车牌号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationNum',
label: '预约数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'examineUserName',
label: '审核人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
]
{
prop: 'trainNumber',
label: '车次号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationCode',
label: '预约单号',
type: 13,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingTime',
label: '签收复核时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'sjsigningTime',
label: '司机签收时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'driverName',
label: '司机姓名',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'vehicleName',
label: '车牌号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationNum',
label: '预约数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'examineUserName',
label: '审核人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
];

555
src/option/aftersales/vueTvemp.js
Unescape View File

@ -20,7 +20,7 @@ export const columnList = [
fixed: true,
},
{
prop: 'workOrderTypeNameS', //workOrderType
prop: 'workOrderTypeNameS',
label: '异常类型',
type: 3,
values: '',
@ -31,7 +31,7 @@ export const columnList = [
head: false,
},
{
prop: 'discoveryNodeNameS', //discoveryNode
prop: 'discoveryNodeNameS',
label: '发现节点',
type: 3,
values: '',
@ -228,7 +228,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
isshowSummary: true, //开启统计
isshowSummary: true,
},
{
prop: 'warehouseServiceName',
@ -255,7 +255,7 @@ export const columnList = [
{
prop: 'overTime',
label: '完结时间', //审核时间
label: '完结时间',
type: 1,
values: '',
width: '150',
@ -319,179 +319,6 @@ export const columnList = [
sortable: true,
head: false,
},
// {
// prop: 'customerServiceName',
// label: '归属客服名称',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'operator',
// label: '操作人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'deliverGoodsTime',
// label: '送货时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'discoveryTime',
// label: '发现时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'warehousingTime',
// label: '入库时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'deliveryTime',
// label: '配送时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'deliveryDriver',
// label: '配送司机',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'trainNumber',
// label: '车次号',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'vehicleRoute',
// label: '车辆线路',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'auditTime',
// label: '审核时间', //审核时间
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'investigationProcess',
// label: '调查经过',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// // {
// // prop: 'personResponsible',
// // label: '责任人(库内作业环节)',
// // type: 2,
// // values: '',
// // width: '170',
// // checkarr: [],
// // fixed: false,
// // sortable: true,
// // head: false,
// // },
// {
// prop: 'reviewedBy',
// label: '审核人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'ceator',
// label: '创建人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// // {
// // prop: 'remarks',
// // label: '备注',
// // type: 1,
// // values: '',
// // width: '150',
// // checkarr: [],
// // fixed: false,
// // sortable: true,
// // head: false,
// // },
{
prop: 'createUserName',
@ -524,7 +351,7 @@ export const columnList8 = [
fixed: true,
},
{
prop: 'workOrderTypeNameS', //workOrderType
prop: 'workOrderTypeNameS',
label: '异常类型',
type: 3,
values: '',
@ -535,7 +362,7 @@ export const columnList8 = [
head: false,
},
{
prop: 'discoveryNodeNameS', //discoveryNode
prop: 'discoveryNodeNameS',
label: '发现节点',
type: 3,
values: '',
@ -635,20 +462,8 @@ export const columnList8 = [
sortable: true,
head: false,
},
// {
// prop: 'secondary',
// label: '二级品',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'workOrderStatusNameS', //workOrderStatus
prop: 'workOrderStatusNameS',
label: '工单状态',
type: 1,
values: '',
@ -779,221 +594,6 @@ export const columnList8 = [
sortable: true,
head: false,
},
// {
// prop: 'customerServiceName',
// label: '归属客服名称',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'totalAmount',
// label: '赔款金额',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'entryTime',
// label: '财务入账时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'operator',
// label: '操作人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'deliverGoodsTime',
// label: '送货时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'discoveryTime',
// label: '发现时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'warehousingTime',
// label: '入库时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'deliveryTime',
// label: '配送时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'deliveryDriver',
// label: '配送司机',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'trainNumber',
// label: '车次号',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'vehicleRoute',
// label: '车辆线路',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'overTime',
// label: '完结时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'investigationProcess',
// label: '调查经过',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// // {
// // prop: 'personResponsible',
// // label: '责任人(库内作业环节)',
// // type: 2,
// // values: '',
// // width: '170',
// // checkarr: [],
// // fixed: false,
// // sortable: true,
// // head: false,
// // },
// {
// prop: 'processNumber',
// label: '钉钉流程号',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'reviewedBy',
// label: '审核人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'auditTime',
// label: '审核时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'createTime',
// label: '录入时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'remarks',
// label: '备注',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'createUserName',
label: '操作',
@ -1413,7 +1013,7 @@ export const columnList1 = [
},
{
prop: 'workOrderStatusNameS', //workOrderStatus
prop: 'workOrderStatusNameS',
label: '工单状态',
type: 1,
values: '',
@ -1688,7 +1288,7 @@ export const columnList4 = [
},
{
prop: 'workOrderStatusNameS', //workOrderStatus
prop: 'workOrderStatusNameS',
label: '工单状态',
type: 1,
values: '',
@ -1780,7 +1380,7 @@ export const columnList4 = [
{
prop: 'businessName',
label: '内部责任方',
type:2,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -1966,7 +1566,7 @@ export const columnList2 = [
},
{
prop: 'workOrderStatusNameS', //workOrderStatus
prop: 'workOrderStatusNameS',
label: '工单状态',
type: 1,
values: '',
@ -2530,7 +2130,7 @@ export const columnList9 = [
},
{
prop: 'workOrderStatusNameS', //workOrderStatus
prop: 'workOrderStatusNameS',
label: '工单状态',
type: 1,
values: '',
@ -2819,7 +2419,7 @@ export const columnList6 = [
},
{
prop: 'workOrderStatusNameS', //workOrderStatus
prop: 'workOrderStatusNameS',
label: '工单状态',
type: 1,
values: '',
@ -2951,6 +2551,17 @@ export const columnList6 = [
sortable: true,
head: false,
},
{
prop: 'responsibleMoney',
label: '赔款总金额',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'indemnitorInfo',
label: '受款方信息',
@ -2962,6 +2573,17 @@ export const columnList6 = [
sortable: true,
head: false,
},
{
prop: 'indemnitorMoney',
label: '受款总金额',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reasonArbitration',
label: '仲裁原因',
@ -2985,7 +2607,7 @@ export const columnList6 = [
head: false,
},
{
prop: 'appealStatusName',
prop: 'appealStatusName',
label: '申诉状态',
type: 1,
values: '',
@ -2996,7 +2618,7 @@ export const columnList6 = [
head: false,
},
{
prop: 'processNumber',
prop: 'processNumber',
label: '钉钉号',
type: 1,
values: '',
@ -3346,17 +2968,6 @@ export const Claimsfield = [
sortable: true,
head: false,
},
// {
// prop: 'businessId',
// label: '营业部ID',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'brandName',
label: '品牌',
@ -3390,17 +3001,6 @@ export const Claimsfield = [
sortable: true,
head: false,
},
// {
// prop: 'workOrderType',
// label: '异常类型',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'workOrderTypeNameS',
label: '异常类型',
@ -3412,17 +3012,6 @@ export const Claimsfield = [
sortable: true,
head: false,
},
// {
// prop: 'resultType',
// label: '处理结果',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'resultTypeName',
label: '处理结果名称',
@ -3434,28 +3023,6 @@ export const Claimsfield = [
sortable: true,
head: false,
},
// {
// prop: 'laprId',
// label: '处理结果ID',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'discoveryNode',
// label: '发现环节',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'discoveryNodeName',
label: '发现环节',
@ -3522,17 +3089,6 @@ export const Claimsfield = [
sortable: true,
head: false,
},
// {
// prop: 'lawoId',
// label: '异常工单ID',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'processNumber',
label: '钉钉流程号',
@ -3544,17 +3100,6 @@ export const Claimsfield = [
sortable: true,
head: false,
},
// {
// prop: 'workOrderStatus',
// label: '工单状态',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'workOrderStatusNameS',
label: '工单状态',
@ -3750,19 +3295,6 @@ export const timeoutList = [
sortable: true,
head: false,
},
// {
// prop: 'warehouseId',
// label: '仓库ID',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'businessName',
label: '处理方名称',
@ -3774,19 +3306,6 @@ export const timeoutList = [
sortable: true,
head: false,
},
// {
// prop: 'businessId',
// label: '处理方ID',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'remarks',
label: '备注',

10
src/option/basicdata/basicClient.js
Unescape View File

@ -114,16 +114,6 @@ export default {
prop: "bladeRegionProvinceId",
search: true,
},
// {
// label: "市",
// prop: "bladeRegionCityId",
// search: true,
// },
// {
// label: "区/县",
// prop: "bladeRegionAreaId",
// search: true,
// },
{
label: "合同附件",
prop: "fileName",

58
src/option/basicdata/basicdataCarrier.js
Unescape View File

@ -115,11 +115,6 @@ export default {
},
dataType: 'String',
search: true,
// rules: [{
// required: true,
// message: "请选择类型",
// trigger: "blur"
// }],
},
{
label: '承运商编号',
@ -139,37 +134,15 @@ export default {
},
],
},
// {
// label: "集团ID",
// prop: "groupId",
// labelWidth:'150',
// width:"100px",
// align:'center',
// span:11,
// type: "input",
// search: true,
// rules: [{
// required: true,
// message: "输入集团ID",
// trigger: "blur"
// }],
// },
{
label: '承运商电话',
labelWidth: '150',
// width: 'fit-content',
width: '100px',
align: 'center',
span: 11,
prop: 'carrierPhone',
type: 'input',
},
// {
// label: "绑定仓库Id",
// prop: "warehouseId",
// type: "input",
// },
{
label: '承运商名称',
prop: 'carrierName',
@ -202,8 +175,6 @@ export default {
{
label: '营业执照注册号',
prop: 'licenseNub',
// labelWidth: '150',
// width: 'fit-content',
width: '200px',
align: 'center',
span: 11,
@ -230,7 +201,6 @@ export default {
prop: 'legalPersonPhone',
labelWidth: '150',
span: 11,
// width: 'fit-content',
width: '150px',
align: 'center',
type: 'input',
@ -241,7 +211,6 @@ export default {
prop: 'legalPersonId',
labelWidth: '150',
span: 11,
// width: 'fit-content',
width: '150px',
align: 'center',
type: 'input',
@ -266,7 +235,6 @@ export default {
prop: 'customerServicePhone',
labelWidth: '150',
span: 11,
// width: 'fit-content',
width: '150px',
align: 'center',
type: 'input',
@ -275,9 +243,7 @@ export default {
{
label: '合同开始时间',
prop: 'contractStartTime',
// labelWidth: '150',
span: 11,
// width: 'fit-content',
width: '150px',
align: 'center',
type: 'date',
@ -287,9 +253,7 @@ export default {
{
label: '合同结束时间',
prop: 'contractEndTime',
// labelWidth: '150',
span: 11,
// width: 'fit-content',
width: '150px',
align: 'center',
type: 'date',
@ -303,7 +267,6 @@ export default {
labelWidth: '180',
span: 11,
width: '200px',
// width: 'fit-content',
align: 'center',
rules: [
{
@ -329,7 +292,6 @@ export default {
type: 'number',
labelWidth: '150',
span: 11,
// width: 'fit-content',
width: '150px',
align: 'center',
},
@ -339,7 +301,6 @@ export default {
type: 'number',
labelWidth: '150',
span: 11,
// width: 'fit-content',
width: '150px',
align: 'center',
},
@ -358,7 +319,6 @@ export default {
type: 'input',
labelWidth: '150',
span: 11,
// width: 'fit-content',
width: '150px',
align: 'center',
},
@ -397,24 +357,6 @@ export default {
width: 'fit-content',
align: 'center',
},
// {
// label: "照片信息",
// prop: "photo",
// type: 'upload',
// listType: 'picture-card',
// dataType: 'string',
// labelWidth:'150',
// span:11,
// multiple:true,
// width:"fit-content",
// align:'left',
// action: '/blade-resource/oss/endpoint/put-file',
// limit: 3,
// propsHttp: {
// res: 'data',
// url: 'link',
// },
// },
{
label: '道路运输许可证图片',

10
src/option/basicdata/basicdataCarrier2.js
Unescape View File

@ -248,16 +248,6 @@ export const columnList = [
fixed: false,
sortable: true,
},
// {
// label: '道路运输许可证图片',
// prop: 'notes',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'notes',
label: '操作',

188
src/option/basicdata/basicdataCategory.js
Unescape View File

@ -1,10 +1,10 @@
export default {
height:'auto',
height: 'auto',
calcHeight: 30,
tip: false,
searchShow: false,
searchMenuSpan: 6,
indexLabel:'序号',
indexLabel: '序号',
indexWidth: 80,
border: true,
index: true,
@ -13,200 +13,155 @@ export default {
dialogClickModal: false,
column: [
{
label: "主键",
prop: "id",
type: "input",
label: '主键',
prop: 'id',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "租户号",
prop: "tenantId",
type: "input",
label: '租户号',
prop: 'tenantId',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "创建人",
prop: "createUser",
type: "input",
label: '创建人',
prop: 'createUser',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "创建时间",
prop: "createTime",
type: "input",
label: '创建时间',
prop: 'createTime',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "更新人",
prop: "updateUser",
type: "input",
label: '更新人',
prop: 'updateUser',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "更新时间",
prop: "updateTime",
type: "input",
label: '更新时间',
prop: 'updateTime',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "状态",
prop: "status",
type: "input",
label: '状态',
prop: 'status',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "是否已删除",
prop: "isDeleted",
type: "input",
label: '是否已删除',
prop: 'isDeleted',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "创建部门",
prop: "createDept",
type: "input",
label: '创建部门',
prop: 'createDept',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "预留1",
prop: "reserve1",
type: "input",
label: '预留1',
prop: 'reserve1',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "预留2",
prop: "reserve2",
type: "input",
label: '预留2',
prop: 'reserve2',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "预留3",
prop: "reserve3",
type: "input",
label: '预留3',
prop: 'reserve3',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "预留4",
prop: "reserve4",
type: "input",
label: '预留4',
prop: 'reserve4',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
width: 'fit-content',
},
{
label: "预留5",
prop: "reserve5",
type: "input",
label: '预留5',
prop: 'reserve5',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
width: "fit-content",
},
// {
// label: "父ID",
// prop: "pid",
// type: "input",
// },
// {
// label: "一级编码",
// prop: "stairCode",
// type: "input",
// },
// {
// label: "一级名称",
// prop: "stairName",
// type: "input",
// },
// {
// label: "二级编码",
// prop: "secondCode",
// type: "input",
// },
// {
// label: "二级名称",
// prop: "secondName",
// type: "input",
// },
// {
// label: "三级编码",
// prop: "threeCode",
// type: "input",
// },
// {
// label: "三级名称",
// prop: "threeName",
// type: "input",
// },
// {
// label: "四级编码",
// prop: "fourCode",
// type: "input",
// },
// {
// label: "四级名称",
// prop: "fourName",
// type: "input",
// },
{
label: "名称",
prop: "name",
type: "input",
width: 'fit-content',
},
{
label: '名称',
prop: 'name',
type: 'input',
search: true,
},
{
label: "类型",
prop: "type",
type: "select",
label: '类型',
prop: 'type',
type: 'select',
search: true,
dicUrl: '/api/blade-system/dict-biz/dictionary?code=category',
props: {
@ -217,10 +172,9 @@ export default {
{
required: true,
message: '请选择类型',
trigger: 'blur'
}
]
trigger: 'blur',
},
],
},
]
}
],
};

76
src/option/basicdata/basicdataCostCorrelation.js
Unescape View File

@ -5,105 +5,97 @@ export default {
selection: true,
column: [
{
label: "主键",
prop: "id",
label: '主键',
prop: 'id',
display: false,
hide: true,
},
{
label: "租户号",
prop: "tenantId",
label: '租户号',
prop: 'tenantId',
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
label: '创建人',
prop: 'createUser',
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
label: '创建时间',
prop: 'createTime',
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
label: '更新人',
prop: 'updateUser',
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
label: '更新时间',
prop: 'updateTime',
display: false,
hide: true,
},
{
label: "状态",
prop: "status",
label: '状态',
prop: 'status',
display: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
label: '是否已删除',
prop: 'isDeleted',
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
label: '创建部门',
prop: 'createDept',
display: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",
label: '预留1',
prop: 'reserve1',
display: false,
hide: true,
},
{
label: "预留2",
prop: "reserve2",
label: '预留2',
prop: 'reserve2',
display: false,
hide: true,
},
{
label: "预留3",
prop: "reserve3",
label: '预留3',
prop: 'reserve3',
display: false,
hide: true,
},
{
label: "预留4",
prop: "reserve4",
label: '预留4',
prop: 'reserve4',
display: false,
hide: true,
},
{
label: "预留5",
prop: "reserve5",
label: '预留5',
prop: 'reserve5',
display: false,
hide: true,
},
// {
// label: "区域价格ID",
// prop: "zonePriceId",
// },
{
label: "编码",
prop: "coding",
label: '编码',
prop: 'coding',
search: true,
},
{
label: "费用",
prop: "ensue",
label: '费用',
prop: 'ensue',
},
// {
// label: "标识",
// prop: "identification",
// },
]
}
],
};

111
src/option/basicdata/basicdataCustomerBase.js
Unescape View File

@ -1,11 +1,11 @@
export default {
height:'auto',
height: 'auto',
calcHeight: 30,
tip: false,
searchShow: false,
searchMenuSpan: 6,
indexWidth:80,
indexLabel:"序号",
indexWidth: 80,
indexLabel: '序号',
border: true,
index: true,
viewBtn: true,
@ -13,147 +13,142 @@ export default {
dialogClickModal: false,
column: [
{
label: "租户号",
prop: "tenantId",
type: "input",
label: '租户号',
prop: 'tenantId',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
type: "input",
label: '创建人',
prop: 'createUser',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
type: "input",
label: '创建时间',
prop: 'createTime',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
type: "input",
label: '更新人',
prop: 'updateUser',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
type: "input",
label: '更新时间',
prop: 'updateTime',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "状态",
prop: "status",
type: "input",
label: '状态',
prop: 'status',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
type: "input",
label: '是否已删除',
prop: 'isDeleted',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
type: "input",
label: '创建部门',
prop: 'createDept',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "主键",
prop: "id",
type: "input",
label: '主键',
prop: 'id',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",
type: "input",
label: '预留1',
prop: 'reserve1',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留2",
prop: "reserve2",
type: "input",
label: '预留2',
prop: 'reserve2',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留3",
prop: "reserve3",
type: "input",
label: '预留3',
prop: 'reserve3',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留4",
prop: "reserve4",
type: "input",
label: '预留4',
prop: 'reserve4',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留5",
prop: "reserve5",
type: "input",
label: '预留5',
prop: 'reserve5',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "基地名称",
prop: "baseName",
type: "input",
label: '基地名称',
prop: 'baseName',
type: 'input',
search: true,
},
{
label: "基地编码",
prop: "baseCode",
type: "input",
label: '基地编码',
prop: 'baseCode',
type: 'input',
search: true,
},
// {
// label: "客户ID",
// prop: "clientId",
// type: "input",
// },
]
}
],
};

112
src/option/basicdata/basicdataCustomerStore.js
Unescape View File

@ -1,11 +1,11 @@
export default {
height:'auto',
height: 'auto',
calcHeight: 30,
tip: false,
searchShow: false,
searchMenuSpan: 6,
indexWidth:80,
indexLabel:"序号",
indexWidth: 80,
indexLabel: '序号',
border: true,
index: true,
viewBtn: true,
@ -13,148 +13,142 @@ export default {
dialogClickModal: false,
column: [
{
label: "租户号",
prop: "tenantId",
type: "input",
label: '租户号',
prop: 'tenantId',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
type: "input",
label: '创建人',
prop: 'createUser',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
type: "input",
label: '创建时间',
prop: 'createTime',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
type: "input",
label: '更新人',
prop: 'updateUser',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
type: "input",
label: '更新时间',
prop: 'updateTime',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "状态",
prop: "status",
type: "input",
label: '状态',
prop: 'status',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
type: "input",
label: '是否已删除',
prop: 'isDeleted',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
type: "input",
label: '创建部门',
prop: 'createDept',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "主键",
prop: "id",
type: "input",
label: '主键',
prop: 'id',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",
type: "input",
label: '预留1',
prop: 'reserve1',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留2",
prop: "reserve2",
type: "input",
label: '预留2',
prop: 'reserve2',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留3",
prop: "reserve3",
type: "input",
label: '预留3',
prop: 'reserve3',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留4",
prop: "reserve4",
type: "input",
label: '预留4',
prop: 'reserve4',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留5",
prop: "reserve5",
type: "input",
label: '预留5',
prop: 'reserve5',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "商场名称",
prop: "storeName",
type: "input",
label: '商场名称',
prop: 'storeName',
type: 'input',
search: true,
},
{
label: "商场编码",
prop: "storeCode",
type: "input",
label: '商场编码',
prop: 'storeCode',
type: 'input',
search: true,
},
// {
// label: "客户",
// prop: "clientId",
// type: "input",
// search: true,
// },
]
}
],
};

4
src/option/basicdata/basicdataDriverArtery.js
Unescape View File

@ -178,10 +178,6 @@ export default {
value: 'id',
disabled: true,
},
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true,
},
{
label: '合同开始时间',

11
src/option/basicdata/basicdataFreight.js
Unescape View File

@ -316,17 +316,6 @@ export default {
valueFormat:'YYYY-MM-DD HH:mm:ss'
},
// {
// label: "类型",
// prop: "type",
// type: "input",
// },
// {
// label: "标识",
// prop: "identification",
// type: "input",
//
// },
{
label: "时间段", //;1 0-30天 2 0-60天 3 60天以上
prop: "warehousingTimeCharge",

22
src/option/basicdata/basicdataGoodsArea.js
Unescape View File

@ -62,28 +62,6 @@ export default {
prop: "enableStatus",
hide:false,
},
// {
// label: "预留1",
// prop: "reserve1",
// },
// {
// label: "预留2",
// prop: "reserve2",
// },
// {
// label: "预留3",
// prop: "reserve3",
// },
// {
// label: "预留4",
// prop: "reserve4",
// },
// {
// label: "预留5",
// prop: "reserve5",
// },
{
label: "货区类型",
prop: "areaTypeName",

28
src/option/basicdata/basicdataGoodsShelf.js
Unescape View File

@ -58,26 +58,6 @@ export default {
display: false,
hide: true,
},
// {
// label: "预留1",
// prop: "reserve1",
// },
// {
// label: "预留2",
// prop: "reserve2",
// },
// {
// label: "预留3",
// prop: "reserve3",
// },
// {
// label: "预留4",
// prop: "reserve4",
// },
// {
// label: "预留5",
// prop: "reserve5",
// },
{
label: "仓库名称",
prop: "warehouseName",
@ -119,20 +99,12 @@ export default {
prop: "enableStatus",
hide:false,
},
// {
// label: "货位名称",
// prop: "goodsAllcationId",
// },
{
label: "二维码",
prop: "qrCode",
display: false,
hide: true,
},
// {
// label: "二维码图片",
// prop: "qrCodeUrl",
// },
{
label: "备注",
prop: "remarks",

26
src/option/basicdata/basicdataStoreBrand.js
Unescape View File

@ -123,27 +123,6 @@ export default {
viewDisplay: false,
hide: true,
},
// {
// label: "门店名称",
// prop: "shopId",
// type: "select",
// remote: false,
// allowCreate:false,
// filterable:false,
// search: false,
// dicUrl: `${baseUrl}/basicdataShop/lists?storeName={{key}}`,
// props: {
// label: 'storeName',
// value: 'id',
// },
// // rules: [
// // {
// // required: true,
// // message: '请选择门店',
// // trigger: 'blur'
// // }
// // ]
// },
{
label: "品牌名称",
prop: "brandId",
@ -182,11 +161,6 @@ export default {
editDisplay: false,
viewDisplay: false,
hide: true,
// dicUrl: '/api/blade-system/tenant/list',
// props: {
// label: 'tenantName',
// value: 'tenantId',
// },
},
]
}

4
src/option/basicdata/basicdataTeamStaff.js
Unescape View File

@ -92,10 +92,6 @@ export default {
label: "姓名",
prop: "name",
},
// {
// label: "工号",
// prop: "jobNumber",
// },
{
label: "班组名称",
prop: "teamGroupName",

57
src/option/basicdata/basicdataTray.js
Unescape View File

@ -131,37 +131,6 @@ export default {
hide: true,
width: '130',
},
// {
// label: "预留1",
// prop: "reserve1",
// type: "input",
// },
// {
// label: "预留2",
// prop: "reserve2",
// type: "input",
// },
// {
// label: "预留3",
// prop: "reserve3",
// type: "input",
// },
// {
// label: "预留4",
// prop: "reserve4",
// type: "input",
// },
// {
// label: "预留5",
// prop: "reserve5",
// type: "input",
// },
// {
// label: "托盘名称",
// prop: "palletName",
// type: "input",
// labelWidth:'100',
// },
{
label: '仓 库',
prop: 'warehouseId',
@ -280,31 +249,5 @@ export default {
hide: true,
width: '130',
},
// {
// label: "二维码",
// prop: "qrCode",
// type: "input",
// labelWidth:'100',
// addDisplay: true,
// hide: true,
// },
// {
// label: "二维码图片",
// prop: "qrCodeUrl",
// type: "upload",
// dataType: 'string',
// listType: 'picture-img',
// hide: true,
// labelWidth:'100',
// span:11,
// multiple:false,
// width:"200px",
// align:'left',
// action: '/blade-resource/oss/endpoint/put-file',
// propsHttp: {
// res: 'data',
// url: 'link',
// },
// },
],
};

4
src/option/basicdata/basicdataTripartiteMall.js
Unescape View File

@ -88,10 +88,6 @@ export default {
display: false,
hide: true,
},
// {
// label: "客户ID",
// prop: "client",
// },
{
label: "三方商场",
prop: "tripartiteMall",

11
src/option/basicdata/basicdataVehicle.js
Unescape View File

@ -503,15 +503,6 @@ export default {
align:'center',
span:11,
},
// {
// label: "车辆挂靠公司",
// prop: "vehicleParkingCompany",
// type: "input",
// labelWidth:'150',
// width:"150px",
// align:'center',
// span:11,
// },
{
label: "是否有GPS",
prop: "withGps",
@ -610,7 +601,6 @@ export default {
width:"200px",
align:'left',
action: '/blade-resource/oss/endpoint/put-file',
// limit: 3,
propsHttp: {
res: 'data',
url: 'link',
@ -628,7 +618,6 @@ export default {
width:"200px",
align:'left',
action: '/blade-resource/oss/endpoint/put-file',
// limit: 3,
propsHttp: {
res: 'data',
url: 'link',

153
src/option/distribution/TripartiteTransfer.js
Unescape View File

@ -368,16 +368,6 @@ export const detailsColumnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'lineNameTitle',
// label: '订单来源',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'trayName',
label: '托盘名称',
@ -418,26 +408,6 @@ export const detailsColumnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'nodeNub',
// label: '装车仓库',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'startTime',
// label: '扫码时间',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'unloadNodeName',
label: '卸车仓库',
@ -578,86 +548,6 @@ export const detailsColumnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'totalFee',
// label: '是否齐套',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'carrierName',
// label: '一级品类',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'waybillCount',
// label: '二级品类',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'totalNum',
// label: '三级品类',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'totalWeight',
// label: '物料名称',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'totalVolume',
// label: '装车扫描人',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'createUserName',
// label: '卸车人',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'totalWeight',
// label: '同步状态',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'createTime',
label: '装车时间',
@ -871,17 +761,6 @@ export const TripartiteTransferColumnList = [
isshowSummary: true,
sortable: true,
},
// {
// prop: 'stockNum',
// label: '在库数',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// isshowSummary: true,
// sortable: true,
// },
{
prop: 'loadingNum',
label: '装车数',
@ -915,17 +794,6 @@ export const TripartiteTransferColumnList = [
isshowSummary: true,
sortable: true,
},
// {
// prop: 'openPrice',
// label: '运单开单价格',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// isColumnMerge: true,
// sortable: true,
// },
{
prop: 'weight',
label: '重量(KG)',
@ -971,27 +839,6 @@ export const TripartiteTransferColumnList = [
isshowSummary: true,
sortable: true,
},
{
prop: 'orderFreight',
label: '订单运费',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
isshowSummary: true,
sortable: true,
},
// {
// prop: 'customerTrain',
// label: '客户车次',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'remark',
label: '运单备注',

20
src/option/distribution/VehicleArrivalManagement.js
Unescape View File

@ -89,16 +89,6 @@ export const columnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'startTime',
// label: '滞留扫描',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'isCustomerName',
label: '是否直发商家',
@ -112,16 +102,6 @@ export const columnList = [
fixed: false,
sortable: false,
},
// {
// prop: 'planVolume',
// label: '类型',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'loadStatusName',
label: '车辆状态',

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

@ -89,16 +89,6 @@ export const columnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'startTime',
// label: '滞留扫描',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'isCustomerName',
label: '是否直发商家',
@ -112,16 +102,6 @@ export const columnList = [
fixed: false,
sortable: false,
},
// {
// prop: 'planVolume',
// label: '类型',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'loadStatusName',
label: '车辆状态',
@ -375,17 +355,6 @@ export const columnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'createUserName',
// label: '卸车总收入',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// isshowSummary: true,
// },
{
prop: 'createUserName',
label: '操作',

20
src/option/distribution/zeroAdditionalRecording.js
Unescape View File

@ -96,16 +96,6 @@ export const oldColumnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'planNum',
// label: '计划件数',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'stockNum',
label: '在库件数',
@ -287,16 +277,6 @@ export const newColumnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'realNum',
// label: '装车件数',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'loadingNum',
label: '装车件数',

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

@ -81,6 +81,23 @@ export const columnList = [
head: false,
isshowSummary: true, //开启统计
},
{
prop: 'serviceTypeName',
label: '订单类型',
type: 1,
values: '',
width: '150',
checkarr: [
{ label: '商配', value: 1 },
{ label: '市配', value: 2 },
{ label: '自提', value: 3 },
{ label: '三方中转', value: 4 },
],
fixed: false,
sortable: true,
head: false,
isshowSummary: true, //开启统计
},
{
prop: 'departureWarehouseName',
label: '始发仓',

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

@ -94,6 +94,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: 'onTimeNum',
label: '准时发运数',
@ -106,6 +118,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: 'onTimeRate',
label: '准时发运率',
@ -128,4 +152,15 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'hoursTime',
label: '标准时效(小时)',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
];

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

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

11
src/option/storagecost/Traincostbreakdown.js
Unescape View File

@ -89,6 +89,17 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'trainCompletionTime',
label: '复核完成时',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'destinationWarehouse',
label: '目的仓',

19
src/page/index/logo.vue
Unescape View File

@ -15,7 +15,7 @@
<span class="avue-logo_title" key="1">{{ website.indexTitle }} </span>
</template>
</transition-group>
</div>
</div>
</template>
@ -28,7 +28,7 @@ export default {
data() {
return {};
},
created() {},
created() { },
computed: {
...mapGetters(['isCollapse']),
},
@ -37,13 +37,22 @@ export default {
</script>
<style lang="scss" scoped>
.logo-img {
height: 100%;
display: flex;
align-items: center;
margin:0 10px;
img {
width: 60px;
height: 60px;
margin-top: -5px;
width: 40px;
height: 40px;
}
}
.logo-x {
display: flex;
height: 100%;
background-color: #fff;
}
.avue-logo{
color: #000000;
}
</style>

22
src/page/login/index.vue
Unescape View File

@ -14,8 +14,10 @@
<div class="login-border">
<div class="login-main">
<h4 class="login-title">
<img src="../../../public/img/logo-login.png" />
<!-- {{ $t('login.title') }} -->
{{ website.title }}
<!-- {{ website.title }} -->
<span>物流信息平台</span>
<!-- <top-lang></top-lang> -->
<!-- 语言转换 -->
</h4>
@ -76,7 +78,7 @@ export default {
this.handleLogin();
this.getTime();
},
mounted() {},
mounted() { },
computed: {
...mapGetters(['tagWel']),
},
@ -148,13 +150,29 @@ export default {
<style lang="scss">
@import '@/styles/login.scss';
.index_footer {
position: fixed;
bottom: 0;
width: 100%;
p {
text-align: center;
color: #999;
}
}
.login-title {
display: flex;
align-items: center;
justify-content: center;
img {
width: 130px;
height: 60px;
}
span{
margin-left: 10px;
}
}
</style>

8
src/page/login/userlogin.vue
Unescape View File

@ -1,7 +1,5 @@
<template>
<div class="login-logo">
<img src="../../../public/img/p-logo.png" />
</div>
<el-form
class="login-form"
status-icon
@ -361,10 +359,10 @@ export default {
}
.login-logo {
position: absolute;
right: 70px;
// right: 60px;
top: 66px;
img {
width: 60px;
width:130px;
height: 60px;
}
}

41
src/views/aftersales/aftersalesWorkOrderend.vue
Unescape View File

@ -490,14 +490,14 @@
identifyingC3: item.difference == '3',
'mx-1': true,
}" effect="dark">{{
item.difference == '1'
? ' 调查记录'
: item.difference == '2'
? '指定记录'
: item.difference == '3'
? '操作记录'
: ''
}}
item.difference == '1'
? ' 调查记录'
: item.difference == '2'
? '指定记录'
: item.difference == '3'
? '操作记录'
: ''
}}
</el-tag>
</div>
@ -582,10 +582,10 @@
/>
</el-select> -->
</div>
<!-- <el-button v-if="$route.query.RouteIndexs == '2'" type="primary" class="el_next"
<el-button v-if="$route.query.RouteIndexs == '2'" type="primary" class="el_next"
@click="NextRecord()">
下一条
</el-button> -->
</el-button>
</div>
<el-input v-model="Msgtextarea" :rows="5" type="textarea" placeholder="请输入要回复的内容"
@ -2177,11 +2177,14 @@ const replyMessage = () => {
};
// 下一条跳转
const Nextjump = res => {
console.log(res);
console.log(res);
if (res.data) {
if (res.data.data.records.length) {
let dataInfo = res.data.data.records[0];
const workOrderInfoPath_end = '/aftersales/aftersalesWorkOrderend'; //跳转路径
const queryParams = {
id: dataInfo.id, //异常工单ID
@ -2190,18 +2193,8 @@ const Nextjump = res => {
RouteIndexs: '2', //当前菜单编号
workOrderStatus: dataInfo.workOrderStatus, //工单状态
};
if (res.data.data.total > Nextpage.value) {
Nextpage.value = Nextpage.value - 1;
ElMessage({
type: 'warning',
message: '没有更多数据了',
})
onLoad()
} else {
$router.push({ path: workOrderInfoPath_end, query: { ...queryParams } });
onLoad()
}
$router.push({ path: workOrderInfoPath_end, query: { ...queryParams } });
onLoad()
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
} else {
Nextpage.value = Nextpage.value - 1;

22
src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
Unescape View File

@ -38,7 +38,19 @@
:value-format="'YYYY-MM-DD HH:mm:ss'"
/>
</el-form-item>
<el-form-item label="复核完成时间">
<el-date-picker
v-model="TopQuery.traintime"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
:value-format="'YYYY-MM-DD HH:mm:ss'"
/>
</el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
@ -433,6 +445,14 @@ const TopSearch = () => {
delete details.query.deliveryDateStart;
delete details.query.deliveryDateEnd;
}
if (TopQuery.value.traintime?.length) {
details.query.trainCompletionTimeStart = TopQuery.value.traintime[0]; //开始日期
details.query.trainCompletionTimeEnd = TopQuery.value.traintime[1]; //结束日期
} else {
delete details.query.trainCompletionTimeStart;
delete details.query.trainCompletionTimeEnd;
}
if (TopQuery.value.destinationWarehouse?.length) {
details.query.destinationWarehouse = TopQuery.value.destinationWarehouse.join(',');

18
src/views/cost/storagecost/Monthlyorderwarehousing.vue
Unescape View File

@ -32,12 +32,15 @@
type="year"
placeholder="请选择年份"
value-format="YYYY"
/>
</el-form-item>
<el-form-item label="结算月">
<el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份" style="min-width: 80px">
<el-select
v-model="queryTop.costSettlementMonth"
placeholder="请选择月份"
style="min-width: 80px"
>
<el-option
v-for="item in monthList"
:key="item.value"
@ -60,12 +63,13 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" @click="exportExcel"
<el-button type="primary" @click="handleExportExcel"
><el-icon><Plus /></el-icon>导出</el-button
>
</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>
@ -139,6 +143,7 @@ import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util';
import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { exportExcel } from '@/utils/exportData';
const $router = useRouter(); //跳转
const $useStore = useStore(); //权限
const $route = useRoute(); //获取地址栏参数
@ -392,7 +397,7 @@ const PageOnload = () => {
//页面初始化方法
PageOnload();
const exportExcel = () => {
const handleExportExcel = () => {
ElMessageBox.confirm('是否导出数据?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -416,6 +421,11 @@ const exportExcel = () => {
})
.catch(() => {});
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '月度订单仓储成本明细 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

11
src/views/cost/storagecost/WarehouseMonthly.vue
Unescape View File

@ -59,10 +59,11 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button icon="Download" type="primary" @click="exportExcel">导出</el-button>
<el-button icon="Download" type="primary" @click="handleExportExcel">导出</el-button>
</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>
@ -137,6 +138,7 @@ import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util';
import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { exportExcel } from '@/utils/exportData';
const $router = useRouter(); //跳转
const $useStore = useStore(); //权限
const $route = useRoute(); //获取地址栏参数
@ -418,7 +420,7 @@ const PageOnload = () => {
PageOnload();
//导出
const exportExcel = () => {
const handleExportExcel = () => {
ElMessageBox.confirm('是否导出数据?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -442,6 +444,11 @@ const exportExcel = () => {
})
.catch(() => {});
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '月度仓储成本统计 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

45
src/views/cost/storagecost/Warehouserentalmanagement.vue
Unescape View File

@ -29,7 +29,7 @@
v-model="queryTop.warehouse"
multiple
placeholder="请选择仓库"
:max-collapse-tags="2"
:max-collapse-tags="2"
style="min-width: 340px"
>
<el-option
@ -55,13 +55,13 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" @click="AddInfo"
><el-icon><Plus /></el-icon>新增</el-button
>
</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>
@ -161,7 +161,13 @@
<!-- 虚拟字段 -->
<el-form-item label="剩余可租用面积(m²)">
<el-input-number v-model="form.residualArea" :min="0" :controls="false" :precision="2" disabled/>
<el-input-number
v-model="form.residualArea"
:min="0"
:controls="false"
:precision="2"
disabled
/>
</el-form-item>
<el-form-item label="客户租用类型">
@ -186,7 +192,14 @@
</el-form-item>
<el-form-item label="客户租用面积(m²)" prop="leasedArea">
<el-input-number v-model="form.leasedArea" :disabled="form.type == 2" :min="0" :value-on-clear="0" :controls="false" :precision="2"/>
<el-input-number
v-model="form.leasedArea"
:disabled="form.type == 2"
:min="0"
:value-on-clear="0"
:controls="false"
:precision="2"
/>
</el-form-item>
<el-form-item label="月租金(元/月)" prop="monthlyRent">
@ -243,6 +256,7 @@ import { downloadXls } from '@/utils/util';
import { useStore } from 'vuex';
import dayjs from 'dayjs';
import error from '@/error';
import { exportExcel } from '@/utils/exportData';
const $router = useRouter(); //跳转
const $useStore = useStore(); //权限
const $route = useRoute(); //获取地址栏参数
@ -402,13 +416,12 @@ const selectionChange = list => {
};
// 网页顶部搜索按钮
const searchChange = () => {
let data={
let data = {
warehouseIds: queryTop.value.warehouse.join(','),
}
if(queryTop.value.warehouse?.length){
};
if (queryTop.value.warehouse?.length) {
onLoad(data);
}
};
// 每页多少条
const sizeChange = val => {
@ -424,12 +437,12 @@ const currentChange = val => {
const searchChangeS = () => {
details.search = false; //关闭搜索
};
const searchReset=() => {
const searchReset = () => {
details.query = {};
queryTop.value={}
details.data=[]
queryTop.value = {};
details.data = [];
onLoad();
}
};
// 顶部搜索
const searchHide = () => {
console.log(details);
@ -500,7 +513,7 @@ const onLoad = value => {
current: details.page.currentPage,
size: details.page.pageSize,
...details.query,
...value,
...value,
};
details.loadingObj.list = true;
$_Warehouserentalmanagement(data)
@ -618,7 +631,6 @@ const Customeradded = () => {
if (valid) {
const { type, storageLocationCount, leasedArea } = form.value;
if ((type === 1 && leasedArea == null) || (type === 2 && storageLocationCount == null)) {
ElMessage({
message: '请维护仓库基础资料',
@ -757,6 +769,11 @@ const Viewdelete = rwo => {
})
.catch(() => {});
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '仓库租用 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

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

@ -185,6 +185,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>
@ -732,6 +733,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
import print from '@/utils/print';
import { exportExcelByDom } from '@/utils/export';
import { dateNow } from '@/utils/date';
import { exportExcel } from '@/utils/exportData';
const ArteryPrintTemplateV2 = defineAsyncComponent(
() => import('@/components/ArteryPrintTemplateV2/ArteryPrintTemplateV2.vue')
@ -1883,6 +1885,11 @@ const handleShowVehicleImgs = ({ row }) => {
},
});
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '到车 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

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

@ -166,6 +166,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>
@ -664,6 +665,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
import print from '@/utils/print';
import { dateNow } from '@/utils/date';
import { exportExcelByDom } from '@/utils/export';
import { exportExcel } from '@/utils/exportData';
const ArteryPrintTemplateV2 = defineAsyncComponent(
() => import('@/components/ArteryPrintTemplateV2/ArteryPrintTemplateV2.vue')
@ -1690,6 +1692,11 @@ const handleExportAbnormal = () => {
const time = new Date().getTime();
exportExcelByDom(abnormalOrderTableNode.value.$el, '异常数据' + ' - ' + time + '.xlsx');
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '车辆配载 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

8
src/views/distribution/artery/abnormalList.vue
Unescape View File

@ -489,14 +489,6 @@ const currentChange = current => {
onLoad();
};
/** 弹出层开启前清除数据 */
const beforeClose = done => {
done();
details.form = {};
details.selectionList = [];
details.view = false;
};
/** 处理异常 */
const handleAnException = async ({ row }) => {
details.abnormalInfo = { ...row };

25
src/views/distribution/artery/addTripartiteTransfer.vue
Unescape View File

@ -42,25 +42,6 @@
<el-button type="primary" @click="handleAddCarrier" icon="Plus" />
</div>
<el-form-item label="经办人" prop="operator">
<!-- <el-select
v-model="form.operator"
filterable
:teleported="false"
remote
reserve-keyword
placeholder="经办人"
@change="val => carrierNameChange(val, index)"
:remote-method="remoteMethod"
:loading="details.loadingObj.loading"
:disabled="index === 0"
>
<el-option
v-for="val in details.carrierNameOptions"
:key="val.operator"
:label="val.operator"
:value="val.carrierId"
/>
</el-select> -->
<el-input v-model="form.operator" />
</el-form-item>
<el-form-item label="送货方式" prop="deliveryType">
@ -1105,12 +1086,6 @@ const handleAddWaybill = () => {
_orderMap.push(item.orderCode + ',' + item.waybillNo);
details.newData.push(item);
}
// details.selectionList.forEach(val => {
// val.planNum = val.stockNum;
// val.loadingNum = 0;
// details.newData.push(val);
// });
details.orderCodeList = [...new Set([...details.orderCodeList, ..._orderMap])];
console.log('details.orderCodeList :>> ', details.orderCodeList);

10
src/views/distribution/inventory/CreateOrder.vue
Unescape View File

@ -2900,7 +2900,7 @@ const handleComputed = (row: any, onlyComputedTrunline = false) => {
// 计算配送价格 -- 行
// if (_dispatchKey)
// row.subtotalDispatch = _dispatchKey
// row.subtotalDeliveryFee = _dispatchKey
// ? computeNumber(row.deliveryPrice || 0, '*', row[_dispatchKey]).result
// : 0;
@ -3326,13 +3326,13 @@ const handleDispatchPrice = (dispatch, template) => {
_orderNum += item.orderGoodsNum;
const _dispatchKey = typeArr[item.systemDeliveryChargeType];
item.subtotalDispatch = _dispatchKey
item.subtotalDeliveryFee = _dispatchKey
? computeNumber(item.deliveryPrice || 0, '*', item[_dispatchKey]).result
: 0;
_orderSubtotalDispatch = computeNumber(
_orderSubtotalDispatch,
'+',
item.subtotalDispatch
item.subtotalDeliveryFee
).result;
}
@ -3641,13 +3641,13 @@ const handleComputedPlanPrice = submitData => {
_orderNum += item.orderGoodsNum;
const _dispatchKey = typeArr[item.systemDeliveryChargeType || 1];
item.subtotalDispatch = _dispatchKey
item.subtotalDeliveryFee = _dispatchKey
? computeNumber(item.deliveryPrice || 0, '*', item[_dispatchKey]).result
: 0;
_orderSubtotalDispatch = computeNumber(
_orderSubtotalDispatch,
'+',
item.subtotalDispatch
item.subtotalDeliveryFee
).result;
}

5
src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
Unescape View File

@ -96,6 +96,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>
@ -381,6 +382,7 @@ import {
getObjType,
} from '@/utils/util';
import { dateNow } from '@/utils/date';
import { exportExcel } from '@/utils/exportData';
export default {
data() {
@ -1114,6 +1116,9 @@ export default {
: (this.loadingObj.pageLoading = false);
}
},
handleExportData() {
exportExcel(this.columnList, this.data, '干线提货 - ' + new Date().getTime());
},
},
activated() {
if (this.$store.state.isRefresh.refreshObj.addArteryDistrilbutionBillLadingList) {

10
src/views/distribution/signfor/distributionSignforedt.vue
Unescape View File

@ -66,8 +66,8 @@
</div>
<div class="el-txt" style="margin-top: 20px">
<el-icon><Stopwatch /></el-icon>
<span class="title-name"> 实际配送时间:</span>
<el-input v-model="pageRow.taskTime" disabled placeholder="卸车班组" />
<span class="title-name"> 配送时间:</span>
<el-input v-model="pageRow.taskTime" disabled placeholder="暂无配送时间" />
</div>
</div>
@ -165,17 +165,17 @@
<div class="el-txt">
<el-icon><User /></el-icon>
<span class="title-name">计划件数:</span>
<el-input v-model="pageRow.reservationNum" disabled placeholder="暂无计划件数" />
<el-input v-model="pageRow.planNum" disabled placeholder="暂无计划件数" />
</div>
<div class="el-txt">
<el-icon><User /></el-icon>
<span class="title-name">装车件数:</span>
<el-input v-model="pageRow.loadedNumber" disabled placeholder="暂无装车件数" />
<el-input v-model="pageRow.loadingNum" disabled placeholder="暂无装车件数" />
</div>
<div class="el-txt">
<el-icon><Postcard /></el-icon>
<span class="title-name"> 签收件数:</span>
<el-input v-model="pageRow.receivedQuantity" disabled placeholder="暂无签收件数" />
<el-input v-model="pageRow.signingNum" disabled placeholder="暂无签收件数" />
</div>
<div class="el-txt">
<el-icon><Van /></el-icon>

8
src/views/finance/CustomerSettlement.vue
Unescape View File

@ -96,6 +96,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="Search" @click="searchHide" circle></el-button>
@ -185,6 +186,7 @@ import { useRouter } from 'vue-router';
import { deepClone } from '@/utils/util';
import { ElMessage, ElMessageBox } from 'element-plus';
import { $_getMyWarehouseList } from '@/api/reportforms/index.js';
import { exportExcel } from '@/utils/exportData';
// 获取路由实例
const $router = useRouter();
const warehouseList = ref([]);
@ -488,6 +490,12 @@ const handleConfirmCustomer = ({ row }) => {
const handleConfirmCustomerAll = () => {
handleConfirmCustomerFU(details.selectionList);
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '商家结算 - ' + new Date().getTime());
};
onActivated(() => {
console.log('actived');
onLoad();

27
src/views/finance/MerchantDepositSlip.vue
Unescape View File

@ -70,6 +70,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="Search" @click="searchHide" circle></el-button>
@ -457,27 +458,6 @@ const handleExport = () => {
/** 导出订单详情 */
const handleExportOrderDetail = () => {
// const _header = [];
// const blackArr = ['序号', '复选框', '操作'];
// const _data = [];
// for (let j = 0; j < details.orderInfo.data.length; j++) {
// const item = details.orderInfo.data[j];
// const arr = [];
// for (let i = 0; i < details.orderInfo.columnList.length; i++) {
// const val = details.orderInfo.columnList[i];
// if (blackArr.includes(val.label)) continue;
// if (j === 0) _header.push(val.label);
// arr.push(item[val.prop] || '');
// }
// console.log('arr :>> ', arr);
// _data.push(arr);
// }
exportExcel(
details.orderInfo.columnList,
details.orderInfo.data,
@ -554,6 +534,11 @@ const handleRemoveOrder = ({ row }) => {
}
});
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '商家对账单 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

15
src/views/finance/ReconciliationDepositSlip.vue
Unescape View File

@ -134,6 +134,11 @@
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button
icon="Download"
@click="() => handleExportData(item.columnList, details.data)"
circle
></el-button>
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(item, true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
@ -287,6 +292,7 @@ import {
import { useRouter } from 'vue-router';
import { deepClone } from '@/utils/util';
import { ElMessage, ElMessageBox } from 'element-plus';
import { exportExcel } from '@/utils/exportData';
// 获取路由实例
const $router = useRouter();
@ -833,6 +839,15 @@ const handleExport = () => {
}
});
};
/** 导出表格数据 */
const handleExportData = (columnList, data) => {
exportExcel(
columnList,
data,
'预对账单 - ' + (details.pageStatus === 1 ? 'toB' : 'toC') + ' - ' + new Date().getTime()
);
};
</script>
<style scoped lang="scss">

7
src/views/finance/WaybillAudit.vue
Unescape View File

@ -107,6 +107,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="Search" @click="searchHide" circle></el-button>
@ -308,6 +309,7 @@ import { deepClone } from '@/utils/util';
import { getToken } from '@/utils/auth';
import { ElMessage, ElMessageBox, type UploadProps } from 'element-plus';
import { $_getMyWarehouseList } from '@/api/reportforms/index.js';
import { exportExcel } from '@/utils/exportData';
// 获取路由实例
const $router = useRouter();
const $store = useStore();
@ -902,6 +904,11 @@ const handleSubmitChangeServiceType = async () => {
details.loadingObj.pageLoading = false;
}
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '运单审核 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

4
src/views/reportforms/PackageAllTrunklineTimePageReport.vue
Unescape View File

@ -24,7 +24,7 @@
</el-select>
</el-form-item>
<el-form-item label="工厂推送时间">
<el-form-item :label="details.tabStatus === 'order' ? '工厂推送时间' : '运单创建时间'">
<el-date-picker
v-model="query.timeArr"
type="daterange"
@ -372,7 +372,7 @@ const init = () => {
// onLoad();
};
init();
// init();
/** 查询品牌 */
const handleFindBrand = async () => {

7
src/views/reportforms/PackageStartTimePageReport.vue
Unescape View File

@ -24,7 +24,10 @@
</el-select>
</el-form-item>
<el-form-item label="暂存单创建时间" label-width="120px">
<el-form-item
label-width="120px"
:label="details.tabStatus === 'order' ? '暂存单创建时间' : '运单创建时间'"
>
<el-date-picker
v-model="query.timeArr"
type="daterange"
@ -372,7 +375,7 @@ const init = () => {
// onLoad();
};
init();
// init();
/** 查询品牌 */
const handleFindBrand = async () => {

7
src/views/reportforms/PackageTransferTimePageReport.vue
Unescape View File

@ -24,7 +24,10 @@
</el-select>
</el-form-item>
<el-form-item label="包件入库时间">
<el-form-item
label-width="120px"
:label="details.tabStatus === 'order' ? '包件入库时间' : '零担入库时间'"
>
<el-date-picker
v-model="query.timeArr"
type="daterange"
@ -372,7 +375,7 @@ const init = () => {
// onLoad();
};
init();
// init();
/** 查询品牌 */
const handleFindBrand = async () => {

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

@ -53,49 +53,48 @@
</div>
<!-- 控件模块 -->
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<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>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
</div>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="Download" @click="handleExport">导出</el-button> -->
</div>
</el-row>
<!-- 头部右侧按钮模块 -->
<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="Search" @click="searchHide" circle></el-button>
</div>
</div>
<!-- 表格 -->
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '运单号'">
<el-text @click="handleGoWaybillDetails(slotProps.scope)">
{{ slotProps.scope.row.waybillNo }}
</el-text>
</template>
<template v-else-if="slotProps.scope.column.label === '操作'">
<el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
查看
</el-button>
</template>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '运单号'">
<el-text @click="handleGoWaybillDetails(slotProps.scope)">
{{ slotProps.scope.row.waybillNo }}
</el-text>
</template>
</tablecmt>
</el-row>
<template v-else-if="slotProps.scope.column.label === '操作'">
<el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
查看
</el-button>
</template>
</template>
</tablecmt>
<!-- 分页模块 -->
<el-row class="el-fy">
@ -522,6 +521,11 @@ const handleExport = () => {
exportExcel(details.columnList, details.data, '改单 - ' + new Date().getTime());
});
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '改单 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

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

@ -2190,7 +2190,7 @@ const handleComputed = (row: any, onlyComputedTrunline = false) => {
// 计算配送价格 -- 行
if (_dispatchKey)
row.subtotalDispatch = _dispatchKey
row.subtotalDeliveryFee = _dispatchKey
? computeNumber(row.deliveryPrice || 0, '*', row[_dispatchKey]).result
: 0;
@ -2544,8 +2544,8 @@ const handleDispatchPrice = (dispatch, template) => {
for (let i = 0; i < details.goodsList.length; i++) {
const value = details.goodsList[i];
if (value.subtotalDispatch)
_total = computeNumber(_total, '+', value.subtotalDispatch || 0).result;
if (value.subtotalDeliveryFee)
_total = computeNumber(_total, '+', value.subtotalDeliveryFee || 0).result;
}
// 是否存在最低计费

43
src/views/waybill/WarehousingByTrainNumber.vue
Unescape View File

@ -28,26 +28,25 @@
</div>
<!-- 控件模块 -->
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button
type="primary"
icon="Van"
v-if="permissionObj.WarehousingByTrainNumber_batchIncoming"
@click="handleBatchPutInStorage"
>批量入库</el-button
>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
</div>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button
type="primary"
icon="Van"
v-if="permissionObj.WarehousingByTrainNumber_batchIncoming"
@click="handleBatchPutInStorage"
>批量入库</el-button
>
</div>
</el-row>
<!-- 头部右侧按钮模块 -->
<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="Search" @click="searchHide" circle></el-button>
</div>
</div>
<!-- 表格 -->
<tablecmt
@ -121,6 +120,7 @@ import { columnList } from '@/option/waybill/WarehousingByTrainNumber';
import { useRouter } from 'vue-router';
import { useStore } from 'vuex';
import { ElMessage, ElMessageBox } from 'element-plus';
import { exportExcel } from '@/utils/exportData';
// 获取路由实例
const $router = useRouter();
@ -411,6 +411,11 @@ const handleIsSelect = val => {
return false;
}
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, renderData.value, '按车次入库 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

8
src/views/waybill/WaybillOrderList.vue
Unescape View File

@ -125,6 +125,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="Search" @click="searchHide" circle></el-button>
@ -333,7 +334,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
import { getToken } from '@/utils/auth';
import { getListName } from '@/api/basicdata/basicdataVehicle';
import type { UploadProps, UploadUserFile } from 'element-plus';
import { utils } from 'sortablejs';
import { exportExcel } from '@/utils/exportData';
const $store = useStore();
@ -1037,6 +1038,11 @@ getListName({ name: '' }).then(res => {
};
});
});
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(details.columnList, details.data, '运单列表 - ' + new Date().getTime());
};
</script>
<style scoped lang="scss">

11
src/views/waybill/orderPackageList.vue
Unescape View File

@ -72,6 +72,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="Search" @click="searchHide" circle></el-button>
@ -334,6 +335,7 @@ import { flowNodeColumnList } from '@/option/waybill/orderPackageListDetails.js'
import { useRouter } from 'vue-router';
import print from '@/utils/print';
import { ElMessage, ElMessageBox } from 'element-plus';
import { exportExcel } from '@/utils/exportData';
const Tableexportcomponent = defineAsyncComponent(
() => import('@/components/Tableexportcomponent/Tableexportcomponent.vue')
);
@ -918,6 +920,15 @@ const handleShowFlowNode = async ({ row }) => {
details.loadingObj.pageLoading = false;
}
};
/** 导出表格数据 */
const handleExportData = () => {
exportExcel(
details.packageListColumnList,
details.packageListData,
'订单明细 - ' + new Date().getTime()
);
};
</script>
<style scoped lang="scss">

Write Preview
Loading…
Cancel
Save