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

src/http/moudules/dept.js

@@ -229,6 +229,21 @@ export const unbind = (data) => {
         data
     })
 }
+//修改银行卡
+export const bankupdate = (data) => {
+  return axios({
+      url: '/userBank/update',
+      method: 'put',
+      data
+  })
+}
+//银行卡详情
+export const bankgetByBankId = (id) => {
+  return axios({
+      url: '/userBank/getByBankId?id='+id,
+      method: 'get',
+  })
+}
 // 可用银行卡
 export const queryUsableCard = (data) => {
     return axios({
@@ -353,4 +368,4 @@ export const sysUserLinkDeptInternalAgentFindAllUserList = (data) => {
         method: 'post',
         data
     })
-}
+}

src/views/FinancialManagement/AcountWithdrawal/WithdrawalReview.vue

@@ -33,9 +33,9 @@
                     </el-form-item>
                 </el-form>
             </el-row>
-            <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false" 
+            <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false"
              :data="pageResult" :columns="columns"
-                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回" 
+                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回"
                 @handleButton2="handleButton2"></kt-common-table>
         </el-main>
     </div>
@@ -73,6 +73,7 @@ export default {
                 { prop: "userId", label: "工号" },
                 { prop: "userName", label: "姓名" },
                 { prop: "bankNumber", label: "卡号" },
+                { prop: "realUserName", label: "真实姓名" },
                 { prop: "bankAccount", label: "银行" },
                 { prop: "bankAddress", label: "开户行" },
                 { prop: "auditStatus", label: "状态",formatter:this.statusFormatter },
@@ -105,8 +106,8 @@ export default {
                 })
                 .then(data != null ? data.callback : "");
         },
-      
-      
+
+
         handleButton3({ row, index }) {
             this.$confirm('确认审核通过？', '提示', {
                 confirmButtonText: '确定',
@@ -129,7 +130,7 @@ export default {
                 this.$message({
                     type: 'info',
                     message: '已取消删除'
-                });          
+                });
             });
 
         },
@@ -155,14 +156,14 @@ export default {
                         this.$message.error(res.msg)
                     }
                 })
-            }) 
-           
+            })
+
         },
     }
 };
 </script>
-    
-    
+
+
 <style scoped>
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
@@ -191,4 +192,3 @@ export default {
     display: block;
 }
 </style>
-    

src/views/FinancialManagement/AcountWithdrawal/WithdrawalReview1.vue

@@ -24,9 +24,9 @@
                     </el-form-item>
                 </el-form>
             </el-row>
-            <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false" 
+            <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false"
              :data="pageResult" :columns="columns"
-                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回" 
+                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回"
                 @handleButton2="handleButton2"></kt-common-table>
         </el-main>
     </div>
@@ -66,6 +66,7 @@ export default {
                 { prop: "userId", label: "工号" },
                 { prop: "userName", label: "姓名" },
                 { prop: "bankNumber", label: "卡号" },
+                { prop: "realUserName", label: "真实姓名" },
                 { prop: "bankAccount", label: "银行" },
                 { prop: "bankAddress", label: "开户行" },
                 { prop: "auditStatus", label: "状态",formatter:this.statusFormatter },
@@ -98,8 +99,8 @@ export default {
                 })
                 .then(data != null ? data.callback : "");
         },
-      
-      
+
+
         handleButton3({ row, index }) {
             this.$confirm('确认审核通过？', '提示', {
                 confirmButtonText: '确定',
@@ -122,7 +123,7 @@ export default {
                 this.$message({
                     type: 'info',
                     message: '已取消删除'
-                });          
+                });
             });
 
         },
@@ -148,14 +149,14 @@ export default {
                         this.$message.error(res.msg)
                     }
                 })
-            }) 
-           
+            })
+
         },
     }
 };
 </script>
-    
-    
+
+
 <style scoped>
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
@@ -184,4 +185,3 @@ export default {
     display: block;
 }
 </style>
-    

src/views/FinancialManagement/AcountWithdrawal/WithdrawalReview2.vue

@@ -24,9 +24,9 @@
                     </el-form-item>
                 </el-form>
             </el-row>
-            <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false" 
+            <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false"
              :data="pageResult" :columns="columns" :showOperation="false"
-                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回" 
+                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回"
                 @handleButton2="handleButton2"></kt-common-table>
         </el-main>
     </div>
@@ -66,6 +66,7 @@ export default {
                 { prop: "userId", label: "工号" },
                 { prop: "userName", label: "姓名" },
                 { prop: "bankNumber", label: "卡号" },
+                { prop: "realUserName", label: "真实姓名" },
                 { prop: "bankAccount", label: "银行" },
                 { prop: "bankAddress", label: "开户行" },
                 { prop: "auditTime", label: "审核时间" },
@@ -99,8 +100,8 @@ export default {
                 })
                 .then(data != null ? data.callback : "");
         },
-      
-      
+
+
         handleButton3({ row, index }) {
             this.$confirm('确认审核通过？', '提示', {
                 confirmButtonText: '确定',
@@ -123,7 +124,7 @@ export default {
                 this.$message({
                     type: 'info',
                     message: '已取消删除'
-                });          
+                });
             });
 
         },
@@ -149,14 +150,14 @@ export default {
                         this.$message.error(res.msg)
                     }
                 })
-            }) 
-           
+            })
+
         },
     }
 };
 </script>
-    
-    
+
+
 <style scoped>
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
@@ -185,4 +186,3 @@ export default {
     display: block;
 }
 </style>
-    

src/views/FinancialManagement/AcountWithdrawal/WithdrawalReview3.vue

@@ -24,9 +24,9 @@
                     </el-form-item>
                 </el-form>
             </el-row>
-            <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false" 
+            <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false"
              :data="pageResult" :columns="columns" :showOperation="false"
-                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回" 
+                @findPage="findPage" button3Name="审核通过" @handleButton3="handleButton3" button2Name="审核驳回"
                 @handleButton2="handleButton2"></kt-common-table>
         </el-main>
     </div>
@@ -66,6 +66,7 @@ export default {
                 { prop: "userId", label: "工号" },
                 { prop: "userName", label: "姓名" },
                 { prop: "bankNumber", label: "卡号" },
+                { prop: "realUserName", label: "真实姓名" },
                 { prop: "bankAccount", label: "银行" },
                 { prop: "bankAddress", label: "开户行" },
                 { prop: "auditTime", label: "审核时间" },
@@ -99,8 +100,8 @@ export default {
                 })
                 .then(data != null ? data.callback : "");
         },
-      
-      
+
+
         handleButton3({ row, index }) {
             this.$confirm('确认审核通过？', '提示', {
                 confirmButtonText: '确定',
@@ -123,7 +124,7 @@ export default {
                 this.$message({
                     type: 'info',
                     message: '已取消删除'
-                });          
+                });
             });
 
         },
@@ -149,14 +150,14 @@ export default {
                         this.$message.error(res.msg)
                     }
                 })
-            }) 
-           
+            })
+
         },
     }
 };
 </script>
-    
-    
+
+
 <style scoped>
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
@@ -185,4 +186,3 @@ export default {
     display: block;
 }
 </style>
-    

src/views/Letter/Wallet/BankCard.vue

@@ -2,7 +2,7 @@
 <template>
   <div id="body">
     <!-- 模板内容 -->
-    <el-radio-group v-model="bankType" style="margin: 0 40px 30px;" >
+    <el-radio-group v-model="bankType" style="margin: 0 40px 30px;">
       <el-radio-button label="0">未审核</el-radio-button>
       <el-radio-button label="1">已审核</el-radio-button>
       <el-radio-button label="2">审核驳回</el-radio-button>
@@ -28,14 +28,16 @@
                 <span>储蓄卡</span>
               </div>
             </div>
+
             <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>
-            <div>****</div>
-            <div>****</div>
-            <span>{{ item.bankNumber.slice(-4) }}</span>
+            <div>{{ item.bankNumber.slice(0, 4) }}</div>
+            <div>{{ item.bankNumber.slice(4, 8) }}</div>
+            <div>{{ item.bankNumber.slice(8, 12) }}</div>
+            <div>{{ item.bankNumber.slice(12, 16) }}</div>
+            <div>{{ item.bankNumber.slice(-3) }}</div>
           </div>
         </div>
       </template>
@@ -53,14 +55,19 @@
                 <span>储蓄卡</span>
               </div>
             </div>
-            <img src="../../../../static/bankdel.png" mode="" style="width: 24px;height: 24px;" @click="bankdel(item)"
-              v-loading.fullscreen.lock="Loading">
+            <div>
+              <img src="../../../../static/bankupdate.png" mode="" style="width: 24px;height: 24px;"
+                @click="bankupdate(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>
           <div class="bank flex j-s a-c">
-            <div>****</div>
-            <div>****</div>
-            <div>****</div>
-            <span>{{ item.bankNumber.slice(-4) }}</span>
+            <div>{{ item.bankNumber.slice(0, 4) }}</div>
+            <div>{{ item.bankNumber.slice(4, 8) }}</div>
+            <div>{{ item.bankNumber.slice(8, 12) }}</div>
+            <div>{{ item.bankNumber.slice(12, 16) }}</div>
+            <div>{{ item.bankNumber.slice(-3) }}</div>
           </div>
         </div>
       </template>
@@ -82,22 +89,26 @@
               v-loading.fullscreen.lock="Loading"> -->
           </div>
           <div class="bank flex j-s a-c">
-            <div>****</div>
-            <div>****</div>
-            <div>****</div>
-            <span>{{ item.bankNumber.slice(-4) }}</span>
+            <div>{{ item.bankNumber.slice(0, 4) }}</div>
+            <div>{{ item.bankNumber.slice(4, 8) }}</div>
+            <div>{{ item.bankNumber.slice(8, 12) }}</div>
+            <div>{{ item.bankNumber.slice(12, 16) }}</div>
+            <div>{{ item.bankNumber.slice(-3) }}</div>
           </div>
         </div>
       </template>
     </div>
-    <el-dialog title="添加银行卡" :visible.sync="bankAddVisible" width="28%">
+    <el-dialog :title="banktitle + '银行卡'" :visible.sync="bankAddVisible" width="28%" @close="bankopen">
       <div class="dialogCentent">
         <el-form ref="form" :model="bankAddform" label-width="80px">
           <el-form-item label="选择银行">
-            <el-select v-model="bankAddform.bankAccount" placeholder="点击选择银行卡" filterable  clearable >
+            <el-select v-model="bankAddform.bankAccount" placeholder="点击选择银行卡" filterable clearable>
               <el-option :label="item.label" :value="item.label" v-for="(item, index) in list " :key="index"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="真实姓名">
+            <el-input v-model="bankAddform.realUserName" placeholder="请输入真实姓名"></el-input>
+          </el-form-item>
           <el-form-item label="银行卡">
             <el-input v-model="bankAddform.bankNumber" placeholder="请输入银行卡号"></el-input>
           </el-form-item>
@@ -120,11 +131,13 @@ export default {
   // 数据存放区域
   data() {
     return {
+      banktitle: "添加",
       bankType: "1",
       bankAddform: {
         "bankNumber": "",
         "bankAccount": "",
         "bankAddress": "",
+        "realUserName": "",
         "isDefault": 0,
       },
       bankAddVisible: false,
@@ -305,21 +318,40 @@ export default {
   // 方法函数
   methods: {
     bankAdd() {
-      this.$api.letter.insertByBankNumber(this.bankAddform).then((res) => {
-        if (res.code == '200') {
-          this.bankAddVisible = false;
-          this.banklist();
-          this.$message({
-            type: 'success',
-            message: "添加成功",
-          });
-        } else {
-          this.$message({
-            type: 'error',
-            message: res.msg,
-          });
-        }
-      });
+      if (this.banktitle == '添加') {
+        this.$api.letter.insertByBankNumber(this.bankAddform).then((res) => {
+          if (res.code == '200') {
+            this.bankAddVisible = false;
+            this.banklist();
+            this.$message({
+              type: 'success',
+              message: "添加成功",
+            });
+          } else {
+            this.$message({
+              type: 'error',
+              message: res.msg,
+            });
+          }
+        });
+      } else {
+        this.$api.dept.bankupdate(this.bankAddform).then((res) => {
+          if (res.code == '200') {
+            this.bankAddVisible = false;
+            this.banklist();
+            this.$message({
+              type: 'success',
+              message: "修改成功",
+            });
+          } else {
+            this.$message({
+              type: 'error',
+              message: res.msg,
+            });
+          }
+        });
+      }
+
     },
     bankdel(item) {
       this.$confirm('是否解绑银行卡?', '提示', {
@@ -329,11 +361,11 @@ export default {
       }).then(() => {
         this.loading = true;
         // this.$api.letter.Bankdelete(id).then((res) => {
-          this.$api.dept.unbind({
-            id: item.id,
-            delFlag: '1',
-            bankNumber: item.bankNumber
-          }).then((res) => {
+        this.$api.dept.unbind({
+          id: item.id,
+          delFlag: '1',
+          bankNumber: item.bankNumber
+        }).then((res) => {
           if (res.code == '200') {
             this.banklist();
             this.$message({
@@ -356,6 +388,23 @@ export default {
       });
 
     },
+    bankopen(){
+      this.banktitle = '添加';
+    },
+    bankupdate(item) {
+      this.$api.dept.bankgetByBankId(item.id).then((res) => {
+        if (res.code == '200') {
+          this.bankAddform = res.data;
+          this.banktitle = '编辑';
+          this.bankAddVisible = true;
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
     banklist(type) {
       const loading = this.$loading({
         lock: true,
@@ -480,7 +529,7 @@ export default {
   .bank {
     font-size: 20px;
     color: #fff;
-    margin-bottom: 30px;
+    margin-bottom: 15px;
 
     span {
       font-size: 20px;