yinq
/
zs_aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改看板

Browse Source
master
夜笙歌 2 years ago
parent 5f050b0f32
commit 241da15d0b
1 changed files with 240 additions and 217 deletions
Show Stats Download Patch File Download Diff File

149
src/views/base/monitorWorkUnit/index.vue
Unescape Escape View File

@ -29,7 +29,8 @@
</el-col> </el-col>
<el-col :span="19" :xs="24"> <el-col :span="19" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px">
<el-form-item label="计量设备状态" prop="monitorStatus"> <el-form-item label="计量设备状态" prop="monitorStatus">
<el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable> <el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
<el-option <el-option
@ -40,16 +41,16 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="计量设备类型" prop="monitorType">--> <!-- <el-form-item label="计量设备类型" prop="monitorType">-->
<!-- <el-select v-model="queryParams.monitorType" placeholder="请选择计量设备类型" clearable>--> <!-- <el-select v-model="queryParams.monitorType" placeholder="请选择计量设备类型" clearable>-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="dict in dict.type.monitor_type"--> <!-- v-for="dict in dict.type.monitor_type"-->
<!-- :key="dict.value"--> <!-- :key="dict.value"-->
<!-- :label="dict.label"--> <!-- :label="dict.label"-->
<!-- :value="dict.value"--> <!-- :value="dict.value"-->
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="计算方式" prop="formulaMode"> <el-form-item label="计算方式" prop="formulaMode">
<el-select v-model="queryParams.formulaMode" placeholder="请选择计算方式" clearable> <el-select v-model="queryParams.formulaMode" placeholder="请选择计算方式" clearable>
<el-option <el-option
@ -75,7 +76,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['base:monitorWorkUnit:add']" v-hasPermi="['base:monitorWorkUnit:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -86,7 +88,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['base:monitorWorkUnit:edit']" v-hasPermi="['base:monitorWorkUnit:edit']"
>修改</el-button> >修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -97,7 +100,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['base:monitorWorkUnit:remove']" v-hasPermi="['base:monitorWorkUnit:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -107,13 +111,14 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['base:monitorWorkUnit:export']" v-hasPermi="['base:monitorWorkUnit:export']"
>导出</el-button> >导出
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="monitorWorkUnitList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="monitorWorkUnitList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/> <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/> <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
<el-table-column label="统计单元编号" align="center" prop="workUnitCode" v-if="columns[2].visible"/> <el-table-column label="统计单元编号" align="center" prop="workUnitCode" v-if="columns[2].visible"/>
@ -159,14 +164,16 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['base:monitorWorkUnit:edit']" v-hasPermi="['base:monitorWorkUnit:edit']"
>修改</el-button> >修改
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['base:monitorWorkUnit:remove']" v-hasPermi="['base:monitorWorkUnit:remove']"
>删除</el-button> >删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -184,24 +191,27 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="计量设备名称" prop="monitorCode"> <el-form-item label="计量设备名称" prop="monitorCode">
<treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer" placeholder="请选择计量设备" /> <treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer"
placeholder="请选择计量设备"/>
</el-form-item> </el-form-item>
<el-form-item label="统计单元编号" prop="workUnitCode"> <el-form-item label="统计单元编号" prop="workUnitCode">
<treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer" placeholder="请选择父级编号" /> <treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer"
placeholder="请选择父级编号"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="计量设备编号" prop="monitorCode">--> <!-- <el-form-item label="计量设备编号" prop="monitorCode">-->
<!-- <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />--> <!-- <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="统计单元编号" prop="workUnitCode">--> <!-- <el-form-item label="统计单元编号" prop="workUnitCode">-->
<!-- <el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />--> <!-- <el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="计量设备类型" prop="monitorType"> <el-form-item label="计量设备类型" prop="monitorType">
<el-radio-group v-model="form.monitorType"> <el-radio-group v-model="form.monitorType">
<el-radio <el-radio
v-for="dict in dict.type.monitor_type" v-for="dict in dict.type.monitor_type"
:key="dict.value" :key="dict.value"
:label="parseInt(dict.value)" :label="parseInt(dict.value)"
>{{dict.label}}</el-radio> >{{ dict.label }}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="计算方式" prop="formulaMode"> <el-form-item label="计算方式" prop="formulaMode">
@ -210,14 +220,15 @@
v-for="dict in dict.type.formula_mode" v-for="dict in dict.type.formula_mode"
:key="dict.value" :key="dict.value"
:label="parseInt(dict.value)" :label="parseInt(dict.value)"
>{{dict.label}}</el-radio> >{{ dict.label }}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="比率" prop="proportion"> <el-form-item label="比率" prop="proportion">
<el-input v-model="form.proportion" placeholder="请输入比率" /> <el-input v-model="form.proportion" placeholder="请输入比率"/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注"/>
</el-form-item> </el-form-item>
<el-form-item label="计量设备状态" prop="monitorStatus"> <el-form-item label="计量设备状态" prop="monitorStatus">
<el-radio-group v-model="form.monitorStatus"> <el-radio-group v-model="form.monitorStatus">
@ -225,7 +236,8 @@
v-for="dict in dict.type.is_flag" v-for="dict in dict.type.is_flag"
:key="dict.value" :key="dict.value"
:label="parseInt(dict.value)" :label="parseInt(dict.value)"
>{{dict.label}}</el-radio> >{{ dict.label }}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="启用标识" prop="isFlag"> <el-form-item label="启用标识" prop="isFlag">
@ -234,7 +246,8 @@
v-for="dict in dict.type.is_flag" v-for="dict in dict.type.is_flag"
:key="dict.value" :key="dict.value"
:label="parseInt(dict.value)" :label="parseInt(dict.value)"
>{{dict.label}}</el-radio> >{{ dict.label }}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -247,9 +260,15 @@
</template> </template>
<script> <script>
import { listMonitorWorkUnit, getMonitorWorkUnit, delMonitorWorkUnit, addMonitorWorkUnit, updateMonitorWorkUnit } from "@/api/base/monitorWorkUnit"; import {
listMonitorWorkUnit,
getMonitorWorkUnit,
delMonitorWorkUnit,
addMonitorWorkUnit,
updateMonitorWorkUnit
} from "@/api/base/monitorWorkUnit";
import {getWorkUnitTrees} from '@/api/base/workUnit' import {getWorkUnitTrees} from '@/api/base/workUnit'
import { listMonitorInfo } from '@/api/base/monitorInfo' import {listMonitorInfo} from '@/api/base/monitorInfo'
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -258,11 +277,11 @@ export default {
dicts: ['monitor_type', 'formula_mode', 'is_flag'], dicts: ['monitor_type', 'formula_mode', 'is_flag'],
components: { components: {
Treeselect Treeselect
},data() { }, data() {
return { return {
monitorInfoOptions:[], monitorInfoOptions: [],
workUnitOptions:[], workUnitOptions: [],
workUnitName:undefined, workUnitName: undefined,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -307,26 +326,26 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
objId: [ objId: [
{ required: true, message: "主键标识不能为空", trigger: "blur" } {required: true, message: "主键标识不能为空", trigger: "blur"}
], ],
monitorCode: [ monitorCode: [
{ required: true, message: "计量设备编号不能为空", trigger: "blur" } {required: true, message: "计量设备编号不能为空", trigger: "blur"}
], ],
}, },
columns: [ columns: [
{ key: 0, label: `主键标识`, visible: false }, {key: 0, label: `主键标识`, visible: false},
{ key: 1, label: `计量设备编号`, visible: true }, {key: 1, label: `计量设备编号`, visible: true},
{ key: 2, label: `统计单元编号`, visible: true }, {key: 2, label: `统计单元编号`, visible: true},
{ key: 3, label: `计量设备状态`, visible: true }, {key: 3, label: `计量设备状态`, visible: true},
{ key: 4, label: `计量设备类型`, visible: true }, {key: 4, label: `计量设备类型`, visible: true},
{ key: 5, label: `计算方式`, visible: true }, {key: 5, label: `计算方式`, visible: true},
{ key: 6, label: `比率`, visible: true }, {key: 6, label: `比率`, visible: true},
{ key: 7, label: `备注`, visible: true }, {key: 7, label: `备注`, visible: true},
{ key: 8, label: `启用标识`, visible: false }, {key: 8, label: `启用标识`, visible: false},
{ key: 9, label: `创建人`, visible: false }, {key: 9, label: `创建人`, visible: false},
{ key: 10, label: `创建时间`, visible: false }, {key: 10, label: `创建时间`, visible: false},
{ key: 11, label: `修改人`, visible: false }, {key: 11, label: `修改人`, visible: false},
{ key: 12, label: `修改时间`, visible: false }, {key: 12, label: `修改时间`, visible: false},
] ]
}; };
}, },
@ -347,9 +366,11 @@ export default {
getTreeselect() { getTreeselect() {
listMonitorInfo().then(response => { listMonitorInfo().then(response => {
this.monitorInfoOptions = []; this.monitorInfoOptions = [];
const data = { objId: 0, monitorName: '顶级节点', children: [] }; // const data = { objId: 0, monitorName: '顶级节点', children: [] };
data.children = this.handleTree(response.data, "objId", "parentId"); this.monitorInfoOptions = this.handleTree(response.data, "objId", "parentId");
this.monitorInfoOptions.push(data); // data.children = this.handleTree(response.data, "objId", "parentId");
console.log('data', data)
// this.monitorInfoOptions = data;
}); });
}, },
/** 转换计量设备信息数据结构 */ /** 转换计量设备信息数据结构 */
@ -365,6 +386,7 @@ export default {
}, },
/** 转换统计单元信息数据结构 */ /** 转换统计单元信息数据结构 */
workUnitOptionsNormalizer(node) { workUnitOptionsNormalizer(node) {
console.log('node', node)
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
delete node.children; delete node.children;
} }
@ -378,8 +400,9 @@ export default {
/** 查询计量设备下拉树结构 */ /** 查询计量设备下拉树结构 */
getDeptTrees() { getDeptTrees() {
getWorkUnitTrees().then(response => { getWorkUnitTrees().then(response => {
this.workUnitOptions = response.data; this.workUnitOptions = [];
console.log(this.workUnitOptions) this.workUnitOptions = JSON.parse(JSON.stringify(response.data).replaceAll('id','id2').replaceAll('code','id'));
console.log('this.workUnitOptions',this.workUnitOptions)
}); });
}, },
// 筛选节点 // 筛选节点
@ -409,7 +432,7 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
parentIds:null, parentIds: null,
parentId: null, parentId: null,
objId: null, objId: null,
monitorCode: null, monitorCode: null,
@ -441,7 +464,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId) this.ids = selection.map(item => item.objId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -464,7 +487,6 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
console.log(this.form.monitorCode)
if (valid) { if (valid) {
if (this.form.objId != null) { if (this.form.objId != null) {
updateMonitorWorkUnit(this.form).then(response => { updateMonitorWorkUnit(this.form).then(response => {
@ -485,12 +507,13 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const objIds = row.objId || this.ids; const objIds = row.objId || this.ids;
this.$modal.confirm('是否确认删除统计计量信息编号为"' + objIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除统计计量信息编号为"' + objIds + '"的数据项？').then(function () {
return delMonitorWorkUnit(objIds); return delMonitorWorkUnit(objIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {

Write Preview
Loading…
Cancel
Save