|
|
|
@ -1,46 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<template>
|
|
|
|
|
<div class="JNPF-common-layout">
|
|
|
|
|
<div class="JNPF-common-layout-center">
|
|
|
|
|
<el-row class="JNPF-common-search-box" :gutter="16">
|
|
|
|
|
<el-form @submit.native.prevent>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="所属回收站">
|
|
|
|
|
<JnpfSelect v-model="query.stationCode" placeholder="选择本组织回收站进行绑定" clearable :options="stationCodeOptions"
|
|
|
|
|
:props="stationCodeProps" multiple>
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
<el-form-item label="区域名称">
|
|
|
|
|
<el-input v-model="query.areaName" placeholder="请输入" clearable> </el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="区域类型">
|
|
|
|
|
<JnpfSelect v-model="query.areaType" placeholder="请选择围栏类型" clearable :options="areaTypeOptions"
|
|
|
|
|
:props="areaTypeProps" multiple>
|
|
|
|
|
<JnpfSelect v-model="query.areaType" placeholder="请选择围栏类型" clearable
|
|
|
|
|
:options="areaTypeOptions"
|
|
|
|
|
:props="areaTypeProps" multiple >
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="区域名称">
|
|
|
|
|
<el-input v-model="query.areaName" placeholder="请输入" clearable> </el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<template v-if="showAll">
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="是否启用">
|
|
|
|
|
<JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
|
|
|
|
|
:props="statusProps">
|
|
|
|
|
<JnpfSelect v-model="query.status" placeholder="请选择" clearable
|
|
|
|
|
:options="statusOptions"
|
|
|
|
|
:props="statusProps" >
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</template>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="search()">查询{{ areaVisible }}</el-button>
|
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
|
|
|
|
|
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
|
|
|
|
|
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
|
|
|
|
|
展开
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
|
|
|
|
|
收起
|
|
|
|
|
</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-form>
|
|
|
|
@ -57,97 +51,136 @@
|
|
|
|
|
@click="openSuperQuery()" />
|
|
|
|
|
</el-tooltip>
|
|
|
|
|
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
|
|
|
|
|
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
|
|
|
|
|
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
|
|
|
|
|
@click="initData()" />
|
|
|
|
|
</el-tooltip>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
|
|
|
|
|
<el-table-column prop="areaName" label="区域名称" align="left">
|
|
|
|
|
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
|
|
|
|
|
:span-method="arraySpanMethod"
|
|
|
|
|
|
|
|
|
|
>
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="stationCode"
|
|
|
|
|
label="站点编号" align="center"
|
|
|
|
|
sortable="custom" >
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="areaName"
|
|
|
|
|
label="区域名称" align="center"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="areaType"
|
|
|
|
|
label="区域类型" align="center"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="status"
|
|
|
|
|
label="是否启用" align="center"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="areaType" label="区域类型" align="left">
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="areaMapInfo"
|
|
|
|
|
label="地图信息" align="center"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="stationCode" label="所属回收站" align="left">
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="areaDesc"
|
|
|
|
|
label="区域描述" align="center"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="status" label="是否启用" align="left">
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="creatorUserId"
|
|
|
|
|
label="创建用户" align="center"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="areaMapInfo" label="地图信息" align="left">
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="lastModifyUserId"
|
|
|
|
|
label="修改用户" align="center"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="areaDesc" label="区域描述" align="left">
|
|
|
|
|
<el-table-column
|
|
|
|
|
prop="lastModifyTime"
|
|
|
|
|
label="修改时间" align="center"
|
|
|
|
|
>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="操作" fixed="right" width="150">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
|
|
|
|
|
<el-table-column label="操作"
|
|
|
|
|
fixed="right" width="150" >
|
|
|
|
|
<template slot-scope="scope" >
|
|
|
|
|
<el-button type="text"
|
|
|
|
|
@click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
|
|
|
|
|
<el-button type="text" v-has="'btn_detail'"
|
|
|
|
|
@click="goDetail(scope.row.id)">详情
|
|
|
|
|
</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</JNPF-table>
|
|
|
|
|
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
|
|
|
|
|
@pagination="initData" />
|
|
|
|
|
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
|
|
|
|
|
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
|
|
|
|
|
|
|
|
|
|
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
|
|
|
|
|
|
|
|
|
|
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
|
|
|
|
|
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
|
|
|
|
|
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
|
|
|
|
|
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
|
|
|
|
|
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
|
|
|
|
|
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
|
|
|
|
|
@superQuery="superQuery" />
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
|
|
|
|
|
import request from '@/utils/request'
|
|
|
|
|
import { mapGetters } from "vuex";
|
|
|
|
|
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
|
|
|
|
|
import JNPFForm from './form'
|
|
|
|
|
import Detail from './Detail'
|
|
|
|
|
import ExportBox from '@/components/ExportBox'
|
|
|
|
|
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
|
|
|
|
|
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
|
|
|
|
|
import { getConfigData } from '@/api/onlineDev/visualDev'
|
|
|
|
|
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
|
|
|
|
|
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
|
|
|
|
|
import columnList from './columnList'
|
|
|
|
|
import { thousandsFormat } from "@/components/Generator/utils/index"
|
|
|
|
|
import SuperQuery from '@/components/SuperQuery'
|
|
|
|
|
import superQueryJson from './superQueryJson'
|
|
|
|
|
import request from '@/utils/request'
|
|
|
|
|
import {mapGetters} from "vuex";
|
|
|
|
|
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
|
|
|
|
|
import JNPFForm from './form'
|
|
|
|
|
import Detail from './Detail'
|
|
|
|
|
import ExportBox from '@/components/ExportBox'
|
|
|
|
|
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
|
|
|
|
|
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
|
|
|
|
|
import { getConfigData } from '@/api/onlineDev/visualDev'
|
|
|
|
|
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
|
|
|
|
|
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
|
|
|
|
|
import columnList from './columnList'
|
|
|
|
|
import { thousandsFormat } from "@/components/Generator/utils/index"
|
|
|
|
|
import SuperQuery from '@/components/SuperQuery'
|
|
|
|
|
import superQueryJson from './superQueryJson'
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
export default {
|
|
|
|
|
components: {
|
|
|
|
|
JNPFForm,
|
|
|
|
|
Detail,
|
|
|
|
|
ExportBox, ToFormDetail, SuperQuery
|
|
|
|
|
ExportBox,ToFormDetail , SuperQuery
|
|
|
|
|
},
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
|
|
|
|
|
keyword: '',
|
|
|
|
|
keyword:'',
|
|
|
|
|
expandsTree: true,
|
|
|
|
|
refreshTree: true,
|
|
|
|
|
toFormDetailVisible: false,
|
|
|
|
|
expandObj: {},
|
|
|
|
|
toFormDetailVisible:false,
|
|
|
|
|
expandObj:{},
|
|
|
|
|
columnOptions: [],
|
|
|
|
|
mergeList: [],
|
|
|
|
|
exportList: [],
|
|
|
|
|
exportList:[],
|
|
|
|
|
columnList,
|
|
|
|
|
|
|
|
|
|
showAll: false,
|
|
|
|
|
superQueryVisible: false,
|
|
|
|
|
superQueryJson,
|
|
|
|
|
uploadBoxVisible: false,
|
|
|
|
|
detailVisible: false,
|
|
|
|
|
query: {
|
|
|
|
|
stationCode: undefined,
|
|
|
|
|
areaType: undefined,
|
|
|
|
|
areaName: undefined,
|
|
|
|
|
status: undefined,
|
|
|
|
|
areaName:undefined,
|
|
|
|
|
areaType:undefined,
|
|
|
|
|
status:undefined,
|
|
|
|
|
},
|
|
|
|
|
treeProps: {
|
|
|
|
|
children: 'children',
|
|
|
|
@ -171,13 +204,12 @@ export default {
|
|
|
|
|
flowListVisible: false,
|
|
|
|
|
flowList: [],
|
|
|
|
|
exportBoxVisible: false,
|
|
|
|
|
areaTypeOptions: [],
|
|
|
|
|
areaTypeProps: { "label": "fullName", "value": "enCode" },
|
|
|
|
|
statusOptions: [],
|
|
|
|
|
statusProps: { "label": "fullName", "value": "enCode" },
|
|
|
|
|
stationCodeOptions: [],
|
|
|
|
|
stationCodeProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
areaTypeOptions:[],
|
|
|
|
|
areaTypeProps:{"label":"fullName","value":"enCode" },
|
|
|
|
|
statusOptions:[],
|
|
|
|
|
statusProps:{"label":"fullName","value":"enCode" },
|
|
|
|
|
interfaceRes: {
|
|
|
|
|
stationCode:[] ,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
@ -190,7 +222,6 @@ export default {
|
|
|
|
|
created() {
|
|
|
|
|
this.getColumnList(),
|
|
|
|
|
this.initSearchDataAndListData()
|
|
|
|
|
this.getstationCodeOptions();
|
|
|
|
|
this.getareaTypeOptions();
|
|
|
|
|
this.getstatusOptions();
|
|
|
|
|
this.queryData = JSON.parse(JSON.stringify(this.query))
|
|
|
|
@ -224,9 +255,9 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
loadNode(node, resolve) {
|
|
|
|
|
const nodeData = node.data
|
|
|
|
|
const config = {
|
|
|
|
|
treeInterfaceId: "",
|
|
|
|
|
treeTemplateJson: []
|
|
|
|
|
const config ={
|
|
|
|
|
treeInterfaceId:"",
|
|
|
|
|
treeTemplateJson:[]
|
|
|
|
|
}
|
|
|
|
|
if (config.treeInterfaceId) {
|
|
|
|
|
//这里是为了拿到参数中关联的字段的值,后端自行拿
|
|
|
|
@ -305,7 +336,7 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
newList.forEach(item => {
|
|
|
|
|
if (item.children && item.children.length) {
|
|
|
|
|
if (item.children && item.children.length ) {
|
|
|
|
|
item.children.forEach((child, index) => {
|
|
|
|
|
if (index == 0) {
|
|
|
|
|
this.mergeList.push({
|
|
|
|
@ -343,12 +374,6 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
this.exportList = exportList
|
|
|
|
|
},
|
|
|
|
|
getstationCodeOptions() {
|
|
|
|
|
getDataInterfaceRes('520259300875047493').then(res => {
|
|
|
|
|
let data = res.data
|
|
|
|
|
this.stationCodeOptions = data
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
getareaTypeOptions() {
|
|
|
|
|
getDictionaryDataSelector('560423985691492677').then(res => {
|
|
|
|
|
this.areaTypeOptions = res.data.list
|
|
|
|
@ -359,13 +384,13 @@ export default {
|
|
|
|
|
this.statusOptions = res.data.list
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
goDetail(id) {
|
|
|
|
|
goDetail(id){
|
|
|
|
|
this.detailVisible = true
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
this.$refs.Detail.init(id)
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
sortChange({ column, prop, order }) {
|
|
|
|
|
sortChange({column, prop, order}) {
|
|
|
|
|
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
|
|
|
|
|
this.listQuery.sidx = !order ? '' : prop
|
|
|
|
|
this.initData()
|
|
|
|
@ -384,16 +409,16 @@ export default {
|
|
|
|
|
...this.query,
|
|
|
|
|
keyword: this.keyword,
|
|
|
|
|
dataType: 0,
|
|
|
|
|
menuId: this.menuId,
|
|
|
|
|
moduleId: '560427626187981125',
|
|
|
|
|
type: 1,
|
|
|
|
|
menuId:this.menuId,
|
|
|
|
|
moduleId:'560427626187981125',
|
|
|
|
|
type:1,
|
|
|
|
|
};
|
|
|
|
|
request({
|
|
|
|
|
url: `/api/scm/StationArea/getList`,
|
|
|
|
|
method: 'post',
|
|
|
|
|
data: _query
|
|
|
|
|
}).then(res => {
|
|
|
|
|
var _list = res.data.list;
|
|
|
|
|
var _list =res.data.list;
|
|
|
|
|
this.list = _list.map(o => ({
|
|
|
|
|
...o,
|
|
|
|
|
...this.expandObj,
|
|
|
|
@ -421,10 +446,10 @@ export default {
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
handelUpload() {
|
|
|
|
|
handelUpload(){
|
|
|
|
|
this.uploadBoxVisible = true
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
this.$refs.UploadBox.init("", "scm/StationArea")
|
|
|
|
|
this.$refs.UploadBox.init("","scm/StationArea")
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
openSuperQuery() {
|
|
|
|
@ -439,10 +464,10 @@ export default {
|
|
|
|
|
this.initData()
|
|
|
|
|
},
|
|
|
|
|
addOrUpdateHandle(row, isDetail) {
|
|
|
|
|
let id = row ? row.id : ""
|
|
|
|
|
let id = row?row.id:""
|
|
|
|
|
this.formVisible = true
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
this.$refs.JNPFForm.init(id, isDetail, this.list)
|
|
|
|
|
this.$refs.JNPFForm.init(id, isDetail,this.list)
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
exportData() {
|
|
|
|
@ -452,7 +477,7 @@ export default {
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
download(data) {
|
|
|
|
|
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
|
|
|
|
|
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
|
|
|
|
|
request({
|
|
|
|
|
url: `/api/scm/StationArea/Actions/Export`,
|
|
|
|
|
method: 'post',
|
|
|
|
@ -465,10 +490,10 @@ export default {
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
search() {
|
|
|
|
|
this.listQuery.currentPage = 1
|
|
|
|
|
this.listQuery.pageSize = 20
|
|
|
|
|
this.listQuery.sort = "desc"
|
|
|
|
|
this.listQuery.sidx = ""
|
|
|
|
|
this.listQuery.currentPage=1
|
|
|
|
|
this.listQuery.pageSize=20
|
|
|
|
|
this.listQuery.sort="desc"
|
|
|
|
|
this.listQuery.sidx=""
|
|
|
|
|
this.initData()
|
|
|
|
|
},
|
|
|
|
|
refresh(isrRefresh) {
|
|
|
|
@ -482,7 +507,7 @@ export default {
|
|
|
|
|
colseFlow(isrRefresh) {
|
|
|
|
|
this.flowVisible = false
|
|
|
|
|
if (isrRefresh) this.reset()
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
</script>
|
|
|
|
|