Commit 5ca47a30 authored by 吴志坤's avatar 吴志坤

基础信息,设备申请

parent 07f1a295
......@@ -46,4 +46,11 @@ export function deleteLogical(id) {
method: 'delete'
})
}
export function getDictData(params) {
return request({
url: '/wbbaseinfo/queryDict',
method: 'get',
params
})
}
......@@ -7,6 +7,14 @@ export function listWbApply(query) {
params: query
})
}
// apply_detail分页查询接口
export function detailList(query) {
return request({
url: '/wbapplydetail/queryWbApplyDetailByPagination',
method: 'get',
params: query
})
}
// 逻辑删除基础信息接口
export function deleteLogical(id) {
return request({
......
......@@ -143,6 +143,7 @@ export default {
key: 'GX_CODE'
}
getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) {
this.pissbList = res.data
}
......
......@@ -13,24 +13,35 @@
/>
</el-form-item>
<el-form-item label="pgx" prop="pgx">
<el-input
v-model="queryParams.pgx"
placeholder="请输入pgx"
<el-select
v-model="form.pgx"
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
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="prank" prop="prank">
<el-input
v-model="queryParams.prank"
placeholder="请输入prank"
<el-form-item label="ptype" prop="ptype">
<el-select
v-model="form.ptype"
placeholder="请选择ptype"
clearable
size="small"
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-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
......@@ -48,7 +59,7 @@
</el-form>
<div class="placeholder" />
<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-column type="index" label="序号" width="50" />
<el-table-column label="pn" prop="pn">
......@@ -58,7 +69,13 @@
</el-table-column>
<el-table-column label="pgx" prop="pgx">
<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>
</el-table-column>
<el-table-column label="prank" prop="prank">
......@@ -122,15 +139,49 @@
<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-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 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 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 label="pissb" prop="pissb" >
<el-form-item label="pissb" prop="pissb">
<el-select
v-model="form.pissb"
placeholder="请选择pissb"
......@@ -147,10 +198,10 @@
</el-select>
</el-form-item>
<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 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>
<div slot="footer" class="dialog-footer">
......@@ -164,6 +215,7 @@
<script>
import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/api/equipment/basicInfo'
import { parseTime } from '@/utils'
import { getDictData } from '@/api/equipment/application'
export default {
name: 'Role',
data() {
......@@ -178,7 +230,7 @@ export default {
multiple: true,
// 总条数
total: 0,
// 角色表格数据
// 基础信息数据
basicInfoList: [],
// 弹出层标题
title: '',
......@@ -194,6 +246,17 @@ export default {
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
// ptype数据字典
ptypeOptions: [
{
dictLabel: '1',
dictValue: '1'
},
{
dictLabel: '2',
dictValue: '2'
}
],
// 状态数据字典
statusOptions: [
{
......@@ -205,6 +268,8 @@ export default {
dictValue: '0'
}
],
// 数据字典
pgxList: [],
// 查询参数
queryParams: {
page: 1,
......@@ -223,21 +288,22 @@ export default {
// 表单校验
rules: {
pn: [
{ required: true, message: '请输入pn', trigger: 'blur' }
{ required: true, message: '请输入pn', trigger: 'blur' },
{ pattern: /^\d{1,5}$/, message: '请输入少于五位数字', trigger: 'blur' }
],
ptype: [
{ required: true, message: '请输入ptype', trigger: 'blur' }
],
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: [
{ 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: [
{ required: true, message: '请输入psy', trigger: 'blur' }
{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }
]
},
deptOptions: []
......@@ -260,11 +326,27 @@ export default {
this.queryParams = { ...param }
}
this.getList()
this.init()
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data;
// });
},
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() {
this.loading = true
......@@ -360,11 +442,11 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.open = true
this.title = '添加设备基础信息表单'
this.title = '基础信息'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.title = '编辑基础信息表单'
this.title = '基础信息'
const id = row.businessId
getDetailById(id).then(res => {
this.form = res.data
......@@ -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
}
})
}
}
}
......
This diff is collapsed.
......@@ -389,7 +389,7 @@ export default {
that.$refs['input' + index].focus()
})
},
/** 查询角色列表 */
/** 查询设备列表 */
getList() {
this.loading = true
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