新增回款导出

src/router/index.js

@@ -78,6 +78,7 @@ requireAll(files);
 const createRouter = () => new VueRouter({
   mode: 'hash', // require service support
   base: '/admin',
+  //base: '/admin-test',
   scrollBehavior: () => ({ y: 0 }),
   routes: routes
 });

src/views/brokerage/sequence.vue

@@ -22,6 +22,8 @@
         >
           <el-option label="项目结算" value="ITEM_SETTLE"/>
           <el-option label="默认预提" value="DEFAULT_AHEAD"/>
+          <el-option label="转入个人奖金池" value="POOL_SETTLE"/>
+          <el-option label="一次性结算" value="ONCE_SETTLE"/>
         </el-select>
         <el-select
           v-model="listQuery.year"
@@ -211,7 +213,6 @@
   import YPageListLayout from '@/components/YPageListLayout'
   import Breadcrumb from '@/components/Breadcrumb'
   import PermissionButton from '@/components/PermissionButton/PermissionButton'
-  import { fileDown } from '../../utils/file'
 
   export default {
     name: 'ViewsBrokerageSequence',
@@ -315,8 +316,8 @@
           return '转入个人奖金池';
         }
         if (val === 'ONCE_SETTLE') {
-                return '一次性结算';
-            }
+          return '一次性结算';
+        }
       },
       getList() {
         const that = this;

src/views/item/plan.vue

@@ -477,9 +477,6 @@
       box-shadow: 10px 10px 5px #888888;;
       border-radius: 10px;
     }
-    .form-container:hover{
-
-    }
     .filter-item{
       width: 200px;
     }

src/views/login/index.vue

@@ -72,10 +72,7 @@
 
 <script>
 
-  import logBg from '../../assets/images/logo-bg.png'
-  import {setToken} from '@/utils/auth';
   import API from '@/api'
-  import store from '@/store'
 
   export default {
     name: 'Login',
@@ -99,7 +96,6 @@
         loadings:false,
         showboj:true,
         activeName: 'first',
-        logBg,
         loginForm: {
           account: '',
           pwd: '',
@@ -230,7 +226,6 @@
   $assets: '~@/assets/';
 
   .login-container {
-    /* background: url($assets + "images/logo-bg.png") 0 0 no-repeat; */
     background-color: #6C74F7;
     background-size: 100% 100%;
     position: absolute;

src/views/market/payment/list.vue

@@ -16,6 +16,11 @@
             <el-button class="filter-item" style="float: left;" round type="warning" @click="resetSearch()">重置
             </el-button>
           </template>
+          <template slot="right">
+            <PermissionButton menu-code="_views_payment_collection_export" class-name="filter-item" round type="primary" name="导出"
+              @click="paymentExport">
+            </PermissionButton>
+          </template>
           <parentTable v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
             <el-table-column label="事业部流水号" align="center" width="160">
               <template slot-scope="{row}">
@@ -76,6 +81,9 @@
       <el-tab-pane label="回款记录" name="sec">
         <y-page-list-layout :page-list="pageXData" :page-para="listQuery" :get-page-list="getXList">
           <template slot="left">
+            <el-input v-model="listQuery.itemName" placeholder="项目名称" clearable
+              style="margin-left: 20px;width: 320px;float: left;">
+            </el-input>
             <el-input v-model="listQuery.name" placeholder="回款名称" clearable
               style="margin-left: 20px;width: 320px;float: left;">
             </el-input>
@@ -294,6 +302,12 @@ export default {
             that.listLoading = false
           })
       },
+      paymentExport(){
+        this.$utils.exportUtil(
+        "/paymentCollection/item/export", this.listQuery,
+        "导出"
+      );
+      } 
   },
 }
 </script>