Merge branch 'dev1.1.0' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into dev1.1.0

src/views/cyAccountManage/memberInfoManage/mainContent.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" type="border-card" @tab-click="handleTabClick">
       <el-tab-pane label="待处理" name="pending"> </el-tab-pane>
       <el-tab-pane label="全部" name="all"></el-tab-pane>
-      <el-tab-pane label="已录入" name="entered"></el-tab-pane>
+      <!-- <el-tab-pane label="已录入" name="entered"></el-tab-pane> -->
       <div v-if="activeName === 'all'" class="search">
         <div />
         <div class="right">
@@ -190,7 +190,7 @@ export default {
         },
         {
           label: '最后修改时间',
-          prop: 'gmtCreate',
+          prop: 'gmtModified',
           showTooltip: true,
           width: 120
         },
@@ -233,7 +233,7 @@ export default {
                 msg: 'B端新增的修改',
                 icon: 'iconfont icon-xiugai',
                 power: '',
-                tabPower: ['entered', 'pending'],
+                tabPower: ['pending', 'all'],
                 rowPower: ['暂存', '审批退回'],
                 category: 'edit'
               },
@@ -293,11 +293,13 @@ export default {
     ...mapGetters(['constant']),
     tablePower() {
       return ({ item, tab, row }) => {
-        const { tabPower, rowPower,  msg } = item
+        const { tabPower, rowPower, msg } = item
         if (rowPower && rowPower.length) {
           if (tabPower.includes(tab)) {
             if (msg === '新建会员账户') {
               return rowPower.includes(row.verificationStatus)
+            } else if (row.stageStr === '暂存') {
+              return row.button && rowPower.includes(row.stageStr)
             } else {
               return rowPower.includes(row.stageStr)
             }

src/views/userManagement/index.vue

@@ -16,7 +16,7 @@
               </el-select>
             </div>
             <div>
-              <el-input v-model="search.managerName" style="width: 250px" placeholder="业务经理/风控经理" clearable />
+              <el-input v-model="search.managerName" style="width: 250px" placeholder="业务经理/风控经理/用户名称" clearable />
             </div>
             <div class="leftBtn">
               <el-button type="primary" @click="searchData">查询</el-button>