diff --git a/src/views/oilFinalStatement/oilFinalStatementAddList.vue b/src/views/oilFinalStatement/oilFinalStatementAddList.vue index f8a2b1d..a2c7f7d 100644 --- a/src/views/oilFinalStatement/oilFinalStatementAddList.vue +++ b/src/views/oilFinalStatement/oilFinalStatementAddList.vue @@ -56,8 +56,8 @@ - - + + @@ -224,24 +224,7 @@ export default { return { changeCompanyId: '', - oliList: [ - { - value: 'DIESEL', - label: '柴油' - }, - { - value: 'PETROL', - label: '汽油' - }, - { - value: 'GAS', - label: '天然气' - }, - { - value: 'OTHER', - label: '其他' - } - ], + oliList: ['0#柴', '-10#柴', '92#汽', '95#汽'], baocunList: [], daixuanList: [], @@ -430,7 +413,7 @@ export default { return } this.importData.settlementType = 1 - this.importData.oilProductType = this.page.params.oilProductType + this.importData.productType = this.page.params.productType let payRealAmountEnd = [] let customerSettleAmountList = [] @@ -486,7 +469,7 @@ export default { this.$message.warning('请输入时间') return } - if (!this.page.params.oilProductType) { + if (!this.page.params.productType) { this.$message.warning('请选择油品类型') return } @@ -587,7 +570,7 @@ export default { }, async getByPage(e) { this.page.params.type = 1 - + this.page.params.orderType = 4 if (this.page.params.createTimeRange && this.page.params.createTimeRange.length > 1) { this.page.params.dateStartTime = this.page.params.createTimeRange[0] + ' 00:00:00' this.page.params.dateEndTime = this.page.params.createTimeRange[1] + ' 23:59:59'