|
|
@@ -2,7 +2,7 @@
|
|
|
<div class="app-container">
|
|
|
<el-row :gutter="20">
|
|
|
<!--部门数据-->
|
|
|
- <el-col :span="4" :xs="24">
|
|
|
+ <!-- <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" />
|
|
|
@@ -15,6 +15,13 @@
|
|
|
: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="4" :xs="24">
|
|
|
+
|
|
|
+ <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
|
|
|
+ @click="clickTreeNode" businessTree></org-tree>
|
|
|
</el-col>
|
|
|
<el-col :span="20" :xs="24">
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
@@ -23,7 +30,8 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="标签编号" prop="code">
|
|
|
- <el-input maxlength="50" v-model="queryParams.code" placeholder="请输入标签编号" clearable @keyup.enter.native="handleQuery" />
|
|
|
+ <el-input maxlength="50" v-model="queryParams.code" placeholder="请输入标签编号" clearable
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
@@ -47,24 +55,13 @@
|
|
|
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
v-hasPermi="['system:bind:add']">新增</el-button>
|
|
|
</el-col>
|
|
|
-<!-- <el-col :span="1.5">-->
|
|
|
-<!-- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"-->
|
|
|
-<!-- v-hasPermi="['system:bind: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:bind:remove']">删除</el-button>-->
|
|
|
-<!-- </el-col>-->
|
|
|
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table
|
|
|
- border
|
|
|
- height="600"
|
|
|
- size="small"
|
|
|
- v-loading="loading" :data="bindList" @selection-change="handleSelectionChange">
|
|
|
- <!--<el-table-column type="selection" width="55" align="center" />-->
|
|
|
+ <el-table border height="600" size="small" v-loading="loading" :data="bindList"
|
|
|
+ @selection-change="handleSelectionChange">
|
|
|
+
|
|
|
<el-table-column label="序号" align="center" min-width="50">
|
|
|
<template v-slot:default="scope">
|
|
|
<span v-text="getPageIndex(scope.$index)"> </span>
|
|
|
@@ -76,7 +73,7 @@
|
|
|
|
|
|
<el-table-column label="NFC点位" align="left" prop="collectionAreaName" />
|
|
|
<el-table-column label="标签编号" align="left" prop="code" />
|
|
|
-
|
|
|
+ <el-table-column label="标签名称" align="left" prop="labelName" />
|
|
|
<el-table-column prop="status" label="状态" width="80">
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag :options="dict.type.plan_status" :value="scope.row.enable" />
|
|
|
@@ -102,25 +99,26 @@
|
|
|
<!-- 添加或修改【请填写功能名称】对话框 -->
|
|
|
<DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
|
|
- <el-form-item label="机构名称" prop="orgId">
|
|
|
- <treeselect 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 mode="multiple" style="width: 100%;" v-model="form.areaId" placeholder="请选择区域名称" @change="changeSelect">
|
|
|
- <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="NFC点位" v-if="form.orgId!=null" prop="checkId">
|
|
|
- <el-select style="width: 100%;" v-model="form.checkId" placeholder="请选择NFC点位名称">
|
|
|
- <el-option v-for="item in checkList" :key="item.id" :label="item.checkName" :value="item.id"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
+ <el-form-item label="机构名称" prop="orgId">
|
|
|
+ <treeselect 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 mode="multiple" 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="NFC点位" v-if="form.orgId != null" prop="checkId">
|
|
|
+ <el-select style="width: 100%;" v-model="form.checkId" placeholder="请选择NFC点位名称">
|
|
|
+ <el-option v-for="item in checkList" :key="item.id" :label="item.checkName" :value="item.id"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="标签编号" prop="code">
|
|
|
<el-input maxlength="50" v-model="form.code" placeholder="请输入标签" />
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="标签名称" prop="labelName">
|
|
|
+ <el-input v-model="form.labelName" placeholder="请输入标签名称" maxlength="50" />
|
|
|
+ </el-form-item>
|
|
|
|
|
|
<el-form-item label="状态" prop="enable">
|
|
|
<el-select style="width: 100%" v-model="form.enable" placeholder="请选择状态">
|
|
|
@@ -145,13 +143,14 @@ import tableList from '@/mixins/tableList'
|
|
|
import treeselect from '@riophae/vue-treeselect'
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
import { listBind, getBind, delBind, addBind, updateBind } from "@/api/system/bind";
|
|
|
-import{getAreaByOrg} from "@/api/system/area";
|
|
|
-import { deptTreeSelect } from "@/api/system/public";
|
|
|
-import { getCheckByAreaId } from "@/api/system/check";
|
|
|
+import { getAreaByOrg } from "@/api/system/area";
|
|
|
+import { deptTreeSelect,businessTreeSelect } from "@/api/system/public";
|
|
|
+import { getCheckByAreaId, getAreaCheckInfoByOrgId } from "@/api/system/check";
|
|
|
+import orgTree from "@/components/orgTree";
|
|
|
export default {
|
|
|
/** 引入基础minxins*/
|
|
|
mixins: [tableList],
|
|
|
- components: { treeselect },
|
|
|
+ components: { treeselect, orgTree },
|
|
|
dicts: ['sys_normal_disable', 'plan_status'],
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -159,8 +158,8 @@ export default {
|
|
|
loading: true,
|
|
|
// 选中数组
|
|
|
ids: [],
|
|
|
- // 总条数
|
|
|
- total: 0,
|
|
|
+ // 总条数
|
|
|
+ total: 0,
|
|
|
names: [],
|
|
|
//搜索tree
|
|
|
deptName: null,
|
|
|
@@ -192,7 +191,7 @@ export default {
|
|
|
orgPath: null,
|
|
|
collectionAreaName: null,
|
|
|
checkId: null,
|
|
|
- checkSub:true
|
|
|
+ checkSub: true
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
@@ -212,6 +211,9 @@ export default {
|
|
|
],
|
|
|
enable: [
|
|
|
{ required: true, message: '请选择状态', trigger: 'blur' }
|
|
|
+ ],
|
|
|
+ labelName:[
|
|
|
+ { required: true, message: '请输入标签名称', trigger: 'change'}
|
|
|
]
|
|
|
},
|
|
|
checkList: [],
|
|
|
@@ -235,13 +237,23 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ //单选框状态改变
|
|
|
+ checkChange(state) {
|
|
|
+ this.queryParams.checkSub = state;
|
|
|
+ this.handleQuery();
|
|
|
+ },
|
|
|
+ // 节点单击事件
|
|
|
+ clickTreeNode(data) {
|
|
|
+ this.queryParams.orgId = data.id;
|
|
|
+ this.handleQuery();
|
|
|
+ },
|
|
|
getPageIndex($index) {
|
|
|
//表格序号
|
|
|
return (
|
|
|
(this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
|
|
|
);
|
|
|
},
|
|
|
- closeOptions(){
|
|
|
+ closeOptions() {
|
|
|
this.$refs.fuzzySearch[0].blur()
|
|
|
},
|
|
|
|
|
|
@@ -259,19 +271,29 @@ export default {
|
|
|
this.queryParams.orgId = data.id;
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
- changeSelectArea(val){
|
|
|
- getAreaByOrg(val).then(response =>{
|
|
|
- this.roleOptions = response.data;
|
|
|
- this. form.areaId=null
|
|
|
+ changeSelectArea(val) {
|
|
|
+ getAreaByOrg(val).then(response => {
|
|
|
+ this.roleOptions = response.data;
|
|
|
+ this.form.areaId = null
|
|
|
})
|
|
|
- },
|
|
|
-
|
|
|
- changeSelect(val) {
|
|
|
- getCheckByAreaId(val).then(response => {
|
|
|
+ getAreaCheckInfoByOrgId(val).then(response => {
|
|
|
this.form.checkId = null;
|
|
|
this.checkList = response.data;
|
|
|
})
|
|
|
},
|
|
|
+ getDefaultKey(key) {
|
|
|
+ this.queryParams.orgId = key;
|
|
|
+ this.getList();
|
|
|
+ },
|
|
|
+ // changeSelect(val) {
|
|
|
+ // getCheckByAreaId(val).then(response => {
|
|
|
+
|
|
|
+ // this.checkList = response.data;
|
|
|
+ // })
|
|
|
+ // getAreaCheckInfoByOrgId(val).then(response=>{
|
|
|
+ // this.checkList = response.data;
|
|
|
+ // })
|
|
|
+ // },
|
|
|
/** 查询【请填写功能名称】列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
@@ -283,13 +305,18 @@ export default {
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getDeptTree() {
|
|
|
- deptTreeSelect().then(response => {
|
|
|
- this.deptOptions = response.data;
|
|
|
- this.defaultKeys.push(response.data[0].id);
|
|
|
- this.queryParams.orgId = response.data[0].id;
|
|
|
- console.log( this.queryParams.orgId+"%%%%%%%%%%%%%%%")
|
|
|
- this.handleQuery();
|
|
|
- });
|
|
|
+ // deptTreeSelect().then(response => {
|
|
|
+ // this.deptOptions = response.data;
|
|
|
+ // this.defaultKeys.push(response.data[0].id);
|
|
|
+ // this.queryParams.orgId = response.data[0].id;
|
|
|
+ // this.handleQuery();
|
|
|
+ // });
|
|
|
+ businessTreeSelect().then(response=>{
|
|
|
+ this.deptOptions = response.data;
|
|
|
+ this.defaultKeys.push(response.data[0].id);
|
|
|
+ this.queryParams.orgId = response.data[0].id;
|
|
|
+ this.handleQuery();
|
|
|
+ })
|
|
|
},
|
|
|
tenantIdnormalizer(node, instanceId) {
|
|
|
if (node.children && !node.children.length) {
|
jiawuxian