Browse Source

修复已知bug,修复全部配送日期查询错误,模板配置增加整车字段

dev
马远东 4 days ago
parent
commit
fa58ca00c3
  1. 11
      src/option/storagecost/WarehouseMonthly.js
  2. 11
      src/option/storagecost/Warehousedaily.js
  3. 2
      src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
  4. 3
      src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
  5. 10
      src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue
  6. 16
      src/views/distribution/deliverylist/distributionDeliveryList.vue

11
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: '租用出库件数',

11
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: '客户租用总成本',

2
src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue

@ -250,7 +250,7 @@ const preservation = async () => {
});
}
}
await onLoad();
};
const Reset = () => {
copyform.value = deepClone(form.value);

3
src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue

@ -136,7 +136,7 @@
<div class="el_Kilometers_box">
<span class="title">整车计费单价</span>
<el-input-number
v-model="form.kilometerCost"
v-model="form.wholeVehicleCost"
:min="0"
:controls="false"
:precision="2"
@ -331,6 +331,7 @@ const OversizedbillingData = ref([]);
const loading = ref(false); //loading
const form = ref({
kilometerCost: 0, //
wholeVehicleCost:0,//
subsidyInitKilometer: 0, //
subsidyCost: 0, //
overZoneKilometer: 0, //

10
src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue

@ -9,6 +9,8 @@
<div>
<el-form-item label="目的仓">
<el-select
collapse-tags
:max-collapse-tags="3"
v-model="queryTop.warehouse"
multiple
placeholder="请选择仓库"
@ -32,7 +34,11 @@
</el-form-item>
<el-form-item label="结算月">
<el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份">
<el-select
style="width: 240px"
v-model="queryTop.costSettlementMonth"
placeholder="请选择月份"
>
<el-option
v-for="item in monthList"
:key="item.value"
@ -276,7 +282,7 @@ const selectionChange = list => {
};
//
const searchChange = () => {
onLoad();
onLoad(queryTop.value);
};
//
const sizeChange = val => {

16
src/views/distribution/deliverylist/distributionDeliveryList.vue

@ -14,7 +14,7 @@
<el-form-item label="配送日期:" class="el-times">
<el-date-picker
class="w100"
v-model="query.taskTimeArr"
v-model="Deliverydate"
type="daterange"
unlink-panels
range-separator="至"
@ -335,6 +335,7 @@ export default {
data() {
return {
currentdate: true,
Deliverydate: [],
height: 0,
//
title: '',
@ -1088,20 +1089,19 @@ export default {
const startDate = currentDate.subtract(1, 'month');
// 'YYYY-MM-DD'
const formatDate = date => 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

Loading…
Cancel
Save