|
|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
|
|
|
- <el-row :gutter="20">
|
|
|
+ <!-- <el-row :gutter="20"> -->
|
|
|
<!--部门数据-->
|
|
|
<!-- <el-col :span="4" :xs="24">
|
|
|
<div class="head-container">
|
|
|
@@ -18,27 +18,34 @@
|
|
|
</div>
|
|
|
</el-col> -->
|
|
|
<!--机构数据-->
|
|
|
- <el-col :span="4" :xs="24">
|
|
|
-
|
|
|
+ <!-- <el-col :span="4" :xs="24">
|
|
|
<org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
|
|
|
- @click="clickTreeNode" businessTree></org-tree>
|
|
|
-</el-col>
|
|
|
+ @click="clickTreeNode" businessTree></org-tree>
|
|
|
+</el-col> -->
|
|
|
|
|
|
- <el-col :span="20" :xs="24">
|
|
|
+ <!-- <el-col :span="20" :xs="24"> -->
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
|
|
<el-form-item label="NFC点位" prop="checkName">
|
|
|
<el-input v-model="queryParams.checkName" placeholder="请输入NFC点位名称" clearable
|
|
|
@keyup.enter.native="handleQuery"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="区域名称" prop="areaId">
|
|
|
- <el-select v-model="queryParams.areaId" placeholder="请选择">
|
|
|
- <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
+
|
|
|
+ <el-form-item label="机构类型" prop="orgType">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.orgType"
|
|
|
+ placeholder="请选择机构类型"
|
|
|
+ clearable
|
|
|
+ style="width: 100%"
|
|
|
+ >
|
|
|
+ <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-form-item label="归属部门" prop="orgId">
|
|
|
- <treeselect style="width: 160px;" v-model="queryParams.orgId" :options="deptOptions" :show-count="true"
|
|
|
- :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
|
|
|
- </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>
|
|
|
@@ -51,18 +58,6 @@
|
|
|
v-hasPermi="['system:check:add']">新增
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
- <!-- <el-col :span="1.5">
|
|
|
- <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
|
|
|
- v-hasPermi="['system:check:edit']">修改</el-button>
|
|
|
- </el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
|
|
- v-hasPermi="['system:check:remove']">删除</el-button>
|
|
|
- </el-col>-->
|
|
|
- <!-- <el-col :span="1.5">
|
|
|
- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
|
|
- v-hasPermi="['system:check:export']">导出</el-button>
|
|
|
- </el-col> -->
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
<el-table
|
|
|
@@ -76,8 +71,8 @@
|
|
|
<span v-text="getPageIndex(scope.$index)"> </span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="所属机构" align="left" prop="orgName"/>
|
|
|
- <!-- <el-table-column label="区域名称" align="left" prop="areaName"/> -->
|
|
|
+ <!-- <el-table-column label="所属机构" align="left" prop="orgName"/> -->
|
|
|
+ <el-table-column label="机构类型" align="center" prop="orgType" />
|
|
|
<el-table-column label="NFC点位" align="left" prop="checkName"/>
|
|
|
<el-table-column label="修改人" align="center" prop="updateBy"/>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
@@ -94,28 +89,39 @@
|
|
|
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
@pagination="getList"/>
|
|
|
- </el-col>
|
|
|
+ <!-- </el-col>
|
|
|
|
|
|
|
|
|
- </el-row>
|
|
|
+ </el-row> -->
|
|
|
|
|
|
|
|
|
<!-- 添加或修改区域采集点对话框 -->
|
|
|
<DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
|
|
|
<el-row>
|
|
|
- <el-form-item label="所属机构" prop="orgId">
|
|
|
+ <!-- <el-form-item label="所属机构" prop="orgId">
|
|
|
<treeselect style="width: 100%;" v-model="form.orgId"
|
|
|
:options="deptOptions" :show-count="true"
|
|
|
:normalizer="tenantIdnormalizer"
|
|
|
:props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" @select="changeSelectArea"/>
|
|
|
- </el-form-item>
|
|
|
- <!-- <el-form-item label="区域名称" v-if="form.orgId!=null" prop="areaId">
|
|
|
- <el-select style="width: 100%;" v-model="form.areaId" placeholder="请选择区域名称">
|
|
|
- <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
- </el-select>
|
|
|
</el-form-item> -->
|
|
|
+
|
|
|
+ <el-form-item label="机构类型" prop="orgType">
|
|
|
+ <el-select
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="form.orgType"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择机构类型">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sys_org_type"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="`${dict.value}`"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</el-row>
|
|
|
+
|
|
|
<el-form-item label="NFC点位" prop="checkName">
|
|
|
<el-input v-model="form.checkName" placeholder="请输入NFC点位名称"/>
|
|
|
</el-form-item>
|
|
|
@@ -144,7 +150,7 @@
|
|
|
/** 引入基础minxins*/
|
|
|
mixins: [tableList],
|
|
|
components: {treeselect,orgTree},
|
|
|
- dicts: ['sys_normal_disable'],
|
|
|
+ dicts: ['sys_normal_disable','sys_org_type'],
|
|
|
data() {
|
|
|
return {
|
|
|
// 遮罩层
|