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 4 months ago
parent
75042f8994 beb9b239b1
commit
82801cd180
34 changed files with 1001 additions and 895 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src/api/finance/ReconciliationDepositSlip.js
  2. 21
      src/api/storagecost/index.js
  3. 37
      src/components/tablecmt/tablecmt.vue
  4. 42
      src/option/finance/ReconciliationDepositSlip.js
  5. 30
      src/option/finance/WaybillAudit.js
  6. 117
      src/option/storagecost/OrderTotalWarehouse.js
  7. 150
      src/option/storagecost/WarehouseMonthly.js
  8. 630
      src/option/storagecost/Warehousedaily.js
  9. 72
      src/option/waybill/WaybillOrderList.js
  10. 85
      src/views/cost/storagecost/OrderTotalWarehouse.vue
  11. 99
      src/views/cost/storagecost/WarehouseMonthly.vue
  12. 79
      src/views/cost/storagecost/Warehousedaily.vue
  13. 4
      src/views/cost/storagecost/Warehouserentalmanagement.vue
  14. 25
      src/views/distribution/artery/AddVehicleStowage.vue
  15. 25
      src/views/distribution/artery/addTripartiteTransfer.vue
  16. 2
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  17. 2
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  18. 2
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  19. 1
      src/views/distribution/inventory/CreateOrder.vue
  20. 25
      src/views/distribution/inventory/delivery/OrderInTransit.vue
  21. 2
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  22. 20
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  23. 2
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  24. 27
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  25. 2
      src/views/distribution/inventory/distributionStockListDetails.vue
  26. 2
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  27. 6
      src/views/distribution/inventory/distrilbutionBillLadingView.vue
  28. 196
      src/views/distribution/signfor/distributionSignfortreat.vue
  29. 116
      src/views/finance/ReconciliationDepositSlip.vue
  30. 7
      src/views/finance/WaybillAudit.vue
  31. 6
      src/views/reportforms/Stockordertable.vue
  32. 1
      src/views/waybill/CreateZeroOrder.vue
  33. 21
      src/views/waybill/TemporaryStorageList.vue
  34. 1
      src/views/waybill/WaybillOrderList.vue

39
src/api/finance/ReconciliationDepositSlip.js
Unescape View File

@ -50,6 +50,19 @@ export const postReal = data => {
}); });
}; };
/**
* toB 计算仓储&配送费用
* @param {*} data
* @returns
*/
export const postCalculateRealCostByWaybillId = data => {
return request({
url: `/api/logpm-statisticsdata/merchantStatistics/calculateRealCostByWaybillId/${data}`,
method: 'patch',
});
};
/** /**
* 生成对账单 * 生成对账单
* @param {*} data * @param {*} data
@ -62,3 +75,29 @@ export const postCreateReconciliationOrder = data => {
data, data,
}); });
}; };
/**
* toB 批量结算完成
* @param {*} data
* @returns
*/
export const postCreateFinishWaybillId = data => {
return request({
url: '/api/logpm-statisticsdata/merchantStatistics/createFinishWaybillId',
method: 'post',
data,
});
};
/**
* toB 生成对账单
* @param {*} data
* @returns
*/
export const postCreateReconciliationwWaybillId = data => {
return request({
url: '/api/logpm-statisticsdata/merchantStatistics/createReconciliationwWaybillId',
method: 'post',
data,
});
};

21
src/api/storagecost/index.js
Unescape View File

@ -2,7 +2,7 @@ import request from '@/axios';
// 月度仓储成本统计表接口 // 月度仓储成本统计表接口
export const $_Getlist = params => { export const $_Getlist = params => {
return request({ return request({
url: '/api/logpm-statisticsdata/expenseWarehouseMonth/page', url: '/api/logpm-statisticsdata/expenseWarehouse/month',
method: 'get', method: 'get',
params, params,
}); });
@ -10,11 +10,22 @@ export const $_Getlist = params => {
// 日度仓储成本统计表接口 // 日度仓储成本统计表接口
export const $_GetexpenseWarehouseDay = params => { export const $_GetexpenseWarehouseDay = params => {
return request({ return request({
url: '/api/logpm-statisticsdata/expenseWarehouseDay/page', url: '/api/logpm-statisticsdata/expenseWarehouse/day',
method: 'get', method: 'get',
params, params,
}); });
}; };
//日度仓储成本统计导出
export const $_exporDay = params => {
return request({
url: '/api/logpm-statisticsdata/expenseWarehouse/exporDay',
method: 'get',
params,
responseType: 'blob',
});
};
// 获取仓库 // 获取仓库
export const $_getMyWarehouseList = params => { export const $_getMyWarehouseList = params => {
return request({ return request({
@ -27,7 +38,7 @@ export const $_getMyWarehouseList = params => {
//月度仓储成本统计导出 //月度仓储成本统计导出
export const $_expenseWarehouseMonth = params => { export const $_expenseWarehouseMonth = params => {
return request({ return request({
url: '/api/logpm-statisticsdata/expenseWarehouseMonth/export-expenseWarehouseMonth', url: '/api/logpm-statisticsdata/expenseWarehouse/exporMonth',
method: 'get', method: 'get',
params, params,
responseType: 'blob', responseType: 'blob',
@ -54,7 +65,7 @@ export const $_expenseOrderWarehouseMonth = params => {
// 订单总仓储成本明细列表 // 订单总仓储成本明细列表
export const $_OrderTotalWarehouse = params => { export const $_OrderTotalWarehouse = params => {
return request({ return request({
url: '/api/logpm-statisticsdata/expenseOrderWarehouseTotal/page', url: '/api/logpm-statisticsdata/expenseWarehouse/order',
method: 'get', method: 'get',
params, params,
}); });
@ -62,7 +73,7 @@ export const $_OrderTotalWarehouse = params => {
// 订单总仓储成本明细导出 // 订单总仓储成本明细导出
export const $_expenseOrderWarehouseTotal = params => { export const $_expenseOrderWarehouseTotal = params => {
return request({ return request({
url: '/api/logpm-statisticsdata/expenseOrderWarehouseTotal/export-expenseOrderWarehouseTotal', url: '/api/logpm-statisticsdata/expenseWarehouse/exporOrder',
method: 'get', method: 'get',
params, params,
responseType: 'blob', responseType: 'blob',

37
src/components/tablecmt/tablecmt.vue
Unescape View File

@ -381,7 +381,7 @@ const isHaveSelection = ref(false);
let selectarr = ref([]); let selectarr = ref([]);
/** 设置每行颜色 */ /** 设置每行颜色 */
const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => { const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => {
if (props.tableData.length === selectarr.value.length) return 'table-SelectedRow-bgcolor'; // if (props.tableData.length === selectarr.value.length) return 'table-SelectedRow-bgcolor';
for (let i = 0; i < selectarr.value.length; i++) { for (let i = 0; i < selectarr.value.length; i++) {
if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor'; if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor';
@ -931,4 +931,39 @@ defineExpose({ handleCheckSelect, handleClearSelect });
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
} }
// 表格行样式
.el-table {
tr {
// 预警
&.WarningTime {
color: #e6a23c !important;
background-color: #fff3e8;
.el-text {
color: #e6a23c !important;
// background-color: #fff3e8;
}
td {
border-color: #fff !important;
}
}
// 超时
&.timeOut {
color: #f56c6c !important;
background-color: #feeded;
.el-text {
color: #f56c6c !important;
// background-color: #feeded;
}
td {
border-color: #fff !important;
}
}
}
}
</style> </style>

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

@ -108,7 +108,7 @@ export const columnList = [
}, },
{ {
prop: 'typeServiceName', prop: 'typeServiceName',
label: '订单类型', label: '配送类型',
type: 3, type: 3,
values: '', values: '',
width: '150', width: '150',
@ -130,6 +130,30 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
// {
// prop: 'typeServiceName',
// label: '服务类型',
// type: 3,
// values: '',
// width: '150',
// checkarr: [
// {
// label: '商配',
// value: 1,
// },
// {
// label: '市配',
// value: 2,
// },
// {
// label: '自提',
// value: 3,
// },
// ],
// fixed: false,
// sortable: true,
// head: false,
// },
{ {
prop: 'openTime', prop: 'openTime',
label: '开单时间', label: '开单时间',
@ -245,7 +269,7 @@ export const columnList = [
}, },
{ {
prop: 'sysTotalFee', prop: 'sysTotalFee',
label: '订单开单价', label: '订单预估总价',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '130',
@ -268,7 +292,7 @@ export const columnList = [
}, },
{ {
prop: 'systemFreightPrice', prop: 'systemFreightPrice',
label: '开单运费', label: '预估运费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '130',
@ -292,7 +316,7 @@ export const columnList = [
}, },
{ {
prop: 'systemPickupPrice', prop: 'systemPickupPrice',
label: '开单提货费', label: '预估提货费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '130',
@ -388,7 +412,7 @@ export const columnList = [
}, },
{ {
prop: 'systemDeliveryFee', prop: 'systemDeliveryFee',
label: '开单配送费', label: '预估配送费',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
@ -1017,7 +1041,7 @@ export const columnListB = [
}, },
{ {
prop: 'sysTotalFee', prop: 'sysTotalFee',
label: '订单开单价', label: '订单预估总价',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '130',
@ -1041,7 +1065,7 @@ export const columnListB = [
}, },
{ {
prop: 'systemFreightPrice', prop: 'systemFreightPrice',
label: '开单运费', label: '预估运费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '130',
@ -1065,7 +1089,7 @@ export const columnListB = [
}, },
{ {
prop: 'systemPickupPrice', prop: 'systemPickupPrice',
label: '开单提货费', label: '预估提货费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '130',
@ -1161,7 +1185,7 @@ export const columnListB = [
}, },
{ {
prop: 'systemDeliveryFee', prop: 'systemDeliveryFee',
label: '开单配送费', label: '预估配送费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '130',

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

@ -876,6 +876,36 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'payStatusName',
label: '收款状态',
type: 1,
values: '',
width: '150',
checkarr: [
{label: '未收款', value: '10'},
// {label: '部分收款', value: '20'},
{label: '已收款', value: '30'},
],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'settlementStatusName',
label: '结算状态',
type: 1,
values: '',
width: '150',
checkarr: [
{label: '未结算', value: '10'},
// {label: '部分结算', value: '20'},
{label: '已结算', value: '30'},
],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: '', prop: '',
label: '操作', label: '操作',

117
src/option/storagecost/OrderTotalWarehouse.js
Unescape View File

@ -38,18 +38,18 @@ export const columnList = [
}, },
{ {
prop: 'shipmentNumber', prop: 'shipmentNumber',
label: '运单编号', label: '运单编号 ',
type: 1, type: 2,
values: '', values: '',
width: '150', width: '200',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'receivingUnit', prop: 'shippingUnit',
label: '收货单位', label: '发货单位',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
@ -59,8 +59,8 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'shippingUnit', prop: 'receivingUnit',
label: '发货单位', label: '收货单位',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
@ -70,9 +70,9 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'shipmenttype', prop: 'deliveryType',
label: '运单类型', label: '运单类型',
type: 3, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [ checkarr: [
@ -90,63 +90,28 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'servicetype', prop: 'reviewStatus',
label: '服务类型', label: '复核完成状态',
type: 1, type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalQuantity',
label: '总件数',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'originWarehouse',
label: '发站仓',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'consignmentInQuantity',
label: '代入库仓件数',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'consignmentInTotalCost',
label: '代入库总成本',
type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [
{
label: '未完成',
value: '未完成',
},
{
label: '已完成',
value: '已完成',
},
],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'consignmentOutQuantity', prop: 'totalNumber',
label: '代出库仓件数', label: '订单总件数',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
@ -156,8 +121,8 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'consignmentOutTotalCost', prop: 'outNumber',
label: '代出库总成本', label: '签收复核件数',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
@ -167,11 +132,11 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'contractedOperaCost', prop: 'originWarehouse',
label: '代作业总成本', label: '发站仓 ',
type: 1, type: 2,
values: '', values: '',
width: '150', width: '200',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -188,28 +153,6 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'warehousingCost',
label: '仓储总成本',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'a17',
// label: '结算时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// { // {
// prop: 'createUserName', // prop: 'createUserName',

150
src/option/storagecost/WarehouseMonthly.js
Unescape View File

@ -26,7 +26,7 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'costSettlementTime', prop: 'statisticalTime',
label: '成本结算时间', label: '成本结算时间',
type: 1, type: 1,
values: '', values: '',
@ -36,17 +36,6 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'totalArea',
label: '仓库总面积(㎡)',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: 'monthlyRent', prop: 'monthlyRent',
label: '仓库月租金', label: '仓库月租金',
@ -59,7 +48,7 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'totalQuantityIssued', prop: 'totalOutQuantity',
label: '出库总件数', label: '出库总件数',
type: 1, type: 1,
values: '', values: '',
@ -69,17 +58,6 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'customerLeasedArea',
label: '客户租用面积(㎡)',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: 'customerMonthlyRent', prop: 'customerMonthlyRent',
label: '客户月租金', label: '客户月租金',
@ -92,18 +70,7 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'wholeVehicleCost', prop: 'customerRentalOutQuantity',
label: '整车单价',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'rentedItemsDispatchedQuantity',
label: '租用出库件数', label: '租用出库件数',
type: 1, type: 1,
values: '', values: '',
@ -114,7 +81,7 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'customerRentedItemCostPerUnit', prop: 'customerRentalUnitCost',
label: '客户租用单件成本', label: '客户租用单件成本',
type: 1, type: 1,
values: '', values: '',
@ -125,7 +92,7 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'customerTotalLeasingCost', prop: 'customerTotalRentalCost',
label: '客户租用总成本', label: '客户租用总成本',
type: 1, type: 1,
values: '', values: '',
@ -135,17 +102,6 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'temporaryTurnoverArea',
label: '临时周转面积',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: 'temporaryTurnoverQuantity', prop: 'temporaryTurnoverQuantity',
label: '临时周转件数', label: '临时周转件数',
@ -158,7 +114,7 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'temporaryTurnoverCostPerItem', prop: 'temporaryTurnoverUnitCost',
label: '临时周转单件成本', label: '临时周转单件成本',
type: 1, type: 1,
values: '', values: '',
@ -169,7 +125,7 @@ export const columnList = [
head: false, head: false,
}, },
{ {
prop: 'totalTemporaryTurnoverCost', prop: 'temporaryTurnoverTotalCost',
label: '临时周转总成本', label: '临时周转总成本',
type: 1, type: 1,
values: '', values: '',
@ -179,17 +135,6 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'drWareDisArea',
label: '干仓配仓储面积(㎡)',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{ {
prop: 'drWareDisNumber', prop: 'drWareDisNumber',
label: '干仓配件数', label: '干仓配件数',
@ -223,50 +168,43 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'totalCostOfConsignmentStorage', // {
label: '代入库总成本', // prop: 'statisticalMonth',
type: 1, // label: '统计月',
values: '', // type: 1,
width: '150', // values: '',
checkarr: [], // width: '150',
fixed: false, // checkarr: [],
sortable: true, // fixed: false,
head: false, // sortable: true,
}, // head: false,
{ // },
prop: 'totalCostOfConsignmentWithdrawal',
label: '代出库总成本', // {
type: 1, // prop: 'statisticalYear',
values: '', // label: '统计年',
width: '150', // type: 1,
checkarr: [], // values: '',
fixed: false, // width: '150',
sortable: true, // checkarr: [],
head: false, // fixed: false,
}, // sortable: true,
{ // head: false,
prop: 'totalCostOfAgencyOperations', // },
label: '代作业总成本',
type: 1, // {
values: '', // prop: 'warehouseCost',
width: '150', // label: '仓库租赁总成本',
checkarr: [], // type: 1,
fixed: false, // values: '',
sortable: true, // width: '150',
head: false, // checkarr: [],
}, // fixed: false,
{ // sortable: true,
prop: 'totalWarehouseCost', // head: false,
label: '仓储总成本', // },
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// { // {
// prop: '', // prop: '',
// label: '操作', // label: '操作',

630
src/option/storagecost/Warehousedaily.js
Unescape View File

@ -1,281 +1,351 @@
export const columnList = [ export const columnList = [
{ {
prop: '', prop: '',
label: '复选框', label: '复选框',
type: 0, type: 0,
width: 55, width: 55,
fixed: true, fixed: true,
}, },
{ {
prop: '', prop: '',
label: '序号', label: '序号',
type: 12, type: 12,
values: '', values: '',
width: 55, width: 55,
fixed: true, fixed: true,
}, },
{ {
prop: 'warehouseName', prop: 'warehouseName',
label: '目的仓', label: '目的仓',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'costSettlement', prop: 'statisticalTime',
label: '成本结算时间', label: '成本结算日期',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'totalArea', prop: 'totalArea',
label: '仓库总面积(㎡)', label: '仓库总面积(㎡)',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'monthlyRent', prop: 'rent',
label: '仓库日租金', label: '仓库月租金',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'totalQuantityIssued', prop: 'dailyRent',
label: '出库总件数', label: '仓库日租金',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'customerLeasedArea', prop: 'totalOutQuantity',
label: '客户租用面积(㎡)', label: '出库总件数',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'customerMonthlyRent', prop: 'customerDailyRent',
label: '客户日租金', label: '客户租用日租金',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'rentedItemsDispatchedQuantity', prop: 'customerRentalArea',
label: '租用出库件数', label: '客户租用面积（㎡）',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'customerRentedItemCostPerUnit', prop: 'customerRentalOutQuantity',
label: '客户租用单件成本', label: '租用出库件数',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'wholeVehicleCost', prop: 'customerRentalUnitCost',
label: '整车单价', label: '租用单件成本',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'customerTotalLeasingCost', prop: 'customerTotalRentalCost',
label: '客户租用总成本', label: '租用总成本',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'temporaryTurnoverArea', prop: 'temporaryTurnoverArea',
label: '临时周转面积', label: '临时周转面积',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'temporaryTurnoverQuantity', prop: 'temporaryTurnoverQuantity',
label: '临时周转件数', label: '临时周转件数',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'temporaryTurnoverCostPerItem', prop: 'temporaryTurnoverUnitCost',
label: '临时周转单件成本', label: '临时周转单件成本',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'totalTemporaryTurnoverCost', prop: 'temporaryTurnoverTotalCost',
label: '临时周转总成本', label: '临时周转总成本',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'drWareDisArea', prop: 'drWareDisArea',
label: '干仓配仓储面积(㎡)', label: '干仓配仓储面积(㎡)',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'drWareDisNumber', prop: 'drWareDisNumber',
label: '干仓配件数', label: '干仓配件数',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'drWareDisCostPerUnit', prop: 'drWareDisCostPerUnit',
label: '干仓配单件成本', label: '干仓配单件成本',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'drWareDisTotalCost', prop: 'drWareDisTotalCost',
label: '干仓配仓储总成本', label: '干仓配仓储总成本',
type: 1, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{
prop: 'totalCostOfConsignmentStorage',
label: '代入库总成本',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false, // {
sortable: true, // prop: 'dayNumber',
head: false, // label: '当月天数',
}, // type: 1,
{ // values: '',
prop: 'totalCostOfConsignmentWithdrawal', // width: '150',
label: '代出库总成本', // checkarr: [],
type: 1, // fixed: false,
values: '', // sortable: true,
width: '150', // head: false,
checkarr: [], // },
fixed: false,
sortable: true, // {
head: false, // prop: 'warehouseCost',
}, // label: '仓库租赁总成本',
{ // type: 1,
prop: 'totalCostOfAgencyOperations', // values: '',
label: '代作业总成本', // width: '150',
type: 1, // checkarr: [],
values: '', // fixed: false,
width: '150', // sortable: true,
checkarr: [], // head: false,
fixed: false, // },
sortable: true,
head: false,
}, // {
{ // prop: 'customerMonthlyRent',
prop: 'totalWarehouseCost', // label: '客户租用月租金',
label: '仓储总成本', // type: 1,
type: 1, // values: '',
values: '', // width: '150',
width: '150', // checkarr: [],
checkarr: [], // fixed: false,
fixed: false, // sortable: true,
sortable: true, // head: false,
head: false, // },
},
// {
// prop: '', // {
// label: '操作', // prop: 'rent',
// type: 6, // label: '仓库租金',
// values: '', // type: 1,
// width: '200', // values: '',
// checkarr: [], // width: '150',
// fixed: 'right', // checkarr: [],
// sortable: false, // fixed: false,
// }, // sortable: true,
]; // head: false,
// },
// {
// prop: 'statisticalDay',
// label: '统计日',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'statisticalYear',
// label: '统计年',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'drWareDisNumber',
// label: '干仓配件数',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'drWareDisCostPerUnit',
// label: '干仓配单件成本',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'drWareDisArea',
// label: '干仓配仓储面积',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: '',
// label: '操作',
// type: 6,
// values: '',
// width: '200',
// checkarr: [],
// fixed: 'right',
// sortable: false,
// },
];

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

@ -19,7 +19,7 @@ export const columnList = [
label: '运单号', label: '运单号',
type: 13, type: 13,
values: '', values: '',
width: '150', width: '120',
checkarr: [], checkarr: [],
fixed: true, fixed: true,
sortable: true, sortable: true,
@ -30,7 +30,7 @@ export const columnList = [
label: '订单自编号', label: '订单自编号',
type: 2, type: 2,
values: '', values: '',
width: '200', width: '160',
checkarr: [], checkarr: [],
fixed: true, fixed: true,
sortable: true, sortable: true,
@ -40,7 +40,7 @@ export const columnList = [
label: '目的仓', label: '目的仓',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -50,7 +50,7 @@ export const columnList = [
label: '发站仓', label: '发站仓',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -60,7 +60,7 @@ export const columnList = [
label: '运单状态', label: '运单状态',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '100',
checkarr: [ checkarr: [
{ label: '未入库', value: '0' }, { label: '未入库', value: '0' },
{ label: '部分入库', value: '10' }, { label: '部分入库', value: '10' },
@ -93,7 +93,7 @@ export const columnList = [
label: '品牌', label: '品牌',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -113,7 +113,7 @@ export const columnList = [
label: '发货人', label: '发货人',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -133,7 +133,7 @@ export const columnList = [
label: '发货方地址', label: '发货方地址',
type: 1, type: 1,
values: '', values: '',
width: '180', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -163,7 +163,7 @@ export const columnList = [
label: '收货人', label: '收货人',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -193,7 +193,7 @@ export const columnList = [
label: '到站', label: '到站',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -296,7 +296,7 @@ export const columnList = [
label: '运费', label: '运费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -307,7 +307,7 @@ export const columnList = [
label: '送货费', label: '送货费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -318,7 +318,7 @@ export const columnList = [
label: '提货费', label: '提货费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -329,7 +329,7 @@ export const columnList = [
label: '仓库管理费', label: '仓库管理费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -340,7 +340,7 @@ export const columnList = [
label: '仓储费', label: '仓储费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -351,7 +351,7 @@ export const columnList = [
label: '仓储操作费', label: '仓储操作费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -362,7 +362,7 @@ export const columnList = [
label: '仓储分拣费', label: '仓储分拣费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -395,7 +395,7 @@ export const columnList = [
label: '申明价值', label: '申明价值',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -406,7 +406,7 @@ export const columnList = [
label: '回扣', label: '回扣',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -417,7 +417,7 @@ export const columnList = [
label: '支付方式', label: '支付方式',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '100',
checkarr: [ checkarr: [
{ label: '现金', value: 1 }, { label: '现金', value: 1 },
{ label: '银行卡', value: 2 }, { label: '银行卡', value: 2 },
@ -434,7 +434,7 @@ export const columnList = [
label: '付款方式', label: '付款方式',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '100',
checkarr: [ checkarr: [
{ label: '现付', value: 1 }, { label: '现付', value: 1 },
{ label: '到付', value: 2 }, { label: '到付', value: 2 },
@ -450,7 +450,7 @@ export const columnList = [
label: '现付', label: '现付',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -461,7 +461,7 @@ export const columnList = [
label: '到付', label: '到付',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -472,7 +472,7 @@ export const columnList = [
label: '月付', label: '月付',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -483,7 +483,7 @@ export const columnList = [
label: '回付', label: '回付',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -494,7 +494,7 @@ export const columnList = [
label: '送货方式', label: '送货方式',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '100',
checkarr: [ checkarr: [
{ label: '自提', value: 1 }, { label: '自提', value: 1 },
{ label: '送货', value: 2 }, { label: '送货', value: 2 },
@ -512,7 +512,7 @@ export const columnList = [
label: '紧急度', label: '紧急度',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '100',
checkarr: [ checkarr: [
{ label: '正常', value: 1 }, { label: '正常', value: 1 },
{ label: '急', value: 2 }, { label: '急', value: 2 },
@ -528,7 +528,7 @@ export const columnList = [
label: '回单数', label: '回单数',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -539,7 +539,7 @@ export const columnList = [
label: '回单要求', label: '回单要求',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '100',
checkarr: [ checkarr: [
{ label: '签回单', value: 1 }, { label: '签回单', value: 1 },
{ label: '签原单', value: 2 }, { label: '签原单', value: 2 },
@ -561,7 +561,7 @@ export const columnList = [
label: '运输方式', label: '运输方式',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '100',
checkarr: [ checkarr: [
{ label: '公路快运', value: 1 }, { label: '公路快运', value: 1 },
{ label: '海运', value: 2 }, { label: '海运', value: 2 },
@ -588,7 +588,7 @@ export const columnList = [
label: '三方操作费', label: '三方操作费',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: true, isshowSummary: true,
@ -599,7 +599,7 @@ export const columnList = [
label: '经办人', label: '经办人',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: false, isshowSummary: false,
@ -882,7 +882,7 @@ export const columnList = [
label: '审核状态', label: '审核状态',
type: 3, type: 3,
values: '', values: '',
width: '130', width: '80',
checkarr: [ checkarr: [
{ label: '待审核', value: '0' }, { label: '待审核', value: '0' },
{ label: '已审核', value: '1' }, { label: '已审核', value: '1' },
@ -907,7 +907,7 @@ export const columnList = [
label: '审核人', label: '审核人',
type: 1, type: 1,
values: '', values: '',
width: '130', width: '100',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: false, isshowSummary: false,
@ -940,7 +940,7 @@ export const columnList = [
label: '备注', label: '备注',
type: 2, type: 2,
values: '', values: '',
width: '180', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
isshowSummary: false, isshowSummary: false,
@ -984,7 +984,7 @@ export const columnList = [
label: '操作', label: '操作',
type: 6, type: 6,
values: '', values: '',
width: '250', width: '150',
checkarr: [], checkarr: [],
fixed: 'right', fixed: 'right',
sortable: false, sortable: false,

85
src/views/cost/storagecost/OrderTotalWarehouse.vue
Unescape View File

@ -7,16 +7,24 @@
<!-- 查询模块 --> <!-- 查询模块 -->
<el-form :inline="true" :model="query" class="el-fr-d"> <el-form :inline="true" :model="query" class="el-fr-d">
<div> <div>
<el-form-item label="客户名称">
<el-input v-model="queryTop.orderNo" placeholder="请输入客户名称"></el-input>
</el-form-item>
<el-form-item label="目的仓"> <el-form-item label="目的仓">
<el-select <el-select
v-model="queryTop.warehouse" v-model="queryTop.warehouse"
multiple multiple
placeholder="请选择仓库" placeholder="请选择仓库"
style="min-width: 340px" style="min-width: 340px"
collapse-tags
:max-collapse-tags="2"
> >
<template #header>
<el-checkbox
v-model="warehousecheckAll"
:indeterminate="indeterminate"
@change="handleCheckAll"
>
全选
</el-checkbox>
</template>
<el-option <el-option
v-for="item in warehouseList" v-for="item in warehouseList"
:key="item.value" :key="item.value"
@ -25,25 +33,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="结算年份">
<el-date-picker
v-model="queryTop.costSettlementYear"
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-option
v-for="item in monthList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</div> </div>
<!-- 查询按钮 --> <!-- 查询按钮 -->
<el-form-item class="el-btn"> <el-form-item class="el-btn">
@ -58,9 +47,6 @@
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<el-button type="primary" @click="ImportExcel"
><el-icon><Upload /></el-icon>导入</el-button
>
<el-button type="primary" @click="exportExcel" <el-button type="primary" @click="exportExcel"
><el-icon><Download /></el-icon>导出</el-button ><el-icon><Download /></el-icon>导出</el-button
> >
@ -136,8 +122,7 @@ import {
$_OrderTotalWarehouse, $_OrderTotalWarehouse,
$_expenseOrderWarehouseTotal, $_expenseOrderWarehouseTotal,
} from '@/api/storagecost/index.js'; } from '@/api/storagecost/index.js';
import { processRowProperty, setNodeHeight } from '@/utils/util'; import { processRowProperty, setNodeHeight,handleClearTableQuery } from '@/utils/util';
import functions from '@/utils/functions.js';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util'; import { downloadXls } from '@/utils/util';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
@ -147,6 +132,8 @@ const $useStore = useStore(); //权限
const $route = useRoute(); //获取地址栏参数 const $route = useRoute(); //获取地址栏参数
const queryTop = ref({}); const queryTop = ref({});
const monthList = ref([]); const monthList = ref([]);
const warehousecheckAll = ref(false);
const indeterminate = ref(false);
const warehouseList = ref([]); const warehouseList = ref([]);
const details = reactive({ const details = reactive({
/** 是否开启搜索 */ /** 是否开启搜索 */
@ -270,6 +257,7 @@ const btnsc = val => {
/** 表格表头下拉框选择 */ /** 表格表头下拉框选择 */
const selectsc = (index, row) => { const selectsc = (index, row) => {
processRowProperty(index, row, details); processRowProperty(index, row, details);
onLoad();
}; };
/** 表格表头复选框选择 */ /** 表格表头复选框选择 */
const selectionChange = list => { const selectionChange = list => {
@ -277,19 +265,19 @@ const selectionChange = list => {
details.selectionList = list; details.selectionList = list;
}; };
// 清空 // 清空
const searchReset=()=>{ const searchReset = () => {
queryTop.value = {}; queryTop.value = {};
details.query={} details.query = {};
details.data=[] details.data = [];
handleClearTableQuery(details.columnList);
onLoad(); onLoad();
} };
// 网页顶部搜索按钮 // 网页顶部搜索按钮
const searchChange = () => { const searchChange = () => {
if (queryTop.value.warehouse?.length) { if (queryTop.value.warehouse?.length) {
queryTop.value.warehouseName = queryTop.value.warehouse.join(','); queryTop.value.warehouseName = queryTop.value.warehouse.join(',');
} else { } else {
delete details.query.warehouseName; delete details.query.warehouseName;
delete queryTop.value.warehouseName;
} }
if (queryTop.value.costSettlementMonth) { if (queryTop.value.costSettlementMonth) {
if (!queryTop.value.costSettlementYear) { if (!queryTop.value.costSettlementYear) {
@ -315,6 +303,29 @@ const currentChange = val => {
details.page.currentPage = val; details.page.currentPage = val;
onLoad(); onLoad();
}; };
watch(
() => queryTop.value.warehouse,
val => {
if (!val.length) {
warehousecheckAll.value = false;
indeterminate.value = false;
} else if (val.length === warehouseList.value.length) {
warehousecheckAll.value = true;
indeterminate.value = false;
} else {
indeterminate.value = true;
}
}
);
const handleCheckAll = val => {
indeterminate.value = false;
if (val) {
queryTop.value.warehouse = warehouseList.value.map(_ => _.value);
} else {
queryTop.value.warehouse = [];
}
};
// 刷新按钮 // 刷新按钮
const searchChangeS = () => { const searchChangeS = () => {
details.search = false; //关闭搜索 details.search = false; //关闭搜索
@ -340,7 +351,6 @@ function updateDictionary(targetArray, dictionaryType) {
}); });
} }
// 页面初始化 // 页面初始化
// 页面初始化
const onLoad = value => { const onLoad = value => {
let data = { let data = {
current: details.page.currentPage, current: details.page.currentPage,
@ -393,10 +403,9 @@ const PageOnload = () => {
}; };
PageOnload(); PageOnload();
// 导入 // 导入
const ImportExcel=()=>{ const ImportExcel = () => {
return;
return };
}
// 导出 // 导出
const exportExcel = () => { const exportExcel = () => {
ElMessageBox.confirm('是否导出数据?', { ElMessageBox.confirm('是否导出数据?', {
@ -413,7 +422,7 @@ const exportExcel = () => {
console.log(data, '要提交的数据'); console.log(data, '要提交的数据');
$_expenseOrderWarehouseTotal(data).then(res => { $_expenseOrderWarehouseTotal(data).then(res => {
details.loadingObj.list = false; details.loadingObj.list = false;
downloadXls(res.data, `月度订单仓储成本明细.xlsx`); downloadXls(res.data, `订单仓储成本报表.xlsx`);
ElMessage({ ElMessage({
message: '导出成功', message: '导出成功',
type: 'success', type: 'success',

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

@ -1,5 +1,5 @@
<template> <template>
<basic-container> <basic-container v-loading="loadingObj.packageListLoading" element-loading-text="Loading...">
<!-- 首页表格 --> <!-- 首页表格 -->
<div class="avue-crud"> <div class="avue-crud">
<!-- 搜索模块 --> <!-- 搜索模块 -->
@ -46,26 +46,6 @@
:shortcuts="shortcuts" :shortcuts="shortcuts"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="结算年份">
<el-date-picker
v-model="queryTop.costSettlementYear"
type="year"
placeholder="请选择年份"
value-format="YYYY"
/>
</el-form-item>
<el-form-item label="结算月">
<el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份"
style="width: 240px;">
<el-option
v-for="item in monthList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> -->
</div> </div>
<el-form-item class="el-btn"> <el-form-item class="el-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@ -79,9 +59,7 @@
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<el-button type="primary" @click="exportExcel" <el-button icon="Download" type="primary" @click="exportExcel">导出</el-button>
><el-icon><Plus /></el-icon>导出</el-button
>
</div> </div>
<!-- 头部右侧按钮模块 --> <!-- 头部右侧按钮模块 -->
<div class="avue-crud__right"> <div class="avue-crud__right">
@ -154,8 +132,7 @@ import {
$_expenseWarehouseMonth, $_expenseWarehouseMonth,
} from '@/api/storagecost/index.js'; } from '@/api/storagecost/index.js';
import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { processRowProperty, setNodeHeight } from '@/utils/util'; import { processRowProperty, setNodeHeight, handleClearTableQuery } from '@/utils/util';
import functions from '@/utils/functions.js';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util'; import { downloadXls } from '@/utils/util';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
@ -167,8 +144,7 @@ const warehouseList = ref([]); //仓库
const monthList = ref([]); //月份 const monthList = ref([]); //月份
const warehousecheckAll = ref(false); const warehousecheckAll = ref(false);
const indeterminate = ref(false); const indeterminate = ref(false);
const queryTop = ref({ const queryTop = ref({}); //顶部查询
}); //顶部查询
const details = reactive({ const details = reactive({
/** 是否开启搜索 */ /** 是否开启搜索 */
search: false, search: false,
@ -288,7 +264,7 @@ const timesc = (index, row) => {
watch( watch(
() => queryTop.value.warehouse, () => queryTop.value.warehouse,
val => { val => {
if (!val.length) { if (!val?.length) {
warehousecheckAll.value = false; warehousecheckAll.value = false;
indeterminate.value = false; indeterminate.value = false;
} else if (val.length === warehouseList.value.length) { } else if (val.length === warehouseList.value.length) {
@ -322,30 +298,37 @@ const selectionChange = list => {
details.selectionList = list; details.selectionList = list;
}; };
// 网页顶部搜索按钮 // 网页顶部搜索按钮
const deleteIfExists = (obj, key) => {
if (obj[key] !== undefined) {
delete obj[key];
}
};
const searchChange = () => { const searchChange = () => {
console.log(queryTop.value.Settlementdate); const { Settlementdate, warehouse } = queryTop.value;
if (queryTop.value.Settlementdate) {
const [startDateQuery, endDateQuery] = queryTop.value.Settlementdate; // 处理 Settlementdate
details.query.startDateQuery = startDateQuery; if (Settlementdate) {
details.query.endDateQuery = endDateQuery; [details.query.startDate, details.query.endDate] = Settlementdate;
} else { } else {
delete details.query.startDateQuery; deleteIfExists(details.query, 'startDate');
delete details.query.endDateQuery; deleteIfExists(details.query, 'endDate');
} }
if (queryTop.value.warehouse?.length) {
details.query.warehouseNameQuery = queryTop.value.warehouse.join(','); // 处理 warehouse
if (warehouse?.length) {
details.query.warehouseName = warehouse.join(',');
} else { } else {
delete details.query.warehouseNameQuery; deleteIfExists(details.query, 'warehouseName');
} }
onLoad(); onLoad();
}; };
// 清空 // 清空
const searchReset = () => { const searchReset = () => {
details.query = {}; details.query = {};
queryTop.value = {}; queryTop.value = {};
details.columnList.forEach(item => { handleClearTableQuery(details.columnList);
item.values = '';
});
onLoad(); onLoad();
}; };
// 每页多少条 // 每页多少条
@ -396,19 +379,27 @@ const MyWarehouseList = () => {
}; };
// 页面初始化 // 页面初始化
const onLoad = value => { const onLoad = async value => {
let data = { try {
current: details.page.currentPage, details.loadingObj.packageListLoading = true;
size: details.page.pageSize, let submit = {
...details.query, current: details.page.currentPage,
...value, size: details.page.pageSize,
}; ...details.query,
$_Getlist(data).then(res => { ...value,
if (res.data.code == 200) { };
details.data = res.data.data.records || []; let res = await $_Getlist(submit);
details.page.total = res.data.data.total; //页码 const { code, data } = res.data;
if (code != 200) {
return;
} }
}); details.data = data.records || [];
details.page.total = data.total;
} catch (e) {
console.log(e);
} finally {
details.loadingObj.packageListLoading = false;
}
}; };
const monthFn = () => { const monthFn = () => {
for (let i = 0; i < 12; i++) { for (let i = 0; i < 12; i++) {

79
src/views/cost/storagecost/Warehousedaily.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<basic-container> <basic-container v-loading="loadingObj.packageListLoading" element-loading-text="Loading...">
<!-- 首页表格 --> <!-- 首页表格 -->
<div class="avue-crud"> <div class="avue-crud">
<!-- 搜索模块 --> <!-- 搜索模块 -->
@ -34,26 +34,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="结算年份">
<el-date-picker
v-model="queryTop.costSettlementYear"
type="year"
placeholder="请选择年份"
value-format="YYYY"
/>
</el-form-item>
<el-form-item label="结算月">
<el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份">
<el-option
v-for="item in monthList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="结算日期"> <el-form-item label="结算日期">
<el-date-picker <el-date-picker
v-model="queryTop.costSettlementYear" v-model="queryTop.costSettlementYear"
@ -63,6 +43,7 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束如期" end-placeholder="结束如期"
:shortcuts="shortcuts" :shortcuts="shortcuts"
value-format="YYYY-MM-DD HH:mm:ss"
/> />
</el-form-item> </el-form-item>
</div> </div>
@ -78,9 +59,7 @@
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<!-- <el-button type="primary" @click="exportExcel" <el-button icon="Download" type="primary" @click="exportExcel">导出</el-button>
><el-icon><Plus /></el-icon>导出</el-button
> -->
</div> </div>
<!-- 头部右侧按钮模块 --> <!-- 头部右侧按钮模块 -->
<div class="avue-crud__right"> <div class="avue-crud__right">
@ -150,11 +129,10 @@ import { columnList } from '@/option/storagecost/Warehousedaily.js';
import { import {
$_GetexpenseWarehouseDay, $_GetexpenseWarehouseDay,
$_getMyWarehouseList, $_getMyWarehouseList,
$_expenseWarehouseMonth, $_exporDay,
} from '@/api/storagecost/index.js'; } from '@/api/storagecost/index.js';
import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { processRowProperty, setNodeHeight } from '@/utils/util'; import { processRowProperty, setNodeHeight,handleClearTableQuery } from '@/utils/util';
import functions from '@/utils/functions.js';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util'; import { downloadXls } from '@/utils/util';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
@ -323,16 +301,16 @@ const handleCheckAll = val => {
const searchChange = () => { const searchChange = () => {
if (queryTop.value.costSettlementYear?.length) { if (queryTop.value.costSettlementYear?.length) {
const [startDateQuery, endDateQuery] = queryTop.value.costSettlementYear; const [startDateQuery, endDateQuery] = queryTop.value.costSettlementYear;
details.query.startDateQuery = startDateQuery; details.query.startDate = startDateQuery;
details.query.endDateQuery = endDateQuery; details.query.endDate = endDateQuery;
} else { } else {
delete details.query.startDateQuery; delete details.query.startDateQuery;
delete details.query.endDateQuery; delete details.query.endDateQuery;
} }
if (queryTop.value.warehouse) { if (queryTop.value.warehouse) {
details.query.warehouseNameQuery = queryTop.value.warehouse.join(','); details.query.warehouseName = queryTop.value.warehouse.join(',');
} else { } else {
delete details.query.warehouseNameQuery; delete details.query.warehouseName;
} }
onLoad(); onLoad();
}; };
@ -340,9 +318,7 @@ const searchChange = () => {
const searchReset = () => { const searchReset = () => {
details.query = {}; details.query = {};
queryTop.value = {}; queryTop.value = {};
details.columnList.forEach(item => { handleClearTableQuery(details.columnList)
item.values = '';
});
onLoad(); onLoad();
}; };
// 每页多少条 // 每页多少条
@ -393,19 +369,26 @@ const MyWarehouseList = () => {
}; };
// 页面初始化 // 页面初始化
const onLoad = value => { const onLoad = async value => {
let data = { try {
current: details.page.currentPage, details.loadingObj.packageListLoading = true;
size: details.page.pageSize, let submit = {
...details.query, current: details.page.currentPage,
...value, size: details.page.pageSize,
}; ...details.query,
$_GetexpenseWarehouseDay(data).then(res => { ...value,
if (res.data.code == 200) { };
details.data = res.data.data.records || []; let res = await $_GetexpenseWarehouseDay(submit);
details.page.total = res.data.data.total; //页码 const { code, data } = res.data;
if (code != 200) {
return;
} }
}); details.data = data.records || [];
details.page.total = data.total;
} catch (e) {
} finally {
details.loadingObj.packageListLoading = false;
}
}; };
const monthFn = () => { const monthFn = () => {
for (let i = 0; i < 12; i++) { for (let i = 0; i < 12; i++) {
@ -437,9 +420,9 @@ const exportExcel = () => {
...details.query, ...details.query,
}; };
console.log(data, '要提交的数据'); console.log(data, '要提交的数据');
$_expenseWarehouseMonth(data).then(res => { $_exporDay(data).then(res => {
details.loadingObj.list = false; details.loadingObj.list = false;
downloadXls(res.data, `月度仓储成本统计.xlsx`); downloadXls(res.data, `日度仓储成本统计.xlsx`);
ElMessage({ ElMessage({
message: '导出成功', message: '导出成功',
type: 'success', type: 'success',

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

@ -86,8 +86,8 @@
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> <template v-if="slotProps.scope.column.label === '操作'">
<div class="ElBtnClass"> <div class="ElBtnClass">
<el-button @click="edit(slotProps.scope.row)">编辑</el-button> <el-text @click="edit(slotProps.scope.row)">编辑</el-text>
<el-button @click="Viewdelete(slotProps.scope.row)">删除</el-button> <el-text @click="Viewdelete(slotProps.scope.row)">删除</el-text>
</div> </div>
</template> </template>
</template> </template>

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

@ -2131,9 +2131,9 @@ const handleSubmitProblemData = () => {
const handleSetRowClassName = (row, rowIndex) => { const handleSetRowClassName = (row, rowIndex) => {
if (!row.warehouseEntryTimeStart) return 'timeOut'; if (!row.warehouseEntryTimeStart) return 'timeOut';
// 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期 // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
// 当前时间 - 创建时间 // 当前时间 - 入库时间
const time = Date.now() - new Date(row.warehouseEntryTimeStart).getTime(); const time = Date.now() - new Date(row.warehouseEntryTimeStart).getTime();
// 预警时间 // 预警时间
@ -2842,25 +2842,4 @@ onActivated(() => {
:deep(.el-form-item__content) { :deep(.el-form-item__content) {
width: 250px !important; width: 250px !important;
} }
// 表格行样式
:deep(.el-table) {
tr {
&.WarningTime {
color: #e6a23c !important;
.el-text {
color: #e6a23c !important;
}
}
&.timeOut {
color: #f56c6c !important;
.el-text {
color: #f56c6c !important;
}
}
}
}
</style> </style>

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

@ -1302,9 +1302,9 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
const handleSetRowClassName = (row, rowIndex) => { const handleSetRowClassName = (row, rowIndex) => {
if (!row.warehouseEntryTimeStart) return 'timeOut'; if (!row.warehouseEntryTimeStart) return 'timeOut';
// 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期 // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
// 当前时间 - 创建时间 // 当前时间 - 入库时间
const time = Date.now() - new Date(row.warehouseEntryTimeStart).getTime(); const time = Date.now() - new Date(row.warehouseEntryTimeStart).getTime();
// 预警时间 // 预警时间
@ -1489,25 +1489,4 @@ const handleSetRowClassName = (row, rowIndex) => {
background: #f5f7fa; background: #f5f7fa;
} }
} }
// 表格行样式
:deep(.el-table) {
tr {
&.WarningTime {
color: #e6a23c !important;
.el-text {
color: #e6a23c !important;
}
}
&.timeOut {
color: #f56c6c !important;
.el-text {
color: #f56c6c !important;
}
}
}
}
</style> </style>

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

@ -191,7 +191,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120, 200]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"

2
src/views/distribution/deliverylist/distributionDeliveryListdis.vue
Unescape View File

@ -195,7 +195,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"

2
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -188,7 +188,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"

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

@ -565,7 +565,6 @@
v-model="item.chargeType" v-model="item.chargeType"
@change="() => handleAssignmentItemPrice(item, false, item.chargeType)" @change="() => handleAssignmentItemPrice(item, false, item.chargeType)"
style="display: flex" style="display: flex"
:disabled="isDisabled"
> >
<el-radio :label="1">件</el-radio> <el-radio :label="1">件</el-radio>
<el-radio :label="2">方</el-radio> <el-radio :label="2">方</el-radio>

25
src/views/distribution/inventory/delivery/OrderInTransit.vue
Unescape View File

@ -428,9 +428,9 @@ const handleView = ({ row }) => {
const handleSetRowClassName = (row, rowIndex) => { const handleSetRowClassName = (row, rowIndex) => {
if (!row.warehouseEntryTime) return 'timeOut'; if (!row.warehouseEntryTime) return 'timeOut';
// 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期 // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
// 当前时间 - 创建时间 // 当前时间 - 入库时间
const time = Date.now() - new Date(row.warehouseEntryTime).getTime(); const time = Date.now() - new Date(row.warehouseEntryTime).getTime();
// 预警时间 // 预警时间
@ -471,25 +471,4 @@ const handleSetRowClassName = (row, rowIndex) => {
:deep(.el-overlay-dialog) { :deep(.el-overlay-dialog) {
position: absolute; position: absolute;
} }
// 表格行样式
:deep(.el-table) {
tr {
&.WarningTime {
color: #e6a23c !important;
.el-text {
color: #e6a23c !important;
}
}
&.timeOut {
color: #f56c6c !important;
.el-text {
color: #f56c6c !important;
}
}
}
}
</style> </style>

2
src/views/distribution/inventory/delivery/distributionStockArticle.vue
Unescape View File

@ -210,7 +210,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"

20
src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
Unescape View File

@ -102,6 +102,7 @@
:columnList="columnList" :columnList="columnList"
:tableData="data" :tableData="data"
:loading="loading" :loading="loading"
:tableRowClassName="handleSetRowClassName"
@inputTxt="inputsc" @inputTxt="inputsc"
@timeCheck="timesc" @timeCheck="timesc"
@btnCheck="btnsc" @btnCheck="btnsc"
@ -167,7 +168,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"
@ -1415,6 +1416,23 @@ export default {
console.log('error :>> ', error); console.log('error :>> ', error);
} }
}, },
handleSetRowClassName(row, rowIndex) {
console.log('row.warehouseEntryTime :>> ', row.warehouseEntryTime);
if (!row.warehouseEntryTime) return 'timeOut';
// 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
// 当前时间 - 入库时间
const time = Date.now() - new Date(row.warehouseEntryTime).getTime();
// 预警时间
const WarningTime = 1000 * 60 * 60 * (24 * 2 - 2);
// 超时
const timeOut = 1000 * 60 * 60 * 24 * 2;
if (time > timeOut) return 'timeOut';
else if (time > WarningTime && time < timeOut) return 'WarningTime';
},
}, },
}; };
</script> </script>

2
src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
Unescape View File

@ -203,7 +203,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"

27
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
Unescape View File

@ -186,7 +186,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"
@ -788,9 +788,9 @@ export default {
console.log('row.warehouseEntryTime :>> ', row.warehouseEntryTime); console.log('row.warehouseEntryTime :>> ', row.warehouseEntryTime);
if (!row.warehouseEntryTime) return 'timeOut'; if (!row.warehouseEntryTime) return 'timeOut';
// 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期 // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
// 当前时间 - 创建时间 // 当前时间 - 入库时间
const time = Date.now() - new Date(row.warehouseEntryTime).getTime(); const time = Date.now() - new Date(row.warehouseEntryTime).getTime();
// 预警时间 // 预警时间
const WarningTime = 1000 * 60 * 60 * (24 * 2 - 2); const WarningTime = 1000 * 60 * 60 * (24 * 2 - 2);
@ -1844,25 +1844,4 @@ export default {
.el_textBtn { .el_textBtn {
font-weight: bold; font-weight: bold;
} }
// 表格行样式
:deep(.el-table) {
tr {
&.WarningTime {
color: #e6a23c !important;
.el-text {
color: #e6a23c !important;
}
}
&.timeOut {
color: #f56c6c !important;
.el-text {
color: #f56c6c !important;
}
}
}
}
</style> </style>

2
src/views/distribution/inventory/distributionStockListDetails.vue
Unescape View File

@ -120,7 +120,7 @@
</el-pagination> </el-pagination>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="出库明细" name="outbound"> <el-tab-pane label="备货明细" name="outbound">
<tablecmt <tablecmt
class="tableNode" class="tableNode"
:columnList="columnListarrs.columnDetails" :columnList="columnListarrs.columnDetails"

2
src/views/distribution/inventory/distrilbutionBillLadingList.vue
Unescape View File

@ -175,7 +175,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120, 200]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"

6
src/views/distribution/inventory/distrilbutionBillLadingView.vue
Unescape View File

@ -107,7 +107,7 @@
@size-change="sizeOrderChange" @size-change="sizeOrderChange"
@current-change="currentOrderChange" @current-change="currentOrderChange"
:current-page="ordpage.currentPage" :current-page="ordpage.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="ordpage.pageSize" :page-size="ordpage.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="ordpage.total" :total="ordpage.total"
@ -154,7 +154,7 @@
@size-change="psizeChange" @size-change="psizeChange"
@current-change="pcurrentChange" @current-change="pcurrentChange"
:current-page="packpage.currentPage" :current-page="packpage.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="packpage.pageSize" :page-size="packpage.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="packpage.total" :total="packpage.total"
@ -193,7 +193,7 @@
@size-change="sizeInChange" @size-change="sizeInChange"
@current-change="currentInChange" @current-change="currentInChange"
:current-page="inventorypage.currentPage" :current-page="inventorypage.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120,200]"
:page-size="inventorypage.pageSize" :page-size="inventorypage.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="inventorypage.total" :total="inventorypage.total"

196
src/views/distribution/signfor/distributionSignfortreat.vue
Unescape View File

@ -108,101 +108,99 @@
</el-row> </el-row>
</div> </div>
<div style="height: 100%"> <!-- 列表模块 -->
<!-- 列表模块 --> <tablecmt
<tablecmt ref="tableNodeRef"
ref="tableNodeRef" :columnList="columnList"
:columnList="columnList" :tableData="data"
:tableData="data" :loading="loading"
:loading="loading" :tableRowClassName="handleSetRowClassName"
@inputTxt="inputsc" @inputTxt="inputsc"
@timeCheck="timesc" @timeCheck="timesc"
@btnCheck="btnsc" @btnCheck="btnsc"
@selectCheck="selectsc" @selectCheck="selectsc"
@selection="selectionsc" @selection="selectionsc"
> >
<template #default="slotProps"> <template #default="slotProps">
<template <template
v-if=" v-if="
slotProps.scope.column.label === '配送件数' || slotProps.scope.column.label === '配送件数' ||
'装车件数' || '装车件数' ||
'签收数' || '签收数' ||
'未签收数' || '未签收数' ||
'未装车件数' || '未装车件数' ||
'异常装车件数' || '异常装车件数' ||
'异常签收件数' '异常签收件数'
" "
> >
<el-text @click="InformationViewing(slotProps.scope)"> <el-text @click="InformationViewing(slotProps.scope)">
<!-- {{slotProps.scope.row.reservationNum}} --> <!-- {{slotProps.scope.row.reservationNum}} -->
{{ {{
slotProps.scope.column.label === '计划配送件数' slotProps.scope.column.label === '计划配送件数'
? slotProps.scope.row.reservationNum ? slotProps.scope.row.reservationNum
: slotProps.scope.column.label === '计划装车件数' : slotProps.scope.column.label === '计划装车件数'
? slotProps.scope.row.loadedNumber ? slotProps.scope.row.loadedNumber
: slotProps.scope.column.label === '计划签收件数' : slotProps.scope.column.label === '计划签收件数'
? slotProps.scope.row.receivedQuantity ? slotProps.scope.row.receivedQuantity
: slotProps.scope.column.label === '计划未签收件数' : slotProps.scope.column.label === '计划未签收件数'
? slotProps.scope.row.unreceivedQuantity ? slotProps.scope.row.unreceivedQuantity
: slotProps.scope.column.label === '计划未装车件数' : slotProps.scope.column.label === '计划未装车件数'
? slotProps.scope.row.unloadedNumber ? slotProps.scope.row.unloadedNumber
: slotProps.scope.column.label === '异常装车件数' : slotProps.scope.column.label === '异常装车件数'
? slotProps.scope.row.abnormalLoadedNumber ? slotProps.scope.row.abnormalLoadedNumber
: slotProps.scope.column.label === '异常签收件数' : slotProps.scope.column.label === '异常签收件数'
? slotProps.scope.row.abnormalReceivedQuantity ? slotProps.scope.row.abnormalReceivedQuantity
: '' : ''
}} }}
</el-text> </el-text>
</template> </template>
<template v-if="slotProps.scope.column.label === '操作'"> <template v-if="slotProps.scope.column.label === '操作'">
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text> <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
<el-text <el-text
size="small" size="small"
v-if="slotProps.scope.row.abnormalLoadedNumber > 0" v-if="slotProps.scope.row.abnormalLoadedNumber > 0"
@click="viewAbnormalLoading(slotProps.scope)" @click="viewAbnormalLoading(slotProps.scope)"
>异 常 审 核</el-text >异 常 审 核</el-text
> >
<!-- v-if=" <!-- v-if="
slotProps.scope.row.sijiSigningStatus == '司机已签收' && slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
slotProps.scope.row.wenyuanSigningStatus == '文员待审核' slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
" --> " -->
<el-text <el-text
v-if=" v-if="
slotProps.scope.row.sijiSigningStatus == '已完成' && slotProps.scope.row.sijiSigningStatus == '已完成' &&
slotProps.scope.row.wenyuanSigningStatus == '文员待审核' slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
" "
size="small" size="small"
@click="handleSign(slotProps.scope.row)" @click="handleSign(slotProps.scope.row)"
>复 核</el-text >复 核</el-text
> >
<el-text size="small" @click="asurcharge(slotProps.scope.row)">附加费</el-text> <el-text size="small" @click="asurcharge(slotProps.scope.row)">附加费</el-text>
</template>
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
</template> </template>
</tablecmt>
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
</template>
</tablecmt>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div> </div>
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
<!-- 表单模块 --> <!-- 表单模块 -->
<el-dialog <el-dialog
@ -2571,6 +2569,28 @@ export default {
} }
); );
}, },
/** 设置表格行样式 */
handleSetRowClassName(row, rowIndex) {
try {
if (!row.taskTime) return 'timeOut';
// 设置预警 -- 以配送时间为基准, 第二天八点后为超期, 前两个小时为预警
// 当前时间 - 入库时间
const time = Date.now() - new Date(row.taskTime).getTime();
// 预警时间
const WarningTime = 1000 * 60 * 60 * (24 - 2);
// 超时
const timeOut = 1000 * 60 * 60 * 24;
if (time > timeOut) return 'timeOut';
else if (time > WarningTime && time < timeOut) return 'WarningTime';
} catch (error) {
console.log('error :>> ', error);
}
},
}, },
}; };
</script> </script>

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

@ -94,7 +94,23 @@
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<!-- 审核 --> <!-- 审核 -->
<el-button type="primary" icon="Stamp" @click="handleConfirm">生成对账单</el-button> <el-button
v-if="permissionObj.ReconciliationDepositSlip_handleConfirm"
type="primary"
icon="Stamp"
@click="handleConfirm"
>
生成对账单
</el-button>
<el-button
v-if="permissionObj.ReconciliationDepositSlip_handleBatchSettle"
type="primary"
icon="Stamp"
@click="handleBatchSettle"
>
批量结算
</el-button>
<!-- 导出 --> <!-- 导出 -->
<el-button type="primary" icon="Download" @click="handleExport">导 出</el-button> <el-button type="primary" icon="Download" @click="handleExport">导 出</el-button>
@ -120,7 +136,11 @@
> >
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> <template v-if="slotProps.scope.column.label === '操作'">
<el-text @click="() => handleComputedPrice(slotProps.scope)">计算费用</el-text> <el-text
v-if="permissionObj.ReconciliationDepositSlip_handleComputedPrice"
@click="() => handleComputedPrice(slotProps.scope)"
>计算费用</el-text
>
</template> </template>
</template> </template>
</tablecmt> </tablecmt>
@ -215,7 +235,7 @@
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue'; import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import functions from '@/utils/functions.js'; import functions from '@/utils/functions.js';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { mapGetters } from 'vuex'; import { mapGetters, useStore } from 'vuex';
/** 获取字典 */ /** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import { import {
@ -224,6 +244,9 @@ import {
postReal, postReal,
postOrderInfoListExport, postOrderInfoListExport,
postCreateReconciliationOrder, postCreateReconciliationOrder,
postCreateFinishWaybillId,
postCreateReconciliationwWaybillId,
postCalculateRealCostByWaybillId,
} from '@/api/finance/ReconciliationDepositSlip'; } from '@/api/finance/ReconciliationDepositSlip';
import { import {
downloadXls, downloadXls,
@ -336,8 +359,32 @@ const tableNodeRef = ref();
const { search, shortcuts, selectionList, drawerShow, page, defaultTime2 } = toRefs(details); const { search, shortcuts, selectionList, drawerShow, page, defaultTime2 } = toRefs(details);
/** vuex */ /** vuex */
const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList'])); const $store = useStore();
console.log('permission :>> ', permission);
const { permission } = $store.getters;
const permissionObj = reactive({
// 生成对账单
ReconciliationDepositSlip_handleConfirm: computed(() => {
return details.pageStatus === 1
? permission.ReconciliationDepositSlip_handleConfirm_toB
: permission.ReconciliationDepositSlip_handleConfirm_toC;
}),
// 批量结算
ReconciliationDepositSlip_handleBatchSettle: computed(() => {
return details.pageStatus === 1
? permission.ReconciliationDepositSlip_handleBatchSettle_toB
: // 暂时没有
permission.ReconciliationDepositSlip_handleBatchSettle_toC;
}),
// 计算费用
ReconciliationDepositSlip_handleComputedPrice: computed(() => {
return details.pageStatus === 1
? // 暂时没有
permission.ReconciliationDepositSlip_handleComputedPrice_toB
: permission.ReconciliationDepositSlip_handleComputedPrice_toC;
}),
});
onMounted(async () => { onMounted(async () => {
await nextTick(); await nextTick();
@ -565,6 +612,42 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
} }
}; };
/** 批量结算 */
const handleBatchSettle = () => {
try {
if (details.selectionList.length === 0) return ElMessage.warning('请选择需要结算的数据');
ElMessageBox.confirm('是否批量结算?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
details.popUpShow.confirmVisited = false;
try {
details.loadingObj.pageLoading = true;
const submitData = {
waybillIds: details.selectionList.map(val => val.waybillId),
};
const res = await postCreateFinishWaybillId(submitData);
const { code, msg } = res.data;
if (code !== 200) return msg && ElMessage.warning(msg);
if (msg) ElMessage.success(msg);
} catch (error) {
console.log('error :>> ', error);
} finally {
onLoad();
details.loadingObj.pageLoading = false;
}
});
} catch (error) {
console.log('error :>> ', error);
} finally {
}
};
/** 生成对账单 */ /** 生成对账单 */
const handleConfirm = async () => { const handleConfirm = async () => {
await nextTick(); await nextTick();
@ -608,11 +691,25 @@ const handleSubmitConfrim = () => {
try { try {
details.loadingObj.pageLoading = true; details.loadingObj.pageLoading = true;
const submitData = { let res: any = {};
orderInfoIds: details.selectionList.map(val => val.orderInfoId),
}; // toB
if (details.pageStatus === 1) {
const submitData = {
waybillIds: details.selectionList.map(val => val.waybillId),
};
res = await postCreateReconciliationwWaybillId(submitData);
}
// toC
else {
const submitData = {
orderInfoIds: details.selectionList.map(val => val.orderInfoId),
};
res = await postCreateReconciliationOrder(submitData);
}
const res = await postCreateReconciliationOrder(submitData);
const { code, msg } = res.data; const { code, msg } = res.data;
if (code !== 200) return msg && ElMessage.warning(msg); if (code !== 200) return msg && ElMessage.warning(msg);
@ -637,6 +734,7 @@ const handleComputedPrice = ({ row }) => {
details.loadingObj.pageLoading = true; details.loadingObj.pageLoading = true;
const res = await postReal(row.orderInfoId); const res = await postReal(row.orderInfoId);
// const res = await postCalculateRealCostByWaybillId(row.waybillId);
const { code, msg } = res.data; const { code, msg } = res.data;
if (code !== 200) return msg && ElMessage.warning(msg); if (code !== 200) return msg && ElMessage.warning(msg);

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

@ -375,6 +375,13 @@ const onLoad = async () => {
if (code !== 200) return; if (code !== 200) return;
details.data = data.records; details.data = data.records;
for (let i = 0; i < details.data .length; i++) {
const value = details.data [i];
!value.payStatus && (value.payStatus = '10')
!value.settlementStatus && (value.settlementStatus = '10')
}
details.page.total = data.total; details.page.total = data.total;
handleTranslationDataSeclect(details.data, details.columnList); handleTranslationDataSeclect(details.data, details.columnList);
return res.data; return res.data;

6
src/views/reportforms/Stockordertable.vue
Unescape View File

@ -167,7 +167,7 @@ import {
$_getstockOrder, $_getstockOrder,
} from '@/api/reportforms/index.js'; } from '@/api/reportforms/index.js';
import { ElMessageBox } from 'element-plus'; import { ElMessageBox } from 'element-plus';
import { downloadXls, deepClone } from '@/utils/util'; import { downloadXls, deepClone,handleClearTableQuery } from '@/utils/util';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
const indeterminate = ref(false); const indeterminate = ref(false);
const checkAll = ref(false); const checkAll = ref(false);
@ -338,9 +338,7 @@ const searchReset = () => {
TopQuery.value.time = []; TopQuery.value.time = [];
queryCarn.value = {}; queryCarn.value = {};
details.query = {}; details.query = {};
columnList.forEach(item => { handleClearTableQuery(details.columnList);
item.values = '';
});
details.page.total = 0; details.page.total = 0;
details.data = []; details.data = [];
}; };

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

@ -530,7 +530,6 @@
v-model="item.chargeType" v-model="item.chargeType"
@change="() => handleAssignmentItemPrice(item, false, item.chargeType)" @change="() => handleAssignmentItemPrice(item, false, item.chargeType)"
style="display: flex" style="display: flex"
:disabled="isDisabled"
> >
<el-radio :label="1">件</el-radio> <el-radio :label="1">件</el-radio>
<el-radio :label="2">方</el-radio> <el-radio :label="2">方</el-radio>

21
src/views/waybill/TemporaryStorageList.vue
Unescape View File

@ -1718,25 +1718,4 @@ onActivated(() => {
text-align: left !important; text-align: left !important;
} }
} }
// 表格行样式
:deep(.el-table) {
tr {
&.WarningTime {
color: #e6a23c !important;
.el-text {
color: #e6a23c !important;
}
}
&.timeOut {
color: #f56c6c !important;
.el-text {
color: #f56c6c !important;
}
}
}
}
</style> </style>

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

@ -302,7 +302,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue'; import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import functions from '@/utils/functions.js';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { mapGetters, useStore } from 'vuex'; import { mapGetters, useStore } from 'vuex';
/** 获取字典 */ /** 获取字典 */

Write Preview
Loading…
Cancel
Save