|
|
@@ -5,220 +5,90 @@
|
|
|
<el-main ref="elMain" style="padding: 0px">
|
|
|
<!-- 新增展开折叠 -->
|
|
|
<div style="margin-bottom: 20px; margin-top: 15px" class="flex a-start">
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="primary"
|
|
|
- plain
|
|
|
- icon="el-icon-plus"
|
|
|
- :label="$t('action.addCompany')"
|
|
|
- @click="handleAddCompany"
|
|
|
- >新增子公司</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="warning"
|
|
|
- plain
|
|
|
- icon="el-icon-plus"
|
|
|
- :label="$t('action.addDept')"
|
|
|
- @click="handleAddDept"
|
|
|
- >新增部门</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="info"
|
|
|
- plain
|
|
|
- icon="el-icon-sort"
|
|
|
- @click="fold()"
|
|
|
- >展开折叠</el-button
|
|
|
- >
|
|
|
- <el-form
|
|
|
- :inline="true"
|
|
|
- class="demo-form-inline"
|
|
|
- size="small"
|
|
|
- style="margin-left: 30px"
|
|
|
- >
|
|
|
+ <el-button size="small" type="primary" plain icon="el-icon-plus" :label="$t('action.addCompany')"
|
|
|
+ @click="handleAddCompany">新增子公司</el-button>
|
|
|
+ <el-button size="small" type="warning" plain icon="el-icon-plus" :label="$t('action.addDept')"
|
|
|
+ @click="handleAddDept">新增部门</el-button>
|
|
|
+ <el-button size="small" type="info" plain icon="el-icon-sort" @click="fold()">展开折叠</el-button>
|
|
|
+ <el-form :inline="true" class="demo-form-inline" size="small" style="margin-left: 30px">
|
|
|
<el-form-item label="机构编码:">
|
|
|
- <el-input
|
|
|
- clearable
|
|
|
- v-model="peopledeptid"
|
|
|
- placeholder="请输入机构编码"
|
|
|
- ></el-input>
|
|
|
+ <el-input clearable v-model="peopledeptid" placeholder="请输入机构编码"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="业务来源:">
|
|
|
- <el-select
|
|
|
- v-model="managementSource"
|
|
|
- placeholder="选择业务来源"
|
|
|
- clearable
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="val in business_sourceoptions"
|
|
|
- :key="val.value"
|
|
|
- :label="val.label"
|
|
|
- :value="val.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="managementSource" placeholder="选择业务来源" clearable>
|
|
|
+ <el-option v-for="val in business_sourceoptions" :key="val.value" :label="val.label"
|
|
|
+ :value="val.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="managementSourceQuery"
|
|
|
- >查询</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" size="small" @click="managementSourceQuery">查询</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<!-- 表格渲染 -->
|
|
|
- <el-table
|
|
|
- permsEdit="sys:dept:edit"
|
|
|
- height="720"
|
|
|
- permsDelete="sys:dept:delete"
|
|
|
- row-key="id"
|
|
|
- :expand-row-keys="['9']"
|
|
|
- v-loading="loading"
|
|
|
- border
|
|
|
- :data="ztreeNodes"
|
|
|
- :tree-props="{ children: 'children', hasChildren: 'hasChilkdren' }"
|
|
|
- :header-cell-style="{
|
|
|
+ <el-table permsEdit="sys:dept:edit" height="720" permsDelete="sys:dept:delete" row-key="id"
|
|
|
+ v-loading="loading" border :data="ztreeNodes" default-expand-all
|
|
|
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :header-cell-style="{
|
|
|
background: '#F2F7FC',
|
|
|
fontWeight: '900',
|
|
|
color: '#606266',
|
|
|
- }"
|
|
|
- size="small"
|
|
|
- ref="expandTable"
|
|
|
- highlight-current-row
|
|
|
- @row-click="rowClick"
|
|
|
- >
|
|
|
+ }" size="small" ref="expandTable" highlight-current-row @row-click="rowClick">
|
|
|
<el-table-column prop="name" label="部门管理" width="300">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="deptCount"
|
|
|
- label="部门数量"
|
|
|
- width="80"
|
|
|
- align="center"
|
|
|
- >
|
|
|
+ <el-table-column prop="deptCount" label="部门数量" width="80" align="center">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="id" label="ID" width="150" align="center">
|
|
|
+ <!-- <el-table-column prop="id" label="ID" width="150" align="center">
|
|
|
+ </el-table-column> -->
|
|
|
+ <el-table-column prop="comlevel" label="机构级别" :formatter="comlevelFormatter" align="center"
|
|
|
+ width="150"></el-table-column>
|
|
|
+ <el-table-column prop="comattribute" label="机构性质" :formatter="comattributeFormatter" align="center" width="150">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="comlevel"
|
|
|
- label="机构级别"
|
|
|
- :formatter="comlevelFormatter"
|
|
|
- align="center"
|
|
|
- width="150"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="comattribute"
|
|
|
- label="机构性质"
|
|
|
- :formatter="comattributeFormatter"
|
|
|
- align="center"
|
|
|
- width="150"
|
|
|
- >
|
|
|
+ <el-table-column prop="comtype" label="机构类型" :formatter="comtypeFormatter" align="center" width="150">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="comtype"
|
|
|
- label="机构类型"
|
|
|
- :formatter="comtypeFormatter"
|
|
|
- align="center"
|
|
|
- width="150"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="managementSource"
|
|
|
- label="业务来源"
|
|
|
- align="center"
|
|
|
- width="150"
|
|
|
- >
|
|
|
+ <!-- <el-table-column prop="managementSource" label="业务来源" align="center" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-for="(item, index) in business_sourceoptions" :key="index" v-show="item.value == scope.row.managementSource">{{ item.label }}</span>
|
|
|
+ <span v-for="(item, index) in business_sourceoptions" :key="index"
|
|
|
+ v-show="item.value == scope.row.managementSource">{{ item.label }}</span>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column prop="address" label="机构地址" align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="leadername" label="负责人" align="center">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- fixed="right"
|
|
|
- align="center"
|
|
|
- width="150"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" fixed="right" align="center" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <KtButton
|
|
|
- :perms="'sys:institution:edit'"
|
|
|
- :size="'medium'"
|
|
|
- :type="'text'"
|
|
|
- :label="'编辑'"
|
|
|
- @click.native.stop="handleEdit(scope.row)"
|
|
|
- @findPage="findSubDeptPage"
|
|
|
- ></KtButton>
|
|
|
- <KtButton
|
|
|
- :perms="'sys:institution:delete'"
|
|
|
- v-show="scope.row.parentId != '0'"
|
|
|
- :size="'medium'"
|
|
|
- :type="'text'"
|
|
|
- :label="'删除'"
|
|
|
- @click.native.stop="deleteMechanism(scope.row)"
|
|
|
- ></KtButton>
|
|
|
- <KtButton
|
|
|
- :size="'medium'"
|
|
|
- :type="'text'"
|
|
|
- :label="'设置机构负责人'"
|
|
|
- @click.native.stop="setLeadUserId(scope.row)"
|
|
|
- ></KtButton>
|
|
|
+ <KtButton :perms="'sys:institution:edit'" :size="'medium'" :type="'text'" :label="'编辑'"
|
|
|
+ @click.native.stop="handleEdit(scope.row)" @findPage="findSubDeptPage"></KtButton>
|
|
|
+ <KtButton :perms="'sys:institution:delete'" v-show="scope.row.parentId != '0'" :size="'medium'"
|
|
|
+ :type="'text'" :label="'删除'" @click.native.stop="deleteMechanism(scope.row)"></KtButton>
|
|
|
+ <KtButton :size="'medium'" :type="'text'" :label="'设置机构负责人'" @click.native.stop="setLeadUserId(scope.row)">
|
|
|
+ </KtButton>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</el-main>
|
|
|
</el-container>
|
|
|
<!-- 新增修改机构界面 -->
|
|
|
- <el-dialog
|
|
|
- :title="dialogTitle"
|
|
|
- width="1000px"
|
|
|
- :visible.sync="dialogVisible"
|
|
|
- :close-on-click-modal="false"
|
|
|
- v-dialogDrag
|
|
|
- @close="closeDialog"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- :model="dataForm"
|
|
|
- :rules="dataRule"
|
|
|
- ref="dataForm"
|
|
|
- @keyup.enter.native="submitForm()"
|
|
|
- label-width="100px"
|
|
|
- size="small"
|
|
|
- style="text-align: left"
|
|
|
- >
|
|
|
+ <el-dialog :title="dialogTitle" width="1000px" :visible.sync="dialogVisible" :close-on-click-modal="false"
|
|
|
+ v-dialogDrag @close="closeDialog">
|
|
|
+ <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()" label-width="100px"
|
|
|
+ size="small" style="text-align: left">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="机构编码" prop="id">
|
|
|
- <el-input
|
|
|
- style="width: 100%"
|
|
|
- v-model="dataForm.id"
|
|
|
- placeholder="机构编码"
|
|
|
- :disabled="operType != 'ADDC'"
|
|
|
- ></el-input>
|
|
|
+ <el-input style="width: 100%" v-model="dataForm.id" placeholder="机构编码"
|
|
|
+ :disabled="operType != 'ADDC'"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="机构名称" prop="name">
|
|
|
- <el-input
|
|
|
- style="width: 100%"
|
|
|
- v-model="dataForm.name"
|
|
|
- placeholder="机构名称"
|
|
|
- ></el-input>
|
|
|
+ <el-input style="width: 100%" v-model="dataForm.name" placeholder="机构名称"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="上级机构" prop="parentName">
|
|
|
- <span
|
|
|
- style="width: 100%"
|
|
|
- v-if="
|
|
|
- currentTreeNode && currentTreeNode.id == dataForm.parentId
|
|
|
- "
|
|
|
- class="span-disabled"
|
|
|
- >{{ currentTreeNode.name }}</span
|
|
|
- >
|
|
|
+ <span style="width: 100%" v-if="currentTreeNode && currentTreeNode.id == dataForm.parentId
|
|
|
+ " class="span-disabled">{{ currentTreeNode.name }}</span>
|
|
|
<!-- <span v-if="currentTreeNode && (currentTreeNode.id == dataForm.parentId)" class="span-disabled" >{{currentTreeNode.name}}-{{currentTreeNode.id}}</span> -->
|
|
|
<span style="width: 100%" v-else class="span-disabled">{{
|
|
|
dataForm.parentId
|
|
|
@@ -230,61 +100,28 @@
|
|
|
<el-col :span="24">
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="省公司" prop="province">
|
|
|
- <el-select
|
|
|
- :disabled="!disabledAddress.province"
|
|
|
- @change="selectProvince"
|
|
|
- value-key="areaCname"
|
|
|
- style="width: 100%"
|
|
|
- v-model="selectAddress.province"
|
|
|
- placeholder="请选择省"
|
|
|
- size="small"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in provinces"
|
|
|
- :value="item"
|
|
|
- :key="item.areaCode"
|
|
|
- :label="item.areaCname"
|
|
|
- ></el-option>
|
|
|
+ <el-select :disabled="!disabledAddress.province" @change="selectProvince" value-key="areaCname"
|
|
|
+ style="width: 100%" v-model="selectAddress.province" placeholder="请选择省" size="small">
|
|
|
+ <el-option v-for="item in provinces" :value="item" :key="item.areaCode"
|
|
|
+ :label="item.areaCname"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="支公司" prop="city">
|
|
|
- <el-select
|
|
|
- :disabled="!disabledAddress.city"
|
|
|
- @change="selectCity"
|
|
|
- value-key="areaCname"
|
|
|
- style="width: 100%"
|
|
|
- v-model="selectAddress.city"
|
|
|
- placeholder="请选择市"
|
|
|
- size="small"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in cities"
|
|
|
- :key="index"
|
|
|
- :value="item"
|
|
|
- :label="item.areaCname"
|
|
|
- ></el-option>
|
|
|
+ <el-select :disabled="!disabledAddress.city" @change="selectCity" value-key="areaCname"
|
|
|
+ style="width: 100%" v-model="selectAddress.city" placeholder="请选择市" size="small">
|
|
|
+ <el-option v-for="(item, index) in cities" :key="index" :value="item"
|
|
|
+ :label="item.areaCname"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="营销服务部" prop="area">
|
|
|
- <el-select
|
|
|
- :disabled="!disabledAddress.area"
|
|
|
- @change="selectArea"
|
|
|
- value-key="areaCname"
|
|
|
- style="width: 100%"
|
|
|
- v-model="selectAddress.area"
|
|
|
- placeholder="请选择区"
|
|
|
- size="small"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in areas"
|
|
|
- :key="index"
|
|
|
- :value="item"
|
|
|
- :label="item.areaCname"
|
|
|
- ></el-option>
|
|
|
+ <el-select :disabled="!disabledAddress.area" @change="selectArea" value-key="areaCname"
|
|
|
+ style="width: 100%" v-model="selectAddress.area" placeholder="请选择区" size="small">
|
|
|
+ <el-option v-for="(item, index) in areas" :key="index" :value="item"
|
|
|
+ :label="item.areaCname"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -299,29 +136,17 @@
|
|
|
<el-row v-if="dataForm.comlevel == '5'">
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="门店" prop="house">
|
|
|
- <el-input
|
|
|
- style="width: 100%"
|
|
|
- placeholder="门店"
|
|
|
- v-model="dataForm.house"
|
|
|
- ></el-input>
|
|
|
+ <el-input style="width: 100%" placeholder="门店" v-model="dataForm.house"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="业务来源" prop="managementSource">
|
|
|
- <el-select
|
|
|
- :disabled="operType == 'EDIT'"
|
|
|
- style="width: 100%"
|
|
|
- v-model="dataForm.managementSource"
|
|
|
- >
|
|
|
+ <el-select :disabled="operType == 'EDIT'" style="width: 100%" v-model="dataForm.managementSource">
|
|
|
<!-- <el-option label="渠道" value="1"></el-option>
|
|
|
<el-option label="个代" value="2"></el-option>
|
|
|
<el-option label="服务" value="3"></el-option> -->
|
|
|
- <el-option
|
|
|
- v-for="val in business_sourceoptions"
|
|
|
- :key="val.value"
|
|
|
- :label="val.label"
|
|
|
- :value="val.value"
|
|
|
- ></el-option>
|
|
|
+ <el-option v-for="val in business_sourceoptions" :key="val.value" :label="val.label"
|
|
|
+ :value="val.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -330,51 +155,26 @@
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="机构类型" prop="comtype">
|
|
|
- <el-select
|
|
|
- style="width: 100%"
|
|
|
- v-model="dataForm.comtype"
|
|
|
- placeholder="请选择"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in comtypeoptions"
|
|
|
- :key="item.label"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 100%" v-model="dataForm.comtype" placeholder="请选择">
|
|
|
+ <el-option v-for="item in comtypeoptions" :key="item.label" :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="机构级别" prop="comlevel">
|
|
|
- <el-select
|
|
|
- style="width: 100%"
|
|
|
- disabled
|
|
|
- v-model="dataForm.comlevel"
|
|
|
- placeholder="请选择"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in comleveloptions"
|
|
|
- :key="item.label"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 100%" disabled v-model="dataForm.comlevel" placeholder="请选择">
|
|
|
+ <el-option v-for="item in comleveloptions" :key="item.label" :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="机构性质" prop="comattribute">
|
|
|
- <el-select
|
|
|
- style="width: 100%"
|
|
|
- v-model="dataForm.comattribute"
|
|
|
- placeholder="请选择"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in comattributeoptions"
|
|
|
- :key="item.label"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 100%" v-model="dataForm.comattribute" placeholder="请选择">
|
|
|
+ <el-option v-for="item in comattributeoptions" :key="item.label" :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -382,20 +182,13 @@
|
|
|
<el-row>
|
|
|
<el-col :span="16">
|
|
|
<el-form-item label="机构地址" prop="address">
|
|
|
- <el-input
|
|
|
- v-model="dataForm.address"
|
|
|
- placeholder="机构地址"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="dataForm.address" placeholder="机构地址"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="排序" prop="orderNum">
|
|
|
- <el-input-number
|
|
|
- v-model="dataForm.orderNum"
|
|
|
- placeholder="排序"
|
|
|
- controls-position="right"
|
|
|
- :min="0"
|
|
|
- ></el-input-number>
|
|
|
+ <el-input-number v-model="dataForm.orderNum" placeholder="排序" controls-position="right"
|
|
|
+ :min="0"></el-input-number>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -481,47 +274,23 @@
|
|
|
<el-row> </el-row>
|
|
|
</el-form>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="primary"
|
|
|
- style="background-color: #ffc000; border: 1px solid #ffc000"
|
|
|
- @click="dialogVisible = false"
|
|
|
- >取消</el-button
|
|
|
- >
|
|
|
+ <el-button size="small" type="primary" style="background-color: #ffc000; border: 1px solid #ffc000"
|
|
|
+ @click="dialogVisible = false">取消</el-button>
|
|
|
<el-button size="small" type="primary" @click="submitForm()">{{
|
|
|
$t("action.comfirm")
|
|
|
}}</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<!-- 新增修改界面 -->
|
|
|
- <el-dialog
|
|
|
- :title="dialogTitle"
|
|
|
- width="1000px"
|
|
|
- :visible.sync="deptDialogVisible"
|
|
|
- :close-on-click-modal="false"
|
|
|
- v-dialogDrag
|
|
|
- @close="closeDeptDialog"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- :model="deptDataForm"
|
|
|
- :rules="deptDataRule"
|
|
|
- ref="deptDataForm"
|
|
|
- @keyup.enter.native="deptSubmitForm()"
|
|
|
- label-width="100px"
|
|
|
- size="small"
|
|
|
- style="text-align: left"
|
|
|
- >
|
|
|
+ <el-dialog :title="dialogTitle" width="1000px" :visible.sync="deptDialogVisible" :close-on-click-modal="false"
|
|
|
+ v-dialogDrag @close="closeDeptDialog">
|
|
|
+ <el-form :model="deptDataForm" :rules="deptDataRule" ref="deptDataForm" @keyup.enter.native="deptSubmitForm()"
|
|
|
+ label-width="100px" size="small" style="text-align: left">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="所属机构" prop="id">
|
|
|
- <span
|
|
|
- style="width: 100%; overflow: hidden"
|
|
|
- v-if="
|
|
|
- currentTreeNode && currentTreeNode.id == deptDataForm.parentId
|
|
|
- "
|
|
|
- class="span-disabled"
|
|
|
- >{{ currentTreeNode.name }}-{{ currentTreeNode.id }}</span
|
|
|
- >
|
|
|
+ <span style="width: 100%; overflow: hidden" v-if="currentTreeNode && currentTreeNode.id == deptDataForm.parentId
|
|
|
+ " class="span-disabled">{{ currentTreeNode.name }}-{{ currentTreeNode.id }}</span>
|
|
|
<span style="width: 100%" v-else class="span-disabled">{{
|
|
|
deptDataForm.id
|
|
|
}}</span>
|
|
|
@@ -529,42 +298,26 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="部门编号" prop="id">
|
|
|
- <el-input
|
|
|
- style="width: 100%"
|
|
|
- v-model="deptDataForm.id"
|
|
|
- placeholder="部门编号"
|
|
|
- disabled
|
|
|
- ></el-input>
|
|
|
+ <el-input style="width: 100%" v-model="deptDataForm.id" placeholder="部门编号" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="部门名称" prop="name">
|
|
|
- <el-input
|
|
|
- style="width: 100%"
|
|
|
- v-model="deptDataForm.name"
|
|
|
- placeholder="部门名称"
|
|
|
- ></el-input>
|
|
|
+ <el-input style="width: 100%" v-model="deptDataForm.name" placeholder="部门名称"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="16">
|
|
|
<el-form-item label="机构地址" prop="address">
|
|
|
- <el-input
|
|
|
- v-model="deptDataForm.address"
|
|
|
- placeholder="机构地址"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="deptDataForm.address" placeholder="机构地址"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="排序" prop="orderNum">
|
|
|
- <el-input-number
|
|
|
- v-model="deptDataForm.orderNum"
|
|
|
- placeholder="排序"
|
|
|
- controls-position="right"
|
|
|
- :min="0"
|
|
|
- ></el-input-number>
|
|
|
+ <el-input-number v-model="deptDataForm.orderNum" placeholder="排序" controls-position="right"
|
|
|
+ :min="0"></el-input-number>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -578,43 +331,21 @@
|
|
|
}}</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
- <!-- 设置部门负责人 -->
|
|
|
- <el-dialog
|
|
|
- title="设置部门负责人"
|
|
|
- width="500px"
|
|
|
- :visible.sync="deptDialogLeadVisible"
|
|
|
- :close-on-click-modal="false"
|
|
|
- v-dialogDrag
|
|
|
- @close="closeLeadDialog"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- :model="leadDataForm"
|
|
|
- :rules="leadDataRule"
|
|
|
- ref="leadDataForm"
|
|
|
- label-width="100px"
|
|
|
- size="small"
|
|
|
- style="text-align: left"
|
|
|
- >
|
|
|
- <el-row>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="机构负责人" prop="address">
|
|
|
- <el-select
|
|
|
- style="width: 200px;"
|
|
|
- filterable
|
|
|
- v-model="leadDataForm.leadId"
|
|
|
- placeholder="请选择"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in userList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
+ <!-- 设置部门负责人 -->
|
|
|
+ <el-dialog title="设置部门负责人" width="500px" :visible.sync="deptDialogLeadVisible" :close-on-click-modal="false"
|
|
|
+ v-dialogDrag @close="closeLeadDialog">
|
|
|
+ <el-form :model="leadDataForm" :rules="leadDataRule" ref="leadDataForm" label-width="100px" size="small"
|
|
|
+ style="text-align: left">
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="机构负责人" prop="address">
|
|
|
+ <el-select style="width: 200px;" filterable v-model="leadDataForm.leadId" placeholder="请选择">
|
|
|
+ <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button size="small" @click="closeLeadDialog">取消
|
|
|
</el-button>
|
|
|
@@ -661,10 +392,11 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- deptDialogLeadVisible:false,
|
|
|
- leadDataForm:{
|
|
|
- leadId:"",
|
|
|
- deptId:""
|
|
|
+ expandrowkeys: '',
|
|
|
+ deptDialogLeadVisible: false,
|
|
|
+ leadDataForm: {
|
|
|
+ leadId: "",
|
|
|
+ deptId: ""
|
|
|
},
|
|
|
userList: [],
|
|
|
loading: false,
|
|
|
@@ -741,7 +473,7 @@ export default {
|
|
|
managementSource: 1, //来源
|
|
|
orderNum: 0,
|
|
|
},
|
|
|
- leadDataRule:{
|
|
|
+ leadDataRule: {
|
|
|
leadId: [
|
|
|
{
|
|
|
required: true,
|
|
|
@@ -883,34 +615,33 @@ export default {
|
|
|
methods: {
|
|
|
//关闭部门弹框
|
|
|
closeLeadDialog() {
|
|
|
- this.leadDataForm={
|
|
|
- leadId:"",
|
|
|
- deptId:""
|
|
|
+ this.leadDataForm = {
|
|
|
+ leadId: "",
|
|
|
+ deptId: ""
|
|
|
},
|
|
|
- this.deptDialogLeadVisible = false;
|
|
|
+ this.deptDialogLeadVisible = false;
|
|
|
},
|
|
|
//提交
|
|
|
- leadSubmitForm(){
|
|
|
+ leadSubmitForm() {
|
|
|
this.$api.dept.saveLeadId(this.leadDataForm).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
- this.findTreeData();
|
|
|
- this.closeLeadDialog();
|
|
|
- this.$message({
|
|
|
- type: "success",
|
|
|
- message: "设置成功!",
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.$message({
|
|
|
- type: "error",
|
|
|
- message: "设置失败!",
|
|
|
- });
|
|
|
- }
|
|
|
+ this.findTreeData();
|
|
|
+ this.closeLeadDialog();
|
|
|
+ this.$message({
|
|
|
+ type: "success",
|
|
|
+ message: "设置成功!",
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ type: "error",
|
|
|
+ message: "设置失败!",
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
// 设置机构负责人
|
|
|
setLeadUserId(data) {
|
|
|
- console.log(data.id)
|
|
|
- this.leadDataForm.deptId =data.id;
|
|
|
+ this.leadDataForm.deptId = data.id;
|
|
|
//查询该机构下的后线人员
|
|
|
this.$api.dept.getLeadListDeptId(data.id).then((res) => {
|
|
|
this.userList = res.data;
|
|
|
@@ -920,11 +651,13 @@ export default {
|
|
|
//点击每一行的事件
|
|
|
rowClick(row, treeNode) {
|
|
|
//点每行展开折叠
|
|
|
+ if(row.expanded===undefined){
|
|
|
+ row.expanded=false;
|
|
|
+ }
|
|
|
row.expanded = !row.expanded;
|
|
|
this.$refs.expandTable.toggleRowExpansion(row, row.expanded);
|
|
|
//新增子公司、部门
|
|
|
this.currentTreeNode = row;
|
|
|
- // this.currentTreeNode = treeNode;
|
|
|
this.filters.id = this.currentTreeNode.id;
|
|
|
this.findSubDeptPage();
|
|
|
},
|
|
|
@@ -1130,20 +863,12 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
managementSourceQuery() {
|
|
|
- this.loading = true;
|
|
|
this.$api.dept
|
|
|
.findDeptTree(this.peopledeptid, this.managementSource)
|
|
|
.then((res) => {
|
|
|
this.ztreeNodes = res.data;
|
|
|
- this.loading = false;
|
|
|
});
|
|
|
},
|
|
|
- handleCreated(ztreeObj) {
|
|
|
- this.ztreeObj = ztreeObj;
|
|
|
- // onCreated 中操作ztreeObj对象展开第一个节点
|
|
|
- ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
|
|
|
- this.currentTreeNode = ztreeObj.getNodes()[0];
|
|
|
- },
|
|
|
// 右边表格Start
|
|
|
findSubDeptPage: function (data) {
|
|
|
// 获取分页数据
|
|
|
@@ -1532,11 +1257,7 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
-<style scoped>
|
|
|
-body {
|
|
|
- scrollbar-gutter: stable both-edges;
|
|
|
-}
|
|
|
-
|
|
|
+<style lang="scss" scoped>
|
|
|
.bh-medium-font-size {
|
|
|
font-size: 30px !important;
|
|
|
}
|