chore update

src/components/base/AppList.vue

@@ -21,8 +21,8 @@
                   @change="search">
                   <template v-for="(option, index) in item.options">
                     <el-option
-                      :label="option[item.labelKey] || option.label"
-                      :value="option[item.valueKey] || option.value"
+                      :label="option[item.labelKey] || option.label || option"
+                      :value="option[item.valueKey] || option.value || option"
                       :key="index"></el-option>
                   </template>
                 </el-select>
@@ -45,6 +45,7 @@
       <slot name="body" v-bind="{ data: dataList }">
         <el-table
           :data="dataList"
+          :header-cell-style="{ background: '#f7f9fa' }"
           v-loading="loading"
           v-bind="$attrs"
           v-on="$listeners"

src/components/layout/Header.vue

@@ -41,7 +41,7 @@ export default {
 .app-header {
   position: sticky;
   top: 0;
-  z-index: 1000;
+  z-index: 9999;
   padding: 0 20px;
   display: flex;
   align-items: center;

src/main.js

@@ -3,17 +3,21 @@ import App from './App.vue'
 import router from './router'
 import store from '@/store'
 import modules from './modules'
+
 // 公共css
 import '@/assets/css/base.css'
-import beforeEnter from '@/utils/beforeEnter'
+
+// Element-UI
+import ElementUI from 'element-ui'
+import '@/assets/theme/style.scss'
 
 // 公共组件
 import AppCard from './components/base/AppCard.vue'
 import AppList from './components/base/AppList.vue'
 
-// Element-UI
-import ElementUI from 'element-ui'
-import '@/assets/theme/style.scss'
+import beforeEnter from '@/utils/beforeEnter'
+
+// 注册element-ui组件
 Vue.use(ElementUI, { size: 'small' })
 
 // 注册公共组件

src/modules/payment/components/Confirmed.vue

 <!-- 支付详情-已确认列表 -->
 <template>
-  <app-card>
-    <app-list v-bind="tableOptions" ref="list">
-      <template v-slot:payment_voucher_filename="{ row }">
-        <el-image v-for="(item, index) in row.payment_voucher_filename" :key="index" :src="item"></el-image>
-      </template>
-      <template v-slot:table-x="{ row }">
-        <el-button @click="toPayDetail(row)">查看</el-button>
-        <el-button @click="cancelReceive(row)">取消到账</el-button>
-      </template>
-    </app-list>
-  </app-card>
+  <app-list v-bind="tableOptions" ref="list">
+    <template v-slot:payment_voucher_filename="{ row }">
+      <el-image v-for="(item, index) in row.payment_voucher_filename" :key="index" :src="item"></el-image>
+    </template>
+    <template v-slot:table-x="{ row }">
+      <el-button @click="toPayDetail(row)">查看</el-button>
+      <el-button @click="cancelReceive(row)">取消到账</el-button>
+    </template>
+  </app-list>
 </template>
 <script>
 // 组件

src/modules/payment/components/Toconfirm.vue

 <!-- 待确认列表 -->
 <template>
-  <app-card>
-    <app-list v-bind="tableOptions" ref="list">
-      <template v-slot:payment_voucher_filename="{ row }">
-        <el-image v-for="(item, index) in row.payment_voucher_filename" :key="index" :src="item"></el-image>
-      </template>
-      <template v-slot:table-x="{ row }">
-        <el-button @click="toDeal(row)">处理</el-button>
-      </template>
-    </app-list>
-  </app-card>
+  <app-list v-bind="tableOptions" ref="list">
+    <template v-slot:payment_voucher_filename="{ row }">
+      <el-image v-for="(item, index) in row.payment_voucher_filename" :key="index" :src="item"></el-image>
+    </template>
+    <template v-slot:table-x="{ row }">
+      <el-button @click="toDeal(row)">处理</el-button>
+    </template>
+  </app-list>
 </template>
 <script>
 // 接口

src/modules/payment/views/List.vue

@@ -100,7 +100,7 @@ import ShareQrcode from '../components/ShareQrcode.vue'
 import History from '../components/History.vue'
 
 // 接口
-import { getCondition, getPayList, allowCreate, createNewTicket, drawBack, cancelTicket, download } from '../api'
+import { getCondition, getPayList, allowCreate, createNewTicket, drawBack, cancelTicket } from '../api'
 import * as XLSX from 'xlsx'
 import { funDownload } from '@/utils/util'
 import queryString from 'query-string'
@@ -156,7 +156,8 @@ export default {
             final_payment_time_from: '',
             final_payment_time_to: '',
             sort: '',
-            related_id: ''
+            related_id: '',
+            class_name: ''
           },
           beforeRequest: this.beforeRequest
         },
@@ -227,6 +228,12 @@ export default {
             type: 'input',
             prop: 'related_id',
             placeholder: '交易流水号'
+          },
+          {
+            type: 'select',
+            options: this.conditionList.classes,
+            prop: 'class_name',
+            placeholder: '班级名称'
           }
         ],
         moreFilters: [
@@ -637,10 +644,12 @@ export default {
       Object.keys(this.tableOptions.remote.params).forEach(key => {
         if (this.tableOptions.remote.params[key] === '') delete this.tableOptions.remote.params[key]
       })
-      download(this.tableOptions.remote.params).then(() => {
-        const params = queryString.stringify(this.tableOptions.remote.params)
-        window.open(`/api/finance/v1/payments/download?${params}`)
-      })
+      const params = queryString.stringify(this.tableOptions.remote.params)
+      window.open(`/api/finance/v1/payments/download?${params}`)
+      // download(this.tableOptions.remote.params).then(() => {
+      //   const params = queryString.stringify(this.tableOptions.remote.params)
+      //   window.open(`/api/finance/v1/payments/download?${params}`)
+      // })
     },
     // 根据首次缴费时间排序
     sortChange(columns) {