Răsfoiți Sursa

feat(2.5): 修复切换菜单后分页失效问题,修复主体信息汇总搜索后分页未带入搜索条件的问题,调整五联单账户透视搜索条件为支付宝用户ID、支付宝户名

17602115550 8 luni în urmă
părinte
comite
6585420f03

+ 1 - 1
src/components/Pagination.vue

@@ -52,7 +52,7 @@
         mounted(){},
         methods: {
              handleSizeChange(val) {
-                 console.log('come in')
+                 console.log('come in-=-=切换页码')
                 let payload = {
                     ...this.upParam
                 };

+ 58 - 3
src/modules/createmodel/alipay/components/ResultTable.vue

@@ -5,18 +5,28 @@
             <search-sort></search-sort>
             <div class="excel-btns" v-if="!isRelationMap">
                 <el-form v-if="isMainMessageTotal || isAccountPerspective || isOpponentPerspective || isOpponentPerspectiveAndAccount" ref="form" :model="normalSearchData" label-width="120px">
-                    <el-form-item v-if="!isOpponentPerspective" label="交易主体账号">
+                    <el-form-item v-if="!isOpponentPerspective && !isAccountPerspectiveFive" label="交易主体账号">
                       <el-input :clearable="true" v-model="normalSearchData.jyztzh"></el-input>
                     </el-form-item>
-                    <el-form-item v-if="!isOpponentPerspective" label="交易主体户名">
+                    <el-form-item v-if="!isOpponentPerspective && !isAccountPerspectiveFive" label="交易主体户名">
                     <el-input :clearable="true" v-model="normalSearchData.jyzthm"></el-input>
                     </el-form-item>
+
                     <el-form-item v-if="isOpponentPerspective && isOpponentPerspectiveFive" label="对手支付宝用户ID" label-width="130px">
                       <el-input :clearable="true" v-model="normalSearchData.jydszhFive"></el-input>
                     </el-form-item>
                     <el-form-item v-if="isOpponentPerspective && isOpponentPerspectiveFive" label="对手支付宝户名">
                     <el-input :clearable="true" v-model="normalSearchData.jydshmFive"></el-input>
                     </el-form-item>
+
+                    <el-form-item v-if="isAccountPerspective && isAccountPerspectiveFive" label="支付宝用户ID" label-width="130px">
+                      <el-input :clearable="true" v-model="normalSearchData.jyzhFive"></el-input>
+                    </el-form-item>
+                    <el-form-item v-if="isAccountPerspective && isAccountPerspectiveFive" label="支付宝户名">
+                    <el-input :clearable="true" v-model="normalSearchData.jyhmFive"></el-input>
+                    </el-form-item>
+
+                    
                     <el-form-item v-if="isOpponentPerspective && !isOpponentPerspectiveFive" label="交易对手账号">
                       <el-input :clearable="true" v-model="normalSearchData.jydszh"></el-input>
                     </el-form-item>
@@ -186,6 +196,8 @@ export default {
                 jydshm:'',
                 jydszhFive:'',
                 jydshmFive:'',
+                jyzhFive:'',
+                jyhmFive:'',
             },
             DailyTransactionsList:'公司, 超市、餐饮、慈善、学校、财政局、京东、美团、携程、ETC等',
             relationGraphSearchHeight:188,
@@ -278,6 +290,12 @@ export default {
                 return this.$store.state.fileStore.fileobj.filename.indexOf('五联单-对手透视') != -1
             }
         },
+        // 五联单-账户透视
+        isAccountPerspectiveFive:{
+            get(){
+                return this.$store.state.fileStore.fileobj.filename.indexOf('五联单-账户透视') != -1
+            }
+        },
         // 数据分析-对手透视 || 账户透视
         isOpponentPerspectiveAndAccount:{
             get(){
@@ -300,6 +318,33 @@ export default {
         getFileName (val, oldVal) {
             this.headerSortValue = ''
             this.isAdesc = 'asc'
+            console.log('val-=-=-=',val,oldVal)
+            this.beforePayload= {
+                page: 1,
+                pageSize: 20
+            }
+            this.relationSearchData = {
+                jyztzh:'',
+                jyzthm:'',
+                jyztzhds:'',
+                jyzthmds:'',
+                jysjStart:'',
+                jysjEnd:'',
+                startNum: 3,
+                // endNum: 0,
+                deleteName: 2,
+            }
+            this.normalSearchData = {
+                jyztzh:'',
+                jyzthm:'',
+                jyzjhm:'',
+                jydszh:'',
+                jydshm:'',
+                jydszhFive:'',
+                jydshmFive:'',
+                jyzhFive:'',
+                jyhmFive:'',
+            }
         }
     },
     created() {
@@ -374,6 +419,16 @@ export default {
                     {"field":"交易主体户名","fieldAlias":"交易主体户名","mode":"is","value":this.filterInPayloadSpace(this.normalSearchData.jyzthm)},
                 )
             }
+            if(this.filterInPayloadSpace(this.normalSearchData.jyzhFive) && this.isAccountPerspective && this.isAccountPerspectiveFive){
+                values.push(
+                    {"field":"支付宝用户ID","fieldAlias":"支付宝用户ID","mode":"is","value":this.filterInPayloadSpace(this.normalSearchData.jyzhFive)},
+                )
+            }
+            if(this.filterInPayloadSpace(this.normalSearchData.jyhmFive) && this.isAccountPerspective && this.isAccountPerspectiveFive){
+                values.push(
+                    {"field":"支付宝户名","fieldAlias":"支付宝户名","mode":"is","value":this.filterInPayloadSpace(this.normalSearchData.jyhmFive)},
+                )
+            }
             if(this.filterInPayloadSpace(this.normalSearchData.jydszhFive) && this.isOpponentPerspective && this.isOpponentPerspectiveFive){
                 values.push(
                     {"field":"对手支付宝用户ID","fieldAlias":"对手支付宝用户ID","mode":"is","value":this.filterInPayloadSpace(this.normalSearchData.jydszhFive)},
@@ -628,7 +683,7 @@ export default {
             payload.mode = upSearchSortParams.mode;
 
             this.beforePayload = payload;
-            if(this.isAccountPerspective || this.isOpponentPerspective){
+            if(this.isAccountPerspective || this.isOpponentPerspective || this.isMainMessageTotal){
                 payload.values =  this.getSearchValuesList()
                 payload.mode = 'and'
             }