Skip to content

S
SuperMan
Commit 7b03438e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent d1f8badb
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 189 deletions
src/components/administrative/departmentManagement.vue
View file @ 7b03438e
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
min-height: 800px; min-height: 800px;
} }
.departmentTreeStyleCont .departmentTreeStyle > p { .departmentTreeStyleCont .departmentTreeStyle>p {
font-size: 14px; font-size: 14px;
margin-bottom: 15px; margin-bottom: 15px;
color: #333; color: #333;
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
color: #E95252; color: #E95252;
} }
.departmentTreeStyleCont .departmentTreeLayer > p { .departmentTreeStyleCont .departmentTreeLayer>p {
font-size: 14px; font-size: 14px;
margin-bottom: 15px; margin-bottom: 15px;
color: #333; color: #333;
...@@ -79,55 +79,51 @@ ...@@ -79,55 +79,51 @@
.departmentTreeStyleCont .el-date-editor.el-input__inner { .departmentTreeStyleCont .el-date-editor.el-input__inner {
width: auto !important; width: auto !important;
} }
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne">
</el-select>
<div class="query-box" v-show="!isTree"> <div class="query-box" v-show="!isTree">
<ul> <ul>
<li> <li>
<span><em>{{$t('admin.admin_company')}}</em><el-select filterable :disabled="msg.IsParentCompany==2" <span><em>{{$t('admin.admin_company')}}</em>
v-model='msg.RB_Branch_Id' <el-select filterable :disabled="msg.IsParentCompany==2" v-model='msg.RB_Branch_Id'
:placeholder="$t('pub.unlimitedSel')"> :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option v-for='item in companyList' <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
:label='item.BName' </el-option>
:value='item.Id' </el-select>
:key="item.Id"> </span>
</el-option>
</el-select>
</span>
</li> </li>
<li> <li>
<span><em>{{$t('admin.admin_parentdepartment')}}</em><el-select filterable clearable v-model='msg.ParentId' <span><em>{{$t('admin.admin_parentdepartment')}}</em>
:placeholder="$t('pub.unlimitedSel')"> <el-select filterable clearable v-model='msg.ParentId' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for='item in departmentList' <el-option v-for='item in departmentList' :label='item.DepartmentName' :value='item.DepartmentID'
:label='item.DepartmentName' :key="item.DepartmentID">
:value='item.DepartmentID' </el-option>
:key="item.DepartmentID"> </el-select>
</el-option> </span>
</el-select>
</span>
</li> </li>
<li> <li>
<span><em>{{$t('admin.admin_departmentLevel')}}</em><el-select v-model="msg.Tier"> <span><em>{{$t('admin.admin_departmentLevel')}}</em>
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option> <el-select v-model="msg.Tier">
<el-option v-for='item in tierList' :label='item.name' :value='item.id' :key="item.id"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
</el-select> <el-option v-for='item in tierList' :label='item.name' :value='item.id' :key="item.id"></el-option>
</span> </el-select>
</span>
</li> </li>
<li> <li>
<span><em>{{$t('admin.admin_department')}} </em><el-input v-model='msg.DepartmentName' <span><em>{{$t('admin.admin_department')}} </em>
@keyup.enter.native="getList" <el-input v-model='msg.DepartmentName' @keyup.enter.native="getList" :placeholder="$t('pub.pleaseImport')">
:placeholder="$t('pub.pleaseImport')"></el-input></span> </el-input>
</span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
<input type="button" @click="outerVisible = true,getCompany()" class="normalBtn" @click="resetPageIndex(),getList()" />
:value="$t('pub.addBtn')"/> <input type="button" @click="outerVisible = true,getCompany()" class="normalBtn" :value="$t('pub.addBtn')" />
<input type="button" class="normalBtn" :value="$t('adm.adm_sxjg')" @click="isTree=true"/> <input type="button" class="normalBtn" :value="$t('adm.adm_sxjg')" @click="isTree=true" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -137,43 +133,43 @@ ...@@ -137,43 +133,43 @@
<p> <p>
{{$t('adm.adm_jggl')}} {{$t('adm.adm_jggl')}}
<input type="button" class="normalBtn fr" <input type="button" class="normalBtn fr"
style="font-size: 12px; width: 86px; height: 24px; padding: 0 2px; margin-top: -5px;" :value="$t('adm.adm_fhlb')" style="font-size: 12px; width: 86px; height: 24px; padding: 0 2px; margin-top: -5px;"
@click="isTree=false"/> :value="$t('adm.adm_fhlb')" @click="isTree=false" />
</p> </p>
<el-tree :data="allList" node-key="id" :props="defaultProps" @node-drag-start="handleDragStart" <el-tree :data="allList" node-key="id" :props="defaultProps" @node-drag-start="handleDragStart"
@node-drag-enter="handleDragEnter" @node-drag-leave="handleDragLeave" @node-drag-over="handleDragOver" @node-drag-enter="handleDragEnter" @node-drag-leave="handleDragLeave" @node-drag-over="handleDragOver"
@node-drag-end="handleDragEnd" @node-drop="handleDrop" draggable :allow-drop="allowDrop" @node-drag-end="handleDragEnd" @node-drop="handleDrop" draggable :allow-drop="allowDrop"
:allow-drag="allowDrag"> :allow-drag="allowDrag">
<span class="TreeSpan" slot-scope="{ node, data }"> <span class="TreeSpan" slot-scope="{ node, data }">
<i v-show="data.DType==1" class="iconfont icon-bumen"></i> <i v-show="data.DType==1" class="iconfont icon-bumen"></i>
<img v-show="data.DType==2" v-if="!data.Images" src="../../assets/img/default_head_img.jpg"> <img v-show="data.DType==2" v-if="!data.Images" src="../../assets/img/default_head_img.jpg">
<img v-show="data.DType==2" v-else :src="data.Images" :onerror='defaultImg'/> <img v-show="data.DType==2" v-else :src="data.Images" :onerror='defaultImg' />
{{node.label}}<span v-show="data.DType==2" {{node.label}}<span v-show="data.DType==2"
style="background: #E95252; font-size: 12px; height: 16px; line-height: 16px; color:#fff; padding: 0 4px; border-radius: 4px; display: inline-block; margin-left: 5px;">{{data.PostName}}</span> style="background: #E95252; font-size: 12px; height: 16px; line-height: 16px; color:#fff; padding: 0 4px; border-radius: 4px; display: inline-block; margin-left: 5px;">{{data.PostName}}</span>
<span class="spanIcon" v-if="data.DType==1"> <span class="spanIcon" v-if="data.DType==1">
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_addzibumen')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('adm.adm_addzibumen')" placement="top">
<i class="iconfont icon-tianjia" <i class="iconfont icon-tianjia"
@click="treeLayerShow=true;treeLayerShowUser=false,resetForm('addMsg'),addTreeData(data)"></i> @click="treeLayerShow=true;treeLayerShowUser=false,resetForm('addMsg'),addTreeData(data)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_addyuangong')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('adm.adm_addyuangong')" placement="top">
<i class="iconfont icon-tianjiayuangong" <i class="iconfont icon-tianjiayuangong"
@click="treeLayerShow=false,treeLayerShowUser=true,resetForm('addMsg1'),addTreeUerData(data)"></i> @click="treeLayerShow=false,treeLayerShowUser=true,resetForm('addMsg1'),addTreeUerData(data)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i class="iconfont icon-xiugai" <i class="iconfont icon-xiugai"
@click="treeLayerShow=true,treeLayerShowUser=false,treeLayerTitle='部门信息编辑',resetForm('addMsg'),updateData(data.DepartmentID)"></i> @click="treeLayerShow=true,treeLayerShowUser=false,treeLayerTitle='部门信息编辑',resetForm('addMsg'),updateData(data.DepartmentID)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
<i class="iconfont icon-shanchu" @click='deleteDeparment(data.DepartmentID)'></i> <i class="iconfont icon-shanchu" @click='deleteDeparment(data.DepartmentID)'></i>
</el-tooltip> </el-tooltip>
</span> </span>
<span class="spanIcon" v-if="data.DType==2"> <span class="spanIcon" v-if="data.DType==2">
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_edityuangong')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('adm.adm_edityuangong')" placement="top">
<i class="iconfont icon-xiugai" <i class="iconfont icon-xiugai"
@click="treeLayerShow=false,treeLayerShowUser=true,treeLayerUserTitle='修改员工信息',resetForm('addMsg1'),updateDataUser(data)"></i> @click="treeLayerShow=false,treeLayerShowUser=true,treeLayerUserTitle='修改员工信息',resetForm('addMsg1'),updateDataUser(data)"></i>
</el-tooltip> </el-tooltip>
</span> </span>
</span> </span>
</el-tree> </el-tree>
</div> </div>
<div class="departmentTreeLayer" v-show="treeLayerShowUser"> <div class="departmentTreeLayer" v-show="treeLayerShowUser">
...@@ -182,7 +178,8 @@ ...@@ -182,7 +178,8 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('system.table_company')" prop="RB_Branch_id"> <el-form-item :label="$t('system.table_company')" prop="RB_Branch_id">
<el-select filterable v-model='addMsg1.RB_Branch_id' @change='layerLinkageDepartment' :placeholder="$t('pub.unlimitedSel')"> <el-select filterable v-model='addMsg1.RB_Branch_id' @change='layerLinkageDepartment'
:placeholder="$t('pub.unlimitedSel')">
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id"> <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -190,8 +187,10 @@ ...@@ -190,8 +187,10 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('admin.admin_Department')" prop="RB_Department_Id"> <el-form-item :label="$t('admin.admin_Department')" prop="RB_Department_Id">
<el-select filterable v-model='addMsg1.RB_Department_Id' @change='layerLinkagePost' :placeholder="$t('pub.unlimitedSel')"> <el-select filterable v-model='addMsg1.RB_Department_Id' @change='layerLinkagePost'
<el-option v-for='item in layerDepartMentList' :label='item.DepartmentName' :value='item.DepartmentID' :key="item.DepartmentID"> :placeholder="$t('pub.unlimitedSel')">
<el-option v-for='item in layerDepartMentList' :label='item.DepartmentName' :value='item.DepartmentID'
:key="item.DepartmentID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -199,15 +198,16 @@ ...@@ -199,15 +198,16 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('admin.admin_Post')" prop="RB_Post_Id"> <el-form-item :label="$t('admin.admin_Post')" prop="RB_Post_Id">
<el-select filterable v-model='addMsg1.RB_Post_Id' :placeholder="$t('pub.unlimitedSel')"> <el-select filterable v-model='addMsg1.RB_Post_Id' :placeholder="$t('pub.unlimitedSel')">
<el-option v-for='item in layerPostList' :label='item.PostName' :value='item.PostId' :key="item.PostId"> <el-option v-for='item in layerPostList' :label='item.PostName' :value='item.PostId'
:key="item.PostId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('system.query_name')" prop="EmName"> <el-form-item :label="$t('system.query_name')" prop="EmName">
<el-input maxlength='20' type="text" v-model="addMsg1.EmName" <el-input maxlength='20' type="text" v-model="addMsg1.EmName" :placeholder="$t('pub.pleaseImport')">
:placeholder="$t('pub.pleaseImport')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('adm.adm_xueli')" prop="EmEducation"> <el-form-item :label="$t('adm.adm_xueli')" prop="EmEducation">
<el-input maxlength='20' type="text" v-model="addMsg1.EmEducation" <el-input maxlength='20' type="text" v-model="addMsg1.EmEducation"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -240,14 +240,14 @@ ...@@ -240,14 +240,14 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="离职时间" prop="EmLeave"> <el-form-item label="离职时间" prop="EmLeave">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmLeave' type="date" <el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmLeave' type="date" disabled>
disabled></el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('admin.admin_address')" prop="EmAddress"> <el-form-item :label="$t('admin.admin_address')" prop="EmAddress">
<el-input maxlength='50' type="text" v-model="addMsg1.EmAddress" <el-input maxlength='50' type="text" v-model="addMsg1.EmAddress" :placeholder="$t('pub.pleaseImport')">
:placeholder="$t('pub.pleaseImport')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -257,8 +257,8 @@ ...@@ -257,8 +257,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('pub.telphone')" prop="EmTel"> <el-form-item :label="$t('pub.telphone')" prop="EmTel">
<el-input maxlength='20' type="text" v-model="addMsg1.EmTel" <el-input maxlength='20' type="text" v-model="addMsg1.EmTel" :placeholder="$t('pub.pleaseImport')">
:placeholder="$t('pub.pleaseImport')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="24"> <el-col :span="24">
<input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn" <input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn"
@click="resetForm('addMsg1'),treeLayerShowUser=false"></input> @click="resetForm('addMsg1'),treeLayerShowUser=false"></input>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input> <input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input>
<button v-if='isleaveBtn' class="normalBtn" @click="setIsLeave(leaveId)">{{leaveBtn}}</button> <button v-if='isleaveBtn' class="normalBtn" @click="setIsLeave(leaveId)">{{leaveBtn}}</button>
</el-col> </el-col>
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('admin.admin_company')" prop="RB_Branch_Id"> <el-form-item :label="$t('admin.admin_company')" prop="RB_Branch_Id">
<el-select filterable clearable v-model='addMsg.RB_Branch_Id' :placeholder="$t('pub.unlimitedSel')" <el-select filterable clearable v-model='addMsg.RB_Branch_Id' :placeholder="$t('pub.unlimitedSel')"
@change='getDeparmentTierByBranch'> @change='getDeparmentTierByBranch'>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id"> <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -312,20 +312,22 @@ ...@@ -312,20 +312,22 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('admin.admin_department')" prop="DepartmentName"> <el-form-item :label="$t('admin.admin_department')" prop="DepartmentName">
<el-input type="text" maxlength='20' v-model="addMsg.DepartmentName" <el-input type="text" maxlength='20' v-model="addMsg.DepartmentName"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('admin.admin_departmentLevel')" prop="Tier"> <el-form-item :label="$t('admin.admin_departmentLevel')" prop="Tier">
<el-select v-model="addMsg.Tier" @change='getParentDeparment'> <el-select v-model="addMsg.Tier" @change='getParentDeparment'>
<el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id"></el-option> <el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('admin.admin_parentdepartment')" prop="ParentId"> <el-form-item :label="$t('admin.admin_parentdepartment')" prop="ParentId">
<el-select filterable v-model='addMsg.ParentId' :placeholder="$t('pub.pleaseSel')"> <el-select filterable v-model='addMsg.ParentId' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in layerDepartmentList' :label='item.DepartmentName' :value='item.DepartmentID' :key="item.DepartmentID"> <el-option v-for='item in layerDepartmentList' :label='item.DepartmentName' :value='item.DepartmentID'
:key="item.DepartmentID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -334,8 +336,10 @@ ...@@ -334,8 +336,10 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('admin.admin_leader')" prop="DepartmentManager"> <el-form-item :label="$t('admin.admin_leader')" prop="DepartmentManager">
<el-select filterable clearable v-model='addMsg.ManagerIdArr' :placeholder="$t('pub.pleaseSel')" multiple> <el-select filterable clearable v-model='addMsg.ManagerIdArr' :placeholder="$t('pub.pleaseSel')"
<el-option v-for='item in employeeList' :label='item.EmName' :value='item.EmployeeId' :key="item.EmployeeId"> multiple>
<el-option v-for='item in employeeList' :label='item.EmName' :value='item.EmployeeId'
:key="item.EmployeeId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -360,7 +364,7 @@ ...@@ -360,7 +364,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="绑定岗位" prop="PostIdArr"> <el-form-item label="绑定岗位" prop="PostIdArr">
<el-select filterable class='w400 multiple_input' multiple v-model='addMsg.PostIdArr' <el-select filterable class='w400 multiple_input' multiple v-model='addMsg.PostIdArr'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId"> <el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
</el-option> </el-option>
</el-select> </el-select>
...@@ -403,27 +407,27 @@ ...@@ -403,27 +407,27 @@
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button type="primary" icon="el-icon-edit" circle <el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible = true,dialogTitle='修改部门信息',updateData(item.DepartmentID)"></el-button> @click="outerVisible = true,dialogTitle='修改部门信息',updateData(item.DepartmentID)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.delete')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('pub.delete')" placement="top">
<el-button type="danger" icon="el-icon-delete" @click='deleteDeparment(item.DepartmentID)' <el-button type="danger" icon="el-icon-delete" @click='deleteDeparment(item.DepartmentID)' circle>
circle></el-button> </el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
</table> </table>
<el-pagination v-show="!isTree" background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination v-show="!isTree" background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total> layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination> </el-pagination>
<el-dialog custom-class='w800' :title="dialogTitle" :visible.sync="outerVisible" center <el-dialog custom-class='w800' :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie"> :before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<table class="layerNoIcon"> <table class="layerNoIcon">
<tr> <tr>
<td> <td>
<el-form-item :label="$t('admin.admin_company')" prop="RB_Branch_Id"> <el-form-item :label="$t('admin.admin_company')" prop="RB_Branch_Id">
<el-select class='w200' filterable clearable v-model='addMsg.RB_Branch_Id' :placeholder="$t('pub.unlimitedSel')" <el-select class='w200' filterable clearable v-model='addMsg.RB_Branch_Id'
@change='getDeparmentTierByBranch'> :placeholder="$t('pub.unlimitedSel')" @change='getDeparmentTierByBranch'>
<el-option v-for='item in layercompanyList' :label='item.BName' :value='item.Id' :key="item.Id"> <el-option v-for='item in layercompanyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -432,7 +436,7 @@ ...@@ -432,7 +436,7 @@
<td> <td>
<el-form-item :label="$t('admin.admin_department')" prop="DepartmentName"> <el-form-item :label="$t('admin.admin_department')" prop="DepartmentName">
<el-input class='w200' type="text" maxlength='20' v-model="addMsg.DepartmentName" <el-input class='w200' type="text" maxlength='20' v-model="addMsg.DepartmentName"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -441,14 +445,16 @@ ...@@ -441,14 +445,16 @@
<td> <td>
<el-form-item :label="$t('admin.admin_departmentLevel')" prop="Tier"> <el-form-item :label="$t('admin.admin_departmentLevel')" prop="Tier">
<el-select class='w200' v-model="addMsg.Tier" @change='getParentDeparment'> <el-select class='w200' v-model="addMsg.Tier" @change='getParentDeparment'>
<el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id"></el-option> <el-option v-for='item in layerTierList' :label='item.name' :value='item.id' :key="item.id">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item :label="$t('admin.admin_parentdepartment')" prop="ParentId"> <el-form-item :label="$t('admin.admin_parentdepartment')" prop="ParentId">
<el-select filterable class='w200' v-model='addMsg.ParentId' :placeholder="$t('pub.pleaseSel')"> <el-select filterable class='w200' v-model='addMsg.ParentId' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in layerDepartmentList' :label='item.DepartmentName' :value='item.DepartmentID' :key="item.DepartmentID"> <el-option v-for='item in layerDepartmentList' :label='item.DepartmentName' :value='item.DepartmentID'
:key="item.DepartmentID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -458,24 +464,25 @@ ...@@ -458,24 +464,25 @@
<td> <td>
<el-form-item :label="$t('admin.admin_leader')" prop="DepartmentManager"> <el-form-item :label="$t('admin.admin_leader')" prop="DepartmentManager">
<el-select filterable class='w200 multiple_input' clearable v-model='addMsg.ManagerIdArr' <el-select filterable class='w200 multiple_input' clearable v-model='addMsg.ManagerIdArr'
:placeholder="$t('pub.pleaseSel')" multiple> :placeholder="$t('pub.pleaseSel')" multiple>
<el-option v-for='item in employeeList' :label='item.EmName' :value='item.EmployeeId' :key="item.EmployeeId"> <el-option v-for='item in employeeList' :label='item.EmName' :value='item.EmployeeId'
:key="item.EmployeeId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item :label="$t('admin.admin_dphone')" prop="DepartmentTel"> <el-form-item :label="$t('admin.admin_dphone')" prop="DepartmentTel">
<el-input class='w200' type="text" v-model="addMsg.DepartmentTel" <el-input class='w200' type="text" v-model="addMsg.DepartmentTel" :placeholder="$t('pub.pleaseImport')">
:placeholder="$t('pub.pleaseImport')"></el-input> </el-input>
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<el-form-item :label="$t('admin.admin_departsort')" prop="Sort"> <el-form-item :label="$t('admin.admin_departsort')" prop="Sort">
<el-input class='w200' type="text" v-model="addMsg.Sort" <el-input class='w200' type="text" v-model="addMsg.Sort" :placeholder="$t('pub.pleaseImport')">
:placeholder="$t('pub.pleaseImport')"></el-input> </el-input>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
...@@ -488,7 +495,7 @@ ...@@ -488,7 +495,7 @@
<td colspan="2"> <td colspan="2">
<el-form-item :label="$t('admin.admin_Bindingposition')" prop="PostIdArr"> <el-form-item :label="$t('admin.admin_Bindingposition')" prop="PostIdArr">
<el-select filterable class='w500 multiple_input' multiple v-model='addMsg.PostIdArr' <el-select filterable class='w500 multiple_input' multiple v-model='addMsg.PostIdArr'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId"> <el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
</el-option> </el-option>
</el-select> </el-select>
...@@ -633,10 +640,10 @@ ...@@ -633,10 +640,10 @@
trigger: 'blur' trigger: 'blur'
}], }],
EmAccount: [{ EmAccount: [{
required: true, required: true,
message: this.$t('login.login_account'), message: this.$t('login.login_account'),
trigger: 'blur' trigger: 'blur'
}, },
{ {
pattern: /^[a-zA-Z0-9]{4,18}$/, pattern: /^[a-zA-Z0-9]{4,18}$/,
message: '账号为6-18位字母数字组成' message: '账号为6-18位字母数字组成'
...@@ -705,8 +712,8 @@ ...@@ -705,8 +712,8 @@
Sort: '', Sort: '',
PostIdArr: [], PostIdArr: [],
IsLeader: '0', IsLeader: '0',
ManagerIds: '',//部门负责人 ManagerIds: '', //部门负责人
ManagerIdArr: []//数组 ManagerIdArr: [] //数组
}, },
getDepartmentMsg: { getDepartmentMsg: {
RB_Group_Id: '0', RB_Group_Id: '0',
...@@ -745,7 +752,8 @@ ...@@ -745,7 +752,8 @@
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.addMsg1.RB_Group_id = this.postMsg.RB_Group_Id = this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = this.addMsg.RB_Group_Id = userInfo.RB_Group_id; //集团 this.addMsg1.RB_Group_id = this.postMsg.RB_Group_Id = this.companyMsg.RB_Group_Id = this.departmentMsg
.RB_Group_Id = this.addMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.companyMsg.RB_Branch_Id = userInfo.RB_Branch_id; //公司 this.companyMsg.RB_Branch_Id = userInfo.RB_Branch_id; //公司
this.msg.RB_Branch_Id = userInfo.RB_Branch_id; //公司 this.msg.RB_Branch_Id = userInfo.RB_Branch_id; //公司
this.msg.IsParentCompany = userInfo.IsParentCompany; //是否为总公司 this.msg.IsParentCompany = userInfo.IsParentCompany; //是否为总公司
...@@ -790,8 +798,7 @@ ...@@ -790,8 +798,7 @@
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
layerLinkageDepartment() { //弹窗联动部门 layerLinkageDepartment() { //弹窗联动部门
this.addMsg1.RB_Department_Id = ''; this.addMsg1.RB_Department_Id = '';
...@@ -810,30 +817,21 @@ ...@@ -810,30 +817,21 @@
this.apipost('admin_get_PostGetList', this.getPostMsg, res => { this.apipost('admin_get_PostGetList', this.getPostMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.layerPostList = res.data.data; this.layerPostList = res.data.data;
} else { } else {}
} }, err => {})
}, err => {
})
}, },
getDerpartMent() { //获取部门 getDerpartMent() { //获取部门
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => { this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.layerDepartMentList = res.data.data; this.layerDepartMentList = res.data.data;
} else { } else {}
} }, err => {})
}, err => {
})
},
handleDragStart(node, ev) {
},
handleDragEnter(draggingNode, dropNode, ev) {
},
handleDragLeave(draggingNode, dropNode, ev) {
},
handleDragOver(draggingNode, dropNode, ev) {
},
handleDragEnd(draggingNode, dropNode, dropType, ev) {
}, },
handleDragStart(node, ev) {},
handleDragEnter(draggingNode, dropNode, ev) {},
handleDragLeave(draggingNode, dropNode, ev) {},
handleDragOver(draggingNode, dropNode, ev) {},
handleDragEnd(draggingNode, dropNode, dropType, ev) {},
handleDrop(node, node1, inner) { handleDrop(node, node1, inner) {
if (inner == 'inner') { if (inner == 'inner') {
this.dragMsg.Tier = node1.data.Tier + 1 this.dragMsg.Tier = node1.data.Tier + 1
...@@ -861,8 +859,7 @@ ...@@ -861,8 +859,7 @@
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
allowDrop(draggingNode, dropNode, type) { allowDrop(draggingNode, dropNode, type) {
...@@ -876,8 +873,7 @@ ...@@ -876,8 +873,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.allList = res.data.data this.allList = res.data.data
} }
}, err => { }, err => {})
})
}, },
getTier() { getTier() {
this.apipost('app_get_GetDepartmentTier', {}, res => { this.apipost('app_get_GetDepartmentTier', {}, res => {
...@@ -889,10 +885,8 @@ ...@@ -889,10 +885,8 @@
name: i + '级' name: i + '级'
}) })
} }
} else { } else {}
} }, err => {})
}, err => {
})
}, },
getlayerTier() { getlayerTier() {
this.apipost('app_get_GetDepartmentTier', this.layerTierMsg, res => { this.apipost('app_get_GetDepartmentTier', this.layerTierMsg, res => {
...@@ -904,13 +898,12 @@ ...@@ -904,13 +898,12 @@
name: i + '级' name: i + '级'
}) })
} }
} else { } else {}
} }, err => {})
}, err => {
})
}, },
getDeparmentTierByBranch() { getDeparmentTierByBranch() {
this.layerTierMsg.BranchId = this.employeeMsg.BranchId = this.layerDepartmentMsg.BranchId = this.addMsg.RB_Branch_Id this.layerTierMsg.BranchId = this.employeeMsg.BranchId = this.layerDepartmentMsg.BranchId = this.addMsg
.RB_Branch_Id
this.addMsg.DepartmentManager = '' this.addMsg.DepartmentManager = ''
this.getLayerParentDepartment() this.getLayerParentDepartment()
this.getEmployee() this.getEmployee()
...@@ -934,54 +927,46 @@ ...@@ -934,54 +927,46 @@
this.DataList = res.data.data.pageData; this.DataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
this.loading = false this.loading = false
} else { } else {}
} }, err => {})
}, err => {
})
}, },
getCompany() { //公司 getCompany() { //公司
this.dialogTitle=this.$t('adm.adm_xzbumen'); this.dialogTitle = this.$t('adm.adm_xzbumen');
this.apipost('admin_get_BranchGetList', this.companyMsg, res => { this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
if (this.outerVisible) { if (this.outerVisible) {
this.layercompanyList = res.data.data this.layercompanyList = res.data.data
} else { } else {
this.companyList = res.data.data this.companyList = res.data.data
} }
}, err => { }, err => {})
})
}, },
getDepartment() { //获取上级部门 getDepartment() { //获取上级部门
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => { this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.departmentList = res.data.data this.departmentList = res.data.data
} }
}, err => { }, err => {})
})
}, },
getLayerParentDepartment() { getLayerParentDepartment() {
this.apipost('app_get_GetDepartmentCascade', this.layerDepartmentMsg, res => { this.apipost('app_get_GetDepartmentCascade', this.layerDepartmentMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.layerDepartmentList = res.data.data this.layerDepartmentList = res.data.data
} }
}, err => { }, err => {})
})
}, },
getPost() { //获取岗位 getPost() { //获取岗位
this.apipost('admin_get_PostGetList', this.postMsg, res => { this.apipost('admin_get_PostGetList', this.postMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.postList = res.data.data this.postList = res.data.data
} }
}, err => { }, err => {})
})
}, },
getEmployee() { //员工 getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => { this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.employeeList = res.data.data; this.employeeList = res.data.data;
} else { } else {}
} }, err => {})
}, err => {
})
}, },
addData1() { addData1() {
this.apipost('admin_post_EmployeeOperate', this.addMsg1, res => { this.apipost('admin_post_EmployeeOperate', this.addMsg1, res => {
...@@ -994,8 +979,7 @@ ...@@ -994,8 +979,7 @@
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
submitForm1(addMsg) { //提交创建、修改表单 submitForm1(addMsg) { //提交创建、修改表单
...@@ -1030,11 +1014,10 @@ ...@@ -1030,11 +1014,10 @@
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
addTreeData(obj) { addTreeData(obj) {
this.treeLayerTitle=this.$t('adm.adm_addbumen'); this.treeLayerTitle = this.$t('adm.adm_addbumen');
this.getCompany() this.getCompany()
this.layerDepartmentMsg.BranchId = this.layerTierMsg.BranchId = this.addMsg.RB_Branch_Id = obj.RB_Branch_Id this.layerDepartmentMsg.BranchId = this.layerTierMsg.BranchId = this.addMsg.RB_Branch_Id = obj.RB_Branch_Id
this.layerDepartmentMsg.Tier = obj.Tier + 1; this.layerDepartmentMsg.Tier = obj.Tier + 1;
...@@ -1046,7 +1029,7 @@ ...@@ -1046,7 +1029,7 @@
}, },
addTreeUerData(obj) { addTreeUerData(obj) {
this.isleaveBtn = false; this.isleaveBtn = false;
this.treeLayerUserTitle=this.$t('adm.adm_addyuangong'); this.treeLayerUserTitle = this.$t('adm.adm_addyuangong');
this.getCompany() this.getCompany()
this.getDepartmentMsg.RB_Branch_Id = this.addMsg1.RB_Branch_id = obj.RB_Branch_Id this.getDepartmentMsg.RB_Branch_Id = this.addMsg1.RB_Branch_id = obj.RB_Branch_Id
this.getDerpartMent(); this.getDerpartMent();
...@@ -1060,10 +1043,12 @@ ...@@ -1060,10 +1043,12 @@
DepartmentID: id DepartmentID: id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.layerDepartmentMsg.BranchId = this.layerTierMsg.BranchId = this.addMsg.RB_Branch_Id = res.data.data.RB_Branch_Id this.layerDepartmentMsg.BranchId = this.layerTierMsg.BranchId = this.addMsg.RB_Branch_Id = res.data.data
.RB_Branch_Id
this.addMsg.DepartmentName = res.data.data.DepartmentName; this.addMsg.DepartmentName = res.data.data.DepartmentName;
this.addMsg.ParentId = res.data.data.ParentId.toString(); this.addMsg.ParentId = res.data.data.ParentId.toString();
this.addMsg.DepartmentManager = res.data.data.DepartmentManager == "0" ? '' : res.data.data.DepartmentManager; this.addMsg.DepartmentManager = res.data.data.DepartmentManager == "0" ? '' : res.data.data
.DepartmentManager;
this.addMsg.DepartmentTel = res.data.data.DepartmentTel; this.addMsg.DepartmentTel = res.data.data.DepartmentTel;
this.addMsg.Sort = res.data.data.Sort; this.addMsg.Sort = res.data.data.Sort;
this.addMsg.ManagerIds = res.data.data.ManagerIds; this.addMsg.ManagerIds = res.data.data.ManagerIds;
...@@ -1089,8 +1074,7 @@ ...@@ -1089,8 +1074,7 @@
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
updateDataUser(obj) { updateDataUser(obj) {
this.leaveId = obj.DepartmentID this.leaveId = obj.DepartmentID
...@@ -1111,13 +1095,12 @@ ...@@ -1111,13 +1095,12 @@
} }
this.addMsg1.EmSex = res.data.data.EmSex.toString(); this.addMsg1.EmSex = res.data.data.EmSex.toString();
} }
}, err => { }, err => {})
})
}, },
deleteDeparment(id) { deleteDeparment(id) {
this.$confirm(this.$t('tips.tips_deletealldepart'), this.$t('tips.tips'), { this.$confirm(this.$t('tips.tips_deletealldepart'), this.$t('tips.tips'), {
confirmButtonText:this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
...@@ -1129,8 +1112,7 @@ ...@@ -1129,8 +1112,7 @@
this.getList(); this.getList();
this.getAllDepartment() this.getAllDepartment()
} }
}, err => { }, err => {})
})
}).catch(() => { }).catch(() => {
this.$message.info('已取消删除！') this.$message.info('已取消删除！')
...@@ -1162,10 +1144,11 @@ ...@@ -1162,10 +1144,11 @@
this.addMsg.DepartmentID = 0 this.addMsg.DepartmentID = 0
this.addMsg1.EmployeeId = '0' this.addMsg1.EmployeeId = '0'
this.addMsg1.EmPhoto = '' this.addMsg1.EmPhoto = ''
// this.layerDepartmentMsg.Tier='' // this.layerDepartmentMsg.Tier=''
// this.layerTierList=[] // this.layerTierList=[]
// this.layerDepartmentList=[] // this.layerDepartmentList=[]
} }
} }
} }
</script> </script>
src/components/administrative/userManagement.vue
View file @ 7b03438e
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<li> <li>
<span><em>{{ $t("admin.admin_Department") }}</em> <span><em>{{ $t("admin.admin_Department") }}</em>
<el-select filterable v-model="msg.RB_Department_Id" @change="linkagePost()"> <el-select filterable v-model="msg.RB_Department_Id" @change="linkagePost()">
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in departMentList" :label="item.DepartmentName" :value="item.DepartmentID" <el-option v-for="item in departMentList" :label="item.DepartmentName" :value="item.DepartmentID"
:key="item.DepartmentID"> :key="item.DepartmentID">
</el-option> </el-option>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<li> <li>
<span><em>{{ $t("admin.admin_Post") }}</em> <span><em>{{ $t("admin.admin_Post") }}</em>
<el-select filterable v-model="msg.RB_Post_Id"> <el-select filterable v-model="msg.RB_Post_Id">
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in PostList" :label="item.PostName" :value="item.PostId" :key="item.PostId"> <el-option v-for="item in PostList" :label="item.PostName" :value="item.PostId" :key="item.PostId">
</el-option> </el-option>
</el-select> </el-select>
...@@ -260,7 +260,6 @@ ...@@ -260,7 +260,6 @@
<el-input class="w217" type="text" v-model="addMsg.EmCard" :placeholder="$t('pub.pleaseImport')"> <el-input class="w217" type="text" v-model="addMsg.EmCard" :placeholder="$t('pub.pleaseImport')">
</el-input> </el-input>
</el-form-item> </el-form-item>
<!--<span><em></em>身份证</span><input v-model="addMsg.EmCard" class="layerText" type="text">-->
</td> </td>
<td> <td>
<el-form-item :label="$t('leader.leader_Sex')" prop="EmSex"> <el-form-item :label="$t('leader.leader_Sex')" prop="EmSex">
...@@ -892,4 +891,5 @@ ...@@ -892,4 +891,5 @@
} }
} }
}; };
</script>
\ No newline at end of file </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment