diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue index c980d32..70c51f2 100644 --- a/src/views/task/list/components/addUnit.vue +++ b/src/views/task/list/components/addUnit.vue @@ -768,7 +768,7 @@ const res = await getparameteritem('unitTypeList') this.unitTypeList = res.detail }, - loadUser() { + loadUser(groups) { listCommonuser({ page_size: 999, }). @@ -779,12 +779,28 @@ let contactData = this.contactUser(data) this.userdata = this.sortDepartment(contactData, 'department_id') console.log("this.userdata11", this.userdata) - // 非处长 承办人员只能选自己科室下的 - if(!this.stateObj.is_chuzhang){ - this.douserdata = this.userdata.filter(item=>item.department_id===this.stateObj.department_id) - console.log("this.douserdata11",this.douserdata) + // 非处长 承办人员只能选自己科室下的 所有情况 + // 如果是组别,组长选择 科室组员 只能通过groups里的来 获取 组别中的科室 + let group_name = '' + if(groups && groups.length>0){ + groups.map(item=>{ + if(item.type===1 && item.link_id.includes(this.stateObj.login_id)){ + group_name = item.name + } + }) + groups.map(item=>{ + if(item.type===2 && item.name === group_name){ + console.log(item.link_id) + this.douserdata = this.userdata.filter(item1=> item.link_id.includes(item1.department_id)) + } + }) }else{ - this.douserdata = this.userdata + if(!this.stateObj.is_chuzhang ){ + this.douserdata = this.userdata.filter(item=>item.department_id===this.stateObj.department_id) + console.log("this.douserdata11",this.douserdata) + }else{ + this.douserdata = this.userdata + } } }).catch(error => { @@ -956,7 +972,8 @@ } // if (this.type === 'send') { - this.form.name7 = 1 + this.form.name7 = 1 + this.loadUser(res.groups) } if(this.type==='pid'){ this.form.pid = this.id diff --git a/vue.config.js b/vue.config.js index 8b49cd5..c1b0b04 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,7 @@ module.exports = { * Detail: https://cli.vuejs.org/config/#publicpath */ publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin', - outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin_test', + outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin', assetsDir: 'static', lintOnSave: process.env.NODE_ENV === 'development', productionSourceMap: false,