diff --git a/src/option/storagecost/WarehouseMonthly.js b/src/option/storagecost/WarehouseMonthly.js index b1c1ee59..2e790aa1 100644 --- a/src/option/storagecost/WarehouseMonthly.js +++ b/src/option/storagecost/WarehouseMonthly.js @@ -91,6 +91,17 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'wholeVehicleCost', + label: '整车单价', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'rentedItemsDispatchedQuantity', label: '租用出库件数', diff --git a/src/option/storagecost/Warehousedaily.js b/src/option/storagecost/Warehousedaily.js index aa28efab..78678d63 100644 --- a/src/option/storagecost/Warehousedaily.js +++ b/src/option/storagecost/Warehousedaily.js @@ -113,6 +113,17 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'wholeVehicleCost', + label: '整车单价', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'customerTotalLeasingCost', label: '客户租用总成本', diff --git a/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue b/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue index 7b09dd10..8745901f 100644 --- a/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue +++ b/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue @@ -250,7 +250,7 @@ const preservation = async () => { }); } } - await onLoad(); + }; const Reset = () => { copyform.value = deepClone(form.value); diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue index 493dfbd7..ef04c1d0 100644 --- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue +++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue @@ -136,7 +136,7 @@
整车计费单价 - + { }; // 网页顶部搜索按钮 const searchChange = () => { - onLoad(); + onLoad(queryTop.value); }; // 每页多少条 const sizeChange = val => { diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index d542a5b1..84b386db 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -14,7 +14,7 @@ date.format('YYYY-MM-DD'); - this.query.taskTimeArr = []; - (this.query.taskTimeArr[0] = formatDate(startDate)), // 一个月前的日期 - (this.query.taskTimeArr[1] = formatDate(currentDate)); // 当前日期 + this.Deliverydate = []; + this.Deliverydate[0] = formatDate(startDate); // 一个月前的日期 + this.Deliverydate[1] = formatDate(currentDate); // 当前日期 }, async onLoad(page, params = {}) { this.loading = true; if (this.currentdate) { await this.Getcurrentdate(); } - if (getObjType(this.query.taskTimeArr) === 'array') { - params.taskTimeStart = this.query.taskTimeArr[0]; - params.taskTimeEnd = this.query.taskTimeArr[1]; + if (getObjType(this.Deliverydate) === 'array') { + params.taskTimeStart = this.Deliverydate[0]; + params.taskTimeEnd = this.Deliverydate[1]; } - getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; // eslint-disable-next-line no-empty