Merge branch 'dev' of https://git.yidian-inc.com:8021/bp/op-web-service into dev

src/components/UserList/index.vue

@@ -280,6 +280,7 @@ export default {
     //重置
     onReset() {
       this.pageParams = {
+        appid: this.appId,
         page: 1,
         pageSize: 20,
         user_name: "",

src/pages/Withdrawal/Examine/index.less

@@ -80,4 +80,7 @@
 .confirm {
 	background-color: #b8b8b8 !important;
 	border: none;
+}
+.el-card__body{
+	padding: 10px;
 }
\ No newline at end of file

src/pages/Withdrawal/Examine/index.vue

@@ -535,9 +535,10 @@ export default {
       }
 
       const WITHDRAWAL_PERMISSION_ID = 10;
+      const WITHDRAWAL_PERMISSION_ID1 = 10000005;
 
       let withdrawlPermission = this.permissions.filter(
-        (item) => item.id === WITHDRAWAL_PERMISSION_ID
+        (item) => (item.id === WITHDRAWAL_PERMISSION_ID || item.id === WITHDRAWAL_PERMISSION_ID1)
       );
       // 无此模块权限
       if (withdrawlPermission.length === 0) {
@@ -545,8 +546,9 @@ export default {
       }
 
       const AUDIT_PERMSSION_ID = 14;
+      const AUDIT_PERMSSION_ID1 = 10000014;
       const auditPermission = withdrawlPermission[0].sub_permissions.filter(
-        (item) => item.id === AUDIT_PERMSSION_ID
+        (item) => (item.id === AUDIT_PERMSSION_ID || item.id === AUDIT_PERMSSION_ID1)
       );
 
       return auditPermission.length !== 0;