Explorar o código

【修改】台账滚动显示明细

howie %!s(int64=2) %!d(string=hai) anos
pai
achega
60307f3073

+ 11 - 1
src/components/Common/collapse.vue

@@ -43,19 +43,23 @@ export default {
       type: Boolean,
       default: true
     },
+    // 折叠
     isCollapse: {
       type: Boolean,
       default: true
     },
+    // 搜索参数
     screenForm: {
       type: Object,
       required: true,
       default: {}
     },
+    //搜索函数名称
     screenFnName: {
       type: String,
       default: ''
     },
+    // 按钮配置
     btnOptions: {
       type: Object,
       default: () => {
@@ -81,20 +85,26 @@ export default {
     }
   },
   methods: {
+    // 折叠处理
     handleCollapse() {
       if (!this.isGlobal) {
+        // 组件内状态
         this.$parent.isCollapse = !this.isCollapse
       } else {
+        // 全局统一状态
         this.$store.dispatch('user/setStatus', this.isCollapse)
       }
     },
+    // enter键搜索
     handleScreen() {
       const parent = this.$parent
-      const { searchFn, submitScreenForm } = parent
+      // 动态函数执行搜索
       if (this.screenFnName) {
         parent[this.screenFnName]()
         return
       }
+      // 不传props: screenFnName 时执行 searchFn, submitScreenForm
+      const { searchFn, submitScreenForm } = parent
       searchFn && searchFn()
       submitScreenForm && submitScreenForm()
     }

+ 1 - 1
src/layout/components/AppMain.vue

@@ -29,7 +29,7 @@ export default {
   min-height: calc(100vh - 50px);
   width: 100%;
   position: relative;
-  overflow: hidden;
+  /*overflow: inherit;*/
 }
 .fixed-header + .app-main {
   /* padding-top: 50px; */

+ 28 - 6
src/views/finance/standbook_list.vue

@@ -4,7 +4,6 @@
       <el-page-header @back="goBack"> </el-page-header>
       <br /><br />
     </div>
-
     <!-- <span v-else>台账</span>
     <el-divider></el-divider> -->
 
@@ -50,7 +49,7 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="返利类型" prop="customerWalletId">
+                <el-form-item label="钱包类型" prop="customerWalletId">
                   <el-select class="selectStyle" v-model="searchForm.customerWalletId" placeholder="请选择" filterable>
                     <el-option
                       v-for="(v, i) in walletList"
@@ -152,22 +151,38 @@
             show-summary
             :summary-method="getSummaries"
           >
-            <el-table-column label="序号" align="left" width="50" type="index" show-overflow-tooltip></el-table-column>
+            <el-table-column
+              label="序号"
+              fixed="left"
+              align="left"
+              width="50"
+              type="index"
+              show-overflow-tooltip
+            ></el-table-column>
             <el-table-column
               align="left"
               label="单据日期"
               prop="theTime"
               min-width="160"
+              fixed="left"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="left"
               label="单据类型"
               prop="billType"
+              fixed="left"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column align="left" label="单据号" prop="billNo" min-width="150" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              fixed="left"
+              label="单据号"
+              prop="billNo"
+              min-width="150"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.billNo" />
                 <span>{{ scope.row.billNo }}</span>
@@ -177,6 +192,7 @@
               align="left"
               label="钱包"
               prop="walletName"
+              fixed="left"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
@@ -1199,9 +1215,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.ulStyle {
+::v-deep .ulStyle {
+  position: sticky;
+  top: 80px;
   list-style: none;
-  padding: 0;
+  margin: 0;
+  padding: 10px 0;
+  background-color: #ffffff;
+  z-index: 1;
+
   li {
     display: inline-block;
     font-weight: 700;