Skip to content

T
template_vue
Commit 5ca47a30 authored by 吴志坤's avatar 吴志坤
Browse files
Options

基础信息,设备申请

parent 07f1a295
Hide whitespace changes
Inline Side-by-side
Showing with 392 additions and 190 deletions
src/api/equipment/basicInfo.js
View file @ 5ca47a30
...@@ -46,4 +46,11 @@ export function deleteLogical(id) { ...@@ -46,4 +46,11 @@ export function deleteLogical(id) {
method: 'delete' method: 'delete'
}) })
} }
export function getDictData(params) {
return request({
url: '/wbbaseinfo/queryDict',
method: 'get',
params
})
}
src/api/equipment/draw.js
View file @ 5ca47a30
...@@ -7,6 +7,14 @@ export function listWbApply(query) { ...@@ -7,6 +7,14 @@ export function listWbApply(query) {
params: query params: query
}) })
} }
// apply_detail分页查询接口
export function detailList(query) {
return request({
url: '/wbapplydetail/queryWbApplyDetailByPagination',
method: 'get',
params: query
})
}
// 逻辑删除基础信息接口 // 逻辑删除基础信息接口
export function deleteLogical(id) { export function deleteLogical(id) {
return request({ return request({
......
src/views/equipment/application.vue
View file @ 5ca47a30
...@@ -143,6 +143,7 @@ export default { ...@@ -143,6 +143,7 @@ export default {
key: 'GX_CODE' key: 'GX_CODE'
} }
getDictData(obj).then(res => { getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) { if (res.code === 200 && res.data !== null) {
this.pissbList = res.data this.pissbList = res.data
} }
......
src/views/equipment/basicInfo.vue
View file @ 5ca47a30
...@@ -13,24 +13,35 @@ ...@@ -13,24 +13,35 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="pgx" prop="pgx"> <el-form-item label="pgx" prop="pgx">
<el-input <el-select
v-model="queryParams.pgx" v-model="form.pgx"
placeholder="请输入pgx"
clearable clearable
size="small" placeholder="请选择pgx"
style="width: 150px" :style="{ width: '150px', height: '30px' }"
@keyup.enter.native="handleQuery" >
/> <el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="prank" prop="prank"> <el-form-item label="ptype" prop="ptype">
<el-input <el-select
v-model="queryParams.prank" v-model="form.ptype"
placeholder="请输入prank" placeholder="请选择ptype"
clearable clearable
size="small" size="small"
style="width: 150px" style="width: 150px"
@keyup.enter.native="handleQuery" >
/> <el-option
v-for="dict in ptypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button> <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
...@@ -48,7 +59,7 @@ ...@@ -48,7 +59,7 @@
</el-form> </el-form>
<div class="placeholder" /> <div class="placeholder" />
<div style="padding:5px 10px"> <div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备基本信息列表</div> <div class="mb12 font-small-bold">基本信息</div>
<el-table v-loading="loading" border :data="basicInfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="basicInfoList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" /> <el-table-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn"> <el-table-column label="pn" prop="pn">
...@@ -58,7 +69,13 @@ ...@@ -58,7 +69,13 @@
</el-table-column> </el-table-column>
<el-table-column label="pgx" prop="pgx"> <el-table-column label="pgx" prop="pgx">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.pgx || '-' }} <span v-if="scope.row.pgx === '001'">压缩</span>
<span v-if="scope.row.pgx === '002'">排水</span>
</template>
</el-table-column>
<el-table-column label="ptype" prop="ptype">
<template slot-scope="scope">
{{ scope.row.ptype || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="prank" prop="prank"> <el-table-column label="prank" prop="prank">
...@@ -122,15 +139,49 @@ ...@@ -122,15 +139,49 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel"> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="pn" prop="pn"> <el-form-item label="pn" prop="pn">
<el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" /> <el-input
ref="input1"
v-model.trim="form.pn"
:maxlength="5"
placeholder="请输入pn"
@keyup.enter.native="handelTab(1,$event)"
/>
</el-form-item> </el-form-item>
<el-form-item label="pgx" prop="pgx"> <el-form-item label="pgx" prop="pgx">
<el-input v-model.trim="form.pgx" :maxlength="30" placeholder="请输入pgx" /> <el-select
v-model="form.pgx"
clearable
placeholder="请选择pgx"
:style="{ width: '150px', height: '30px' }"
>
<el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="ptype" prop="ptype">
<el-select
v-model="form.ptype"
placeholder="请选择ptype"
clearable
size="small"
style="width: 150px"
>
<el-option
v-for="dict in ptypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="prank" prop="prank"> <el-form-item label="prank" prop="prank">
<el-input v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" /> <el-input v-model.trim="form.prank" :maxlength="10" placeholder="请输入prank" />
</el-form-item> </el-form-item>
<el-form-item label="pissb" prop="pissb" > <el-form-item label="pissb" prop="pissb">
<el-select <el-select
v-model="form.pissb" v-model="form.pissb"
placeholder="请选择pissb" placeholder="请选择pissb"
...@@ -147,10 +198,10 @@ ...@@ -147,10 +198,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="psm" prop="psm"> <el-form-item label="psm" prop="psm">
<el-input v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" /> <el-input v-model.trim="form.psm" :maxlength="10" placeholder="请输入psm" />
</el-form-item> </el-form-item>
<el-form-item label="psy" prop="psy"> <el-form-item label="psy" prop="psy">
<el-input v-model.trim="form.psy" :maxlength="30" placeholder="请输入psy" /> <el-input v-model.trim="form.psy" :maxlength="10" placeholder="请输入psy" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -164,6 +215,7 @@ ...@@ -164,6 +215,7 @@
<script> <script>
import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/api/equipment/basicInfo' import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/api/equipment/basicInfo'
import { parseTime } from '@/utils' import { parseTime } from '@/utils'
import { getDictData } from '@/api/equipment/application'
export default { export default {
name: 'Role', name: 'Role',
data() { data() {
...@@ -178,7 +230,7 @@ export default { ...@@ -178,7 +230,7 @@ export default {
multiple: true, multiple: true,
// 总条数 // 总条数
total: 0, total: 0,
// 角色表格数据 // 基础信息数据
basicInfoList: [], basicInfoList: [],
// 弹出层标题 // 弹出层标题
title: '', title: '',
...@@ -194,6 +246,17 @@ export default { ...@@ -194,6 +246,17 @@ export default {
menuNodeAll: false, menuNodeAll: false,
deptExpand: true, deptExpand: true,
deptNodeAll: false, deptNodeAll: false,
// ptype数据字典
ptypeOptions: [
{
dictLabel: '1',
dictValue: '1'
},
{
dictLabel: '2',
dictValue: '2'
}
],
// 状态数据字典 // 状态数据字典
statusOptions: [ statusOptions: [
{ {
...@@ -205,6 +268,8 @@ export default { ...@@ -205,6 +268,8 @@ export default {
dictValue: '0' dictValue: '0'
} }
], ],
// 数据字典
pgxList: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
page: 1, page: 1,
...@@ -223,21 +288,22 @@ export default { ...@@ -223,21 +288,22 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
pn: [ pn: [
{ required: true, message: '请输入pn', trigger: 'blur' } { required: true, message: '请输入pn', trigger: 'blur' },
{ pattern: /^\d{1,5}$/, message: '请输入少于五位数字', trigger: 'blur' }
], ],
ptype: [ ptype: [
{ required: true, message: '请输入ptype', trigger: 'blur' } { required: true, message: '请输入ptype', trigger: 'blur' }
], ],
pgx: [ pgx: [
{ required: true, message: '请输入pgx', trigger: 'blur' } { required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }
], ],
prank: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }], prank: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
pissb: [ pissb: [
{ required: true, message: '请输入pissb', trigger: 'blur' } { required: true, message: '请选择pissb', trigger: 'blur' }
], ],
psm: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }], psm: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
psy: [ psy: [
{ required: true, message: '请输入psy', trigger: 'blur' } { required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }
] ]
}, },
deptOptions: [] deptOptions: []
...@@ -260,11 +326,27 @@ export default { ...@@ -260,11 +326,27 @@ export default {
this.queryParams = { ...param } this.queryParams = { ...param }
} }
this.getList() this.getList()
this.init()
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => { // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data; // this.statusOptions = response.data;
// }); // });
}, },
methods: { methods: {
// 初始化要调的接口
init() {
this.getDict()
},
// 回车到下一个输入框方法
handelTab(i, e) {
const that = this
if (that.$refs['input' + i]) {
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
}
},
/** 查询基础信息列表 */ /** 查询基础信息列表 */
getList() { getList() {
this.loading = true this.loading = true
...@@ -360,11 +442,11 @@ export default { ...@@ -360,11 +442,11 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.open = true this.open = true
this.title = '添加设备基础信息表单' this.title = '基础信息'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.title = '编辑基础信息表单' this.title = '基础信息'
const id = row.businessId const id = row.businessId
getDetailById(id).then(res => { getDetailById(id).then(res => {
this.form = res.data this.form = res.data
...@@ -417,6 +499,18 @@ export default { ...@@ -417,6 +499,18 @@ export default {
} }
}) })
}) })
},
// 调数据字典查询
getDict() {
const obj = {
key: 'GX_CODE'
}
getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) {
this.pgxList = res.data
}
})
} }
} }
} }
......
src/views/equipment/draw.vue
View file @ 5ca47a30
...@@ -32,6 +32,20 @@ ...@@ -32,6 +32,20 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-select
v-model="queryParams.pstatus"
placeholder="请选择状态"
clearable
size="small"
style="width: 341px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
<el-form-item> <el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button> <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button> <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
...@@ -39,7 +53,7 @@ ...@@ -39,7 +53,7 @@
</el-form> </el-form>
<div class="placeholder" /> <div class="placeholder" />
<div style="padding:5px 10px"> <div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备领用信息列表</div> <div class="mb12 font-small-bold">设备领用</div>
<el-table v-loading="loading" border :data="equipmentapplyList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="equipmentapplyList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" /> <el-table-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn"> <el-table-column label="pn" prop="pn">
...@@ -74,24 +88,30 @@ ...@@ -74,24 +88,30 @@
<span v-else style="color: green">已完成</span> <span v-else style="color: green">已完成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作员" prop="createName"> <el-table-column label="申请人" prop="createName">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.createName || '-' }} {{ scope.row.createName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px"> <el-table-column label="申请时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="150px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="scope.row.pstatus === '0'"
size="mini" size="mini"
type="text" type="text"
style="color: #49cec9" style="color: #49cec9"
@click="handleUpdate(scope.row)" @click="handle(scope.row)"
>处理</el-button> >处理</el-button>
<el-button
size="mini"
type="text"
@click="handleDetail(scope.row)"
>详情</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
...@@ -134,7 +154,7 @@ ...@@ -134,7 +154,7 @@
style="width: 150px" style="width: 150px"
> >
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in pissbOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictValue"
...@@ -153,15 +173,181 @@ ...@@ -153,15 +173,181 @@
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- TODO: 单项详情信息表单配置 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="phd：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="pgx：" prop="pgx">
<el-input v-model.trim="singleDetails.pgx" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="pissb：" prop="pissb">
<el-input v-model.trim="singleDetails.pissb" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态：" prop="pstatus">
<template >
<span v-if="singleDetails.pstatus === '0'" style="color: red">未完成</span>
<span v-else style="color: green">已完成</span>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="申请人：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 申请时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<!-- TODO: 申请处理表单 -->
<el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body>
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="30"
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="phd" prop="phdStr">
<el-input
v-model="queryParams.phdStr"
placeholder="请输入phd"
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="prank" prop="prankStr">
<el-input
v-model="queryParams.prankStr"
placeholder="请输入prank"
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQueryDetail">查询</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQueryDetail">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loadingDetail" border :data="detailApplyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.lot || '-' }}
</template>
</el-table-column>
<el-table-column label="plocation" prop="plocation">
<template slot-scope="scope">
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="prank" prop="prank">
<template slot-scope="scope">
{{ scope.row.prank || '-' }}
</template>
</el-table-column>
<el-table-column label="pzl" prop="pzl">
<template slot-scope="scope">
{{ scope.row.pzl || '-' }}
</template>
</el-table-column>
<el-table-column label="phd" prop="phd">
<template slot-scope="scope">
{{ scope.row.phd || '-' }}
</template>
</el-table-column>
<el-table-column label="psm" prop="psm">
<template slot-scope="scope">
{{ scope.row.psm || '-' }}
</template>
</el-table-column>
<el-table-column label="pissb" prop="pissb">
<template slot-scope="scope">
<span v-if="scope.row.pissb === '0'">否</span>
<span v-else >是</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="totalDetail>0"
:total="totalDetail"
:page.sync="queryParams.page"
:limit.sync="queryParams.rows"
@pagination="getDeviceList"
/>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listWbApply, deleteLogical } from '@/api/equipment/draw' import { listWbApply, deleteLogical, detailList } from '@/api/equipment/draw'
import { parseTime } from '@/utils'
export default { export default {
name: 'Role', name: 'Role',
data() { data() {
return { return {
detailApplyList: [],
// TODO: 表单里的单项详情参数
singleDetails: {
pn: '',
phd: '',
prank: '',
pgx: '',
pissb: '',
pstatus: '',
createName: '',
createTime: ''
},
// 是否显示弹出层（申请处理）
openHandle: false,
// 是否显示弹出层（数据详情）
openDetails: false,
loadingDetail: false,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -172,6 +358,8 @@ export default { ...@@ -172,6 +358,8 @@ export default {
multiple: true, multiple: true,
// 总条数 // 总条数
total: 0, total: 0,
// apply_detail的总条数
totalDetail: 0,
// 设备申请表格数据 // 设备申请表格数据
equipmentapplyList: [], equipmentapplyList: [],
// 弹出层标题 // 弹出层标题
...@@ -191,39 +379,25 @@ export default { ...@@ -191,39 +379,25 @@ export default {
// 状态数据字典 // 状态数据字典
statusOptions: [ statusOptions: [
{ {
dictLabel: '是', dictLabel: '已完成',
dictValue: '1' dictValue: '1'
}, },
{ {
dictLabel: '否', dictLabel: '未完成',
dictValue: '0' dictValue: '0'
} }
], ],
// 数据范围选项 // pissb数据字典
dataScopeOptions: [ pissbOptions: [
{
value: '1',
label: '全部数据权限'
},
{ {
value: '2', dictLabel: '是',
label: '自定数据权限' dictValue: '1'
},
{
value: '3',
label: '本部门数据权限'
},
{
value: '4',
label: '本部门及以下数据权限'
}, },
{ {
value: '5', dictLabel: '否',
label: '仅本人数据权限' dictValue: '0'
} }
], ],
// 部门列表
tOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
page: 1, page: 1,
...@@ -234,6 +408,16 @@ export default { ...@@ -234,6 +408,16 @@ export default {
ptype: 1, ptype: 1,
delFlag: 0 delFlag: 0
}, },
// 查询apply_detail的参数
queryParamsDetail: {
page: 1,
rows: 10,
pn: undefined,
lot: undefined,
plocation: undefined,
ptype: 1,
delFlag: 0
},
// 表单参数 // 表单参数
form: {}, form: {},
defaultProps: { defaultProps: {
...@@ -289,16 +473,31 @@ export default { ...@@ -289,16 +473,31 @@ export default {
// }); // });
}, },
methods: { methods: {
getFontColor(state) { /** 查询apply_detail列表 */
if (state === 1) { getDeviceList() {
return '已完成' this.loadingDetail = true
} else if (state === '待审核') { detailList(this.queryParams).then(res => {
return 'color: orange;' res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
} else if (state === '已通过') { this.totalDetail = res.total
return 'color: green;' this.detailApplyList = res.rows
} else { this.loadingDetail = false
return '' })
} },
handle() {
this.openHandle = !this.openHandle
this.loadingDetail = true
detailList(this.queryParamsDetail).then(res => {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.totalDetail = res.total
this.detailApplyList = res.rows
this.loadingDetail = false
})
},
// : 获取所选行详情信息操作
handleDetail(row) {
this.singleDetails = row
this.title = '详情信息'
this.openDetails = !this.openDetails
}, },
/** 查询基础信息列表 */ /** 查询基础信息列表 */
getList() { getList() {
...@@ -311,77 +510,6 @@ export default { ...@@ -311,77 +510,6 @@ export default {
} }
) )
}, },
/** 查询菜单树结构 */
getMenuTreeselect() {
menuTreeselect().then(response => {
this.menuOptions = response.data
})
},
/** 查询菜单列表 */
getMenuList(roleId) {
roleMenuTreeselectMC(roleId).then(response => {
this.menuList = this.handleTree(response.data.menus, 'businessId')
this.loading = false
})
},
/** 查询部门树结构 */
getDeptTreeselect() {
deptTreeselect().then(response => {
this.deptOptions = response.data
})
},
// 所有菜单节点数据
getMenuAllCheckedKeys() {
// 目前被选中的菜单节点
const checkedKeys = this.$refs.menu.getHalfCheckedKeys()
// 半选中的菜单节点
const halfCheckedKeys = this.$refs.menu.getCheckedKeys()
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
return checkedKeys
},
// 所有部门节点数据
getDeptAllCheckedKeys() {
// 目前被选中的部门节点
const checkedKeys = this.$refs.dept.getHalfCheckedKeys()
// // 半选中的部门节点
const halfCheckedKeys = this.$refs.dept.getCheckedKeys()
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
return this.$refs.dept.getCheckedKeys()
},
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.data.menus
return response
})
},
/** 根据角色ID和菜单ID查询部门树结构 */
getRoleDeptTreeselect(roleId, menuId) {
return roleDeptTreeselect(roleId, menuId).then(response => {
this.form.deptCheckStrictly = response.data.deptCheckStrictly
this.deptOptions = response.data.depts
this.form.dataScope = this.dataScopeOptions[response.data.dataScope - 1].value
return response
})
},
// 角色状态修改
handleStatusChange(row) {
const text = row.flag === '1' ? '启用' : '停用'
this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return changeRoleStatus(row.businessId, row.flag)
}).then(() => {
this.$message({
message: text + '成功',
type: 'success'
})
}).catch(function() {
row.flag = row.flag === '0' ? '1' : '0'
})
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false this.open = false
...@@ -464,54 +592,6 @@ export default { ...@@ -464,54 +592,6 @@ export default {
} }
} }
}, },
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.getMenuTreeselect()
this.open = true
this.title = '添加角色'
},
/** 修改按钮操作 */
// handleUpdate(row) {
// this.reset()
// const roleId = row.businessId || this.ids
// const roleMenu = this.getRoleMenuTreeselect(roleId)
// getRole(roleId).then(response => {
// this.form = response.data
// this.open = true
// this.getMenuTreeselect(roleId)
// this.$nextTick(() => {
// roleMenu.then(res => {
// this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
// })
// })
// this.title = '修改角色'
// })
// },
/** 提交按钮 */
submitForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.businessId !== undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys()
// eslint-disable-next-line no-undef
updateBasicInfo(this.form).then(response => {
this.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
this.form.menuIds = this.getMenuAllCheckedKeys()
// eslint-disable-next-line no-undef
addBasicInfo(this.form).then(response => {
this.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.businessId const id = row.businessId
...@@ -532,6 +612,18 @@ export default { ...@@ -532,6 +612,18 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.aboutSingleDetails{
.el-form-item{
.el-input >>> .el-input__inner {
-webkit-appearance: none;
background-color: #FFF;
background-image: none;
border-radius: 4px;
border: 0;
width: 100%;
}
}
}
.app-container { .app-container {
font-size: 18px; font-size: 18px;
padding: 0; padding: 0;
......
src/views/equipment/management.vue
View file @ 5ca47a30
...@@ -389,7 +389,7 @@ export default { ...@@ -389,7 +389,7 @@ export default {
that.$refs['input' + index].focus() that.$refs['input' + index].focus()
}) })
}, },
/** 查询角色列表 */ /** 查询设备列表 */
getList() { getList() {
this.loading = true this.loading = true
listdevice(this.queryParams).then( listdevice(this.queryParams).then(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment