|
|
@ -6,7 +6,7 @@
|
|
|
|
<div class="head-container">
|
|
|
|
<div class="head-container">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="workUnitName"
|
|
|
|
v-model="workUnitName"
|
|
|
|
placeholder="请输入计量设备名称"
|
|
|
|
placeholder="请输入统计单元名称"
|
|
|
|
clearable
|
|
|
|
clearable
|
|
|
|
size="small"
|
|
|
|
size="small"
|
|
|
|
prefix-icon="el-icon-search"
|
|
|
|
prefix-icon="el-icon-search"
|
|
|
@ -29,7 +29,7 @@
|
|
|
|
</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="68px">
|
|
|
|
<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 +40,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
|
|
|
@ -117,11 +117,6 @@
|
|
|
|
<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"/>
|
|
|
|
<el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[3].visible">
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<dict-tag :options="dict.type.is_flag" :value="scope.row.monitorStatus"/>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[4].visible">
|
|
|
|
<el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[4].visible">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<dict-tag :options="dict.type.monitor_type" :value="scope.row.monitorType"/>
|
|
|
|
<dict-tag :options="dict.type.monitor_type" :value="scope.row.monitorType"/>
|
|
|
@ -133,6 +128,11 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="比率" align="center" prop="proportion" v-if="columns[6].visible"/>
|
|
|
|
<el-table-column label="比率" align="center" prop="proportion" v-if="columns[6].visible"/>
|
|
|
|
|
|
|
|
<el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[3].visible">
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<dict-tag :options="dict.type.is_flag" :value="scope.row.monitorStatus"/>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
|
|
|
|
<el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
|
|
|
|
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
|
|
|
|
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
@ -183,7 +183,7 @@
|
|
|
|
<!-- 添加或修改统计计量信息对话框 -->
|
|
|
|
<!-- 添加或修改统计计量信息对话框 -->
|
|
|
|
<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">
|
|
|
@ -195,15 +195,6 @@
|
|
|
|
<!-- <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="monitorStatus">
|
|
|
|
|
|
|
|
<el-radio-group v-model="form.monitorStatus">
|
|
|
|
|
|
|
|
<el-radio
|
|
|
|
|
|
|
|
v-for="dict in dict.type.is_flag"
|
|
|
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
|
|
|
:label="parseInt(dict.value)"
|
|
|
|
|
|
|
|
>{{dict.label}}</el-radio>
|
|
|
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
|
|
|
</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
|
|
|
@ -228,6 +219,15 @@
|
|
|
|
<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-radio-group v-model="form.monitorStatus">
|
|
|
|
|
|
|
|
<el-radio
|
|
|
|
|
|
|
|
v-for="dict in dict.type.is_flag"
|
|
|
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
|
|
|
:label="parseInt(dict.value)"
|
|
|
|
|
|
|
|
>{{dict.label}}</el-radio>
|
|
|
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="启用标识" prop="isFlag">
|
|
|
|
<el-form-item label="启用标识" prop="isFlag">
|
|
|
|
<el-radio-group v-model="form.isFlag">
|
|
|
|
<el-radio-group v-model="form.isFlag">
|
|
|
|
<el-radio
|
|
|
|
<el-radio
|
|
|
|