溢付款、积分新增明细查询

src/api/maintenance/integral.js

@@ -11,3 +11,19 @@ export const getList = (current, size, params) => {
     }
   })
 }
+// 积分明细查询
+export function detail(data) {
+  return request({
+    url: '/api/blade-mocha-item/businesspointsitem/list',
+    method: 'get',
+    params: data
+  })
+}
+//积分主表客户查询
+export function integralDetail(data) {
+  return request({
+    url: '/api/blade-mocha-item/businesspoints/detail',
+    method: 'get',
+    params: data
+  })
+}

src/api/maintenance/overpayment.js

@@ -16,7 +16,16 @@ export const getList = (current, size, params) => {
 //溢付款主表查询
 export function getCorpDetail(data) {
   return request({
-    url: '/api//blade-mocha-item/businessoverpayment/detail',
+    url: '/api/blade-mocha-item/businessoverpayment/detail',
+    method: 'get',
+    params: data
+  })
+}
+
+// 溢付款明细查询
+export function overpaymentDetail(data) {
+  return request({
+    url: '/api/blade-mocha-item/businessoverpaymentitem/list',
     method: 'get',
     params: data
   })

src/views/maintenance/integral/config/mainList.json

@@ -15,6 +15,8 @@
   "searchIndex": 2,
   "selection": true,
   "tip":false,
+  "expand": true,
+  "expandWidth": 38,
   "column": [
     {
       "label": "客户",

src/views/maintenance/integral/index.vue

@@ -15,7 +15,27 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @expand-change="expandChange"
       >
+        <template slot-scope="scope" slot="expand">
+          <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
+            <el-table-column  label="发货单号" prop="billNo" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="订单号" prop="orderNo" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="状态" prop="status" align="center" show-overflow-tooltip width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.status == 0? '正常': '停用' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column  label="消费类型" prop="pointsType" align="center" show-overflow-tooltip width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.overpaymentType == 0? '增加': '消费' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column  label="创建时间" prop="createTime" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="创建人" prop="createUser" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="备注" prop="remarks" align="center" show-overflow-tooltip width="200"></el-table-column>
+          </el-table>
+        </template>
         <template slot="corpIdSearch">
           <crop-select
             v-model="search.corpId"
@@ -32,7 +52,7 @@
 
 <script>
 import option from './config/mainList.json';
-import {getList} from '@/api/maintenance/integral';
+import {getList, detail} from '@/api/maintenance/integral';
 
 export default {
   name: "index",
@@ -75,6 +95,10 @@ export default {
       this.page.pageSize = val;
     },
     refreshChange() {
+      this.dataList.forEach(item => {
+        this.$refs.crud.toggleRowExpansion(item, false)
+      })
+      this.page.currentPage = 1;
       this.onLoad(this.page, this.search);
     },
     onLoad(page, params) {
@@ -86,16 +110,34 @@ export default {
           if (this.page.total) {
             this.option.height = window.innerHeight - 260;
           }
+          this.dataList.forEach(item => {
+            this.$set(item,'insideList',[])
+            this.$set(item,'loading', true)
+          })
         })
         .finally(() => {
           this.loading = false;
         });
     },
+    // 表格展开触发
+    expandChange(row, index) {
+      if (row.loading) {
+        detail({pid: row.id}).then(res => {
+          row.insideList = res.data.data? res.data.data.records: []
+          row.loading = false
+        })
+      }
+    },
     async saveColumn() {},
   },
 }
 </script>
 
 <style scoped>
-
+/deep/ .el-table__expanded-cell .el-table__header-wrapper .cell {
+  font-size: 8px !important;
+}
+/deep/ .el-table__body-wrapper .cell {
+  font-size: 8px;
+}
 </style>

src/views/maintenance/overpayment/config/mainList.json

@@ -15,6 +15,8 @@
   "searchIndex": 2,
   "selection": true,
   "tip":false,
+  "expand": true,
+  "expandWidth": 38,
   "column": [
     {
       "label": "客户",

src/views/maintenance/overpayment/index.vue

@@ -15,7 +15,22 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @expand-change="expandChange"
       >
+        <template slot-scope="scope" slot="expand">
+          <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
+            <el-table-column  label="发货单号" prop="billNo" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="订单号" prop="orderNo" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="金额" prop="overpayment" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="消费类型" prop="overpaymentType" align="center" show-overflow-tooltip width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.overpaymentType == 0? '增加': '消费' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column  label="创建时间" prop="createTime" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="创建人" prop="createUser" align="center" show-overflow-tooltip width="200"></el-table-column>
+          </el-table>
+        </template>
         <template slot="corpIdSearch">
           <crop-select
             v-model="search.corpId"
@@ -32,7 +47,7 @@
 
 <script>
 import option from './config/mainList.json';
-import {getList} from '@/api/maintenance/overpayment';
+import {getList, overpaymentDetail} from '@/api/maintenance/overpayment';
 
 export default {
   name: "index",
@@ -75,6 +90,10 @@ export default {
       this.page.pageSize = val;
     },
     refreshChange() {
+      this.dataList.forEach(item => {
+        this.$refs.crud.toggleRowExpansion(item, false)
+      })
+      this.page.currentPage = 1;
       this.onLoad(this.page, this.search);
     },
     onLoad(page, params) {
@@ -86,16 +105,34 @@ export default {
           if (this.page.total) {
             this.option.height = window.innerHeight - 260;
           }
+          this.dataList.forEach(item => {
+            this.$set(item,'insideList',[])
+            this.$set(item,'loading', true)
+          })
         })
         .finally(() => {
           this.loading = false;
         });
     },
+    // 表格展开触发
+    expandChange(row, index) {
+      if (row.loading) {
+        overpaymentDetail({pid: row.id}).then(res => {
+          row.insideList = res.data.data? res.data.data.records: []
+          row.loading = false
+        })
+      }
+    },
     async saveColumn() {},
   },
 }
 </script>
 
 <style scoped>
-
+/deep/ .el-table__expanded-cell .el-table__header-wrapper .cell {
+  font-size: 8px !important;
+}
+/deep/ .el-table__body-wrapper .cell {
+  font-size: 8px;
+}
 </style>