|  | @@ -4,49 +4,112 @@
 | 
	
		
			
				|  |  |        <!--机构数据-->
 | 
	
		
			
				|  |  |        <el-col :span="4" :xs="24">
 | 
	
		
			
				|  |  |          <div class="head-container">
 | 
	
		
			
				|  |  | -          <el-input v-model="deptName" placeholder="请输入机构名称" clearable size="small" prefix-icon="el-icon-search"
 | 
	
		
			
				|  |  | -            style="margin-bottom: 20px" />
 | 
	
		
			
				|  |  | +          <el-input
 | 
	
		
			
				|  |  | +            v-model="deptName"
 | 
	
		
			
				|  |  | +            placeholder="请输入机构名称"
 | 
	
		
			
				|  |  | +            clearable
 | 
	
		
			
				|  |  | +            size="small"
 | 
	
		
			
				|  |  | +            prefix-icon="el-icon-search"
 | 
	
		
			
				|  |  | +            style="margin-bottom: 20px"
 | 
	
		
			
				|  |  | +          />
 | 
	
		
			
				|  |  |          </div>
 | 
	
		
			
				|  |  |          <div class="tree-container">
 | 
	
		
			
				|  |  | -          <div style="margin-bottom: 10px;">
 | 
	
		
			
				|  |  | -            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox">是否关联下级机构</el-checkbox>
 | 
	
		
			
				|  |  | +          <div style="margin-bottom: 10px">
 | 
	
		
			
				|  |  | +            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox"
 | 
	
		
			
				|  |  | +              >是否关联下级机构</el-checkbox
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  |            </div>
 | 
	
		
			
				|  |  | -          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
 | 
	
		
			
				|  |  | -            :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="defaultKeys"
 | 
	
		
			
				|  |  | -            :default-checked-keys="defaultKeys" @node-click="handleNodeClick" />
 | 
	
		
			
				|  |  | +          <el-tree
 | 
	
		
			
				|  |  | +            :data="deptOptions"
 | 
	
		
			
				|  |  | +            :props="defaultProps"
 | 
	
		
			
				|  |  | +            :expand-on-click-node="false"
 | 
	
		
			
				|  |  | +            :filter-node-method="filterNode"
 | 
	
		
			
				|  |  | +            ref="tree"
 | 
	
		
			
				|  |  | +            node-key="id"
 | 
	
		
			
				|  |  | +            :default-expanded-keys="defaultKeys"
 | 
	
		
			
				|  |  | +            :default-checked-keys="defaultKeys"
 | 
	
		
			
				|  |  | +            @node-click="handleNodeClick"
 | 
	
		
			
				|  |  | +          />
 | 
	
		
			
				|  |  |          </div>
 | 
	
		
			
				|  |  |        </el-col>
 | 
	
		
			
				|  |  |        <!--用户数据-->
 | 
	
		
			
				|  |  |        <el-col :span="20" :xs="24">
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |          <!--    搜索条件    -->
 | 
	
		
			
				|  |  | -        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 | 
	
		
			
				|  |  | +        <el-form
 | 
	
		
			
				|  |  | +          :model="queryParams"
 | 
	
		
			
				|  |  | +          ref="queryForm"
 | 
	
		
			
				|  |  | +          size="small"
 | 
	
		
			
				|  |  | +          :inline="true"
 | 
	
		
			
				|  |  | +          v-show="showSearch"
 | 
	
		
			
				|  |  | +        >
 | 
	
		
			
				|  |  |            <el-form-item label="机构名称" prop="name">
 | 
	
		
			
				|  |  | -            <el-input v-model="queryParams.name" placeholder="请输入机构名称" clearable @keyup.enter.native="handleQuery" />
 | 
	
		
			
				|  |  | +            <el-input
 | 
	
		
			
				|  |  | +              v-model="queryParams.name"
 | 
	
		
			
				|  |  | +              placeholder="请输入机构名称"
 | 
	
		
			
				|  |  | +              clearable
 | 
	
		
			
				|  |  | +              @keyup.enter.native="handleQuery"
 | 
	
		
			
				|  |  | +            />
 | 
	
		
			
				|  |  |            </el-form-item>
 | 
	
		
			
				|  |  |            <el-form-item label="状态" prop="isLock">
 | 
	
		
			
				|  |  | -            <el-select v-model="queryParams.isLock" placeholder="机构状态" clearable>
 | 
	
		
			
				|  |  | -              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
 | 
	
		
			
				|  |  | -                :value="dict.value" />
 | 
	
		
			
				|  |  | +            <el-select
 | 
	
		
			
				|  |  | +              v-model="queryParams.isLock"
 | 
	
		
			
				|  |  | +              placeholder="机构状态"
 | 
	
		
			
				|  |  | +              clearable
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  | +              <el-option
 | 
	
		
			
				|  |  | +                v-for="dict in dict.type.sys_normal_disable"
 | 
	
		
			
				|  |  | +                :key="dict.value"
 | 
	
		
			
				|  |  | +                :label="dict.label"
 | 
	
		
			
				|  |  | +                :value="dict.value"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </el-select>
 | 
	
		
			
				|  |  |            </el-form-item>
 | 
	
		
			
				|  |  |            <el-form-item>
 | 
	
		
			
				|  |  | -            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 | 
	
		
			
				|  |  | -            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 | 
	
		
			
				|  |  | +            <el-button
 | 
	
		
			
				|  |  | +              type="primary"
 | 
	
		
			
				|  |  | +              icon="el-icon-search"
 | 
	
		
			
				|  |  | +              size="mini"
 | 
	
		
			
				|  |  | +              @click="handleQuery"
 | 
	
		
			
				|  |  | +              >搜索</el-button
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  | +            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
 | 
	
		
			
				|  |  | +              >重置</el-button
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  |            </el-form-item>
 | 
	
		
			
				|  |  |          </el-form>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          <el-row :gutter="10" class="mb8">
 | 
	
		
			
				|  |  |            <el-col :span="1.5">
 | 
	
		
			
				|  |  | -            <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="showDialogEdit(0)"
 | 
	
		
			
				|  |  | -              v-hasPermi="['system:dept:add']">新增离行式自助银行</el-button>
 | 
	
		
			
				|  |  | -              <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="handleAdd(row)"
 | 
	
		
			
				|  |  | -              v-hasPermi="['system:dept:add']">新增中心业务库</el-button>
 | 
	
		
			
				|  |  | +            <el-button
 | 
	
		
			
				|  |  | +              type="primary"
 | 
	
		
			
				|  |  | +              plain
 | 
	
		
			
				|  |  | +              icon="el-icon-plus"
 | 
	
		
			
				|  |  | +              size="mini"
 | 
	
		
			
				|  |  | +              @click="showDialogEdit(0)"
 | 
	
		
			
				|  |  | +              v-hasPermi="['system:dept:add']"
 | 
	
		
			
				|  |  | +              >新增离行式自助银行</el-button
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  | +            <el-button
 | 
	
		
			
				|  |  | +              type="primary"
 | 
	
		
			
				|  |  | +              plain
 | 
	
		
			
				|  |  | +              icon="el-icon-plus"
 | 
	
		
			
				|  |  | +              size="mini"
 | 
	
		
			
				|  |  | +              @click="handleAdd(row)"
 | 
	
		
			
				|  |  | +              v-hasPermi="['system:dept:add']"
 | 
	
		
			
				|  |  | +              >新增中心业务库</el-button
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  | -          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 | 
	
		
			
				|  |  | +          <right-toolbar
 | 
	
		
			
				|  |  | +            :showSearch.sync="showSearch"
 | 
	
		
			
				|  |  | +            @queryTable="getList"
 | 
	
		
			
				|  |  | +          ></right-toolbar>
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        <el-table v-loading="loading" :data="deptList" @selection-change="handleSelectionChange">
 | 
	
		
			
				|  |  | +        <el-table
 | 
	
		
			
				|  |  | +          v-loading="loading"
 | 
	
		
			
				|  |  | +          :data="deptList"
 | 
	
		
			
				|  |  | +          @selection-change="handleSelectionChange"
 | 
	
		
			
				|  |  | +        >
 | 
	
		
			
				|  |  |            <el-table-column label="序号" align="center" min-width="30">
 | 
	
		
			
				|  |  |              <template v-slot:default="scope">
 | 
	
		
			
				|  |  |                <span v-text="getPageIndex(scope.$index)"> </span>
 | 
	
	
		
			
				|  | @@ -55,16 +118,25 @@
 | 
	
		
			
				|  |  |            <el-table-column prop="code" label="编码"></el-table-column>
 | 
	
		
			
				|  |  |            <el-table-column prop="type" label="机构类型">
 | 
	
		
			
				|  |  |              <template v-slot="scope">
 | 
	
		
			
				|  |  | -              <dict-tag :options="dict.type.sys_org_type" :value="scope.row.type" />
 | 
	
		
			
				|  |  | +              <dict-tag
 | 
	
		
			
				|  |  | +                :options="dict.type.sys_org_type"
 | 
	
		
			
				|  |  | +                :value="scope.row.type"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-table-column>
 | 
	
		
			
				|  |  |            <el-table-column prop="name" label="机构名称"></el-table-column>
 | 
	
		
			
				|  |  |            <el-table-column prop="isLock" label="状态">
 | 
	
		
			
				|  |  |              <template v-slot="scope">
 | 
	
		
			
				|  |  | -              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isLock" />
 | 
	
		
			
				|  |  | +              <dict-tag
 | 
	
		
			
				|  |  | +                :options="dict.type.sys_normal_disable"
 | 
	
		
			
				|  |  | +                :value="scope.row.isLock"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-table-column>
 | 
	
		
			
				|  |  | -          <el-table-column prop="weatherCityCode" label="天气区域编码"></el-table-column>
 | 
	
		
			
				|  |  | +          <el-table-column
 | 
	
		
			
				|  |  | +            prop="weatherCityCode"
 | 
	
		
			
				|  |  | +            label="天气区域编码"
 | 
	
		
			
				|  |  | +          ></el-table-column>
 | 
	
		
			
				|  |  |            <el-table-column prop="address" label="地址"></el-table-column>
 | 
	
		
			
				|  |  |            <el-table-column label="负责人及电话" align="center">
 | 
	
		
			
				|  |  |              <template v-slot:default="scope">
 | 
	
	
		
			
				|  | @@ -73,33 +145,78 @@
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-table-column>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 | 
	
		
			
				|  |  | +          <el-table-column
 | 
	
		
			
				|  |  | +            label="操作"
 | 
	
		
			
				|  |  | +            align="center"
 | 
	
		
			
				|  |  | +            class-name="small-padding fixed-width"
 | 
	
		
			
				|  |  | +          >
 | 
	
		
			
				|  |  |              <template slot-scope="scope">
 | 
	
		
			
				|  |  | -              <router-link :to="'/system/dept-extend/extend/' + scope.row.id" class="link-type">
 | 
	
		
			
				|  |  | -                <el-button size="mini" type="text" icon="el-icon-plus"
 | 
	
		
			
				|  |  | -                  v-hasPermi="['system:dept:extend']">补充信息</el-button>
 | 
	
		
			
				|  |  | +              <router-link
 | 
	
		
			
				|  |  | +                :to="'/system/dept-extend/extend/' + scope.row.id"
 | 
	
		
			
				|  |  | +                class="link-type"
 | 
	
		
			
				|  |  | +              >
 | 
	
		
			
				|  |  | +                <el-button
 | 
	
		
			
				|  |  | +                  size="mini"
 | 
	
		
			
				|  |  | +                  type="text"
 | 
	
		
			
				|  |  | +                  icon="el-icon-plus"
 | 
	
		
			
				|  |  | +                  v-hasPermi="['system:dept:extend']"
 | 
	
		
			
				|  |  | +                  >补充信息</el-button
 | 
	
		
			
				|  |  | +                >
 | 
	
		
			
				|  |  |                </router-link>
 | 
	
		
			
				|  |  | -              
 | 
	
		
			
				|  |  | -              <el-button size="mini" type="text" icon="el-icon-edit" @click="showDialogEdit(scope.row)"
 | 
	
		
			
				|  |  | -                v-hasPermi="['system:dept:edit']">修改</el-button>
 | 
	
		
			
				|  |  | -              <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
 | 
	
		
			
				|  |  | -                @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +              <el-button
 | 
	
		
			
				|  |  | +                size="mini"
 | 
	
		
			
				|  |  | +                type="text"
 | 
	
		
			
				|  |  | +                icon="el-icon-edit"
 | 
	
		
			
				|  |  | +                @click="showDialogEdit(scope.row)"
 | 
	
		
			
				|  |  | +                v-hasPermi="['system:dept:edit']"
 | 
	
		
			
				|  |  | +                >修改</el-button
 | 
	
		
			
				|  |  | +              >
 | 
	
		
			
				|  |  | +              <el-button
 | 
	
		
			
				|  |  | +                v-if="scope.row.parentId != 0"
 | 
	
		
			
				|  |  | +                size="mini"
 | 
	
		
			
				|  |  | +                type="text"
 | 
	
		
			
				|  |  | +                icon="el-icon-delete"
 | 
	
		
			
				|  |  | +                @click="handleDelete(scope.row)"
 | 
	
		
			
				|  |  | +                v-hasPermi="['system:dept:remove']"
 | 
	
		
			
				|  |  | +                >删除</el-button
 | 
	
		
			
				|  |  | +              >
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-table-column>
 | 
	
		
			
				|  |  |          </el-table>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
 | 
	
		
			
				|  |  | -          @pagination="getList" />
 | 
	
		
			
				|  |  | +        <pagination
 | 
	
		
			
				|  |  | +          v-show="total > 0"
 | 
	
		
			
				|  |  | +          :total="total"
 | 
	
		
			
				|  |  | +          :page.sync="queryParams.pageNum"
 | 
	
		
			
				|  |  | +          :limit.sync="queryParams.pageSize"
 | 
	
		
			
				|  |  | +          @pagination="getList"
 | 
	
		
			
				|  |  | +        />
 | 
	
		
			
				|  |  |        </el-col>
 | 
	
		
			
				|  |  |      </el-row>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <!-- 添加或修改机构对话框 -->
 | 
	
		
			
				|  |  | -    <el-dialog :title="title" :visible.sync="open" width="600px" @close="closeHandler" append-to-body>
 | 
	
		
			
				|  |  | +    <el-dialog
 | 
	
		
			
				|  |  | +      :title="title"
 | 
	
		
			
				|  |  | +      :visible.sync="open"
 | 
	
		
			
				|  |  | +      width="600px"
 | 
	
		
			
				|  |  | +      @close="closeHandler"
 | 
	
		
			
				|  |  | +      append-to-body
 | 
	
		
			
				|  |  | +    >
 | 
	
		
			
				|  |  |        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 | 
	
		
			
				|  |  |          <el-row>
 | 
	
		
			
				|  |  |            <el-col :span="24">
 | 
	
		
			
				|  |  | -            <el-form-item v-if="this.pId !=-1" label="上级机构" prop="parentId">
 | 
	
		
			
				|  |  | -              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级机构" />
 | 
	
		
			
				|  |  | +            <el-form-item
 | 
	
		
			
				|  |  | +              v-if="this.pId != -1"
 | 
	
		
			
				|  |  | +              label="上级机构"
 | 
	
		
			
				|  |  | +              prop="parentId"
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  | +              <treeselect
 | 
	
		
			
				|  |  | +                v-model="form.parentId"
 | 
	
		
			
				|  |  | +                :options="deptOptions"
 | 
	
		
			
				|  |  | +                :normalizer="normalizer"
 | 
	
		
			
				|  |  | +                placeholder="选择上级机构"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
	
		
			
				|  | @@ -111,81 +228,117 @@
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="12">
 | 
	
		
			
				|  |  |              <el-form-item label="显示排序" prop="sort">
 | 
	
		
			
				|  |  | -              <el-input-number v-model="form.sort" controls-position="right" :min="0" />
 | 
	
		
			
				|  |  | +              <el-input-number
 | 
	
		
			
				|  |  | +                v-model="form.sort"
 | 
	
		
			
				|  |  | +                controls-position="right"
 | 
	
		
			
				|  |  | +                :min="0"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
		
			
				|  |  |          <el-row>
 | 
	
		
			
				|  |  |            <el-col :span="12">
 | 
	
		
			
				|  |  |              <el-form-item label="负责人" prop="manager">
 | 
	
		
			
				|  |  | -              <el-input v-model="form.manager" placeholder="请输入负责人" maxlength="20" />
 | 
	
		
			
				|  |  | +              <el-input
 | 
	
		
			
				|  |  | +                v-model="form.manager"
 | 
	
		
			
				|  |  | +                placeholder="请输入负责人"
 | 
	
		
			
				|  |  | +                maxlength="20"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="12">
 | 
	
		
			
				|  |  |              <el-form-item label="联系电话" prop="phone">
 | 
	
		
			
				|  |  | -              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
 | 
	
		
			
				|  |  | +              <el-input
 | 
	
		
			
				|  |  | +                v-model="form.phone"
 | 
	
		
			
				|  |  | +                placeholder="请输入联系电话"
 | 
	
		
			
				|  |  | +                maxlength="11"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          <el-row>
 | 
	
		
			
				|  |  | -          <el-col :span="12" >
 | 
	
		
			
				|  |  | +          <el-col :span="12">
 | 
	
		
			
				|  |  |              <el-form-item label="机构类型" prop="type">
 | 
	
		
			
				|  |  |                <el-select
 | 
	
		
			
				|  |  | -              prop="type"
 | 
	
		
			
				|  |  | -              label="机构类型"
 | 
	
		
			
				|  |  | -              v-model="form.type"
 | 
	
		
			
				|  |  | -              placeholder="请选择机构类型"
 | 
	
		
			
				|  |  | -              clearable
 | 
	
		
			
				|  |  | -            >
 | 
	
		
			
				|  |  | -              <el-option
 | 
	
		
			
				|  |  | -                v-for="dict in dict.type.sys_org_type"
 | 
	
		
			
				|  |  | -                :key="dict.value"
 | 
	
		
			
				|  |  | -                :label="dict.label"
 | 
	
		
			
				|  |  | -                :value="dict.value"
 | 
	
		
			
				|  |  | -              />
 | 
	
		
			
				|  |  | -            </el-select>
 | 
	
		
			
				|  |  | +                prop="type"
 | 
	
		
			
				|  |  | +                label="机构类型"
 | 
	
		
			
				|  |  | +                v-model="form.type"
 | 
	
		
			
				|  |  | +                placeholder="请选择机构类型"
 | 
	
		
			
				|  |  | +                clearable
 | 
	
		
			
				|  |  | +              >
 | 
	
		
			
				|  |  | +                <el-option
 | 
	
		
			
				|  |  | +                  v-for="dict in dict.type.sys_org_type"
 | 
	
		
			
				|  |  | +                  :key="dict.value"
 | 
	
		
			
				|  |  | +                  :label="dict.label"
 | 
	
		
			
				|  |  | +                  :value="dict.value"
 | 
	
		
			
				|  |  | +                />
 | 
	
		
			
				|  |  | +              </el-select>
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  | -         
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          <el-row>
 | 
	
		
			
				|  |  |            <el-col :span="12" v-if="false">
 | 
	
		
			
				|  |  |              <el-form-item label="邮箱" prop="email">
 | 
	
		
			
				|  |  | -              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
 | 
	
		
			
				|  |  | +              <el-input
 | 
	
		
			
				|  |  | +                v-model="form.email"
 | 
	
		
			
				|  |  | +                placeholder="请输入邮箱"
 | 
	
		
			
				|  |  | +                maxlength="50"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="12">
 | 
	
		
			
				|  |  |              <el-form-item label="机构状态" prop="isLock">
 | 
	
		
			
				|  |  |                <el-radio-group v-model="form.isLock">
 | 
	
		
			
				|  |  | -                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
 | 
	
		
			
				|  |  | -                }}</el-radio>
 | 
	
		
			
				|  |  | +                <el-radio
 | 
	
		
			
				|  |  | +                  v-for="dict in dict.type.sys_normal_disable"
 | 
	
		
			
				|  |  | +                  :key="dict.value"
 | 
	
		
			
				|  |  | +                  :label="dict.value"
 | 
	
		
			
				|  |  | +                  >{{ dict.label }}</el-radio
 | 
	
		
			
				|  |  | +                >
 | 
	
		
			
				|  |  |                </el-radio-group>
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
		
			
				|  |  |        </el-form>
 | 
	
		
			
				|  |  |        <div slot="footer" class="dialog-footer">
 | 
	
		
			
				|  |  | -        <el-button v-if="title == '修改机构'" type="primary" @click="changeSubmitForm">确 定</el-button>
 | 
	
		
			
				|  |  | -        <el-button v-if="title == '添加机构'" type="primary" @click="addSubmitForm">确 定</el-button>
 | 
	
		
			
				|  |  | +        <el-button
 | 
	
		
			
				|  |  | +          v-if="title == '修改机构'"
 | 
	
		
			
				|  |  | +          type="primary"
 | 
	
		
			
				|  |  | +          @click="changeSubmitForm"
 | 
	
		
			
				|  |  | +          >确 定</el-button
 | 
	
		
			
				|  |  | +        >
 | 
	
		
			
				|  |  | +        <el-button
 | 
	
		
			
				|  |  | +          v-if="title == '添加机构'"
 | 
	
		
			
				|  |  | +          type="primary"
 | 
	
		
			
				|  |  | +          @click="addSubmitForm"
 | 
	
		
			
				|  |  | +          >确 定</el-button
 | 
	
		
			
				|  |  | +        >
 | 
	
		
			
				|  |  |          <el-button @click="cancel">取 消</el-button>
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |      </el-dialog>
 | 
	
		
			
				|  |  | -    <DialogEdit ref="dialogEdit" ></DialogEdit>
 | 
	
		
			
				|  |  | +    <DialogEdit ref="dialogEdit" @success="refs"></DialogEdit>
 | 
	
		
			
				|  |  |    </div>
 | 
	
		
			
				|  |  |  </template>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <script>
 | 
	
		
			
				|  |  | -import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
 | 
	
		
			
				|  |  | +import {
 | 
	
		
			
				|  |  | +  listDept,
 | 
	
		
			
				|  |  | +  getDept,
 | 
	
		
			
				|  |  | +  delDept,
 | 
	
		
			
				|  |  | +  addDept,
 | 
	
		
			
				|  |  | +  updateDept,
 | 
	
		
			
				|  |  | +  listDeptExcludeChild,
 | 
	
		
			
				|  |  | +} from "@/api/system/dept";
 | 
	
		
			
				|  |  |  import { deptTreeSelect } from "@/api/system/public";
 | 
	
		
			
				|  |  |  import Treeselect from "@riophae/vue-treeselect";
 | 
	
		
			
				|  |  |  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 | 
	
		
			
				|  |  |  import DialogEdit from "@/views/system/dept/dialog.edit.vue";
 | 
	
		
			
				|  |  |  export default {
 | 
	
		
			
				|  |  |    name: "Dept",
 | 
	
		
			
				|  |  | -  dicts: ['sys_normal_disable', 'sys_org_type'],
 | 
	
		
			
				|  |  | -  components: { Treeselect ,DialogEdit},
 | 
	
		
			
				|  |  | +  dicts: ["sys_normal_disable", "sys_org_type"],
 | 
	
		
			
				|  |  | +  components: { Treeselect, DialogEdit },
 | 
	
		
			
				|  |  |    data() {
 | 
	
		
			
				|  |  |      return {
 | 
	
		
			
				|  |  |        // 遮罩层
 | 
	
	
		
			
				|  | @@ -213,7 +366,7 @@ export default {
 | 
	
		
			
				|  |  |        checked: false,
 | 
	
		
			
				|  |  |        defaultProps: {
 | 
	
		
			
				|  |  |          children: "children",
 | 
	
		
			
				|  |  | -        label: "name"
 | 
	
		
			
				|  |  | +        label: "name",
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |        // 查询参数
 | 
	
		
			
				|  |  |        queryParams: {
 | 
	
	
		
			
				|  | @@ -228,66 +381,65 @@ export default {
 | 
	
		
			
				|  |  |        // 表单校验
 | 
	
		
			
				|  |  |        rules: {
 | 
	
		
			
				|  |  |          parentId: [
 | 
	
		
			
				|  |  | -          { required: true, message: "上级机构不能为空", trigger: "blur" }
 | 
	
		
			
				|  |  | +          { required: true, message: "上级机构不能为空", trigger: "blur" },
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  |          name: [
 | 
	
		
			
				|  |  | -          { required: true, message: "机构名称不能为空", trigger: "blur" }
 | 
	
		
			
				|  |  | +          { required: true, message: "机构名称不能为空", trigger: "blur" },
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  |          orderNum: [
 | 
	
		
			
				|  |  | -          { required: true, message: "显示排序不能为空", trigger: "blur" }
 | 
	
		
			
				|  |  | -        ],
 | 
	
		
			
				|  |  | -        isLock: [
 | 
	
		
			
				|  |  | -          { required: true, message: "状态不能为空", trigger: "blur" }
 | 
	
		
			
				|  |  | +          { required: true, message: "显示排序不能为空", trigger: "blur" },
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  | +        isLock: [{ required: true, message: "状态不能为空", trigger: "blur" }],
 | 
	
		
			
				|  |  |          email: [
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  |              type: "email",
 | 
	
		
			
				|  |  |              message: "请输入正确的邮箱地址",
 | 
	
		
			
				|  |  | -            trigger: ["blur", "change"]
 | 
	
		
			
				|  |  | -          }
 | 
	
		
			
				|  |  | +            trigger: ["blur", "change"],
 | 
	
		
			
				|  |  | +          },
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  |          phone: [
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  |              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
 | 
	
		
			
				|  |  |              message: "请输入正确的手机号码",
 | 
	
		
			
				|  |  | -            trigger: "blur"
 | 
	
		
			
				|  |  | -          }
 | 
	
		
			
				|  |  | -        ]
 | 
	
		
			
				|  |  | +            trigger: "blur",
 | 
	
		
			
				|  |  | +          },
 | 
	
		
			
				|  |  | +        ],
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |        //默认选中节点
 | 
	
		
			
				|  |  | -      defaultKeys: []
 | 
	
		
			
				|  |  | +      defaultKeys: [],
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    computed: {
 | 
	
		
			
				|  |  |      isShow() {
 | 
	
		
			
				|  |  | -      if((this.pId==null&&this.pId!=-1)){
 | 
	
		
			
				|  |  | -        return true
 | 
	
		
			
				|  |  | +      if (this.pId == null && this.pId != -1) {
 | 
	
		
			
				|  |  | +        return true;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    created() {
 | 
	
		
			
				|  |  |      this.getDeptTree();
 | 
	
		
			
				|  |  |      this.getList();
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    methods: {
 | 
	
		
			
				|  |  | -    closeHandler(){
 | 
	
		
			
				|  |  | -     // alert(11111)
 | 
	
		
			
				|  |  | +    closeHandler() {
 | 
	
		
			
				|  |  | +      // alert(11111)
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      getPageIndex($index) {
 | 
	
		
			
				|  |  |        //表格序号
 | 
	
		
			
				|  |  | -      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +      return (
 | 
	
		
			
				|  |  | +        (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
 | 
	
		
			
				|  |  | +      );
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      //自定义数据
 | 
	
		
			
				|  |  |      tenantIdnormalizer(node, instanceId) {
 | 
	
		
			
				|  |  |        if (node.children && !node.children.length) {
 | 
	
		
			
				|  |  | -        delete node.children
 | 
	
		
			
				|  |  | +        delete node.children;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        return {
 | 
	
		
			
				|  |  |          id: node.id,
 | 
	
		
			
				|  |  |          label: node.name,
 | 
	
		
			
				|  |  | -        children: node.children
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | +        children: node.children,
 | 
	
		
			
				|  |  | +      };
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /** 下穿状态改变*/
 | 
	
		
			
				|  |  |      changeCheckBox() {
 | 
	
	
		
			
				|  | @@ -295,7 +447,7 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /** 查询机构下拉树结构 */
 | 
	
		
			
				|  |  |      getDeptTree() {
 | 
	
		
			
				|  |  | -      deptTreeSelect().then(response => {
 | 
	
		
			
				|  |  | +      deptTreeSelect().then((response) => {
 | 
	
		
			
				|  |  |          this.deptOptions = response.data;
 | 
	
		
			
				|  |  |          this.defaultKeys.push(response.data[0].id);
 | 
	
		
			
				|  |  |          this.queryParams.parentId = response.data[0].id;
 | 
	
	
		
			
				|  | @@ -315,7 +467,7 @@ export default {
 | 
	
		
			
				|  |  |      /** 查询机构列表 */
 | 
	
		
			
				|  |  |      getList() {
 | 
	
		
			
				|  |  |        this.loading = true;
 | 
	
		
			
				|  |  | -      listDept(this.queryParams).then(response => {
 | 
	
		
			
				|  |  | +      listDept(this.queryParams).then((response) => {
 | 
	
		
			
				|  |  |          this.deptList = response.rows;
 | 
	
		
			
				|  |  |          this.total = response.total;
 | 
	
		
			
				|  |  |          this.loading = false;
 | 
	
	
		
			
				|  | @@ -329,7 +481,7 @@ export default {
 | 
	
		
			
				|  |  |        return {
 | 
	
		
			
				|  |  |          id: node.id,
 | 
	
		
			
				|  |  |          label: node.name,
 | 
	
		
			
				|  |  | -        children: node.children
 | 
	
		
			
				|  |  | +        children: node.children,
 | 
	
		
			
				|  |  |        };
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      // 取消按钮
 | 
	
	
		
			
				|  | @@ -348,7 +500,7 @@ export default {
 | 
	
		
			
				|  |  |          phone: undefined,
 | 
	
		
			
				|  |  |          email: undefined,
 | 
	
		
			
				|  |  |          status: "0",
 | 
	
		
			
				|  |  | -        isLock: "0"
 | 
	
		
			
				|  |  | +        isLock: "0",
 | 
	
		
			
				|  |  |        };
 | 
	
		
			
				|  |  |        this.resetForm("form");
 | 
	
		
			
				|  |  |      },
 | 
	
	
		
			
				|  | @@ -369,7 +521,6 @@ export default {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        this.open = true;
 | 
	
		
			
				|  |  |        this.title = "添加机构";
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /** 展开/折叠操作 */
 | 
	
		
			
				|  |  |      toggleExpandAll() {
 | 
	
	
		
			
				|  | @@ -382,23 +533,23 @@ export default {
 | 
	
		
			
				|  |  |      /** 修改按钮操作 */
 | 
	
		
			
				|  |  |      handleUpdate(row) {
 | 
	
		
			
				|  |  |        this.reset();
 | 
	
		
			
				|  |  | -      getDept(row.id).then(response => {
 | 
	
		
			
				|  |  | +      getDept(row.id).then((response) => {
 | 
	
		
			
				|  |  |          this.form = response.data;
 | 
	
		
			
				|  |  |          this.pId = response.data.parentId;
 | 
	
		
			
				|  |  |          this.open = true;
 | 
	
		
			
				|  |  |          this.title = "修改机构";
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |        if (this.pId != -1) {
 | 
	
		
			
				|  |  | -        listDeptExcludeChild(row.id).then(response => {
 | 
	
		
			
				|  |  | +        listDeptExcludeChild(row.id).then((response) => {
 | 
	
		
			
				|  |  |            this.deptOptions = this.handleTree(response.data, "id");
 | 
	
		
			
				|  |  |          });
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /** 提交按钮 */
 | 
	
		
			
				|  |  |      changeSubmitForm() {
 | 
	
		
			
				|  |  | -      this.$refs["form"].validate(valid => {
 | 
	
		
			
				|  |  | +      this.$refs["form"].validate((valid) => {
 | 
	
		
			
				|  |  |          if (valid) {
 | 
	
		
			
				|  |  | -          updateDept(this.form).then(response => {
 | 
	
		
			
				|  |  | +          updateDept(this.form).then((response) => {
 | 
	
		
			
				|  |  |              this.$modal.msgSuccess("修改成功");
 | 
	
		
			
				|  |  |              this.open = false;
 | 
	
		
			
				|  |  |              this.getList();
 | 
	
	
		
			
				|  | @@ -408,9 +559,9 @@ export default {
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      addSubmitForm() {
 | 
	
		
			
				|  |  | -      this.$refs["form"].validate(valid => {
 | 
	
		
			
				|  |  | +      this.$refs["form"].validate((valid) => {
 | 
	
		
			
				|  |  |          if (valid) {
 | 
	
		
			
				|  |  | -          addDept(this.form).then(response => {
 | 
	
		
			
				|  |  | +          addDept(this.form).then((response) => {
 | 
	
		
			
				|  |  |              this.$modal.msgSuccess("新增成功");
 | 
	
		
			
				|  |  |              this.open = false;
 | 
	
		
			
				|  |  |              this.getList();
 | 
	
	
		
			
				|  | @@ -421,32 +572,38 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /** 删除按钮操作 */
 | 
	
		
			
				|  |  |      handleDelete(row) {
 | 
	
		
			
				|  |  | -      this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function () {
 | 
	
		
			
				|  |  | -        return delDept(row.id);
 | 
	
		
			
				|  |  | -      }).then(() => {
 | 
	
		
			
				|  |  | -        this.getList();
 | 
	
		
			
				|  |  | -        this.$modal.msgSuccess("删除成功");
 | 
	
		
			
				|  |  | -        this.getDeptTree();
 | 
	
		
			
				|  |  | -      }).catch(() => { });
 | 
	
		
			
				|  |  | +      this.$modal
 | 
	
		
			
				|  |  | +        .confirm('是否确认删除名称为"' + row.name + '"的数据项?')
 | 
	
		
			
				|  |  | +        .then(function () {
 | 
	
		
			
				|  |  | +          return delDept(row.id);
 | 
	
		
			
				|  |  | +        })
 | 
	
		
			
				|  |  | +        .then(() => {
 | 
	
		
			
				|  |  | +          this.getList();
 | 
	
		
			
				|  |  | +          this.$modal.msgSuccess("删除成功");
 | 
	
		
			
				|  |  | +          this.getDeptTree();
 | 
	
		
			
				|  |  | +        })
 | 
	
		
			
				|  |  | +        .catch(() => {});
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      // 多选框选中数据
 | 
	
		
			
				|  |  |      handleSelectionChange(selection) {
 | 
	
		
			
				|  |  | -      this.ids = selection.map(item => item.userId);
 | 
	
		
			
				|  |  | +      this.ids = selection.map((item) => item.userId);
 | 
	
		
			
				|  |  |        this.single = selection.length != 1;
 | 
	
		
			
				|  |  |        this.multiple = !selection.length;
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    showDialogEdit(row){
 | 
	
		
			
				|  |  | -      console.log(row,33333333333)
 | 
	
		
			
				|  |  | -// row.id=row.orgid;
 | 
	
		
			
				|  |  | +    showDialogEdit(row) {
 | 
	
		
			
				|  |  |        this.$refs.dialogEdit.show(row);
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    refs() {
 | 
	
		
			
				|  |  | +      this.getList();
 | 
	
		
			
				|  |  | +      this.getDeptTree();
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    watch: {
 | 
	
		
			
				|  |  |      // 根据名称筛选机构树
 | 
	
		
			
				|  |  |      deptName(val) {
 | 
	
		
			
				|  |  |        this.$refs.tree.filter(val);
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | -  }
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  | +  },
 | 
	
		
			
				|  |  |  };
 | 
	
		
			
				|  |  |  </script>
 | 
	
		
			
				|  |  |  
 |