拉新清单 组织架构增改

src/HManagement/department/index.vue

@@ -66,7 +66,13 @@ export default {
         parent:{
           data:{}
         }
-      }
+      },
+      roleArr:[]
+    }
+  },
+  provide () {
+    return {
+      roleArr:() => this.roleArr
     }
   },
   methods:{
@@ -91,6 +97,18 @@ export default {
     onStaffSuccess () {
       this.$refs.staff.listData(this.depInfo.data.departmentid)
     },
+  },
+  async created () {
+    let res = await this.$api.requested({
+      classname:'webmanage.role.role',
+      method:'query_roleList',
+      content: {
+        pageNumber:1,
+        pageSize:10000
+      }
+    })
+    this.roleArr = res.data
+    console.log(this.roleArr);
   }
 }
 

src/HManagement/department/staff/detail/index.vue

@@ -32,7 +32,13 @@ export default {
   },
   data () {
     return {
-      mainInfo:{}
+      mainInfo:{},
+      roleArr:[]
+    }
+  },
+  provide () {
+    return {
+      roleArr:() => this.roleArr
     }
   },
   methods:{
@@ -41,6 +47,18 @@ export default {
     }
   },
   mounted () {
+  },
+  async created () {
+    let res = await this.$api.requested({
+      classname:'webmanage.role.role',
+      method:'query_roleList',
+      content: {
+        pageNumber:1,
+        pageSize:10000
+      }
+    })
+    this.roleArr = res.data
+    console.log(this.roleArr);
   }
 }
 

src/HManagement/department/staff/list/modules/add.vue

@@ -83,7 +83,19 @@
         </el-col>
         <el-col class="mb-30" :span="24">
           <el-form-item>
-            <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">授权系统账号</el-checkbox>
+            <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否开通账号</el-checkbox>
+          </el-form-item>
+        </el-col>
+        <el-col class="mb-30" :span="24" v-if="form.isleader">
+          <el-form-item label="账号权限组">
+            <el-select v-model="form.roleids" style="width:100%" placeholder="请选择账号" multiple>
+              <el-option
+                v-for="item in roleArr()"
+                :key="item.roleid"
+                :label="item.rolename"
+                :value="item.roleid">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-form>
@@ -144,11 +156,13 @@ export default {
         "isleader":1,
         "position":"",
         "reporthrid":"",
-        "userid":"0"
+        "userid":"0",
+        'roleids':[]
       },
       value:[]
     }
   },
+  inject:['roleArr'],
   methods:{
     onShow () {
       this.dialogFormVisible = true
@@ -189,7 +203,7 @@ export default {
               "method": "createUser",
               "content": {
                 "hrid":res.data.hrid,
-                "roleids":[311]
+                "roleids":this.form.roleids
               }
             })
           }
@@ -214,7 +228,8 @@ export default {
         "isleader":1,
         "position":"",
         "reporthrid":"",
-        "userid":"0"
+        "userid":"0",
+        "roleids":[]
       }
     },
     // 监听汇报对象选择

src/HManagement/department/staff/list/modules/edit.vue

@@ -82,9 +82,16 @@
             <selectMenber :reporthrname="form.reporthrname" @selectMenber="selectMenber"></selectMenber>
           </el-form-item>
         </el-col>
-        <el-col class="mb-30" :span="24">
-          <el-form-item>
-            <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">授权系统账号</el-checkbox>
+        <el-col class="mb-30" :span="24" v-if="form.isleader">
+          <el-form-item label="账号权限组">
+            <el-select v-model="form.roleids" style="width:100%" placeholder="请选择账号" multiple>
+              <el-option
+                v-for="item in roleArr()"
+                :key="item.roleid"
+                :label="item.rolename"
+                :value="item.roleid">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-form>
@@ -144,12 +151,14 @@ export default {
         "isleader":"",
         "position":"",
         "reporthrid":"",
-        "userid":"0"
+        "userid":"0",
+        "roleids":[]
       },
       value:[],
-      deplist:[]
+      deplist:[],
     }
   },
+  inject:['roleArr'],
   methods:{
     async query_hrMain () {
       const res = await this.$api.requested({
@@ -160,6 +169,7 @@ export default {
         }
       })
       this.form = Object.assign({},this.form, res.data)
+      console.log(this.form);
     },
     async department () {
       const res = await this.$api.requested({
@@ -233,6 +243,17 @@ export default {
             type: 'error'
           });
 
+          if (res.data.isleader) {
+            const res2 = await this.$api.requested({
+              "classname": "webmanage.hr.hr",
+              "method": "createUser",
+              "content": {
+                "hrid":res.data.hrid,
+                "roleids":this.form.roleids
+              }
+            })
+          }
+
           this.$notify({
             title: '成功',
             message: '添加成功',
@@ -247,7 +268,7 @@ export default {
     selectMenber (data) {
       this.form.reporthrid = data.hrid
     }
-  }
+  },
 }
 
 </script>

src/SManagement/newPeople/index.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="normal-card">
+    <tableLayout :layout="tablecols" :data="list" :custom="true" :height="tableHieght">
+        <template v-slot:customcol="scope">
+          <p>{{ scope.column.data[scope.column.columnname] }}</p>
+        </template>
+
+        <template v-slot:opreation="scope">
+        </template>
+
+      </tableLayout>
+
+      <div style="margin-top:16px;text-align:right">
+        <el-pagination background small @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-size="params.content.pageSize" layout="total, prev, pager, next, jumper" :total="total">
+        </el-pagination>
+      </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      list: [],
+      tablecols: [],
+      params: {
+      "id": 20240129093502,
+      "content": {
+        "pageSize": 30,
+        "pageNumber": 1
+      },
+      },
+      currentPage: 1,
+      total: 0,
+    }
+  },
+  methods: {
+    getList(init = false) {
+      this.$api.requested(this.params).then(res => {
+        console.log("素材列表", res)
+        this.list = res.data;
+        this.total = res.total;
+        this.params.content.pageNumber = res.pageNumber;
+      })
+    },
+    /* 切换分页 */
+    handleCurrentChange(e) {
+      this.currentPage = e;
+      this.params.content.pageNumber = e;
+      this.getList()
+    },
+  },
+  created () {
+    this.getList()
+    console.log(this.$route.name);
+    this.tablecols = this.tool.tabelCol(this.$route.name)['peopleTableList'].tablecols;
+    console.log(this.tablecols);
+  }
+}
+</script>
+
+<style  scoped>
+
+</style>

src/components/file-block/index.vue

@@ -22,8 +22,8 @@
 
 <script>
 import SeeFile from '@/components/file-block/components/SeeFile'
-
 import removeFile from '@/utils/removeFile'
+import { log } from '@antv/g2plot/lib/utils';
 export default {
   name: 'index',
   data () {
@@ -67,6 +67,8 @@ export default {
         this.seeFile = item
         this.$refs.seeFile.dialogVisible = true
         this.$emit('seeSuccess',item)
+      } else if (item.fileType == 'PDF') {
+        window.open(item.url,'_self')
       } else {
         this.$notify({
           title:'提示',
@@ -75,10 +77,25 @@ export default {
         })
       }
     },
-    downLoad(item) {
+    async downLoad(item) {
       this.$emit('updateDownLoadRecord',item)
       this.$emit('seeSuccess',item)
-      window.open(item.url,'_self')
+      if (item.fileType == 'PDF') {
+        this.$axios.get(item.url,{
+          responseType:'blob'
+        }).then((res) => {
+          let a = document.createElement('a')
+          let url = window.URL.createObjectURL(res.data)
+          a.href = url
+          a.download = item.document
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+          window.URL.revokeObjectURL(a)
+        })
+      } else {
+        window.open(item.url,'_self')
+      }
     }
   },
 };

src/router/SManagement.js

@@ -58,6 +58,15 @@ const SManagement = [{
     upload: true
   },
   component: () => import(/* webpackChunkName: "about" */ '@/SManagement/archives_admag/index.vue')
+},{
+  path: '/newPeople',
+  name: 'newPeople',
+  meta: {
+    title: '拉新清单',
+    ast_nav: true,
+    keeproute: true
+  },
+  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/newPeople/index.vue')
 }, {
   path: '/archives_sc_list',
   name: 'archives_sc',

src/utils/matchingFeilType.js

@@ -1,8 +1,8 @@
 export default {
     fileList (list) {
         let suffixList = {
-            image: ['png', 'jpg', 'jpeg', 'bmp', 'gif','JPG', 'webp', 'svg', 'tiff'],
-            video: ['mp4', 'ogg', 'webm'],
+            image: ['png','PNG','jpg', 'jpeg', 'bmp', 'gif','JPG', 'webp', 'svg', 'tiff'],
+            video: ['mp4', 'ogg', 'webm','MP4'],
             word: ['doc', 'docx'],
             excel: ['xls', 'xlsx'],
             PPT: ['ppt', 'pptx'],

src/views/homePage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <el-row :gutter="20" class="normal-margin">
+    <el-row :gutter="20" class="normal-margin" v-if="usertype == 21">
       <el-col :span="6">
        <user :data="dataOverview.user"></user>
       </el-col>
@@ -72,7 +72,8 @@ export default {
       type:"",
       nowAccount:'',
       userids:[],
-      flag:''
+      flag:'',
+      usertype:JSON.parse(sessionStorage.getItem('account_list'))[0].usertype
     }
   },
   methods:{
@@ -189,6 +190,7 @@ export default {
     }
   },
   mounted () {
+    console.log(this.usertype);
     this.modulesList = JSON.parse(sessionStorage.getItem('module_info'))
     this.type = JSON.parse(sessionStorage.getItem('account_list'))
     this.flag = JSON.parse(sessionStorage.getItem('flag'))