Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/http/moudules/dept.js

@@ -229,7 +229,14 @@ export const unbind = (data) => {
         data
     })
 }
-
+// 可用银行卡
+export const queryUsableCard = (data) => {
+    return axios({
+        url: '/userBank/queryUsableCard',
+        method: 'post',
+        data
+    })
+}
 // 重新绑定
 export const rebind = (data) => {
     return axios({

src/views/Core/KtCommonTable.vue

@@ -36,7 +36,7 @@
               fontWeight: '900',
               color: '#606266',
             }"
-            style="width: 55%"
+            style="width: 70%"
           >
             <el-table-column
               type="index"
@@ -51,6 +51,11 @@
             </el-table-column>
             <el-table-column prop="bankNumber" label="银行卡号" style="flex: 1">
             </el-table-column>
+            <el-table-column prop="auditStatus" label="审核状态" style="flex: 1">
+              <template slot-scope="scope1">
+                <span>{{ scope1.row.auditStatus == 0 ? '未审核' : scope1.row.auditStatus == '1' ? '审核通过' : scope1.row.auditStatus == '2' ? '审核驳回' : scope1.row.auditStatus }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="delFlag" label="是否解绑" style="flex: 1">
               <template slot-scope="scope1">
                 <el-row>

src/views/FinancialManagement/AcountWithdrawal/AcountBalance.vue

@@ -355,7 +355,12 @@ export default {
     withdrawButton({ index, row }) {
       this.sysUserAccountCardList = [];
       this.withdrawForm.userId = row.userId;
-      this.sysUserAccountCardList = row.sysUserAccountCardList;
+      // this.sysUserAccountCardList = row.sysUserAccountCardList;
+      this.$api.dept.queryUsableCard({
+        userId: row.userId
+      }).then((res) => {
+        this.sysUserAccountCardList = res.data;
+      })
       this.dialogVisible = !this.dialogVisible;
     },
     // 绑卡
@@ -363,7 +368,6 @@ export default {
       this.addCard = {}
       this.addCard.userId = row.userId;
       this.addCard.userName = row.name
-      console.log(this.addCard)
       this.dialogVisible1 = true
     },
     //联级选择器触发事件
@@ -391,8 +395,14 @@ export default {
         })
         .then((res) => {
           if (res.code == 200) {
-            this.pageResult = res.data;
-            console.log(this.pageResult);
+            let resData = {
+              content: res.data.records,
+              pageNum: res.data.current,
+              pageSize: res.data.size,
+              totalPages: res.data.pages,
+              totalSize: res.data.total,
+            }
+            this.pageResult = resData;
           }
         });
     },

src/views/Letter/Wallet/BankCard.vue

@@ -78,8 +78,8 @@
                 <span>储蓄卡</span>
               </div>
             </div>
-            <img src="../../../../static/bankdel.png" mode="" style="width: 24px;height: 24px;" @click="bankdel(item)"
-              v-loading.fullscreen.lock="Loading">
+            <!-- <img src="../../../../static/bankdel.png" mode="" style="width: 24px;height: 24px;" @click="bankdel(item)"
+              v-loading.fullscreen.lock="Loading"> -->
           </div>
           <div class="bank flex j-s a-c">
             <div>****</div>

src/views/PeopleManage/Agent/AgentManage.vue

@@ -912,7 +912,7 @@ export default {
                 this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
               }
               if (this.formData.leaderId) {
-                this.formData.leaderName = this.leaderOptions.find(val => val.id == this.formData.leaderId).name
+                this.formData.leaderName = this.leaderOptions.find(val => val.userId == this.formData.leaderId).name
               }
             if (this.dialogTitle == "新增代理人") {
               if (!this.formDataDetail.password) {

src/views/PeopleManage/Player/PlayerManage.vue

@@ -547,8 +547,8 @@ export default {
             if(this.formData.positionId){
                 this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
               }
-              if(this.formData.leaderId){
-              this.formData.leaderName=this.leaderOptions.find(val=>val.id==this.formData.leaderId).name
+            if(this.formData.leaderId){
+              this.formData.leaderName=this.leaderOptions.find(val=>val.userId==this.formData.leaderId).name
             }
             if (this.dialogTitle == "新增渠道信息") {
               this.$api.user

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -793,7 +793,7 @@ export default {
                 this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
             }
             if(this.formData.leaderId){
-              this.formData.leaderName=this.leaderOptions.find(val=>val.id==this.formData.leaderId).name
+              this.formData.leaderName=this.leaderOptions.find(val=>val.userId==this.formData.leaderId).name
             }
             if (this.dialogTitle == "新增渠道信息") {
               this.$api.user

src/views/PeopleManage/Staff/StaffManage.vue

@@ -822,7 +822,7 @@ export default {
                 this.formData.positionName = this.postOption.find(val => val.postId == this.formData.positionId).postName
               }
               if (this.formData.leaderId) {
-                this.formData.leaderName = this.leaderOptions.find(val => val.id == this.formData.leaderId).name
+                this.formData.leaderName = this.leaderOptions.find(val => val.userId == this.formData.leaderId).name
               }
               if (this.dialogTitle == '新增后线人员') {
                 this.$api.user.saveUserInfo({ esmUserImageVo: this.imagesIdList, sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -903,7 +903,7 @@ export default {
                 this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
               }
               if (this.formData.leaderId) {
-                this.formData.leaderName = this.leaderOptions.find(val => val.id == this.formData.leaderId).name
+                this.formData.leaderName = this.leaderOptions.find(val => val.userId == this.formData.leaderId).name
               }
             if (this.dialogTitle == "新增团队长") {
               this.$api.user