change - add异常告警、异常记录

boardTest
yinq 1 year ago
parent 9e85021e53
commit 0c2f86e345

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询异常数据记录列表
export function listRecordAlarmData(query) {
return request({
url: '/ems/record/recordAlarmData/list',
method: 'get',
params: query
})
}
// 查询异常数据记录详细
export function getRecordAlarmData(objId) {
return request({
url: '/ems/record/recordAlarmData/' + objId,
method: 'get'
})
}
// 新增异常数据记录
export function addRecordAlarmData(data) {
return request({
url: '/ems/record/recordAlarmData',
method: 'post',
data: data
})
}
// 修改异常数据记录
export function updateRecordAlarmData(data) {
return request({
url: '/ems/record/recordAlarmData',
method: 'put',
data: data
})
}
// 删除异常数据记录
export function delRecordAlarmData(objId) {
return request({
url: '/ems/record/recordAlarmData/' + objId,
method: 'delete'
})
}

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询异常告警规则列表
export function listRecordAlarmRule(query) {
return request({
url: '/ems/record/recordAlarmRule/list',
method: 'get',
params: query
})
}
// 查询异常告警规则详细
export function getRecordAlarmRule(objId) {
return request({
url: '/ems/record/recordAlarmRule/' + objId,
method: 'get'
})
}
// 新增异常告警规则
export function addRecordAlarmRule(data) {
return request({
url: '/ems/record/recordAlarmRule',
method: 'post',
data: data
})
}
// 修改异常告警规则
export function updateRecordAlarmRule(data) {
return request({
url: '/ems/record/recordAlarmRule',
method: 'put',
data: data
})
}
// 删除异常告警规则
export function delRecordAlarmRule(objId) {
return request({
url: '/ems/record/recordAlarmRule/' + objId,
method: 'delete'
})
}

@ -51,3 +51,12 @@ export function findOrderBomList(query) {
params: query params: query
}) })
} }
// 查询生产BOM树列表
export function productionBomTreeList(query) {
return request({
url: '/mes/prod/prodBomInfo/productionBomTreeList',
method: 'get',
params: query
})
}

@ -0,0 +1,425 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="计量设备编号" prop="monitorId">
<el-input
v-model="queryParams.monitorId"
placeholder="请输入计量设备编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="采集设备编号" prop="collectDeviceId">-->
<!-- <el-input-->
<!-- v-model="queryParams.collectDeviceId"-->
<!-- placeholder="请输入采集设备编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="记录时间" prop="collectTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.collectTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择记录时间"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="异常类型" prop="alarmType">
<el-select v-model="queryParams.alarmType" placeholder="请选择异常类型" clearable>
<el-option
v-for="dict in dict.type.alarm_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="异常状态" prop="alarmStatus">
<el-select v-model="queryParams.alarmStatus" placeholder="请选择异常状态" clearable>
<el-option
v-for="dict in dict.type.alarm_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="操作时间" prop="operationTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.operationTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择操作时间"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item>
<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-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ems/record:recordAlarmData:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ems/record:recordAlarmData:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ems/record:recordAlarmData:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ems/record:recordAlarmData:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="recordAlarmDataList" @selection-change="handleSelectionChange">
<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="monitorId" v-if="columns[1].visible"/>
<el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[2].visible"/>
<el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[3].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="异常类型" align="center" prop="alarmType" v-if="columns[4].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType"/>
</template>
</el-table-column>
<el-table-column label="异常状态" align="center" prop="alarmStatus" v-if="columns[5].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.alarm_status" :value="scope.row.alarmStatus"/>
</template>
</el-table-column>
<el-table-column label="异常数据" align="center" prop="alarmData" v-if="columns[6].visible"/>
<el-table-column label="操作人员" align="center" prop="operationName" v-if="columns[7].visible"/>
<el-table-column label="操作时间" align="center" prop="operationTime" width="180" v-if="columns[8].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="cause" v-if="columns[9].visible"/>
<el-table-column label="通知用户" align="center" prop="notifyUser" v-if="columns[14].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ems/record:recordAlarmData:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ems/record:recordAlarmData:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改异常数据记录对话框 -->
<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-item label="计量设备编号" prop="monitorId">
<el-input v-model="form.monitorId" placeholder="请输入计量设备编号"/>
</el-form-item>
<el-form-item label="采集设备编号" prop="collectDeviceId">
<el-input v-model="form.collectDeviceId" placeholder="请输入采集设备编号"/>
</el-form-item>
<el-form-item label="记录时间" prop="collectTime">
<el-date-picker clearable
v-model="form.collectTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择记录时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="异常类型" prop="alarmType">
<el-radio-group v-model="form.alarmType">
<el-radio
v-for="dict in dict.type.alarm_type"
:key="dict.value"
:label="parseInt(dict.value)"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="异常状态" prop="alarmStatus">
<el-radio-group v-model="form.alarmStatus">
<el-radio
v-for="dict in dict.type.alarm_status"
:key="dict.value"
:label="parseInt(dict.value)"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="异常数据" prop="alarmData">
<el-input v-model="form.alarmData" placeholder="请输入异常数据"/>
</el-form-item>
<el-form-item label="操作人员" prop="operationName">
<el-input v-model="form.operationName" placeholder="请输入操作人员"/>
</el-form-item>
<el-form-item label="操作时间" prop="operationTime">
<el-date-picker clearable
v-model="form.operationTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择操作时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="cause">
<el-input v-model="form.cause" placeholder="请输入备注"/>
</el-form-item>
<el-form-item label="通知用户" prop="notifyUser">
<el-input v-model="form.notifyUser" placeholder="请输入通知用户"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listRecordAlarmData,
getRecordAlarmData,
delRecordAlarmData,
addRecordAlarmData,
updateRecordAlarmData
} from '@/api/ems/record/recordAlarmData'
export default {
name: 'RecordAlarmData',
dicts: ['alarm_status', 'alarm_type'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
recordAlarmDataList: [],
//
title: '',
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
monitorId: null,
collectDeviceId: null,
collectTime: null,
alarmType: null,
alarmStatus: null,
alarmData: null,
operationName: null,
operationTime: null,
cause: null,
notifyUser: null
},
//
form: {},
//
rules: {
objId: [
{ required: true, message: '自增标识不能为空', trigger: 'blur' }
]
},
columns: [
{ key: 0, label: `自增标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `采集设备编号`, visible: true },
{ key: 3, label: `记录时间`, visible: true },
{ key: 4, label: `异常类型`, visible: true },
{ key: 5, label: `异常状态`, visible: true },
{ key: 6, label: `异常数据`, visible: true },
{ key: 7, label: `操作人员`, visible: true },
{ key: 8, label: `操作时间`, visible: true },
{ key: 9, label: `备注`, visible: false },
{ key: 10, label: `创建人`, visible: false },
{ key: 11, label: `创建时间`, visible: true },
{ key: 12, label: `更新人`, visible: false },
{ key: 13, label: `更新时间`, visible: false },
{ key: 14, label: `通知用户`, visible: false }
]
}
},
created() {
this.getList()
},
methods: {
/** 查询异常数据记录列表 */
getList() {
this.loading = true
listRecordAlarmData(this.queryParams).then(response => {
this.recordAlarmDataList = response.rows
this.total = response.total
this.loading = false
})
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.form = {
objId: null,
monitorId: null,
collectDeviceId: null,
collectTime: null,
alarmType: null,
alarmStatus: null,
alarmData: null,
operationName: null,
operationTime: null,
cause: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
notifyUser: null
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加异常数据记录'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getRecordAlarmData(objId).then(response => {
this.form = response.data
this.open = true
this.title = '修改异常数据记录'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateRecordAlarmData(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addRecordAlarmData(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除异常数据记录编号为"' + objIds + '"的数据项?').then(function() {
return delRecordAlarmData(objIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('ems/record/recordAlarmData/export', {
...this.queryParams
}, `recordAlarmData_${new Date().getTime()}.xlsx`)
}
}
}
</script>

@ -0,0 +1,383 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="规则名称" prop="ruleName">
<el-input
v-model="queryParams.ruleName"
placeholder="请输入规则名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="触发规则" prop="triggerRule">
<el-select v-model="queryParams.triggerRule" placeholder="请选择触发规则" clearable>
<el-option
v-for="dict in dict.type.trigger_rule"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="通知用户" prop="notifyUser">-->
<!-- <el-input-->
<!-- v-model="queryParams.notifyUser"-->
<!-- placeholder="请输入通知用户"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<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-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ems/record:recordAlarmRule:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ems/record:recordAlarmRule:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ems/record:recordAlarmRule:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ems/record:recordAlarmRule:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="recordAlarmRuleList" @selection-change="handleSelectionChange">
<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="ruleId" v-if="columns[1].visible"/>
<el-table-column label="规则名称" align="center" prop="ruleName" v-if="columns[2].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[3].visible"/>
<el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[4].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="能源类型" align="center" prop="energyType" v-if="columns[5].visible"/>
<el-table-column label="触发规则" align="center" prop="triggerRule" v-if="columns[6].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.trigger_rule" :value="scope.row.triggerRule"/>
</template>
</el-table-column>
<el-table-column label="触发阈值次数" align="center" prop="triggerNumber" v-if="columns[7].visible"/>
<el-table-column label="时间范围(分)" align="center" prop="timeRange" v-if="columns[8].visible"/>
<el-table-column label="设备离线时间(分)" align="center" prop="deviceOfflineTime" v-if="columns[9].visible"/>
<el-table-column label="通知用户" align="center" prop="notifyUser" v-if="columns[10].visible"/>
<el-table-column label="备注" align="center" prop="cause" v-if="columns[11].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ems/record:recordAlarmRule:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ems/record:recordAlarmRule:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改异常告警规则对话框 -->
<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-item label="规则编号" prop="ruleId">
<el-input v-model="form.ruleId" placeholder="请输入规则编号"/>
</el-form-item>
<el-form-item label="规则名称" prop="ruleName">
<el-input v-model="form.ruleName" placeholder="请输入规则名称"/>
</el-form-item>
<el-form-item label="计量设备编号" prop="monitorId">
<el-input v-model="form.monitorId" placeholder="请输入计量设备编号"/>
</el-form-item>
<el-form-item label="记录时间" prop="collectTime">
<el-date-picker clearable
v-model="form.collectTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择记录时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="能源类型" prop="energyType">
<el-input v-model="form.energyType" placeholder="请输入能源类型"/>
</el-form-item>
<el-form-item label="触发规则" prop="triggerRule">
<el-radio-group v-model="form.triggerRule">
<el-radio
v-for="dict in dict.type.trigger_rule"
:key="dict.value"
:label="parseInt(dict.value)"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="触发阈值次数" prop="triggerNumber">
<el-input v-model="form.triggerNumber" placeholder="请输入触发阈值次数"/>
</el-form-item>
<el-form-item label="时间范围(分)" prop="timeRange">
<el-input v-model="form.timeRange" placeholder="请输入时间范围(分)"/>
</el-form-item>
<el-form-item label="设备离线时间(分)" prop="deviceOfflineTime">
<el-input v-model="form.deviceOfflineTime" placeholder="请输入设备离线时间(分)"/>
</el-form-item>
<el-form-item label="通知用户" prop="notifyUser">
<el-input v-model="form.notifyUser" placeholder="请输入通知用户"/>
</el-form-item>
<el-form-item label="备注" prop="cause">
<el-input v-model="form.cause" placeholder="请输入备注"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listRecordAlarmRule,
getRecordAlarmRule,
delRecordAlarmRule,
addRecordAlarmRule,
updateRecordAlarmRule
} from '@/api/ems/record/recordAlarmRule'
export default {
name: 'RecordAlarmRule',
dicts: ['trigger_rule'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
recordAlarmRuleList: [],
//
title: '',
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
ruleId: null,
ruleName: null,
monitorId: null,
collectTime: null,
energyType: null,
triggerRule: null,
triggerNumber: null,
timeRange: null,
deviceOfflineTime: null,
notifyUser: null,
cause: null
},
//
form: {},
//
rules: {
objId: [
{ required: true, message: '自增标识不能为空', trigger: 'blur' }
]
},
columns: [
{ key: 0, label: `自增标识`, visible: false },
{ key: 1, label: `规则编号`, visible: true },
{ key: 2, label: `规则名称`, visible: true },
{ key: 3, label: `计量设备编号`, visible: true },
{ key: 4, label: `记录时间`, visible: true },
{ key: 5, label: `能源类型`, visible: true },
{ key: 6, label: `触发规则`, visible: true },
{ key: 7, label: `触发阈值次数`, visible: true },
{ key: 8, label: `时间范围(分)`, visible: true },
{ key: 9, label: `设备离线时间(分)`, visible: true },
{ key: 10, label: `通知用户`, visible: false },
{ key: 11, label: `备注`, visible: true },
{ key: 12, label: `创建人`, visible: false },
{ key: 13, label: `创建时间`, visible: false },
{ key: 14, label: `更新人`, visible: false },
{ key: 15, label: `更新时间`, visible: false }
]
}
},
created() {
this.getList()
},
methods: {
/** 查询异常告警规则列表 */
getList() {
this.loading = true
listRecordAlarmRule(this.queryParams).then(response => {
this.recordAlarmRuleList = response.rows
this.total = response.total
this.loading = false
})
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.form = {
objId: null,
ruleId: null,
ruleName: null,
monitorId: null,
collectTime: null,
energyType: null,
triggerRule: null,
triggerNumber: null,
timeRange: null,
deviceOfflineTime: null,
notifyUser: null,
cause: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加异常告警规则'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getRecordAlarmRule(objId).then(response => {
this.form = response.data
this.open = true
this.title = '修改异常告警规则'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateRecordAlarmRule(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addRecordAlarmRule(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除异常告警规则编号为"' + objIds + '"的数据项?').then(function() {
return delRecordAlarmRule(objIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('ems/record/recordAlarmRule/export', {
...this.queryParams
}, `recordAlarmRule_${new Date().getTime()}.xlsx`)
}
}
}
</script>

@ -312,7 +312,6 @@ export default {
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
} }
} }
</script> </script>

@ -1,14 +1,14 @@
<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="68px">
<el-form-item label="物料编码" prop="materialCode"> <!-- <el-form-item label="物料编码" prop="materialCode">-->
<el-input <!-- <el-input-->
v-model="queryParams.materialCode" <!-- v-model="queryParams.materialCode"-->
placeholder="请输入物料编码" <!-- placeholder="请输入物料编码"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="物料名称" prop="materialName">
<el-input <el-input
v-model="queryParams.materialName" v-model="queryParams.materialName"
@ -32,7 +32,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['base:orderBomInfo:add']" v-hasPermi="['base:orderBomInfo:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -41,7 +42,8 @@
icon="el-icon-sort" icon="el-icon-sort"
size="mini" size="mini"
@click="toggleExpandAll" @click="toggleExpandAll"
>展开/折叠</el-button> >展开/折叠
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -50,7 +52,8 @@
icon="el-icon-close" icon="el-icon-close"
size="mini" size="mini"
@click="handleClose" @click="handleClose"
>关闭</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>
@ -64,19 +67,23 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> >
<!-- <el-table-column label="BOM编号" prop="bomCode" />--> <!-- <el-table-column label="BOM编号" prop="bomCode" />-->
<el-table-column label="物料编码" align="center" prop="materialCode" /> <el-table-column label="物料编码" align="center" prop="materialCode"/>
<el-table-column label="物料名称" align="center" prop="materialName" /> <el-table-column label="物料名称" align="center" prop="materialName"/>
<el-table-column label="物料类别" align="center" prop="materialType"> <el-table-column label="物料类别" align="center" prop="materialType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/> <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标准数量" align="center" prop="standardAmount" /> <el-table-column label="标准数量" align="center" prop="standardAmount"/>
<el-table-column label="父级编号" align="center" prop="parentId" /> <el-table-column label="计量单位" align="center" prop="materialUnit">
<el-table-column label="工厂编号" align="center" prop="factoryCode" /> <template slot-scope="scope">
<!-- <el-table-column label="排序" align="center" prop="sort" />--> <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit"/>
<!-- <el-table-column label="销售凭证" align="center" prop="vbeln" />--> </template>
<!-- <el-table-column label="销售单据项目" align="center" prop="vbpos" />--> </el-table-column>
<el-table-column label="工厂名称" align="center" prop="factoryName"/>
<!-- <el-table-column label="排序" align="center" prop="sort" />-->
<!-- <el-table-column label="销售凭证" align="center" prop="vbeln" />-->
<!-- <el-table-column label="销售单据项目" align="center" prop="vbpos" />-->
<!-- <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"/>-->
@ -94,7 +101,7 @@
<!-- <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>--> <!-- <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -102,65 +109,72 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['base:orderBomInfo:edit']" v-hasPermi="['base:orderBomInfo:edit']"
>修改</el-button> >修改
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd(scope.row)" @click="handleAdd(scope.row)"
v-hasPermi="['base:orderBomInfo:add']" v-hasPermi="['base:orderBomInfo:add']"
>新增</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:orderBomInfo:remove']" v-hasPermi="['base:orderBomInfo:remove']"
>删除</el-button> >删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 添加或修改订单BOM对话框 --> <!-- 添加或修改订单BOM对话框 -->
<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="100px">
<el-form-item label="父级编号" prop="parentId"> <el-form-item label="父级编号" prop="parentId">
<treeselect v-model="form.parentId" :options="orderBomInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" /> <treeselect v-model="form.parentId" :options="orderBomInfoOptions" :normalizer="normalizer"
placeholder="请选择父级编号"
/>
</el-form-item> </el-form-item>
<el-form-item label="BOM编号" prop="bomCode"> <!-- <el-form-item label="BOM编号" prop="bomCode">-->
<el-input v-model="form.bomCode" placeholder="请输入BOM编号" /> <!-- <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>-->
<!-- </el-form-item>-->
<el-form-item label="子物料编号" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入成品物料编号" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="物料编码" prop="materialCode"> <el-form-item label="子物料名称" prop="materialName">
<el-input v-model="form.materialCode" placeholder="请输入物料编码" /> <el-input v-model="form.materialName" placeholder="请输入物料名称">
</el-form-item> <el-button slot="append" icon="el-icon-search" @click="handleMaterialAdd"></el-button>
<el-form-item label="物料名称" prop="materialName"> </el-input>
<el-input v-model="form.materialName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="物料类别" prop="materialType">
<el-select v-model="form.materialType" placeholder="请选择物料类别">
<el-option
v-for="dict in dict.type.material_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="物料类别" prop="materialType">-->
<!-- <el-select v-model="form.materialType" placeholder="请选择物料类别">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.material_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="标准数量" prop="standardAmount"> <el-form-item label="标准数量" prop="standardAmount">
<el-input v-model="form.standardAmount" placeholder="请输入标准数量" /> <el-input-number v-model="form.standardAmount" placeholder="请输入标准数量"/>
</el-form-item>
<el-form-item label="工厂编号" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂编号" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="销售凭证" prop="vbeln">
<el-input v-model="form.vbeln" placeholder="请输入销售凭证" />
</el-form-item>
<el-form-item label="销售单据项目" prop="vbpos">
<el-input v-model="form.vbpos" placeholder="请输入销售单据项目" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="工厂编号" prop="factoryCode">-->
<!-- <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="排序" prop="sort">-->
<!-- <el-input v-model="form.sort" placeholder="请输入排序"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="销售凭证" prop="vbeln">-->
<!-- <el-input v-model="form.vbeln" placeholder="请输入销售凭证"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="销售单据项目" prop="vbpos">-->
<!-- <el-input v-model="form.vbpos" placeholder="请输入销售单据项目"/>-->
<!-- </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-->
@ -176,6 +190,16 @@
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 添加物料信息对话框 -->
<el-dialog title="添加成品BOM明细" :visible.sync="materialOpen" width="900px" append-to-body>
<add-bom @selection="handleSelection" ref="materialRef"></add-bom>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitMaterialForm"> </el-button>
<el-button @click="materialOpen = false"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -185,15 +209,17 @@ import {
delProdBomInfo, delProdBomInfo,
addProdBomInfo, addProdBomInfo,
updateProdBomInfo, updateProdBomInfo,
findOrderBomList productionBomTreeList, findOrderBomList
} from '@/api/mes/prod/prodBomInfo' } from '@/api/mes/prod/prodBomInfo'
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'
import addBom from '@//views/mes/prod/prodBomInfo/addBom.vue'
export default { export default {
name: "OrderBomInfo", name: 'OrderBomInfo',
dicts: ['material_type', 'is_flag'], dicts: ['material_subclass', 'is_flag', 'material_unit'],
components: { components: {
'add-bom': addBom,
Treeselect Treeselect
}, },
data() { data() {
@ -207,13 +233,15 @@ export default {
// BOM // BOM
orderBomInfoOptions: [], orderBomInfoOptions: [],
// //
title: "", title: '',
// //
open: false, open: false,
// //
isExpandAll: true, isExpandAll: true,
// //
refreshTable: true, refreshTable: true,
//
materialOpen: false,
// //
queryParams: { queryParams: {
bomCode: null, bomCode: null,
@ -236,48 +264,51 @@ export default {
// //
form: {}, form: {},
// //
rules: { rules: {}
} }
};
}, },
created() { created() {
this.queryParams.ancestors = this.$route.params && this.$route.params.materialCode; this.queryParams.objId = this.$route.params && this.$route.params.materialCode
console.log( this.queryParams.ancestors) this.getList()
this.getList();
}, },
methods: { methods: {
/** 查询订单BOM列表 */ /** 查询订单BOM列表 */
getList() { getList() {
this.loading = true; this.loading = true
findOrderBomList(this.queryParams).then(response => { productionBomTreeList(this.queryParams).then(response => {
this.orderBomInfoList = this.handleTree(response.data, "materialCode", "parentId"); this.orderBomInfoList = this.handleTree(response.data, 'objId', 'parentId')
this.loading = false; this.loading = false
}); })
}, },
/** 转换订单BOM数据结构 */ /** 转换订单BOM数据结构 */
normalizer(node) { normalizer(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
delete node.children; delete node.children
} }
return { return {
id: node.materialCode, id: node.objId,
label: node.materialName, label: node.materialName,
children: node.children children: node.children
}; }
},
handleSelection(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
}, },
/** 查询订单BOM下拉树结构 */ /** 查询订单BOM下拉树结构 */
getTreeselect() { getTreeselect() {
findOrderBomList().then(response => { findOrderBomList().then(response => {
this.orderBomInfoOptions = []; this.orderBomInfoOptions = []
const data = { materialCode: 0, materialName: '顶级节点', children: [] }; const data = { objId: 0, materialName: '顶级节点', children: [] }
data.children = this.handleTree(response.data, "materialCode", "parentId"); data.children = this.handleTree(response.data, 'objId', 'parentId')
this.orderBomInfoOptions.push(data); this.orderBomInfoOptions.push(data)
}); })
}, },
// //
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// //
reset() { reset() {
@ -299,85 +330,101 @@ export default {
vbeln: null, vbeln: null,
vbpos: null, vbpos: null,
ancestors: null ancestors: null
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.getList(); this.getList()
},
/** 新增按钮操作 */
handleMaterialAdd() {
this.materialOpen = true
// this.title = "BOM";
},
/** 提交物料信息按钮 */
submitMaterialForm() {
let selectedRow = this.$refs.materialRef.selectedRow
// this.form.bomCode = selectedRow.bomCode;
this.form.materialCode = selectedRow.materialCode
this.form.materialName = selectedRow.materialName
this.form.factoryCode = selectedRow.factoryCode
this.form.materialType = selectedRow.materialSubclass
this.materialOpen = false
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd(row) { handleAdd(row) {
this.reset(); this.reset()
this.getTreeselect(); this.getTreeselect()
if (row != null && row.materialCode) { if (row != null && row.objId) {
this.form.parentId = row.materialCode; this.form.parentId = row.objId
} else { } else {
this.form.parentId = 0; this.form.parentId = 0
} }
this.open = true; this.open = true
this.title = "添加订单BOM"; this.title = '添加订单BOM'
}, },
/** 返回按钮操作 */ /** 返回按钮操作 */
handleClose() { handleClose() {
const obj = { path: "/base/orderBomInfo" }; const obj = { path: '/prod/prodBomInfo' }
this.$tab.closeOpenPage(obj); this.$tab.closeOpenPage(obj)
}, },
/** 展开/折叠操作 */ /** 展开/折叠操作 */
toggleExpandAll() { toggleExpandAll() {
this.refreshTable = false; this.refreshTable = false
this.isExpandAll = !this.isExpandAll; this.isExpandAll = !this.isExpandAll
this.$nextTick(() => { this.$nextTick(() => {
this.refreshTable = true; this.refreshTable = true
}); })
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
this.getTreeselect(); this.getTreeselect()
if (row != null) { if (row != null) {
this.form.parentId = row.parentId; this.form.parentId = row.parentId
} }
getProdBomInfo(row.objId).then(response => { getProdBomInfo(row.objId).then(response => {
this.form = response.data; this.form = response.data
this.open = true; this.open = true
this.title = "修改订单BOM"; this.title = '修改订单BOM'
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.objId != null) { if (this.form.objId != null) {
updateProdBomInfo(this.form).then(response => { updateProdBomInfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addProdBomInfo(this.form).then(response => { addProdBomInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除订单BOM编号为"' + row.objId + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除订单BOM编号为"' + row.objId + '"的数据项?').then(function() {
return delProdBomInfo(row.objId); return delProdBomInfo(row.objId)
}).then(() => { }).then(() => {
this.getList(); this.getList()
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功')
}).catch(() => {}); }).catch(() => {
})
} }
} }
}; }
</script> </script>

@ -17,16 +17,16 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="是否可生产" prop="isPlanToStation">--> <!-- <el-form-item label="是否可生产" prop="isPlanToStation">-->
<!-- <el-select v-model="queryParams.isPlanToStation" placeholder="请选择是否可生产" clearable>--> <!-- <el-select v-model="queryParams.isPlanToStation" placeholder="请选择是否可生产" clearable>-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="dict in dict.type.is_release"--> <!-- v-for="dict in dict.type.is_release"-->
<!-- :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>
@ -76,15 +76,15 @@
v-hasPermi="['mes/prod:prodBomInfo:export']" v-hasPermi="['mes/prod:prodBomInfo:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- plain--> <!-- plain-->
<!-- icon="el-icon-plus"--> <!-- icon="el-icon-plus"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- @click="AutomaticSynchronizationBOM"--> <!-- @click="AutomaticSynchronizationBOM"-->
<!-- >自动同步生产BOM</el-button>--> <!-- >自动同步生产BOM</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>
@ -94,7 +94,7 @@
<el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/> <el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/>
<el-table-column label="成品物料编号" align="center" prop="materialCode" v-if="columns[2].visible"> <el-table-column label="成品物料编号" align="center" prop="materialCode" v-if="columns[2].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/production/bom-info/index/' + scope.row.materialCode" class="link-type"> <router-link :to="'/production/bom-info/index/' + scope.row.objId" class="link-type">
<span>{{ scope.row.materialCode }}</span> <span>{{ scope.row.materialCode }}</span>
</router-link> </router-link>
</template> </template>
@ -107,13 +107,13 @@
</el-table-column> </el-table-column>
<el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/> <el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/>
<!-- <el-table-column label="父物料编号" align="center" prop="parentId" v-if="columns[6].visible"/>--> <!-- <el-table-column label="父物料编号" align="center" prop="parentId" v-if="columns[6].visible"/>-->
<el-table-column label="工厂名称" align="center" prop="plantName" v-if="columns[7].visible"/> <el-table-column label="工厂名称" align="center" prop="factoryName" v-if="columns[7].visible"/>
<!-- <el-table-column label="产线/工位" align="center" prop="productLineCode" v-if="columns[8].visible"/>--> <!-- <el-table-column label="产线/工位" align="center" prop="productLineCode" v-if="columns[8].visible"/>-->
<!-- <el-table-column label="工单编号" align="center" prop="orderCode" v-if="columns[14].visible"/>--> <!-- <el-table-column label="工单编号" align="center" prop="orderCode" v-if="columns[14].visible"/>-->
<el-table-column label="是否可生产" align="center" prop="isPlanToStation" v-if="columns[9].visible"> <el-table-column label="是否可生产" align="center" prop="isPlanToStation" v-if="columns[9].visible">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<dict-tag :options="dict.type.is_release" :value="scope.row.isPlanToStation"/> <!-- <dict-tag :options="dict.type.is_release" :value="scope.row.isPlanToStation"/>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[10].visible"/> <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[10].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible"> <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
@ -127,7 +127,7 @@
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -166,26 +166,26 @@
<el-button slot="append" icon="el-icon-search" @click="handleMaterialAdd"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleMaterialAdd"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="所属工厂">--> <!-- <el-form-item label="所属工厂">-->
<!-- <el-select v-model="form.plantCode" placeholder="请选择所属工厂">--> <!-- <el-select v-model="form.plantCode" placeholder="请选择所属工厂">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in factoryList"--> <!-- v-for="item in factoryList"-->
<!-- :key="item.factoryCode"--> <!-- :key="item.factoryCode"-->
<!-- :label="item.factoryName"--> <!-- :label="item.factoryName"-->
<!-- :value="item.factoryCode"--> <!-- :value="item.factoryCode"-->
<!-- ></el-option>--> <!-- ></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="物料小类" prop="materialType">--> <!-- <el-form-item label="物料小类" prop="materialType">-->
<!-- <el-select v-model="form.materialType" placeholder="请选择物料小类">--> <!-- <el-select v-model="form.materialType" placeholder="请选择物料小类">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="dict in dict.type.material_subclass"--> <!-- v-for="dict in dict.type.material_subclass"-->
<!-- :key="dict.value"--> <!-- :key="dict.value"-->
<!-- :label="dict.label"--> <!-- :label="dict.label"-->
<!-- :value="dict.value"--> <!-- :value="dict.value"-->
<!-- ></el-option>--> <!-- ></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="标准数量" prop="standardAmount">--> <!-- <el-form-item label="标准数量" prop="standardAmount">-->
<!-- <el-input v-model="form.standardAmount" placeholder="请输入标准数量" />--> <!-- <el-input v-model="form.standardAmount" placeholder="请输入标准数量" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
@ -200,7 +200,7 @@
<el-radio <el-radio
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="dict.value"
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -235,7 +235,7 @@ import addBom from '@//views/mes/prod/prodBomInfo/addBom.vue';
export default { export default {
name: 'ProdBomInfo', name: 'ProdBomInfo',
dicts: ['is_flag'], dicts: ['is_flag','material_subclass'],
components: { components: {
'add-bom': addBom 'add-bom': addBom
}, },
@ -307,11 +307,11 @@ export default {
factoryList: [] factoryList: []
}; };
}, },
create() { created() {
// getBaseFactoryList().then(response => {
// this.factoryList = response.data;
// });
this.getList(); this.getList();
getBaseFactoryList().then(response => {
this.factoryList = response.data;
});
}, },
methods: { methods: {
/** 查询生产BOM列表 */ /** 查询生产BOM列表 */
@ -337,11 +337,11 @@ export default {
materialName: null, materialName: null,
materialType: 1, materialType: 1,
standardAmount: 1, standardAmount: 1,
parentId: null, parentId: 0,
plantCode: null, plantCode: null,
productLineCode: null, productLineCode: null,
isPlanToStation: null, isPlanToStation: null,
isFlag: 0, isFlag: '0',
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,

Loading…
Cancel
Save