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

change - 字段修改

Browse Source
master
yinq 11 months ago
parent 4ea8d10381
commit b389dba0fe
2 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File

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

@ -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

92
src/views/base/workUnit/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<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="workUnitName"> <el-form-item label="统计单元名称" prop="workUnitName">
<el-input <el-input
v-model="queryParams.workUnitName" v-model="queryParams.workUnitName"
@ -9,32 +9,32 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="统计区域" prop="workUnitAddress"> <!-- <el-form-item label="统计区域" prop="workUnitAddress">-->
<el-input <!-- <el-input-->
v-model="queryParams.workUnitAddress" <!-- v-model="queryParams.workUnitAddress"-->
placeholder="请输入统计区域" <!-- placeholder="请输入统计区域"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="产线/工位" prop="productLineCode"> <!-- <el-form-item label="产线/工位" prop="productLineCode">-->
<el-input <!-- <el-input-->
v-model="queryParams.productLineCode" <!-- v-model="queryParams.productLineCode"-->
placeholder="请输入产线/工位" <!-- placeholder="请输入产线/工位"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="统计单元类型" prop="workUnitType"> <!-- <el-form-item label="统计单元类型" prop="workUnitType">-->
<el-select v-model="queryParams.workUnitType" placeholder="请选择统计单元类型" clearable> <!-- <el-select v-model="queryParams.workUnitType" placeholder="请选择统计单元类型" clearable>-->
<el-option <!-- <el-option-->
v-for="dict in dict.type.work_unit_type" <!-- v-for="dict in dict.type.work_unit_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> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -77,11 +77,11 @@
<el-table-column label="统计单元名称" align="center" prop="workUnitName" /> <el-table-column label="统计单元名称" align="center" prop="workUnitName" />
<el-table-column label="统计区域" align="center" prop="workUnitAddress" /> <el-table-column label="统计区域" align="center" prop="workUnitAddress" />
<el-table-column label="产线/工位" align="center" prop="productLineName"/> <el-table-column label="产线/工位" align="center" prop="productLineName"/>
<el-table-column label="统计单元类型" align="center" prop="workUnitType"> <!-- <el-table-column label="统计单元类型" align="center" prop="workUnitType">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<dict-tag :options="dict.type.work_unit_type" :value="scope.row.workUnitType"/> <!-- <dict-tag :options="dict.type.work_unit_type" :value="scope.row.workUnitType"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<!-- <el-table-column label="启用标识" align="center" prop="isFlag">--> <!-- <el-table-column label="启用标识" align="center" prop="isFlag">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>--> <!-- <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
@ -128,13 +128,13 @@
<!-- 添加或修改统计单元信息对话框 --> <!-- 添加或修改统计单元信息对话框 -->
<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="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="统计单元编号" prop="workUnitCode">
<el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />
</el-form-item>
<el-form-item label="父级编号" prop="parentId"> <el-form-item label="父级编号" prop="parentId">
<treeselect v-model="form.parentId" :options="workUnitOptions" :normalizer="normalizer" placeholder="请选择父级编号" /> <treeselect v-model="form.parentId" :options="workUnitOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
</el-form-item> </el-form-item>
<el-form-item label="统计单元编号" prop="workUnitCode">
<el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />
</el-form-item>
<el-form-item label="统计单元名称" prop="workUnitName"> <el-form-item label="统计单元名称" prop="workUnitName">
<el-input v-model="form.workUnitName" placeholder="请输入统计单元名称" /> <el-input v-model="form.workUnitName" placeholder="请输入统计单元名称" />
</el-form-item> </el-form-item>
@ -151,16 +151,16 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="统计单元类型" prop="workUnitType"> <!-- <el-form-item label="统计单元类型" prop="workUnitType">-->
<el-select v-model="form.workUnitType" placeholder="请选择统计单元类型"> <!-- <el-select v-model="form.workUnitType" placeholder="请选择统计单元类型">-->
<el-option <!-- <el-option-->
v-for="dict in dict.type.work_unit_type" <!-- v-for="dict in dict.type.work_unit_type"-->
:key="dict.value" <!-- :key="dict.value"-->
:label="dict.label" <!-- :label="dict.label"-->
:value="parseInt(dict.value)" <!-- :value="parseInt(dict.value)"-->
></el-option> <!-- ></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </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

Write Preview
Loading…
Cancel
Save