后管新增 运营商分润组页面

jsowell-ui/src/api/pile/shareprofitGroup.js

@@ -9,6 +9,14 @@ export function listGroup(query) {
   })
 }
 
+export function getShareprofitGroupList(data) {
+  return request({
+    url: '/pile/shareprofitGroup/getShareprofitGroupList',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询运营商分润组详细
 export function getGroup(id) {
   return request({

jsowell-ui/src/views/pile/shareprofit/group/index.vue

@@ -1,31 +1,31 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="分润组编号" prop="groupCode">
-        <el-input
-          v-model="queryParams.groupCode"
-          placeholder="请输入分润组编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="运营商id" prop="merchantId">
-        <el-input
-          v-model="queryParams.merchantId"
-          placeholder="请输入运营商id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="站点id" prop="stationId">
-        <el-input
-          v-model="queryParams.stationId"
-          placeholder="请输入站点id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分润成员手机号码" prop="memberPhoneNumber">
+<!--      <el-form-item label="分润组编号" prop="groupCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.groupCode"-->
+<!--          placeholder="请输入分润组编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="运营商id" prop="merchantId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.merchantId"-->
+<!--          placeholder="请输入运营商id"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="站点id" prop="stationId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stationId"-->
+<!--          placeholder="请输入站点id"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="分润成员手机号码" prop="memberPhoneNumber" label-width="130px">
         <el-input
           v-model="queryParams.memberPhoneNumber"
           placeholder="请输入分润成员手机号码"
@@ -33,30 +33,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="电费分润比例" prop="electricityFeeScale">
-        <el-input
-          v-model="queryParams.electricityFeeScale"
-          placeholder="请输入电费分润比例"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="服务费分润比例" prop="serviceFeeScale">
-        <el-input
-          v-model="queryParams.serviceFeeScale"
-          placeholder="请输入服务费分润比例"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否承担手续费(0-否；1-是)" prop="undertakeHandlingCharge">
-        <el-input
-          v-model="queryParams.undertakeHandlingCharge"
-          placeholder="请输入是否承担手续费(0-否；1-是)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="电费分润比例" prop="electricityFeeScale">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.electricityFeeScale"-->
+<!--          placeholder="请输入电费分润比例"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="服务费分润比例" prop="serviceFeeScale">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.serviceFeeScale"-->
+<!--          placeholder="请输入服务费分润比例"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否承担手续费(0-否；1-是)" prop="undertakeHandlingCharge">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.undertakeHandlingCharge"-->
+<!--          placeholder="请输入是否承担手续费(0-否；1-是)"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -111,14 +111,16 @@
 
     <el-table v-loading="loading" :data="groupList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
+<!--      <el-table-column label="主键" align="center" prop="id" />-->
       <el-table-column label="分润组编号" align="center" prop="groupCode" />
-      <el-table-column label="运营商id" align="center" prop="merchantId" />
-      <el-table-column label="站点id" align="center" prop="stationId" />
+<!--      <el-table-column label="运营商id" align="center" prop="merchantId" />-->
+      <el-table-column label="运营商名称" align="center" prop="merchantName" />
+<!--      <el-table-column label="站点id" align="center" prop="stationId" />-->
+      <el-table-column label="站点名称" align="center" prop="stationName" />
       <el-table-column label="分润成员手机号码" align="center" prop="memberPhoneNumber" />
       <el-table-column label="电费分润比例" align="center" prop="electricityFeeScale" />
       <el-table-column label="服务费分润比例" align="center" prop="serviceFeeScale" />
-      <el-table-column label="是否承担手续费(0-否；1-是)" align="center" prop="undertakeHandlingCharge" />
+      <el-table-column label="是否承担手续费" align="center" prop="undertakeHandlingCharge" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -184,7 +186,14 @@
 </template>
 
 <script>
-import { listGroup, getGroup, delGroup, addGroup, updateGroup } from "@/api/pile/shareprofitGroup";
+import {
+  listGroup,
+  getGroup,
+  delGroup,
+  addGroup,
+  updateGroup,
+  getShareprofitGroupList
+} from "@/api/pile/shareprofitGroup";
 
 export default {
   name: "shareprofitGroup",
@@ -234,9 +243,21 @@ export default {
     /** 查询运营商分润组列表 */
     getList() {
       this.loading = true;
-      listGroup(this.queryParams).then(response => {
-        this.groupList = response.rows;
-        this.total = response.total;
+      const params = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        groupCode: this.queryParams.groupCode,
+        merchantId: this.queryParams.merchantId,
+        stationId: this.queryParams.stationId,
+        memberPhoneNumber: this.queryParams.memberPhoneNumber,
+        electricityFeeScale: this.queryParams.electricityFeeScale,
+        serviceFeeScale: this.queryParams.serviceFeeScale
+       }
+      console.log("params", params);
+      getShareprofitGroupList(params).then(response => {
+        console.log("response", response);
+        this.groupList = response.obj;
+        this.total = response.obj.length;
         this.loading = false;
       });
     },