Merge pull request 'feat(system): 新增审批白名单功能并优化用户列表' (#947) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/947

src/views/system/approvalWhitelist/index.vue

@@ -10,6 +10,7 @@
 <script setup lang="jsx">
 import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 import {addWhiteUser, delWhiteUser} from "@/api/user/user";
+import {ElMessage} from "element-plus";
 const tableIns = ref()
 const router = useRouter()
 const whiteUserRef = ref()
@@ -56,12 +57,14 @@ const tableConfig = reactive({
     {
       prop: 'name',
       label: '名称',
-      align: 'center'
+      align: 'center',
+      width: 150
     },
     {
       prop: 'phone',
       label: '手机号码',
-      align: 'center'
+      align: 'center',
+      width: 150
     },
     {
       prop: 'companyName',
@@ -75,6 +78,22 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'account_type'} value={row.accountType}/>)
     },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div style={{width: '100%'}}>
+              {
+                    <popover-delete name={row.name} type={'审批白名单'} btnType={'danger'}
+                                    onDelete={() => deleteWhiteUser(row)}/>
+              }
+            </div>
+        )
+      }
+    }
   ],
   api: '/admin/approve/white/list',
   params: {},
@@ -104,7 +123,7 @@ const search = (val) => {
   tableIns.value.refresh()
 }
 const selectionChange = (data) => {
-  selectUser.value=data.map(item=>item.id)
+  selectUser.value=data.map(item=>item.userId)
 }
 const headBtnClick = (key) => {
   switch (key) {
@@ -112,20 +131,20 @@ const headBtnClick = (key) => {
       handleAddWhiteUser()
       break;
     case 'del':
-      handleDeleteWhiteUser()
+      handleDeleteWhiteUser(selectUser.value)
       break;
   }
 }
 const handleAddWhiteUser = () => {
   whiteUserRef.value.showUserPicker()
 }
-const handleDeleteWhiteUser = async () => {
+const handleDeleteWhiteUser = async (user) => {
   // if (selectUser.value.length === 0) {
   //   ElMessage.warning('请选择要删除的用户')
   //   return
   // }
   const res = await delWhiteUser({
-    userIds: selectUser.value
+    userIds: user
   })
   console.log('res',res)
   if (res.code === 1000) {
@@ -135,6 +154,10 @@ const handleDeleteWhiteUser = async () => {
     ElMessage.error(res.msg)
   }
 }
+const deleteWhiteUser=(row)=>{
+  console.log('row',row)
+  handleDeleteWhiteUser([row.userId])
+}
 </script>
 
 <style scoped>