Commit 1e10bc42 authored by kzy's avatar kzy

未知bug

parent 3d9dfbd1
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 --> <!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body> <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px"> <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -221,6 +221,7 @@ ...@@ -221,6 +221,7 @@
:visible.sync="table" :visible.sync="table"
direction="rtl" direction="rtl"
size="50%" size="50%"
:close-on-click-modal= "false"
> >
<el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;"> <el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;">
...@@ -381,12 +382,8 @@ export default { ...@@ -381,12 +382,8 @@ export default {
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
roleName: undefined,
roleKey: undefined,
flag: undefined,
ptype: 1, ptype: 1,
pstatus:0, pstatus:0
delFlag:0
}, },
// 表单参数 // 表单参数
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 --> <!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body> <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px"> <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -216,6 +216,7 @@ ...@@ -216,6 +216,7 @@
:visible.sync="table" :visible.sync="table"
direction="rtl" direction="rtl"
size="50%" size="50%"
:close-on-click-modal= "false"
> >
<el-table v-loading="loading" border :data="tableList" style="padding: 0 10px;" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="tableList" style="padding: 0 10px;" @selection-change="handleSelectionChange">
...@@ -376,13 +377,10 @@ export default { ...@@ -376,13 +377,10 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
roleName: undefined,
roleKey: undefined,
flag: undefined,
ptype: 2, ptype: 2,
pstatus: 0, pstatus:0,
delFlag: 0
}, },
// 表单参数 // 表单参数
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- TODO: 单项详情信息表单配置 --> <!-- TODO: 单项详情信息表单配置 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body> <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px"> <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -214,8 +214,20 @@ ...@@ -214,8 +214,20 @@
<el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false"> <el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px"> <el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px">
<el-form-item label="fq_yy" prop="fq_yy"> <el-form-item label="fq_yy" prop="fq_yy">
<el-input v-model.trim="abandonFrom.fq_yy" :maxlength="100" placeholder="请输入fq_yy" /> <el-select
</el-form-item> v-model.trim="abandonFrom.fq_yy"
clearable
placeholder="请选择fq_yy"
>
<el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.dictValue"
:value="dict.dictLabel"
/>
</el-select>
</el-form-item>
<el-form-item label="fq_bz" prop="fq_bz"> <el-form-item label="fq_bz" prop="fq_bz">
<el-input v-model.trim="abandonFrom.fq_bz" :maxlength="100" placeholder="请输入fq_bz" /> <el-input v-model.trim="abandonFrom.fq_bz" :maxlength="100" placeholder="请输入fq_bz" />
</el-form-item> </el-form-item>
...@@ -255,7 +267,7 @@ import { ...@@ -255,7 +267,7 @@ import {
updateRole updateRole
} from '@/api/system/role' } from '@/api/system/role'
import {listCheck, abandon} from '@/api/equipment/check' import {listCheck, abandon} from '@/api/equipment/check'
import {delEquipment} from '../../api/equipment/equipmentAbandonment' import { getDictData } from '@/api/equipment/application'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu' import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept' import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template' // import { getRolesByInsId } from '../../../api/businessManage/template'
...@@ -276,6 +288,7 @@ export default { ...@@ -276,6 +288,7 @@ export default {
pstatus: '1' pstatus: '1'
}, },
pgxList:[],
abandonFromRules: { abandonFromRules: {
fq_ys: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }], fq_ys: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],
fq_yy: [{ required: true, message: '请输入fq_yy', trigger: 'change' }], fq_yy: [{ required: true, message: '请输入fq_yy', trigger: 'change' }],
...@@ -383,13 +396,10 @@ export default { ...@@ -383,13 +396,10 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
roleName: undefined, ptype: 2,
roleKey: undefined,
flag: undefined,
ptype:2,
pstatus:0, pstatus:0,
delFlag:0
}, },
// 表单参数 // 表单参数
form: { form: {
...@@ -432,6 +442,7 @@ export default { ...@@ -432,6 +442,7 @@ export default {
this.queryParams = { ...param } this.queryParams = { ...param }
} }
this.getList() this.getList()
this.getDict()
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => { // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data; // this.statusOptions = response.data;
// }); // });
...@@ -468,6 +479,17 @@ export default { ...@@ -468,6 +479,17 @@ export default {
} }
}, },
getDict() {
const obj = {
key: 'FQ_CODE'
}
getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) {
this.pgxList = res.data
}
})
},
// TODO: 获取所选行详情信息操作 // TODO: 获取所选行详情信息操作
handleDetail(row) { handleDetail(row) {
this.singleDetails = this.formReset this.singleDetails = this.formReset
...@@ -636,7 +658,8 @@ export default { ...@@ -636,7 +658,8 @@ export default {
this.queryParams={ this.queryParams={
page: 1, page: 1,
rows: 10, rows: 10,
ptype: 2 ptype: 2,
pstatus:0,
} }
this.resetForm('queryForm') this.resetForm('queryForm')
this.handleQuery() this.handleQuery()
......
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