From 487754376a1eb675d430a64b7a4aa9e7ffeb405b Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 25 八月 2023 09:54:15 +0800
Subject: [PATCH] 调整

---
 src/views/system/UserList.vue |  163 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 160 insertions(+), 3 deletions(-)

diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index df8c1ab..47e9d00 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -189,6 +189,7 @@
   import UserRecycleBinModal from './modules/UserRecycleBinModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery'
   import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
+  import {mapActions} from 'vuex'
 
   export default {
     name: "UserList",
@@ -279,12 +280,14 @@
           {
             title: '鎿嶄綔',
             dataIndex: 'action',
-            scopedSlots: {customRender: 'action'},
+            scopedSlots: { customRender: 'action' },
             align: "center",
             width: 80
-          }
+          },
+
 
         ],
+        isDepartType:'',
         superQueryFieldList: [
           { type: 'input', value: 'username', text: '鐢ㄦ埛璐﹀彿', },
           { type: 'input', value: 'realname', text: '鐢ㄦ埛濮撳悕', },
@@ -305,7 +308,161 @@
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       }
     },
-    methods: {
+      created() {
+        this.queryTreeData()
+      },
+      methods: {
+        ...mapActions(['QueryDepartTree']),
+        queryTreeData() {
+          this.QueryDepartTree().then(res => {
+            if (res.success) {
+              this.isDepartType = res.result[0].value
+              if(this.isDepartType == -1){
+                this.columns=[
+                  {
+                    title: '鐢ㄦ埛璐﹀彿',
+                    align: "center",
+                    dataIndex: 'username',
+                    width: 120,
+                    sorter: true
+                  },
+                  {
+                    title: '鐢ㄦ埛濮撳悕',
+                    align: "center",
+                    width: 100,
+                    dataIndex: 'realname',
+                  },
+                  {
+                    title: '澶村儚',
+                    align: "center",
+                    width: 80,
+                    dataIndex: 'avatar',
+                    scopedSlots: {customRender: "avatarslot"}
+                  },
+
+                  // {
+                  //   title: '鎬у埆',
+                  //   align: "center",
+                  //   width: 80,
+                  //   dataIndex: 'sex_dictText',
+                  //   sorter: true
+                  // },
+                  // {
+                  //   title: '鐢熸棩',
+                  //   align: "center",
+                  //   width: 100,
+                  //   dataIndex: 'birthday'
+                  // },
+                  // {
+                  //   title: '鎵嬫満鍙风爜',
+                  //   align: "center",
+                  //   width: 100,
+                  //   dataIndex: 'phone'
+                  // },
+                  {
+                    title: '杞﹂棿',
+                    align: "center",
+                    width: 240,
+                    dataIndex: 'productionName'
+                  },
+                  {
+                    title: '鐘舵��',
+                    align: "center",
+                    width: 80,
+                    dataIndex: 'status_dictText'
+                  },
+                  {
+                    title: '鎿嶄綔',
+                    dataIndex: 'action',
+                    scopedSlots: { customRender: 'action' },
+                    align: "center",
+                    width: 80
+                  },
+
+
+                ]
+              }else{
+                this.columns= [
+                  {
+                  title: '鐢ㄦ埛璐﹀彿',
+                  align: "center",
+                  dataIndex: 'username',
+                  width: 120,
+                  sorter: true
+                },
+                  {
+                    title: '鐢ㄦ埛濮撳悕',
+                    align: "center",
+                    width: 100,
+                    dataIndex: 'realname',
+                  },
+                  {
+                    title: '澶村儚',
+                    align: "center",
+                    width: 80,
+                    dataIndex: 'avatar',
+                    scopedSlots: {customRender: "avatarslot"}
+                  },
+
+                  // {
+                  //   title: '鎬у埆',
+                  //   align: "center",
+                  //   width: 80,
+                  //   dataIndex: 'sex_dictText',
+                  //   sorter: true
+                  // },
+                  // {
+                  //   title: '鐢熸棩',
+                  //   align: "center",
+                  //   width: 100,
+                  //   dataIndex: 'birthday'
+                  // },
+                  // {
+                  //   title: '鎵嬫満鍙风爜',
+                  //   align: "center",
+                  //   width: 100,
+                  //   dataIndex: 'phone'
+                  // },
+                  {
+                    title: '閮ㄩ棬',
+                    align: "center",
+                    width: 240,
+                    dataIndex: 'orgCodeTxt'
+                  },
+                  {
+                    title: '杞﹂棿',
+                    align: "center",
+                    width: 240,
+                    dataIndex: 'productionName'
+                  },
+                  {
+                    title: '鐘舵��',
+                    align: "center",
+                    width: 80,
+                    dataIndex: 'status_dictText'
+                  },
+                  {
+                    title: '鎿嶄綔',
+                    dataIndex: 'action',
+                    scopedSlots: { customRender: 'action' },
+                    align: "center",
+                    width: 80
+                  }
+
+
+              ]
+              }
+
+            } else {
+              // this.$message.warn(res.message)
+              this.$notification.warning({
+                message:'娑堟伅',
+                description:res.message
+              });
+            }
+          }).finally(() =>{
+          })
+        },
       getAvatarView: function (avatar) {
         return getFileAccessHttpUrl(avatar)
       },

--
Gitblit v1.9.3