Merge pull request '更新' (#20) from zyj into master

Reviewed-on: #20

src/views/oilFinalStatement/oilFinalStatementAddList.vue

@@ -56,8 +56,8 @@
                 </el-date-picker>
               </el-form-item>
               <el-form-item prop="paramsid">
-                <el-select v-model="page.params.oilProductType" style="width: 100%" clearable placeholder="请选择油品类型">
+                <el-select v-model="page.params.productType" style="width: 100%" clearable placeholder="请选择油品类型">
-                  <el-option v-for="item in oliList" :key="item.label" :label="item.label" :value="item.value"> </el-option>
+                  <el-option v-for="(item, index) in oliList" :key="index" :label="item" :value="item"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -224,24 +224,7 @@ export default {
     return {
       changeCompanyId: '',
 
-      oliList: [
+      oliList: ['0#柴', '-10#柴', '92#汽', '95#汽'],
-        {
-          value: 'DIESEL',
-          label: '柴油'
-        },
-        {
-          value: 'PETROL',
-          label: '汽油'
-        },
-        {
-          value: 'GAS',
-          label: '天然气'
-        },
-        {
-          value: 'OTHER',
-          label: '其他'
-        }
-      ],
 
       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'