Merge branch 'ly' into dev

src/components/SelectPos/account.data.ts

@@ -12,37 +12,14 @@ import { BasicColumn, FormSchema } from '@/components/Table';
  */
 export const columns: BasicColumn[] = [
   {
-    title: '用户名',
+    title: '名称',
-    dataIndex: 'account',
-    width: 120,
-  },
-  {
-    title: '昵称',
     dataIndex: 'name',
     width: 120,
   },
-  {
-    title: '所属部门',
-    dataIndex: 'organizations',
-    // customRender: ({ value }) => {
-    //   return deptMap[value];
-    // },
-  },
 ];
 
 export const searchFormSchema: FormSchema[] = [
-  {
+  
-    field: 'account',
-    label: '用户名',
-    component: 'Input',
-    colProps: { span: 8 },
-  },
-  {
-    field: 'nickname',
-    label: '昵称',
-    component: 'Input',
-    colProps: { span: 8 },
-  },
 ];
 
 

src/components/SelectRole/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+    <div class="select-account">
     <BasicTable @register="registerTable" :searchInfo="searchInfo"> </BasicTable>
   </div>
 </template>
@@ -69,4 +69,10 @@
     getRow
   })
 
-</script>
+</script>
+<style scoped>
+  .select-account{
+    display: flex;
+    height: 100%;
+  }
+</style>

src/views/demo/workflow/create/index.vue

@@ -36,7 +36,7 @@
       width="100%"
       wrap-class-name="full-modal"
       v-model:open="previewOpen"
-      title="流程设计"
+      title="流程发起"
       :destroyOnClose="true"
     >
       <template #footer> </template>

src/views/demo/workflow/scheme/index.vue

@@ -189,6 +189,8 @@
   }
   function closeMolder(){
     auditOpen.value = false;
+    clearSelectedRowKeys();
+    reload();
   }
 </script>
 <style lang="less">

src/views/demo/workflow/task/myDraft.vue

@@ -36,7 +36,7 @@
       :destroyOnClose="true"
     >
       <template #footer> </template>
-      <Initiate ref="posRef" :processId="processId"  @closeModel="closeMolder"></Initiate>
+      <Initiate ref="posRef" :processId="processId"  @closeModel="closeModel"></Initiate>
     </a-modal>
   </PageWrapper>
 </template>
@@ -126,6 +126,10 @@
     auditOpen.value = true;
     // go('/dashboard/task_look_preview/detail?processId=' + record.id);
   }
+  function closeModel(){
+    auditOpen.value = false
+    reload()
+  }
 </script>
 <style lang="less">
   .full-modal {

src/views/demo/workflow/task/uncompletedTask.vue

@@ -56,7 +56,7 @@
   const isRead = ref(0);
   const type = ref('');
   const auditOpen = ref(false);
-  const [registerTable] = useTable({
+  const [registerTable,{reload}] = useTable({
     api: getLoadMyUncompletedPage,
     columns: [
       {
@@ -148,6 +148,7 @@
   }
   function closeMolder(){
     auditOpen.value = false;
+    reload()
   }
 </script>
 <style lang="less">