解决冲突

src/components/ebiz/account/SelectBankName.vue

@@ -43,14 +43,13 @@ export default {
       default: false
     },
     inputShow: {
-      type: String,
+      type: Boolean,
       default: false
     }
   },
 
   created() {
     this.getBankList()
-    this.inputShow1 = Boolean(this.inputShow)
   },
   watch: {
     inputvalue(val) {
@@ -61,6 +60,7 @@ export default {
       } else {
         this.bankList = this.bankList1
       }
+      document.querySelector('.vanlist').scrollTo(0, 0) //重置滚动条
     }
   },
   computed: {
@@ -83,6 +83,7 @@ export default {
         if (res.result == '0') {
           this.bankList = res.content
           this.bankList1 = res.content
+          this.$emit('getBankList', this.bankList)
         } else {
           this.$toast(res.resultMessage)
         }

src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue

@@ -282,7 +282,13 @@
       <p class="fs14 mt5 ml5">注：是否确认提交，一旦提交在人管审批之前无法再次进行修改</p>
     </van-dialog>
     <!--开户银行选择-->
-    <SelectBankName :inputShow="inputShow" :listShow.sync="islistShow" :operateType="'enter_bank_type'" @getBank="getBank"></SelectBankName>
+    <SelectBankName
+      :inputShow="inputShow"
+      :listShow.sync="islistShow"
+      :operateType="'enter_bank_type'"
+      @getBankList="getBankList"
+      @getBank="getBank"
+    ></SelectBankName>
   </div>
 </template>
 <script>
@@ -297,11 +303,12 @@ import idNoCheck from '@/assets/js/utils/idNoCheck'
 // import DataDictionary from '@/assets/js/utils/data-dictionary'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
 import beforeDate from '@/assets/js/utils/getBeforeDate.js'
-import { getBankList } from '@/api/ebiz/sale/sale'
+
 import RsTop from '@/components/ebiz/agentEenter/RsTop'
 import { saveOrUpdateInfo, agentAll } from '@/api/ebiz/agentEenter/agentEenter.js'
 import { idToData } from '@/views/ebiz/customer/js/verification'
 import SelectBankName from '@/components/ebiz/account/SelectBankName'
+import getBankName from '@/components/ebiz/account/getBankName'
 import {
   selectComp,
   // appCallBack,
@@ -342,6 +349,7 @@ export default {
     return {
       inputShow: false, //模糊查询功能
       islistShow: false, //选择银行弹窗
+      bankList: [], //银行名称列表
       code: '',
       bankCode: '', //二次输入的银行卡号
       checkShow: false, //银行卡校验弹框是否显示 false-不显示 true-显示
@@ -448,13 +456,13 @@ export default {
     // window.appCallBack = this.appCallBack
     window.appCallBack = this.appCallBack
     this.agentAll()
-    // // 获取银行卡
-    // this.getBankList()
   },
   methods: {
-    closePop(value) {
-      //关闭选择银行弹窗
-      this.islistShow = false
+    getBankList(value) {
+      //获取银行列表
+      this.bankList = value
+
+      console.log('getBankList', value)
     },
     getBank(bank) {
       //获取银行名称
@@ -484,7 +492,8 @@ export default {
             this.userInfo.age = idToData(this.userInfo.idNo).age
             this.userInfo.sex = idToData(this.userInfo.idNo).sex
           }
-
+          this.userInfo.bankName = getBankName(this.bankList, this.userInfo.bankName)
+          console.log('getBankName', getBankName(this.bankList, this.userInfo.bankName))
           this.userInfo.nationality = 'CHN'
         }
       })

src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue

@@ -13,7 +13,7 @@
     <Selectors @getDateVal="getDateVal" @getSortType="getSortType" :queryColumns="queryColumns"></Selectors>
     <div class="layer-box">
       <div class="layer">
-        <table class="fs14" style="table-layout:fixed">
+        <table class="fs14" style="table-layout:fixed;padding-left: 4.3em;">
           <tr class="title">
             <th class="td-1" style="height: 1.3em;">排名</th>
             <th class="td-2">机构</th>
@@ -25,7 +25,7 @@
             <th v-if="manageLv != '07'">操作</th>
           </tr>
           <tr >
-            <td class="td-1 white" style="width:3em;height: 1.3em;">1</td>
+            <td class="td-1 white" style="width:3.2em;height: 1.3em;">1</td>
             <td class="td-2">合计</td>
             <td>{{ items[0] }}</td>
             <td>{{ items[1] }}</td>
@@ -33,7 +33,7 @@
             <td>{{ items[3] }}</td>
           </tr>
           <tr v-for="(item, index) in tableData" :key="index">
-            <td class="td-1">{{ index + 1 }}</td>
+            <td class="td-1"><div>{{ index + 1 }}</div></td>
             <td >
               <div style="width:10em">{{ item.name }}</div>
             </td>
@@ -59,7 +59,7 @@ import { branchOfficeApi } from '@/api/ebiz/branchOffice/branchOffice'
 import refreshLogo from '@/assets/images/ebiz/refresh.png'
 import { Tabs, Tab } from 'vant'
 export default {
-  name: 'districtOffice',
+  name: 'InstitutionalManpower',
   components: {
     Selectors,
     [Tabs.name]: Tabs,
@@ -68,8 +68,8 @@ export default {
   data() {
     return {
       sortType: '1',
-      manageCode: '',
-      manageLv: '',
+      manageCode: '8645',
+      manageLv: '02',
       tableData: [],
       items: [],
       bzbfTotol: 0,
@@ -89,7 +89,9 @@ export default {
   watch: {
     tableData(value) {
       if (value.length == 0) {
+     this.items=[]
         this.queryColumns.forEach(() => {
+         
           this.items.push('0.00')
         })
       } else {
@@ -126,15 +128,13 @@ export default {
         this.$router.push({
           path: '/institutionalPerform/UnderOffice'
         })
-      } else {
-        this.curMainType = '01'
-      }
-      this.getlComPremDetil()
+      } 
+     
     },
 
     toDetail(manageCode) {
      
-      if (!this.manageLv) this.manageLv = 1
+    
       this.manageLv = '0' + (Number(this.manageLv) + 1)
       this.manageCode = manageCode
       this.getlComPremDetil()
@@ -176,11 +176,13 @@ export default {
     },
     getSortType(value) {
       console.log(value, 'value')
-      this.sortType = value
+      this.sortType = value.toString()
+     
       this.getlComPremDetil()
     },
     getDateVal(value) {
       this.dateVal = value
+     
       this.getlComPremDetil()
     },
     //获取列表
@@ -190,8 +192,9 @@ export default {
         manageLv: this.manageLv,
         manageCode: this.manageCode,
         sortType: this.sortType,
+        queryType: 'm',
         date: this.dateVal, // 2020-07-31
-        type: this.curMainType
+        type: '02'
       }
       // 去除对象里面是空的属性
       for (var key in data) {
@@ -289,7 +292,7 @@ export default {
   }
     table td {
      text-align: center;
-    padding: 5px 10px;
+    padding:8px;
 
    
   }
@@ -340,12 +343,21 @@ export default {
     overflow-x: scroll;
   }
   .td-1 {
-    /* position: absolute; */
+    position: absolute;
     padding: 2.13333vw;
     left: 0;
     z-index: 2;
     width: 3em;
     height: 2.5em;
+    div{
+      position: absolute;
+      transform: translate(-50%, -50%);
+    left: 50%;
+    top: 50%;
+    }
+  }
+    .td-2 {
+  
   }
 }
 </style>