积分订单

src/api/hisStore/integralOrder.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
-// 查询积分商品订单列表
+// 查询积分商品订单列表（销售端，按看课归属）
 export function listIntegralOrder(query) {
   return request({
-    url: '/his/integralOrder/list',
+    url: '/his/integralOrder/company/list',
     method: 'get',
     params: query
   })
@@ -61,10 +61,10 @@ export function delIntegralOrder(orderId) {
   })
 }
 
-// 导出积分商品订单
+// 导出积分商品订单（销售端，按看课归属）
 export function exportIntegralOrder(query) {
   return request({
-    url: '/his/integralOrder/export',
+    url: '/his/integralOrder/company/export',
     method: 'get',
     params: query
   })

src/views/hisStore/integralOrder/index.vue

@@ -124,7 +124,7 @@
       <el-table-column label="用户电话" align="center" prop="userPhone" />
       <el-table-column label="用户地址" align="center" prop="userAddress" show-overflow-tooltip />
       <el-table-column label="支付积分" align="center" prop="integral" />
-      <el-table-column label="支付金额" align="center" prop="cash" />
+      <el-table-column label="支付金额" align="center" prop="payMoney" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
@@ -135,9 +135,8 @@
       <el-table-column label="快递单号" align="center" prop="deliverySn" />
       <el-table-column label="发货时间" align="center" prop="deliveryTime" width="180"/>
       <el-table-column label="提交时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="销售公司ID" align="center" prop="companyId" width="180"/>
-      <el-table-column label="销售ID" align="center" prop="companyUserId" width="180"/>
-      <el-table-column label="企业微信ID" align="center" prop="qwUserId" width="180"/>
+      <el-table-column label="所属公司" align="center" prop="companyName" width="180" show-overflow-tooltip/>
+      <el-table-column label="所属销售" align="center" prop="companyUserNickName" width="180" show-overflow-tooltip/>
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">