Merge pull request 'chenlianjie' (#14) from chenlianjie into master

Reviewed-on: #14

src/api/order/orderInfo.js

@@ -1,97 +1,96 @@
-import request from '@/utils/request'
-var service_name = 'oil-mall'
-var group_name = 'mallOrderInfo'
-export default {
-  getByPage(page) {
-    // 分页查询
-    return request({
-      url: `/${service_name}/${group_name}/getByPage`,
-      method: 'post',
-      data: page
-    })
-  },
-  getRefundOrder(page) {
-    // 退货列表
-    return request({
-      url: `/${service_name}/${group_name}/getRefundOrder`,
-      method: 'post',
-      data: page
-    })
-  },
-  get(id) {
-    // 订单详情
-    return request({
-      url: `/${service_name}/${group_name}/get/${id}`,
-      method: 'get'
-    })
-  },
-  getRefund(id) {
-    // 订单详情
-    return request({
-      url: `/${service_name}/${group_name}/getRefund/${id}`,
-      method: 'get'
-    })
-  },
-  getOrderBySerialOrId(serialNumber) {
-    // 查询订单统计信息
-    return request({
-      url: `/${service_name}/${group_name}/getOrderBySerialOrId`,
-      method: 'get',
-      params: {
-        serialNumber
-      }
-    })
-  },
-
-  cancelOrder(orderInfo) {
-    // 取消
-    return request({
-      url: `/${service_name}/${group_name}/cancelOrder`,
-      method: 'post',
-      data: orderInfo
-    })
-  },
-  verifyRefundOrder(orderInfo) {
-    // 审核
-    return request({
-      url: `/${service_name}/${group_name}/verifyRefundOrder`,
-      method: 'post',
-      data: orderInfo
-    })
-  },
-  getIntegralSite(siteName) {
-    // 油站模糊查询
-    return request({
-      url: `/oil-finance/oilCustomerIntegralRule/getIntegralSite`,
-      method: 'post',
-      data: { siteName: siteName }
-    })
-  },
-
-  update(orderInfo) {
-    // 更新
-    return request({
-      url: `/${service_name}/${group_name}/update`,
-      method: 'put',
-      data: orderInfo
-    })
-  },
-  exportExcel(page) {
-    // 导出
-    return request({
-      url: `/${service_name}/${group_name}/export`,
-      method: 'post',
-      notEncrypt: true,
-      data: page,
-      responseType: 'blob'
-    })
-  },
-  deleteById(id) {
-    // 根据id删除
-    return request({
-      url: `/${service_name}/${group_name}/delete`,
-      method: 'put',
-      data: { id: id }
-    })
-  }
-}
+import request from '@/utils/request'
+var service_name = 'oil-mall'
+var group_name = 'mallOrderInfo'
+export default {
+  getByPage(page) {
+    // 分页查询
+    return request({
+      url: `/${service_name}/${group_name}/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+  getRefundOrder(page) {
+    // 退货列表
+    return request({
+      url: `/${service_name}/${group_name}/getRefundOrder`,
+      method: 'post',
+      data: page
+    })
+  },
+  get(id) {
+    // 订单详情
+    return request({
+      url: `/${service_name}/${group_name}/get/${id}`,
+      method: 'get'
+    })
+  },
+  getRefund(id) {
+    // 订单详情
+    return request({
+      url: `/${service_name}/${group_name}/getRefund/${id}`,
+      method: 'get'
+    })
+  },
+  getOrderBySerialOrId(serialNumber) {
+    // 查询订单统计信息
+    return request({
+      url: `/${service_name}/${group_name}/getOrderBySerialOrId`,
+      method: 'get',
+      params: {
+        serialNumber
+      }
+    })
+  },
+
+  cancelOrder(orderInfo) {
+    // 取消
+    return request({
+      url: `/${service_name}/${group_name}/cancelOrder`,
+      method: 'post',
+      data: orderInfo
+    })
+  },
+  verifyRefundOrder(orderInfo) {
+    // 审核
+    return request({
+      url: `/${service_name}/${group_name}/verifyRefundOrder`,
+      method: 'post',
+      data: orderInfo
+    })
+  },
+  getIntegralSite(siteName) {
+    // 油站模糊查询
+    return request({
+      url: `/oil-finance/oilCustomerIntegralRule/getIntegralSite`,
+      method: 'post',
+      data: { siteName: siteName }
+    })
+  },
+
+  update(orderInfo) {
+    // 更新
+    return request({
+      url: `/${service_name}/${group_name}/update`,
+      method: 'put',
+      data: orderInfo
+    })
+  },
+  exportExcel(page) {
+    // 导出
+    return request({
+      url: `/${service_name}/${group_name}/exportWeb`,
+      method: 'post',
+      data: page,
+      responseType: 'blob'
+    })
+  },
+  deleteById(id) {
+    // 根据id删除
+    return request({
+      url: `/${service_name}/${group_name}/delete`,
+      method: 'put',
+      data: { id: id }
+    })
+  }
+}

src/views/order/orderList.vue

@@ -283,7 +283,7 @@ export default {
       const searchParam = { ...this.page }
       searchParam.pageSize = endIndex
       searchParam.currentPage = this.output.startPage
-      inspectionApi.exportExcel(searchParam).then(res => {
+      orderInfoApi.exportExcel(searchParam).then(res => {
         const link = document.createElement('a')
         // 创建Blob对象，设置文件类型
         const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型

src/views/order/orderRefundList.vue

@@ -11,7 +11,7 @@
             <el-date-picker v-model="page.params.refundTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker>
           </el-form-item>
           <el-form-item label="处理状态：">
-            <el-select v-model="page.params.refundstatus" placeholder="状态" clearable @keyup.enter.native="getList">
+            <el-select v-model="page.params.refundStatus" placeholder="状态" clearable @keyup.enter.native="getList">
               <el-option label="待处理" value="0" />
               <el-option label="已处理" value="1" />
               <el-option label="已拒绝" value="-1" />
@@ -247,7 +247,7 @@ export default {
       const searchParam = { ...this.page }
       searchParam.pageSize = endIndex
       searchParam.currentPage = this.output.startPage
-      inspectionApi.exportExcel(searchParam).then(res => {
+      orderInfoApi.exportExcel(searchParam).then(res => {
         const link = document.createElement('a')
         // 创建Blob对象，设置文件类型
         const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型