[update] 添加选择用户、组织机构弹框

src/views/dashboard/Analysis.vue

@@ -1,17 +1,15 @@
 <template>
   <div>
-    <a-button @click="previewFileByOnlyOffice('1693528070103957505')">打开预览onlyOffice</a-button>
-    <a-button @click="editFileByOnlyOffice('1693528070103957505')">打开编辑onlyOffice</a-button>
-    <j-upload />
+    <user-or-organ-selection></user-or-organ-selection>
   </div>
 </template>
 
 <script>
-import onlyOfficePreview from '@/common/onlyOffice/onlyOfficePreview'
-import onlyOfficeEdit from '@/common/onlyOffice/onlyOfficeEdit'
+import UserOrOrganSelection from '../../components/selection/UserOrOrganSelection'
 
 export default {
   name: 'Analysis',
+  components: { UserOrOrganSelection },
   data () {
     return {}
   },
@@ -19,12 +17,6 @@ export default {
 
   },
   methods: {
-    previewFileByOnlyOffice (fileId) {
-      onlyOfficePreview(fileId, '文件名')
-    },
-    editFileByOnlyOffice (fileId) {
-      onlyOfficeEdit(fileId, '文件名')
-    }
   }
 }
 </script>

src/views/system/RoleUserList.vue

@@ -48,6 +48,7 @@
 
         <div style="margin-top: 15px">
           <a-table
+            :components="drag(columns,'columns')"
             style="height:500px"
             ref="table"
             size="middle"
@@ -140,6 +141,7 @@
             <a style="margin-left: 24px" @click="onClearSelected2">{{ $t('empty') }}</a>
           </div>
           <a-table
+            :components="drag(columns2,'columns2')"
             style="height:500px"
             ref="table2"
             bordered
@@ -178,6 +180,7 @@
   </a-row>
 </template>
 <script>
+import '@assets/less/common.less'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import { postAction, getAction } from '@/api/manage'
 import SelectUserModal from './modules/SelectUserModal'
@@ -186,10 +189,11 @@ import UserModal from './modules/UserModal'
 import { filterObj } from '@/utils/util'
 import UserRoleModal from './modules/UserRoleModal'
 import moment from 'moment'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
 export default {
   name: 'RoleUserList',
-  mixins: [JeroListMixin],
+  mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
   components: {
     UserRoleModal,
     SelectUserModal,

src/views/system/UserList.vue

@@ -126,11 +126,10 @@
         <a style="margin-left: 24px" @click="onClearSelected">{{ $t('empty') }}</a>
       </div>
 
-      <a-table
-        :components="drag(columns,'columns')"
+      <j-table
+        :can-drag="true"
         :scroll="{x: '100%'}"
         ref="table"
-        bordered
         size="middle"
         rowKey="id"
         :columns="columns"
@@ -140,13 +139,13 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
-        <template slot="avatarslot" slot-scope="text, record/* , index */">
+        <template v-slot:avatarslot="{text, record}">
           <div class="anty-img-wrap">
             <a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>
           </div>
         </template>
 
-        <span slot="action" slot-scope="text, record">
+        <template v-slot:action="{text, record}">
           <a @click="handleEdit(record)" >{{ $t('edit') }}</a>
 
           <a-divider type="vertical" />
@@ -183,9 +182,9 @@
               </a-menu-item>
             </a-menu>
           </a-dropdown>
-        </span>
+        </template>
 
-      </a-table>
+      </j-table>
     </div>
     <!-- table区域-end -->
 
@@ -204,6 +203,7 @@
 </template>
 
 <script>
+import '@assets/less/common.less'
 import RoleAssignment from './modules/RoleAssignment'
 import UserModal from './modules/UserModal'
 import PasswordModal from './modules/PasswordModal'
@@ -212,18 +212,19 @@ import { frozenBatch, queryall } from '@/api/api'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import JInput from '@/components/jero/JInput'
 import UserRecycleBinModal from './modules/UserRecycleBinModal'
-import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import JTable from '@/components/jero/JTable'
 import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
 
 export default {
   name: 'UserList',
-  mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
+  mixins: [JeroListMixin],
   components: {
     RoleAssignment,
     UserModal,
     PasswordModal,
     JInput,
     UserRecycleBinModal,
+    JTable,
     JSearchSelectTag
   },
   data () {
@@ -450,5 +451,4 @@ export default {
 }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
 </style>