xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wanghao 3 months ago
parent 4190426587 0cdaae6ffb
commit 033b3190a3
11 changed files with 1114 additions and 774 deletions
Show Stats Download Patch File Download Diff File

2
src/api/dms/alarmLevel/types.ts
Unescape Escape View File

@ -55,7 +55,7 @@ export interface AlarmLevelForm extends BaseEntity {
/**
* 默认通知方式（1、邮箱，2、短信，3、钉钉，4、微信公众号，5、企业微信），多个保存用,隔开。
*/
defaultNotifyMode?: string;
defaultNotifyMode?: [];
/**
* 描述

12
src/api/mes/baseDeviceType/types.ts
Unescape Escape View File

@ -27,7 +27,7 @@ export interface BaseDeviceTypeVO {
/**
* 设备大类ID（大类ID（关联base_category表category_type为2的））
*/
categoryId: string | number;
deviceCategoryId: string | number;
/**
* 激活标识（1是 0否）
@ -39,6 +39,8 @@ export interface BaseDeviceTypeVO {
*/
remark: string;
deviceCategoryName: string;
}
export interface BaseDeviceTypeForm extends BaseEntity {
@ -70,7 +72,7 @@ export interface BaseDeviceTypeForm extends BaseEntity {
/**
* 设备大类ID（大类ID（关联base_category表category_type为2的））
*/
categoryId?: string | number;
deviceCategoryId?: string | number;
/**
* 激活标识（1是 0否）
@ -82,6 +84,8 @@ export interface BaseDeviceTypeForm extends BaseEntity {
*/
remark?: string;
deviceCategoryName?: string;
}
export interface BaseDeviceTypeQuery extends PageQuery {
@ -114,7 +118,7 @@ export interface BaseDeviceTypeQuery extends PageQuery {
/**
* 设备大类ID（大类ID（关联base_category表category_type为2的））
*/
categoryId?: string | number;
deviceCategoryId?: string | number;
/**
* 激活标识（1是 0否）
@ -125,6 +129,8 @@ export interface BaseDeviceTypeQuery extends PageQuery {
* 日期范围参数
*/
params?: any;
deviceCategoryName?: string;
}

258
src/views/dms/alarmLevel/index.vue
Unescape Escape View File

@ -1,132 +1,142 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="报警级别ID" prop="alarmLevelId">
<el-input v-model="queryParams.alarmLevelId" placeholder="请输入报警级别ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="报警级别名称" prop="alarmLevelName">
<el-input v-model="queryParams.alarmLevelName" placeholder="请输入报警级别名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="严重程度" prop="levelNumber">
<el-input v-model="queryParams.levelNumber" placeholder="请输入严重程度" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="levelStatus">
<el-select v-model="queryParams.levelStatus" placeholder="请选择状态" clearable >
<el-option v-for="dict in dms_level_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
<div class='p-2'>
<transition :enter-active-class='proxy?.animate.searchAnimate.enter'
:leave-active-class='proxy?.animate.searchAnimate.leave'>
<div v-show='showSearch' class='mb-[10px]'>
<el-card shadow='hover'>
<el-form ref='queryFormRef' :model='queryParams' :inline='true' label-width='100px'>
<el-form-item label='报警级别名称' prop='alarmLevelName'>
<el-input v-model='queryParams.alarmLevelName' placeholder='请输入报警级别名称' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<!-- <el-form-item label="状态" prop="levelStatus">-->
<!-- <el-select v-model="queryParams.levelStatus" placeholder="请选择状态" clearable >-->
<!-- <el-option v-for="dict in dms_level_status" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<el-card shadow='never'>
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:alarmLevel:add']">新增</el-button>
<el-row :gutter='10' class='mb8'>
<el-col :span='1.5'>
<el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['dms:alarmLevel:add']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:alarmLevel:edit']">修改</el-button>
<el-col :span='1.5'>
<el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
v-hasPermi="['dms:alarmLevel:edit']">修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:alarmLevel:remove']">删除</el-button>
<el-col :span='1.5'>
<el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
v-hasPermi="['dms:alarmLevel:remove']">删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:alarmLevel:export']">导出</el-button>
<el-col :span='1.5'>
<el-button type='warning' plain icon='Download' @click='handleExport'
v-hasPermi="['dms:alarmLevel:export']">导出
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
<right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
@queryTable='getList'></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="alarmLevelList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="报警级别ID" align="center" prop="alarmLevelId" v-if="columns[0].visible"/>
<el-table-column label="报警级别名称" align="center" prop="alarmLevelName" v-if="columns[1].visible"/>
<el-table-column label="严重程度" align="center" prop="levelNumber" v-if="columns[3].visible"/>
<el-table-column label="状态" align="center" prop="levelStatus" v-if="columns[4].visible">
<template #default="scope">
<dict-tag :options="dms_level_status" :value="scope.row.levelStatus"/>
<el-table v-loading='loading' :data='alarmLevelList' @selection-change='handleSelectionChange'>
<el-table-column type='selection' width='55' align='center' />
<el-table-column label='报警级别ID' align='center' prop='alarmLevelId' v-if='columns[0].visible' />
<el-table-column label='报警级别名称' align='center' prop='alarmLevelName' v-if='columns[1].visible' />
<el-table-column label='严重程度' align='center' prop='levelNumber' v-if='columns[3].visible' />
<el-table-column label='状态' align='center' prop='levelStatus' v-if='columns[4].visible'>
<template #default='scope'>
<dict-tag :options='dms_level_status' :value='scope.row.levelStatus' />
</template>
</el-table-column>
<el-table-column label="默认通知方式" align="center" prop="defaultNotifyMode" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="dms_default_notify_mode" :value="scope.row.defaultNotifyMode ? scope.row.defaultNotifyMode.split(',') : []"/>
<el-table-column label='默认通知方式' align='center' prop='defaultNotifyMode' v-if='columns[5].visible'>
<template #default='scope'>
<dict-tag :options='dms_default_notify_mode'
:value="scope.row.defaultNotifyMode ? scope.row.defaultNotifyMode.split(',') : []" />
</template>
</el-table-column>
<el-table-column label="描述" align="center" prop="remark" v-if="columns[6].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:alarmLevel:edit']"></el-button>
<el-table-column label='描述' align='center' prop='remark' v-if='columns[6].visible' />
<el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
<template #default='scope'>
<el-tooltip content='修改' placement='top'>
<el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
v-hasPermi="['dms:alarmLevel:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:alarmLevel:remove']"></el-button>
<el-tooltip content='删除' placement='top'>
<el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
v-hasPermi="['dms:alarmLevel:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
v-model:limit='queryParams.pageSize' @pagination='getList' />
</el-card>
<!-- 添加或修改报警级别对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="alarmLevelFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="报警级别ID" prop="alarmLevelId">
<el-input v-model="form.alarmLevelId" placeholder="请输入报警级别ID" />
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='alarmLevelFormRef' :model='form' :rules='rules' label-width='110px'>
<el-form-item label='报警级别名称' prop='alarmLevelName'>
<el-input v-model='form.alarmLevelName' placeholder='请输入报警级别名称' />
</el-form-item>
<el-form-item label="报警级别名称" prop="alarmLevelName">
<el-input v-model="form.alarmLevelName" placeholder="请输入报警级别名称" />
<el-form-item label='严重程度' prop='levelNumber'>
<el-input-number v-model='form.levelNumber' placeholder='请输入严重程度' style='width: 220px;' />
<span style='color: #8d8c8c;'>注：数字越大，严重程度越高</span>
</el-form-item>
<el-form-item label="严重程度" prop="levelNumber">
<el-input v-model="form.levelNumber" placeholder="请输入严重程度" />
</el-form-item>
<el-form-item label="状态" prop="levelStatus">
<el-radio-group v-model="form.levelStatus">
<el-radio
v-for="dict in dms_level_status"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="默认通知方式" prop="defaultNotifyMode">
<el-checkbox-group v-model="form.defaultNotifyMode">
<!-- <el-form-item label='状态' prop='levelStatus'>-->
<!-- <el-radio-group v-model='form.levelStatus'>-->
<!-- <el-radio-->
<!-- v-for='dict in dms_level_status'-->
<!-- :key='dict.value'-->
<!-- :value='dict.value'-->
<!-- >{{ dict.label }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label='默认通知方式' prop='defaultNotifyMode'>
<el-checkbox-group v-model='form.defaultNotifyMode'>
<el-checkbox
v-for="dict in dms_default_notify_mode"
:key="dict.value"
:label="dict.value">
{{dict.label}}
v-for='dict in dms_default_notify_mode'
:key='dict.value'
:label='dict.value'>
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="form.remark" placeholder="请输入描述" />
<el-form-item label='描述' prop='remark'>
<el-input v-model='form.remark' type='textarea' placeholder='请输入描述' />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<div class='dialog-footer'>
<el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
<el-button @click='cancel'>取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="AlarmLevel" lang="ts">
<script setup name='AlarmLevel' lang='ts'>
import { listAlarmLevel, getAlarmLevel, delAlarmLevel, addAlarmLevel, updateAlarmLevel } from '@/api/dms/alarmLevel';
import { AlarmLevelVO, AlarmLevelQuery, AlarmLevelForm } from '@/api/dms/alarmLevel/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { dms_level_status, dms_default_notify_mode } = toRefs<any>(proxy?.useDict('dms_level_status', 'dms_default_notify_mode'));
const {
dms_level_status,
dms_default_notify_mode
} = toRefs<any>(proxy?.useDict('dms_level_status', 'dms_default_notify_mode'));
const alarmLevelList = ref<AlarmLevelVO[]>([]);
const buttonLoading = ref(false);
@ -147,30 +157,31 @@ const dialog = reactive<DialogOption>({
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `报警级别ID`, visible: true },
{ 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: true },
{ key: 11, label: `更新时间`, visible: true },
{ key: 0, label: `报警级别ID`, 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: true },
{ key: 11, label: `更新时间`, visible: true }
]);
const initFormData: AlarmLevelForm = {
alarmLevelId: undefined,
alarmLevelName: undefined,
levelNumber: undefined,
levelStatus: undefined,
levelStatus: '1',
defaultNotifyMode: [],
remark: undefined,
}
remark: undefined
};
const data = reactive<PageData<AlarmLevelForm, AlarmLevelQuery>>({
form: {...initFormData},
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
@ -179,16 +190,15 @@ const data = reactive<PageData<AlarmLevelForm, AlarmLevelQuery>>({
levelNumber: undefined,
levelStatus: undefined,
defaultNotifyMode: undefined,
params: {
}
params: {}
},
rules: {
alarmLevelName: [
{ required: true, message: "报警级别名称不能为空", trigger: "blur" }
{ required: true, message: '报警级别名称不能为空', trigger: 'blur' }
],
defaultNotifyMode: [
{ required: true, message: "默认通知方式不能为空", trigger: "blur" }
],
{ required: true, message: '默认通知方式不能为空', trigger: 'blur' }
]
}
});
@ -201,90 +211,90 @@ const getList = async () => {
alarmLevelList.value = res.rows;
total.value = res.total;
loading.value = false;
}
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
};
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
form.value = { ...initFormData };
alarmLevelFormRef.value?.resetFields();
}
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: AlarmLevelVO[]) => {
ids.value = selection.map(item => item.alarmLevelId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加报警级别";
}
dialog.title = '添加报警级别';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: AlarmLevelVO) => {
reset();
const _alarmLevelId = row?.alarmLevelId || ids.value[0]
const _alarmLevelId = row?.alarmLevelId || ids.value[0];
const res = await getAlarmLevel(_alarmLevelId);
Object.assign(form.value, res.data);
form.value.defaultNotifyMode = form.value.defaultNotifyMode.split(",");
form.value.defaultNotifyMode = form.value.defaultNotifyMode.split(',');
dialog.visible = true;
dialog.title = "修改报警级别";
}
dialog.title = '修改报警级别';
};
/** 提交按钮 */
const submitForm = () => {
alarmLevelFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.defaultNotifyMode = form.value.defaultNotifyMode.join(",");
form.value.defaultNotifyMode = form.value.defaultNotifyMode.join(',');
if (form.value.alarmLevelId) {
await updateAlarmLevel(form.value).finally(() => buttonLoading.value = false);
await updateAlarmLevel(form.value).finally(() => buttonLoading.value = false);
} else {
await addAlarmLevel(form.value).finally(() => buttonLoading.value = false);
await addAlarmLevel(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
}
};
/** 删除按钮操作 */
const handleDelete = async (row?: AlarmLevelVO) => {
const _alarmLevelIds = row?.alarmLevelId || ids.value;
await proxy?.$modal.confirm('是否确认删除报警级别编号为"' + _alarmLevelIds + '"的数据项？').finally(() => loading.value = false);
await delAlarmLevel(_alarmLevelIds);
proxy?.$modal.msgSuccess("删除成功");
proxy?.$modal.msgSuccess('删除成功');
await getList();
}
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('dms/alarmLevel/export', {
...queryParams.value
}, `alarmLevel_${new Date().getTime()}.xlsx`)
}
}, `alarmLevel_${new Date().getTime()}.xlsx`);
};
onMounted(() => {
getList();

257
src/views/dms/alarmRule/index.vue
Unescape Escape View File

@ -5,70 +5,38 @@
<div v-show='showSearch' class='mb-[10px]'>
<el-card shadow='hover'>
<el-form ref='queryFormRef' :model='queryParams' :inline='true'>
<el-form-item label='报警规则ID，主键' prop='alarmRuleId'>
<el-input v-model='queryParams.alarmRuleId' placeholder='请输入报警规则ID，主键' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='规则名称' prop='alarmRuleName'>
<el-input v-model='queryParams.alarmRuleName' placeholder='请输入规则名称' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='报警级别，关联表hw_alarm_level字段alarm_level_id' prop='alarmLevelId'>
<el-input v-model='queryParams.alarmLevelId' placeholder='请输入报警级别，关联表hw_alarm_level字段alarm_level_id'
clearable @keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='报警类型，关联表hw_alarm_type字段alarm_type_id' prop='alarmTypeId'>
<el-input v-model='queryParams.alarmTypeId' placeholder='请输入报警类型，关联表hw_alarm_type字段alarm_type_id'
clearable @keyup.enter='handleQuery' />
</el-form-item>
<!-- <el-form-item label='报警级别' prop='alarmLevelId'>-->
<!-- <el-input v-model='queryParams.alarmLevelId' placeholder='请输入报警级别'-->
<!-- clearable @keyup.enter='handleQuery' />-->
<!-- </el-form-item>-->
<!-- <el-form-item label='报警类型' prop='alarmTypeId'>-->
<!-- <el-input v-model='queryParams.alarmTypeId' placeholder='请输入报警类型'-->
<!-- clearable @keyup.enter='handleQuery' />-->
<!-- </el-form-item>-->
<el-form-item label='规则类型' prop='ruleType'>
<el-select v-model='queryParams.ruleType' placeholder='请选择规则类型' clearable>
<el-option v-for='dict in dms_rule_type' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item label='关联表hw_device字段device_id。' prop='ruleDeviceId'>
<el-input v-model='queryParams.ruleDeviceId' placeholder='请输入关联表hw_device字段device_id。' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='关联表hw_device_mode字段device_mode_id；' prop='ruleDeviceModeId'>
<el-input v-model='queryParams.ruleDeviceModeId' placeholder='请输入关联表hw_device_mode字段device_mode_id；'
clearable @keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='一共有几个属性规则' prop='ruleFunctionTotal'>
<el-input v-model='queryParams.ruleFunctionTotal' placeholder='请输入一共有几个属性规则' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='表达式，例如:{}>60 or {}<-88' prop='triggerExpression'>
<el-input v-model='queryParams.triggerExpression' placeholder='请输入表达式，例如:{}>60 or {}<-88' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='联动标识' prop='linkFlag'>
<el-select v-model='queryParams.linkFlag' placeholder='请选择联动标识' clearable>
<el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item label='报警启用状态(1、是，0、否）' prop='alarmRuleStatus'>
<el-select v-model='queryParams.alarmRuleStatus' placeholder='请选择报警启用状态(1、是，0、否）' clearable>
<el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item label='报警推送标识(1、是，0、否）' prop='alarmPushFlag'>
<el-select v-model='queryParams.alarmPushFlag' placeholder='请选择报警推送标识(1、是，0、否）' clearable>
<el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item label='时间范围' prop='triggerTimeFrame'>
<el-input v-model='queryParams.triggerTimeFrame' placeholder='请输入时间范围' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='触发阈值次数' prop='triggerNumber'>
<el-input v-model='queryParams.triggerNumber' placeholder='请输入触发阈值次数' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<el-form-item label='触发死区' prop='triggerDeadzone'>
<el-input v-model='queryParams.triggerDeadzone' placeholder='请输入触发死区' clearable
@keyup.enter='handleQuery' />
</el-form-item>
<!-- <el-form-item label='联动标识' prop='linkFlag'>-->
<!-- <el-select v-model='queryParams.linkFlag' placeholder='请选择联动标识' clearable>-->
<!-- <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label='报警启用状态' prop='alarmRuleStatus'>-->
<!-- <el-select v-model='queryParams.alarmRuleStatus' placeholder='请选择报警启用状态' clearable>-->
<!-- <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label='报警推送标识' prop='alarmPushFlag'>-->
<!-- <el-select v-model='queryParams.alarmPushFlag' placeholder='请选择报警推送标识' clearable>-->
<!-- <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button>
@ -107,41 +75,41 @@
<el-table v-loading='loading' :data='alarmRuleList' @selection-change='handleSelectionChange'>
<el-table-column type='selection' width='55' align='center' />
<el-table-column label='报警规则ID，主键' align='center' prop='alarmRuleId' v-if='columns[0].visible' />
<el-table-column label='规则名称' align='center' prop='alarmRuleName' v-if='columns[1].visible' />
<el-table-column label='报警级别，关联表hw_alarm_level字段alarm_level_id' align='center' prop='alarmLevelId'
<el-table-column label='报警规则ID' align='center' prop='alarmRuleId' v-if='columns[0].visible' />
<el-table-column label='规则名称' align='center' prop='alarmRuleName' v-if='columns[1].visible' width='130' />
<el-table-column label='报警级别' align='center' prop='alarmLevelName'
v-if='columns[3].visible' />
<el-table-column label='报警类型，关联表hw_alarm_type字段alarm_type_id' align='center' prop='alarmTypeId'
<el-table-column label='报警类型' align='center' prop='alarmTypeName'
v-if='columns[4].visible' />
<el-table-column label='规则类型' align='center' prop='ruleType' v-if='columns[5].visible'>
<template #default='scope'>
<dict-tag :options='dms_rule_type' :value='scope.row.ruleType' />
</template>
</el-table-column>
<el-table-column label='关联表hw_device字段device_id。' align='center' prop='ruleDeviceId'
<el-table-column label='设备名称' align='center' prop='ruleDeviceName'
v-if='columns[6].visible' />
<el-table-column label='关联表hw_device_mode字段device_mode_id；' align='center' prop='ruleDeviceModeId'
v-if='columns[7].visible' />
<el-table-column label='一共有几个属性规则' align='center' prop='ruleFunctionTotal' v-if='columns[8].visible' />
<el-table-column label='表达式，例如:{}>60 or {}<-88' align='center' prop='triggerExpression'
v-if='columns[9].visible' />
<el-table-column label='设备模型' align='center' prop='ruleDeviceModeName'
v-if='columns[7].visible' width='110' />
<el-table-column label='属性规则数量' align='center' prop='ruleFunctionTotal' v-if='columns[8].visible' width='110' />
<el-table-column label='表达式' align='center' prop='triggerExpression' v-if='columns[9].visible' width='120' />
<el-table-column label='联动标识' align='center' prop='linkFlag' v-if='columns[10].visible'>
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.linkFlag' />
</template>
</el-table-column>
<el-table-column label='报警启用状态(1、是，0、否）' align='center' prop='alarmRuleStatus' v-if='columns[11].visible'>
<el-table-column label='报警启用状态' align='center' prop='alarmRuleStatus' v-if='columns[11].visible' width='110'>
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.alarmRuleStatus' />
</template>
</el-table-column>
<el-table-column label='报警推送标识(1、是，0、否）' align='center' prop='alarmPushFlag' v-if='columns[12].visible'>
<el-table-column label='报警推送标识' align='center' prop='alarmPushFlag' v-if='columns[12].visible' width='110'>
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.alarmPushFlag' />
</template>
</el-table-column>
<el-table-column label='报警推送内容' align='center' prop='alarmPushContent' v-if='columns[13].visible' />
<el-table-column label='恢复正常推送内容' align='center' prop='alarmRecoverContent' v-if='columns[14].visible' />
<el-table-column label='报警推送内容' align='center' prop='alarmPushContent' v-if='columns[13].visible' width='110' />
<el-table-column label='恢复正常推送内容' align='center' prop='alarmRecoverContent' v-if='columns[14].visible'
width='130' />
<el-table-column label='时间范围' align='center' prop='triggerTimeFrame' v-if='columns[15].visible' />
<el-table-column label='触发阈值次数' align='center' prop='triggerNumber' v-if='columns[16].visible' />
<el-table-column label='触发死区' align='center' prop='triggerDeadzone' v-if='columns[17].visible' />
@ -165,18 +133,29 @@
</el-card>
<!-- 添加或修改报警规则对话框 -->
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='alarmRuleFormRef' :model='form' :rules='rules' label-width='80px'>
<el-form-item label='报警规则ID，主键' prop='alarmRuleId'>
<el-input v-model='form.alarmRuleId' placeholder='请输入报警规则ID，主键' />
</el-form-item>
<el-form ref='alarmRuleFormRef' :model='form' :rules='rules' label-width='130px'>
<el-form-item label='规则名称' prop='alarmRuleName'>
<el-input v-model='form.alarmRuleName' placeholder='请输入规则名称' />
</el-form-item>
<el-form-item label='报警级别，关联表hw_alarm_level字段alarm_level_id' prop='alarmLevelId'>
<el-input v-model='form.alarmLevelId' placeholder='请输入报警级别，关联表hw_alarm_level字段alarm_level_id' />
<el-form-item label='报警级别' prop='alarmLevelId'>
<el-select v-model='form.alarmLevelId' placeholder='请选择报警级别'>
<el-option
v-for='item in alarmLevelList'
:key='item.alarmLevelId'
:label='item.alarmLevelName'
:value='item.alarmLevelId'
/>
</el-select>
</el-form-item>
<el-form-item label='报警类型，关联表hw_alarm_type字段alarm_type_id' prop='alarmTypeId'>
<el-input v-model='form.alarmTypeId' placeholder='请输入报警类型，关联表hw_alarm_type字段alarm_type_id' />
<el-form-item label='报警类型' prop='alarmTypeId'>
<el-select v-model='form.alarmTypeId' placeholder='请选择报警类型'>
<el-option
v-for='item in alarmTypeList'
:key='item.alarmTypeId'
:label='item.alarmTypeName'
:value='item.alarmTypeId'
/>
</el-select>
</el-form-item>
<el-form-item label='规则类型' prop='ruleType'>
<el-radio-group v-model='form.ruleType'>
@ -188,17 +167,24 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label='关联表hw_device字段device_id。' prop='ruleDeviceId'>
<el-input v-model='form.ruleDeviceId' placeholder='请输入关联表hw_device字段device_id。' />
<el-form-item label='设备模型' prop='ruleDeviceModeId'>
<el-select v-model='form.ruleDeviceModeId' placeholder='请选择设备模型'>
<el-option
v-for='item in deviceModeList'
:key='item.deviceModeId'
:label='item.deviceModeName'
:value='item.deviceModeId'
/>
</el-select>
</el-form-item>
<el-form-item label='关联表hw_device_mode字段device_mode_id；' prop='ruleDeviceModeId'>
<el-input v-model='form.ruleDeviceModeId' placeholder='请输入关联表hw_device_mode字段device_mode_id；' />
<!-- <el-form-item label='设备模型功能' prop='ruleDeviceModeId'>-->
<!-- <el-input v-model='form.ruleDeviceModeId' placeholder='请输入设备模型功能' />-->
<!-- </el-form-item>-->
<el-form-item label='属性规则数量' prop='ruleFunctionTotal'>
<el-input-number v-model='form.ruleFunctionTotal' placeholder='请输入属性规则数量' style='width: 220px;' />
</el-form-item>
<el-form-item label='一共有几个属性规则' prop='ruleFunctionTotal'>
<el-input v-model='form.ruleFunctionTotal' placeholder='请输入一共有几个属性规则' />
</el-form-item>
<el-form-item label='表达式，例如:{}>60 or {}<-88' prop='triggerExpression'>
<el-input v-model='form.triggerExpression' placeholder='请输入表达式，例如:{}>60 or {}<-88' />
<el-form-item label='表达式' prop='triggerExpression'>
<el-input v-model='form.triggerExpression' placeholder='请输入表达式' />
</el-form-item>
<el-form-item label='联动标识' prop='linkFlag'>
<el-radio-group v-model='form.linkFlag'>
@ -210,7 +196,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label='报警启用状态(1、是，0、否）' prop='alarmRuleStatus'>
<el-form-item label='报警启用状态' prop='alarmRuleStatus'>
<el-radio-group v-model='form.alarmRuleStatus'>
<el-radio
v-for='dict in active_flag'
@ -220,7 +206,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label='报警推送标识(1、是，0、否）' prop='alarmPushFlag'>
<el-form-item label='报警推送标识' prop='alarmPushFlag'>
<el-radio-group v-model='form.alarmPushFlag'>
<el-radio
v-for='dict in active_flag'
@ -231,19 +217,19 @@
</el-radio-group>
</el-form-item>
<el-form-item label='报警推送内容'>
<editor v-model='form.alarmPushContent' :min-height='192' />
<el-input v-model='form.alarmPushContent' type='textarea' placeholder='请输入报警推送内容' />
</el-form-item>
<el-form-item label='恢复正常推送内容'>
<editor v-model='form.alarmRecoverContent' :min-height='192' />
<el-input v-model='form.alarmRecoverContent' type='textarea' placeholder='请输入恢复正常推送内容' />
</el-form-item>
<el-form-item label='时间范围' prop='triggerTimeFrame'>
<el-input v-model='form.triggerTimeFrame' placeholder='请输入时间范围' />
</el-form-item>
<el-form-item label='触发阈值次数' prop='triggerNumber'>
<el-input v-model='form.triggerNumber' placeholder='请输入触发阈值次数' />
<el-input-number v-model='form.triggerNumber' placeholder='请输入触发阈值次数' style='width: 220px;' />
</el-form-item>
<el-form-item label='触发死区' prop='triggerDeadzone'>
<el-input v-model='form.triggerDeadzone' placeholder='请输入触发死区' />
<el-input-number v-model='form.triggerDeadzone' placeholder='请输入触发死区' style='width: 220px;' />
</el-form-item>
<el-form-item label='描述' prop='remark'>
<el-input v-model='form.remark' placeholder='请输入描述' />
@ -262,6 +248,9 @@
<script setup name='AlarmRule' lang='ts'>
import { listAlarmRule, getAlarmRule, delAlarmRule, addAlarmRule, updateAlarmRule } from '@/api/dms/alarmRule';
import { AlarmRuleVO, AlarmRuleQuery, AlarmRuleForm } from '@/api/dms/alarmRule/types';
import { getBaseAlarmLevelList } from '@/api/dms/alarmLevel';
import { getBaseAlarmTypeList } from '@/api/dms/alarmType';
import { getDmsDeviceModeList } from '@/api/dms/deviceMode';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag, dms_rule_type } = toRefs<any>(proxy?.useDict('active_flag', 'dms_rule_type'));
@ -283,32 +272,53 @@ const dialog = reactive<DialogOption>({
title: ''
});
/** 获取报警级别下拉框 */
const alarmLevelList = ref([]);
const getBaseAlarmLevelListSelect = async () => {
let res = await getBaseAlarmLevelList(null);
alarmLevelList.value = res.data;
};
/** 获取报警类型下拉框 */
const alarmTypeList = ref([]);
const getBaseAlarmTypeListSelect = async () => {
let res = await getBaseAlarmTypeList(null);
alarmTypeList.value = res.data;
};
/** 获取设备模型下拉框 */
const deviceModeList = ref([]);
const getDmsDeviceModeListSelect = async () => {
let res = await getDmsDeviceModeList(null);
deviceModeList.value = res.data;
};
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `报警规则ID，主键`, visible: true },
{ key: 0, label: `报警规则ID`, visible: false },
{ key: 1, label: `规则名称`, visible: true },
{ key: 2, label: `租户编号`, visible: true },
{ key: 3, label: `报警级别，关联表hw_alarm_level字段alarm_level_id`, visible: true },
{ key: 4, label: `报警类型，关联表hw_alarm_type字段alarm_type_id`, visible: true },
{ key: 2, label: `租户编号`, visible: false },
{ key: 3, label: `报警级别`, visible: true },
{ key: 4, label: `报警类型`, visible: true },
{ key: 5, label: `规则类型`, visible: true },
{ key: 6, label: `关联表hw_device字段device_id。`, visible: true },
{ key: 7, label: `关联表hw_device_mode字段device_mode_id；`, visible: true },
{ key: 8, label: `一共有几个属性规则`, visible: true },
{ key: 9, label: `表达式，例如:{}>60 or {}<-88`, visible: true },
{ key: 6, label: `设备名称`, visible: false },
{ key: 7, label: `设备模型`, visible: true },
{ key: 8, label: `属性规则数量`, visible: true },
{ key: 9, label: `表达式`, visible: true },
{ key: 10, label: `联动标识`, visible: true },
{ key: 11, label: `报警启用状态(1、是，0、否）`, visible: true },
{ key: 12, label: `报警推送标识(1、是，0、否）`, visible: true },
{ key: 11, label: `报警启用状态`, visible: true },
{ key: 12, label: `报警推送标识`, visible: true },
{ key: 13, label: `报警推送内容`, visible: true },
{ key: 14, label: `恢复正常推送内容`, visible: true },
{ key: 15, label: `时间范围`, visible: true },
{ key: 16, label: `触发阈值次数`, visible: true },
{ key: 17, label: `触发死区`, visible: true },
{ key: 15, label: `时间范围`, visible: false },
{ key: 16, label: `触发阈值次数`, visible: false },
{ key: 17, label: `触发死区`, visible: false },
{ key: 18, label: `描述`, visible: true },
{ key: 19, label: `创建部门`, visible: true },
{ key: 20, label: `创建人`, visible: true },
{ key: 21, label: `创建时间`, visible: true },
{ key: 22, label: `更新人`, visible: true },
{ key: 23, label: `更新时间`, visible: true }
{ key: 19, label: `创建部门`, visible: false },
{ key: 20, label: `创建人`, visible: false },
{ key: 21, label: `创建时间`, visible: false },
{ key: 22, label: `更新人`, visible: false },
{ key: 23, label: `更新时间`, visible: false }
]);
const initFormData: AlarmRuleForm = {
@ -321,9 +331,9 @@ const initFormData: AlarmRuleForm = {
ruleDeviceModeId: undefined,
ruleFunctionTotal: undefined,
triggerExpression: undefined,
linkFlag: undefined,
alarmRuleStatus: undefined,
alarmPushFlag: undefined,
linkFlag: '1',
alarmRuleStatus: '1',
alarmPushFlag: '1',
alarmPushContent: undefined,
alarmRecoverContent: undefined,
triggerTimeFrame: undefined,
@ -360,16 +370,30 @@ const data = reactive<PageData<AlarmRuleForm, AlarmRuleQuery>>({
{ required: true, message: '规则名称不能为空', trigger: 'blur' }
],
alarmLevelId: [
{ required: true, message: '报警级别，关联表hw_alarm_level字段alarm_level_id不能为空', trigger: 'blur' }
{ required: true, message: '报警级别不能为空', trigger: 'blur' }
],
triggerExpression: [
{ required: true, message: '表达式不能为空', trigger: 'blur' }
],
alarmTypeId: [
{ required: true, message: '报警类型，关联表hw_alarm_type字段alarm_type_id不能为空', trigger: 'blur' }
{ required: true, message: '报警类型不能为空', trigger: 'blur' }
]
}
});
const { queryParams, form, rules } = toRefs(data);
// /** 获取设备模型功能下拉框 */
// const deviceModeFunctionList = ref([]);
// watch(() => form.value.deviceModeId, (val, oldVal) => {
// const getDmsDeviceModeFunctionListSelect = async () => {
// if (val !== null){
// let res = await getDmsDeviceModeFunctionList({ deviceModeId: val, functionMode: '3'});
// deviceModeFunctionList.value = res.data;
// }
// };
// });
/** 查询报警规则列表 */
const getList = async () => {
loading.value = true;
@ -461,6 +485,9 @@ const handleExport = () => {
};
onMounted(() => {
getBaseAlarmLevelListSelect();
getBaseAlarmTypeListSelect();
getDmsDeviceModeListSelect();
getList();
});
</script>

162
src/views/mes/baseDeviceType/index.vue
Unescape Escape View File

@ -4,27 +4,27 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="物料类型ID" prop="deviceTypeId">
<!-- <el-form-item label="物料类型ID" prop="deviceTypeId">
<el-input v-model="queryParams.deviceTypeId" placeholder="请输入物料类型ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="父级标识" prop="parentId">
</el-form-item>-->
<!-- <el-form-item label="父级标识" prop="parentId">
<el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="设备类型编号" prop="deviceTypeCode">
</el-form-item>-->
<!-- <el-form-item label="设备类型编号" prop="deviceTypeCode">
<el-input v-model="queryParams.deviceTypeCode" placeholder="请输入设备类型编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="设备类型名称" prop="deviceTypeName">
</el-form-item>-->
<el-form-item label="设备类型名称" prop="deviceTypeName" label-width="100px">
<el-input v-model="queryParams.deviceTypeName" placeholder="请输入设备类型名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="祖级列表" prop="ancestors">
<!-- <el-form-item label="祖级列表" prop="ancestors">
<el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="设备大类ID" prop="categoryId">
<el-input v-model="queryParams.categoryId" placeholder="请输入设备大类ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="激活标识" prop="activeFlag">
</el-form-item>-->
<!-- <el-form-item label="激活标识" prop="activeFlag">
<el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -55,13 +55,17 @@
<el-table v-loading="loading" :data="baseDeviceTypeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料类型ID" align="center" prop="deviceTypeId" v-if="columns[0].visible"/>
<el-table-column label="设备类型" align="center" prop="deviceTypeId" v-if="columns[0].visible"/>
<el-table-column label="父级标识" align="center" prop="parentId" v-if="columns[2].visible"/>
<el-table-column label="设备类型编号" align="center" prop="deviceTypeCode" v-if="columns[3].visible"/>
<el-table-column label="设备类型名称" align="center" prop="deviceTypeName" v-if="columns[4].visible"/>
<el-table-column label="祖级列表" align="center" prop="ancestors" v-if="columns[5].visible"/>
<el-table-column label="设备大类ID" align="center" prop="categoryId" v-if="columns[6].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible"/>
<el-table-column label="设备大类" align="center" prop="deviceCategoryName" v-if="columns[6].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible">
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.activeFlag' />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
@ -77,29 +81,53 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改设备类型信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="baseDeviceTypeFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="物料类型ID" prop="deviceTypeId">
<el-input v-model="form.deviceTypeId" placeholder="请输入物料类型ID" />
</el-form-item>
<el-form-item label="父级标识" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入父级标识" />
</el-form-item>
<el-form ref="baseDeviceTypeFormRef" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="设备类型" prop="deviceTypeId">
<el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID" />
</el-form-item>-->
<!-- <el-form-item label="父级标识" prop="parentId">
<el-tree-select
v-model="form.parentId"
:data="baseOptions"
:props="{ value: 'deviceTypeId', label: 'deviceTypeName', children: 'children' }"
value-key="deviceTypeId"
placeholder="请选择父级标识"
check-strictly
/>
</el-form-item>-->
<el-form-item label="设备类型编号" prop="deviceTypeCode">
<el-input v-model="form.deviceTypeCode" placeholder="请输入设备类型编号" />
</el-form-item>
<el-form-item label="设备类型名称" prop="deviceTypeName">
<el-input v-model="form.deviceTypeName" placeholder="请输入设备类型名称" />
</el-form-item>
<el-form-item label="祖级列表" prop="ancestors">
<!-- <el-form-item label="祖级列表" prop="ancestors">
<el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
</el-form-item>-->
<el-form-item label="设备大类" prop="deviceCategoryId">
<!-- <el-input v-model="form.categoryId" placeholder="请输入设备大类ID" />-->
<el-select v-model="form.deviceCategoryId" placeholder="请选择设备大类" filterable>
<el-option v-for="item in categoryOptions"
:key="item.deviceCategoryId"
:label="item.deviceCategoryName"
:value="item.deviceCategoryId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="设备大类ID" prop="categoryId">
<el-input v-model="form.categoryId" placeholder="请输入设备大类ID" />
</el-form-item>
<el-form-item label="激活标识" prop="activeFlag">
<!-- <el-form-item label="激活标识" prop="activeFlag">
<el-input v-model="form.activeFlag" placeholder="请输入激活标识" />
</el-form-item>-->
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
<el-radio
v-for="dict in active_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
@ -112,15 +140,26 @@
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="BaseDeviceType" lang="ts">
import { listBaseDeviceType, getBaseDeviceType, delBaseDeviceType, addBaseDeviceType, updateBaseDeviceType } from '@/api/mes/baseDeviceType';
import {
listBaseDeviceType,
getBaseDeviceType,
delBaseDeviceType,
addBaseDeviceType,
updateBaseDeviceType,
getBaseDeviceTypeList
} from '@/api/mes/baseDeviceType';
import { BaseDeviceTypeVO, BaseDeviceTypeQuery, BaseDeviceTypeForm } from '@/api/mes/baseDeviceType/types';
import {getBaseDeviceCategoryList} from "@/api/mes/baseDeviceCategory";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict( 'active_flag'));
const baseDeviceTypeList = ref<BaseDeviceTypeVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -140,20 +179,20 @@ const dialog = reactive<DialogOption>({
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `物料类型ID`, visible: true },
{ key: 1, label: `租户编号`, visible: true },
{ key: 2, label: `父级标识`, visible: true },
{ key: 0, label: `设备类型ID`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `父级标识`, visible: false },
{ key: 3, label: `设备类型编号`, visible: true },
{ key: 4, label: `设备类型名称`, visible: true },
{ key: 5, label: `祖级列表`, visible: true },
{ key: 5, label: `祖级列表`, visible: false },
{ key: 6, label: `设备大类ID`, visible: true },
{ key: 7, label: `激活标识`, visible: true },
{ key: 8, label: `备注`, visible: true },
{ key: 9, label: `创建部门`, visible: true },
{ key: 10, label: `创建人`, visible: true },
{ key: 11, label: `创建时间`, visible: true },
{ key: 12, label: `更新人`, visible: true },
{ key: 13, label: `更新时间`, visible: true },
{ key: 9, label: `创建部门`, visible: false },
{ key: 10, label: `创建人`, visible: false },
{ key: 11, label: `创建时间`, visible: false },
{ key: 12, label: `更新人`, visible: false },
{ key: 13, label: `更新时间`, visible: false },
]);
const initFormData: BaseDeviceTypeForm = {
@ -162,8 +201,9 @@ const initFormData: BaseDeviceTypeForm = {
deviceTypeCode: undefined,
deviceTypeName: undefined,
ancestors: undefined,
categoryId: undefined,
activeFlag: undefined,
deviceCategoryId: undefined,
deviceCategoryName: undefined,
activeFlag: '1',
remark: undefined,
}
const data = reactive<PageData<BaseDeviceTypeForm, BaseDeviceTypeQuery>>({
@ -176,15 +216,16 @@ const data = reactive<PageData<BaseDeviceTypeForm, BaseDeviceTypeQuery>>({
deviceTypeCode: undefined,
deviceTypeName: undefined,
ancestors: undefined,
categoryId: undefined,
deviceCategoryId: undefined,
deviceCategoryName: undefined,
activeFlag: undefined,
params: {
}
},
rules: {
deviceTypeId: [
{ required: true, message: "物料类型ID不能为空", trigger: "blur" }
],
/* deviceTypeId: [
{ required: true, message: "设备类型不能为空", trigger: "blur" }
],*/
parentId: [
{ required: true, message: "父级标识不能为空", trigger: "blur" }
],
@ -194,18 +235,18 @@ const data = reactive<PageData<BaseDeviceTypeForm, BaseDeviceTypeQuery>>({
deviceTypeName: [
{ required: true, message: "设备类型名称不能为空", trigger: "blur" }
],
ancestors: [
/* ancestors: [
{ required: true, message: "祖级列表不能为空", trigger: "blur" }
],
],*/
categoryId: [
{ required: true, message: "设备大类ID不能为空", trigger: "blur" }
{ required: true, message: "设备大类不能为空", trigger: "blur" }
],
activeFlag: [
{ required: true, message: "激活标识不能为空", trigger: "blur" }
],
remark: [
/* remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
],*/
}
});
@ -252,8 +293,9 @@ const handleSelectionChange = (selection: BaseDeviceTypeVO[]) => {
}
/** 新增按钮操作 */
const handleAdd = () => {
const handleAdd = async() => {
reset();
await getTreeselect();
dialog.visible = true;
dialog.title = "添加设备类型信息";
}
@ -261,6 +303,7 @@ const handleAdd = () => {
/** 修改按钮操作 */
const handleUpdate = async (row?: BaseDeviceTypeVO) => {
reset();
await getTreeselect();
const _deviceTypeId = row?.deviceTypeId || ids.value[0]
const res = await getBaseDeviceType(_deviceTypeId);
Object.assign(form.value, res.data);
@ -301,7 +344,30 @@ const handleExport = () => {
}, `baseDeviceType_${new Date().getTime()}.xlsx`)
}
let categoryOptions = ref([]);
const getCategorySelect = async () => {
const res = await getBaseDeviceCategoryList(null);
categoryOptions.value = res.data;
}
/** 查询计量单位信息下拉树结构 */
type BaseOption = {
deviceTypeId: number;
deviceTypeName: string;
children?: BaseOption[];
}
const baseOptions = ref<BaseDeviceTypeVO[]>([]);
const getTreeselect = async () => {
const res = await getBaseDeviceTypeList(null);
baseOptions.value = [];
const data: BaseOption = { deviceTypeId: 0, deviceTypeName: '顶级节点', children: [] };
data.children = proxy?.handleTree<BaseOption>(res.data, "deviceTypeId", "parentId");
baseOptions.value.push(data);
}
onMounted(() => {
getCategorySelect();
getList();
});
</script>

311
src/views/mes/baseEqualMaterialInfo/index.vue
Unescape Escape View File

@ -1,142 +1,175 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<!-- <el-form-item label="主键标识" prop="equalMaterialInfoId">
<el-input v-model="queryParams.equalMaterialInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<!-- <el-form-item label="物料ID" prop="materialId">
<el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="等同物料ID" prop="equalMaterialId">
<el-input v-model="queryParams.equalMaterialId" placeholder="请输入等同物料ID" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<el-form-item label="激活标识" prop="activeFlag">
<el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
<el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
<div class='p-2'>
<transition :enter-active-class='proxy?.animate.searchAnimate.enter'
:leave-active-class='proxy?.animate.searchAnimate.leave'>
<div v-show='showSearch' class='mb-[10px]'>
<el-card shadow='hover'>
<el-form ref='queryFormRef' :model='queryParams' :inline='true'>
<!-- <el-form-item label="主键标识" prop="equalMaterialInfoId">
<el-input v-model="queryParams.equalMaterialInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<!-- <el-form-item label="物料ID" prop="materialId">
<el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="等同物料ID" prop="equalMaterialId">
<el-input v-model="queryParams.equalMaterialId" placeholder="请输入等同物料ID" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<el-form-item label='激活标识' prop='activeFlag'>
<el-select v-model='queryParams.activeFlag' placeholder='请选择激活标识' clearable>
<el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<el-card shadow='never'>
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:baseEqualMaterialInfo:add']">新增</el-button>
<el-row :gutter='10' class='mb8'>
<el-col :span='1.5'>
<el-button type='primary' plain icon='Plus' @click='handleAdd'
v-hasPermi="['mes:baseEqualMaterialInfo:add']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseEqualMaterialInfo:edit']">修改</el-button>
<el-col :span='1.5'>
<el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
v-hasPermi="['mes:baseEqualMaterialInfo:edit']">修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseEqualMaterialInfo:remove']">删除</el-button>
<el-col :span='1.5'>
<el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
v-hasPermi="['mes:baseEqualMaterialInfo:remove']">删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseEqualMaterialInfo:export']">导出</el-button>
<el-col :span='1.5'>
<el-button type='warning' plain icon='Download' @click='handleExport'
v-hasPermi="['mes:baseEqualMaterialInfo:export']">导出
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
<right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
@queryTable='getList'></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="baseEqualMaterialInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键标识" align="center" prop="equalMaterialInfoId" v-if="columns[0].visible"/>
<el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
<el-table-column label="物料" align="center" prop="materialName" v-if="columns[0].visible"/>
<el-table-column label="等同物料" align="center" prop="equalMaterialName" v-if="columns[1].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[2].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
<el-table v-loading='loading' :data='baseEqualMaterialInfoList' @selection-change='handleSelectionChange'>
<el-table-column type='selection' width='55' align='center' />
<!-- <el-table-column label="主键标识" align="center" prop="equalMaterialInfoId" v-if="columns[0].visible"/>
<el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
<el-table-column label='物料' align='center' prop='materialName' v-if='columns[0].visible' width='260' />
<el-table-column label='等同物料' align='center' prop='equalMaterialName' v-if='columns[1].visible' width='220' />
<el-table-column label='父物料名称' align='center' prop='parentName' v-if='columns[4].visible' width='220' />
<el-table-column label='BOM版本' align='center' prop='materialBomVersion' v-if='columns[5].visible' />
<el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[2].visible'>
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.activeFlag' />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[3].visible"/>
<!-- <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[6].visible"/>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseEqualMaterialInfo:edit']"></el-button>
<el-table-column label='备注' align='center' prop='remark' v-if='columns[3].visible' />
<!-- <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[6].visible"/>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>-->
<el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
<template #default='scope'>
<el-tooltip content='修改' placement='top'>
<el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
v-hasPermi="['mes:baseEqualMaterialInfo:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseEqualMaterialInfo:remove']"></el-button>
<el-tooltip content='删除' placement='top'>
<el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
v-hasPermi="['mes:baseEqualMaterialInfo:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
v-model:limit='queryParams.pageSize' @pagination='getList' />
</el-card>
<!-- 添加或修改等同物料信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="baseEqualMaterialInfoFormRef" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="主键标识" prop="equalMaterialInfoId">
<el-input v-model="form.equalMaterialInfoId" placeholder="请输入主键标识" />
</el-form-item>-->
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='baseEqualMaterialInfoFormRef' :model='form' :rules='rules' label-width='120px'>
<!-- <el-form-item label="主键标识" prop="equalMaterialInfoId">
<el-input v-model="form.equalMaterialInfoId" placeholder="请输入主键标识" />
</el-form-item>-->
<el-form-item label="物料" prop="materialId">
<el-input v-model="form.materialName" placeholder="请点击检索物料" @click="handleMaterialAdd('material')" readonly>
<el-form-item label='物料' prop='materialId'>
<el-input v-model='form.materialName' placeholder='请点击检索物料' @click="handleMaterialAdd('material')" readonly>
<template #append>
<el-icon class="el-input__icon"><search/></el-icon>
<el-icon class='el-input__icon'>
<search />
</el-icon>
</template>
</el-input>
</el-form-item>
<el-form-item label="等同物料" prop="equalMaterialId">
<el-input v-model="form.equalMaterialName" placeholder="请点击检索物料" @click="handleMaterialAdd('equalMaterial')" readonly>
<el-form-item label='等同物料' prop='equalMaterialId'>
<el-input v-model='form.equalMaterialName' placeholder='请点击检索物料' @click="handleMaterialAdd('equalMaterial')"
readonly>
<template #append>
<el-icon class="el-input__icon"><search/></el-icon>
<el-icon class='el-input__icon'>
<search />
</el-icon>
</template>
</el-input>
</el-form-item>
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
<el-form-item label='激活标识' prop='activeFlag'>
<el-radio-group v-model='form.activeFlag'>
<el-radio
v-for="dict in active_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
v-for='dict in active_flag'
:key='dict.value'
:value='dict.value'
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item label='父物料名称' prop='parentId'>
<el-input v-model='form.equalMaterialName' placeholder='请点击检索父物料名称'
@click="handleMaterialAdd('parentMaterial')" readonly>
<template #append>
<el-icon class='el-input__icon'>
<search />
</el-icon>
</template>
</el-input>
</el-form-item>
<el-form-item label='BOM版本' prop='materialBomVersion'>
<el-input v-model='form.materialBomVersion' placeholder='请输入BOM版本' />
</el-form-item>
<el-form-item label='备注' prop='remark'>
<el-input v-model='form.remark' placeholder='请输入备注' />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<div class='dialog-footer'>
<el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
<el-button @click='cancel'>取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 添加物料信息对话框 -->
<el-dialog title="选择物料信息" v-model="materialOpen" width='1200px' append-to-body>
<MaterialSelect @selection="handleSelection" ref="materialSelectRef" v-if="materialOpen"></MaterialSelect>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitMaterialForm">确 定</el-button>
<el-button @click="materialOpen = false">取 消</el-button>
<el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
<MaterialSelect @selection='handleSelection' ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
<div slot='footer' class='dialog-footer'>
<el-button type='primary' @click='submitMaterialForm'>确 定</el-button>
<el-button @click='materialOpen = false'>取 消</el-button>
</div>
</el-dialog>
@ -144,10 +177,20 @@
</div>
</template>
<script setup name="BaseEqualMaterialInfo" lang="ts">
import { listBaseEqualMaterialInfo, getBaseEqualMaterialInfo, delBaseEqualMaterialInfo, addBaseEqualMaterialInfo, updateBaseEqualMaterialInfo } from '@/api/mes/baseEqualMaterialInfo';
import { BaseEqualMaterialInfoVO, BaseEqualMaterialInfoQuery, BaseEqualMaterialInfoForm } from '@/api/mes/baseEqualMaterialInfo/types';
import {getBaseMaterialInfoList} from "@/api/mes/baseMaterialInfo";
<script setup name='BaseEqualMaterialInfo' lang='ts'>
import {
listBaseEqualMaterialInfo,
getBaseEqualMaterialInfo,
delBaseEqualMaterialInfo,
addBaseEqualMaterialInfo,
updateBaseEqualMaterialInfo
} from '@/api/mes/baseEqualMaterialInfo';
import {
BaseEqualMaterialInfoVO,
BaseEqualMaterialInfoQuery,
BaseEqualMaterialInfoForm
} from '@/api/mes/baseEqualMaterialInfo/types';
import { getBaseMaterialInfoList } from '@/api/mes/baseMaterialInfo';
import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -173,17 +216,19 @@ const dialog = reactive<DialogOption>({
// 列显隐信息
const columns = ref<FieldOption[]>([
/* { key: 0, label: `主键标识`, visible: true },
{ key: 1, label: `租户编号`, visible: true },*/
{ key: 0, label: `物料`, visible: true },
{ key: 1, label: `等同物料ID`, visible: true },
{ key: 2, label: `激活标识`, visible: true },
{ key: 3, 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: true },*/
/* { key: 0, label: `主键标识`, visible: true },
{ key: 1, label: `租户编号`, visible: true },*/
{ key: 0, label: `物料`, visible: true },
{ key: 1, label: `等同物料ID`, visible: true },
{ key: 2, label: `激活标识`, visible: true },
{ key: 3, label: `备注`, visible: true },
{ key: 4, label: `父物料名称`, visible: true },
{ key: 5, label: `BOM版本`, 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: true },*/
]);
const initFormData: BaseEqualMaterialInfoForm = {
@ -193,10 +238,10 @@ const initFormData: BaseEqualMaterialInfoForm = {
activeFlag: '1',
remark: undefined,
materialName: undefined,//映射字段
equalMaterialName: undefined,//新增：等同物料名称
}
equalMaterialName: undefined//新增：等同物料名称
};
const data = reactive<PageData<BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQuery>>({
form: {...initFormData},
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
@ -207,10 +252,9 @@ const data = reactive<PageData<BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQ
materialName: undefined,//映射字段
equalMaterialName: undefined,//新增：等同物料名称
params: {},
params: {}
},
rules: {
}
rules: {}
});
const { queryParams, form, rules } = toRefs(data);
@ -222,55 +266,55 @@ const getList = async () => {
baseEqualMaterialInfoList.value = res.rows;
total.value = res.total;
loading.value = false;
}
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
};
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
form.value = { ...initFormData };
baseEqualMaterialInfoFormRef.value?.resetFields();
}
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: BaseEqualMaterialInfoVO[]) => {
ids.value = selection.map(item => item.equalMaterialInfoId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加等同物料信息";
}
dialog.title = '添加等同物料信息';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: BaseEqualMaterialInfoVO) => {
reset();
const _equalMaterialInfoId = row?.equalMaterialInfoId || ids.value[0]
const _equalMaterialInfoId = row?.equalMaterialInfoId || ids.value[0];
const res = await getBaseEqualMaterialInfo(_equalMaterialInfoId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改等同物料信息";
}
dialog.title = '修改等同物料信息';
};
/** 提交按钮 */
const submitForm = () => {
@ -278,39 +322,39 @@ const submitForm = () => {
if (valid) {
buttonLoading.value = true;
if (form.value.equalMaterialInfoId) {
await updateBaseEqualMaterialInfo(form.value).finally(() => buttonLoading.value = false);
await updateBaseEqualMaterialInfo(form.value).finally(() => buttonLoading.value = false);
} else {
await addBaseEqualMaterialInfo(form.value).finally(() => buttonLoading.value = false);
await addBaseEqualMaterialInfo(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
}
};
/** 删除按钮操作 */
const handleDelete = async (row?: BaseEqualMaterialInfoVO) => {
const _equalMaterialInfoIds = row?.equalMaterialInfoId || ids.value;
await proxy?.$modal.confirm('是否确认删除等同物料信息编号为"' + _equalMaterialInfoIds + '"的数据项？').finally(() => loading.value = false);
await delBaseEqualMaterialInfo(_equalMaterialInfoIds);
proxy?.$modal.msgSuccess("删除成功");
proxy?.$modal.msgSuccess('删除成功');
await getList();
}
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('mes/baseEqualMaterialInfo/export', {
...queryParams.value
}, `baseEqualMaterialInfo_${new Date().getTime()}.xlsx`)
}
}, `baseEqualMaterialInfo_${new Date().getTime()}.xlsx`);
};
/*w物料下拉框*/
let materialList = ref([]);
const getListsSelect = async() => {
const getListsSelect = async () => {
let res = await getBaseMaterialInfoList(null);
materialList.value = res.data;
}
};
/* 以下为添加物料信息对话框相关方法 */
let materialSelectRef = ref();//物料选择对话框绑定
@ -326,6 +370,9 @@ const submitMaterialForm = () => {
} else if (selectType.value === 'equalMaterial') {
form.value.equalMaterialId = selectedRow.materialId;
form.value.equalMaterialName = selectedRow.materialName;
} else if (selectType.value === 'parentMaterial') {
form.value.parentId = selectedRow.materialId;
form.value.parentName = selectedRow.materialName;
}
materialOpen.value = false;
};
@ -334,7 +381,7 @@ const submitMaterialForm = () => {
const handleMaterialAdd = (type: string) => {
selectType.value = type;
materialOpen.value = true;
}
};
onMounted(() => {
// getListsSelect();

758
src/views/mes/baseMaterialInfo/index.vue
Unescape Escape View File

@ -252,7 +252,7 @@
<el-table-column label="ERP信息" align="center" prop="erpId" v-if="columns[0].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible"/>
<el-table-column label="旧物料编码" align="center" prop="oldMaterialCode" v-if="columns[2].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="220px"/>
<!-- <el-table-column label="物料类型ID" align="center" prop="materialTypeId" v-if="columns[4].visible"/>-->
<el-table-column label="物料类型" align="center" prop="matrialTypeName" v-if="columns[4].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[5].visible"/>
@ -399,337 +399,428 @@
</el-row>
<!-- 添加或修改物料信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="baseMaterialInfoFormRef" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="主键标识" prop="materialId">
<el-input v-model="form.materialId" placeholder="请输入主键标识" />
</el-form-item>-->
<!-- <el-form-item label="ERP信息" prop="erpId">
<el-input v-model="form.erpId" placeholder="请输入ERP信息" />
</el-form-item>-->
<el-form-item label="物料编码" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入物料编码" />
</el-form-item>
<el-form-item label="旧物料编码" prop="oldMaterialCode">
<el-input v-model="form.oldMaterialCode" placeholder="请输入旧物料编码" />
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="物料类型" prop="materialTypeId" >
<!-- <el-input v-model="form.materialTypeId" placeholder="请输入物料类型ID" />-->
<el-select v-model="form.materialTypeId" placeholder="请选择物料类型" @change="materialCategoryIdBymaterialTypeId">
<el-option
v-for="item in materialTypeList"
:key="item.matrialTypeId"
:label="item.matrialTypeName"
:value="item.matrialTypeId"
></el-option>
</el-select>
</el-form-item>
<el-dialog :title="dialog.title" v-model="dialog.visible" width="1200px" append-to-body>
<el-form ref="baseMaterialInfoFormRef" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="物料编码" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入物料编码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="旧物料编码" prop="oldMaterialCode">
<el-input v-model="form.oldMaterialCode" placeholder="请输入旧物料编码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="物料大类" prop="materialCategoryId">
<el-select v-model="form.materialCategoryId" placeholder="请选择物料大类">
<el-option
v-for="item in materialCategoryOptions"
:key="item.materialCategoryId"
:label="item.materialCategoryName"
:value="item.materialCategoryId"
></el-option>
</el-select>
</el-form-item>-->
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="物料类型" prop="materialTypeId">
<el-select v-model="form.materialTypeId" placeholder="请选择物料类型" @change="materialCategoryIdBymaterialTypeId">
<el-option
v-for="item in materialTypeList"
:key="item.matrialTypeId"
:label="item.matrialTypeName"
:value="item.matrialTypeId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料小类" prop="materialSubclass">
<el-input v-model="form.materialSubclass" placeholder="请输入物料小类" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="批次标识" prop="batchFlag">
<el-radio-group v-model="form.batchFlag">
<el-radio
v-for="dict in mes_batch_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="物料小类" prop="materialSubclass">
<el-input v-model="form.materialSubclass" placeholder="请输入物料小类" />
</el-form-item>
<el-form-item label="批次标识" prop="batchFlag">
<el-radio-group v-model="form.batchFlag">
<el-radio
v-for="dict in mes_batch_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="小批次数量" prop="batchAmount">
<el-input v-model="form.batchAmount" placeholder="请输入小批次数量" />
</el-form-item>
<el-form-item label="计量单位" prop="materialUnitId">
<!-- <el-input v-model="form.materialUnitId" placeholder="请输入计量单位" />-->
<el-tree-select
v-model="form.materialUnitId"
:data="MeasureUnitList"
:props="{ value: 'unitId', label: 'unitName', children: 'children' }"
value-key="unitId"
placeholder="请选择计量单位"
check-strictly
@node-click="handleNodeClick"
/>
</el-form-item>
<!-- <el-form-item label="计量单位名称" prop="materialUnit">
<el-input v-model="form.materialUnit" placeholder="请输入计量单位名称" disable/>
</el-form-item>-->
<el-form-item label="物料组" prop="materialMatkl">
<el-input v-model="form.materialMatkl" placeholder="请输入物料组" />
</el-form-item>
<el-form-item label="物料规格" prop="materialSpec">
<el-input v-model="form.materialSpec" placeholder="请输入物料规格" />
</el-form-item>
<el-form-item label="净重" prop="netWeight">
<el-input v-model="form.netWeight" placeholder="请输入净重" />
</el-form-item>
<el-form-item label="毛重" prop="grossWeight">
<el-input v-model="form.grossWeight" placeholder="请输入毛重" />
</el-form-item>
<el-form-item label="绑定标识" prop="alwaysFlag">
<el-radio-group v-model="form.alwaysFlag">
<el-radio
v-for="dict in always_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="所属工厂" prop="factoryId">
<el-input v-model="form.factoryId" placeholder="请输入所属工厂" />
</el-form-item>-->
<el-form-item label="所属工厂" prop="factoryId">
<el-select v-model="form.factoryId" placeholder="请选择所属工厂">
<el-option
v-for="item in factoryList"
:key="item.factoryId"
:label="item.factoryName"
:value="item.factoryId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建组织" prop="createOrgId">
<el-input v-model="form.createOrgId" placeholder="请输入创建组织" />
</el-form-item>
<el-form-item label="使用组织" prop="useOrgId">
<el-input v-model="form.useOrgId" placeholder="请输入使用组织" />
</el-form-item>
<el-form-item label="所属产线" prop="prodLineId">
<el-input v-model="form.prodLineId" placeholder="请输入所属产线" />
</el-form-item>
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
<el-radio
v-for="dict in active_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="删除标识" prop="deletedFlag">
<el-radio-group v-model="form.deletedFlag">
<el-radio
v-for="dict in deleted_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="采购计价单位" prop="purchasePriceUnitId">
<el-input v-model="form.purchasePriceUnitId" placeholder="请输入采购计价单位" />
</el-form-item>
<el-form-item label="审核日期" prop="approveDate">
<el-date-picker clearable
v-model="form.approveDate"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择审核日期">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="erp最后更新日期" prop="erpModifyDate">
<el-date-picker clearable
v-model="form.erpModifyDate"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择erp最后更新日期">
</el-date-picker>
</el-form-item>-->
<el-form-item label="最大库存数量" prop="maxStockAmount">
<el-input v-model="form.maxStockAmount" placeholder="请输入最大库存数量" />
</el-form-item>
<el-form-item label="最小库存数量" prop="minStockAmount">
<el-input v-model="form.minStockAmount" placeholder="请输入最小库存数量" />
</el-form-item>
<el-form-item label="安全库存数量" prop="safeStockAmount">
<el-input v-model="form.safeStockAmount" placeholder="请输入安全库存数量" />
</el-form-item>
<el-form-item label="申请标识" prop="applyFlag">
<el-radio-group v-model="form.applyFlag">
<el-radio
v-for="dict in apply_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="物料分类" prop="materialClassfication">
<el-select v-model="form.materialClassfication" placeholder="请选择物料分类">
<el-option
v-for="dict in material_classfication"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="自动出库标识" prop="autoOutstockFlag">
<el-radio-group v-model="form.autoOutstockFlag">
<el-radio
v-for="dict in auto_outstock_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="辅料标识" prop="accessoriesFlag">
<el-radio-group v-model="form.accessoriesFlag">
<el-radio
v-for="dict in mes_accessories_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="低值易耗品标识" prop="lowValueConsumableFlag">
<el-radio-group v-model="form.lowValueConsumableFlag">
<el-radio
v-for="dict in mes_low_value_consumable_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="品牌" prop="brand">
<!-- <el-input v-model="form.brand" placeholder="请输入品牌" />-->
<el-select v-model="form.brand" placeholder="请选择品牌">
<el-option v-for="item in brandList"
:key="item.masterDataDetailId"
:label="item.dataDetailName"
:value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="层级" prop="plyrating">
<!-- <el-input v-model="form.plyrating" placeholder="请输入层级" />-->
<el-select v-model="form.plyrating" placeholder="请选择层级">
<el-option v-for="item in plyratingList"
:key="item.masterDataDetailId"
:label="item.dataDetailName"
:value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="花纹" prop="pattern">
<!-- <el-input v-model="form.pattern" placeholder="请输入花纹" />-->
<el-select v-model="form.pattern" placeholder="请选择花纹">
<el-option v-for="item in patternList"
:key="item.masterDataDetailId"
:label="item.dataDetailName"
:value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="速度级别" prop="speedLevel">
<!-- <el-input v-model="form.speedLevel" placeholder="请输入速度级别" />-->
<el-select v-model="form.speedLevel" placeholder="请选择速度级别">
<el-option v-for="item in speedLevelList" :key="item.masterDataDetailId" :label="item.dataDetailName" :value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="负荷载重" prop="load">
<!-- <el-input v-model="form.load" placeholder="请输入负荷载重" />-->
<el-select v-model="form.load" placeholder="请选择负荷载重">
<el-option v-for="item in loadList" :key="item.masterDataDetailId" :label="item.dataDetailName" :value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="轮胎标记" prop="tireMarkings">
<el-select v-model="form.tireMarkings" placeholder="请选择轮胎标记">
<el-option
v-for="dict in tire_markings"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="最小停放时间" prop="minParkingTime">
<!-- <el-input v-model="form.minParkingTime" placeholder="请输入最小停放时间" />-->
<el-input-number
v-model="form.minParkingDays"
placeholder="请输入天数"
:min="0"
:max="10000"
:controls="false"
:style="{ width: '50px' }"
/>
<span>&nbsp;天&nbsp;</span>
<el-input-number v-model="form.minParkingHours" placeholder="请输入小时" :min="0" :max="23" :controls="false" :style="{ width: '50px' }" />
<span>&nbsp;小时&nbsp;</span>
<el-input-number
v-model="form.minParkingMinutes"
placeholder="请输入分钟"
:min="0"
:max="59"
:controls="false"
:style="{ width: '50px' }"
/>
<span>&nbsp;分钟&nbsp;</span>
</el-form-item>
<el-form-item label="最大停放时间" prop="maxParkingTime">
<!-- <el-input v-model="form.maxParkingTime" placeholder="请输入最大停放时间" />-->
<el-input-number
v-model="form.maxParkingDays"
placeholder="请输入天数"
:min="0"
:max="10000"
:controls="false"
:style="{ width: '50px' }"
/>
<span>&nbsp;天&nbsp;</span>
<el-input-number v-model="form.maxParkingHours" placeholder="请输入小时" :min="0" :max="23" :controls="false" :style="{ width: '50px' }" />
<span>&nbsp;小时&nbsp;</span>
<el-input-number
v-model="form.maxParkingMinutes"
placeholder="请输入分钟"
:min="0"
:max="59"
:controls="false"
:style="{ width: '50px' }"
/>
<span>&nbsp;分钟&nbsp;</span>
</el-form-item>
<el-form-item label="标准重量" prop="standardWeight">
<el-input v-model="form.standardWeight" placeholder="请输入标准重量" />
</el-form-item>
<el-form-item label="标准重量上限" prop="weightUpperLimit">
<el-input v-model="form.weightUpperLimit" placeholder="请输入标准重量上限" />
</el-form-item>
<el-form-item label="标准重量下限" prop="weightLowerLimit">
<el-input v-model="form.weightLowerLimit" placeholder="请输入标准重量下限" />
</el-form-item>
<el-form-item label="内胎标记" prop="innerTubeFlag">
<el-radio-group v-model="form.innerTubeFlag">
<el-radio
v-for="dict in inner_tube_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="销售类型" prop="saleType">
<el-select v-model="form.saleType" placeholder="请选择销售类型">
<el-option
v-for="dict in sale_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="小批次数量" prop="batchAmount">
<!-- <el-input v-model="form.batchAmount" placeholder="请输入小批次数量" />-->
<el-input-number v-model="form.batchAmount" :min="0" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计量单位" prop="materialUnitId">
<el-tree-select
v-model="form.materialUnitId"
:data="MeasureUnitList"
:props="{ value: 'unitId', label: 'unitName', children: 'children' }"
value-key="unitId"
placeholder="请选择计量单位"
check-strictly
@node-click="handleNodeClick"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料组" prop="materialMatkl">
<el-input v-model="form.materialMatkl" placeholder="请输入物料组" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="物料规格" prop="materialSpec">
<el-input v-model="form.materialSpec" placeholder="请输入物料规格" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="form.netWeight" :min="0" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="form.grossWeight" :min="0" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="绑定标识" prop="alwaysFlag">
<el-radio-group v-model="form.alwaysFlag">
<el-radio
v-for="dict in always_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属工厂" prop="factoryId">
<el-select v-model="form.factoryId" placeholder="请选择所属工厂">
<el-option
v-for="item in factoryList"
:key="item.factoryId"
:label="item.factoryName"
:value="item.factoryId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建组织" prop="createOrgId">
<el-input v-model="form.createOrgId" placeholder="请输入创建组织" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="使用组织" prop="useOrgId">
<el-input v-model="form.useOrgId" placeholder="请输入使用组织" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属产线" prop="prodLineId">
<el-input v-model="form.prodLineId" placeholder="请输入所属产线" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
<el-radio
v-for="dict in active_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="删除标识" prop="deletedFlag">
<el-radio-group v-model="form.deletedFlag">
<el-radio
v-for="dict in deleted_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="采购计价单位" prop="purchasePriceUnitId">
<el-input v-model="form.purchasePriceUnitId" placeholder="请输入采购计价单位" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审核日期" prop="approveDate">
<el-date-picker clearable
v-model="form.approveDate"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择审核日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="最大库存数量" prop="maxStockAmount">
<el-input-number v-model="form.maxStockAmount" :min="0" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="最小库存数量" prop="minStockAmount">
<el-input-number v-model="form.minStockAmount" :min="0"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="安全库存数量" prop="safeStockAmount">
<el-input-number v-model="form.safeStockAmount" :mi="0" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="申请标识" prop="applyFlag">
<el-radio-group v-model="form.applyFlag">
<el-radio
v-for="dict in apply_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料分类" prop="materialClassfication">
<el-select v-model="form.materialClassfication" placeholder="请选择物料分类">
<el-option
v-for="dict in material_classfication"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="自动出库标识" prop="autoOutstockFlag">
<el-radio-group v-model="form.autoOutstockFlag">
<el-radio
v-for="dict in auto_outstock_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="辅料标识" prop="accessoriesFlag">
<el-radio-group v-model="form.accessoriesFlag">
<el-radio
v-for="dict in mes_accessories_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="低值易耗品标识" prop="lowValueConsumableFlag" label-width="160px">
<el-radio-group v-model="form.lowValueConsumableFlag">
<el-radio
v-for="dict in mes_low_value_consumable_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="品牌" prop="brand">
<el-select v-model="form.brand" placeholder="请选择品牌">
<el-option v-for="item in brandList"
:key="item.masterDataDetailId"
:label="item.dataDetailName"
:value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="层级" prop="plyrating">
<el-select v-model="form.plyrating" placeholder="请选择层级">
<el-option v-for="item in plyratingList"
:key="item.masterDataDetailId"
:label="item.dataDetailName"
:value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="花纹" prop="pattern">
<el-select v-model="form.pattern" placeholder="请选择花纹">
<el-option v-for="item in patternList"
:key="item.masterDataDetailId"
:label="item.dataDetailName"
:value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="速度级别" prop="speedLevel">
<el-select v-model="form.speedLevel" placeholder="请选择速度级别">
<el-option v-for="item in speedLevelList" :key="item.masterDataDetailId" :label="item.dataDetailName" :value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="负荷载重" prop="load">
<el-select v-model="form.load" placeholder="请选择负荷载重">
<el-option v-for="item in loadList" :key="item.masterDataDetailId" :label="item.dataDetailName" :value="item.masterDataDetailId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="轮胎标记" prop="tireMarkings">
<el-select v-model="form.tireMarkings" placeholder="请选择轮胎标记">
<el-option
v-for="dict in tire_markings"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="最小停放时间" prop="minParkingTime">
<el-input-number
v-model="form.minParkingDays"
placeholder="请输入天数"
:min="0"
:max="10000"
:controls="false"
:style="{ width: '50px' }"
/>
<span>&nbsp;天&nbsp;</span>
<el-input-number v-model="form.minParkingHours" placeholder="请输入小时" :min="0" :max="23" :controls="false" :style="{ width: '50px' }" />
<span>&nbsp;小时&nbsp;</span>
<el-input-number
v-model="form.minParkingMinutes"
placeholder="请输入分钟"
:min="0"
:max="59"
:controls="false"
:style="{ width: '50px' }"
/>
<span>&nbsp;分钟&nbsp;</span>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="最大停放时间" prop="maxParkingTime">
<el-input-number
v-model="form.maxParkingDays"
placeholder="请输入天数"
:min="0"
:max="10000"
:controls="false"
:style="{ width: '50px' }"
/>
<span>&nbsp;天&nbsp;</span>
<el-input-number v-model="form.maxParkingHours" placeholder="请输入小时" :min="0" :max="23" :controls="false" :style="{ width: '50px' }" />
<span>&nbsp;小时&nbsp;</span>
<el-input-number
v-model="form.maxParkingMinutes"
placeholder="请输入分钟"
:min="0"
:max="59"
:controls="false"
:style="{ width: '50px' }"
/>
<span>&nbsp;分钟&nbsp;</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准重量" prop="standardWeight">
<!-- <el-input v-model="form.standardWeight" placeholder="请输入标准重量" />-->
<el-input-number v-model="form.standardWeight" :min="0" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准重量上限" prop="weightUpperLimit">
<el-input-number v-model="form.weightUpperLimit" :min="0" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="标准重量下限" prop="weightLowerLimit">
<el-input-number v-model="form.weightLowerLimit" :min="0" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="内胎标记" prop="innerTubeFlag">
<el-radio-group v-model="form.innerTubeFlag">
<el-radio
v-for="dict in inner_tube_flag"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="销售类型" prop="saleType">
<el-select v-model="form.saleType" placeholder="请选择销售类型">
<el-option
v-for="dict in sale_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -753,9 +844,9 @@ import {getBaseMaterialCategoryList} from "@/api/mes/baseMaterialCategory";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { apply_flag, inner_tube_flag,
mes_material_categories, always_flag, mes_accessories_flag,
always_flag, mes_accessories_flag,
auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings,
material_classfication, mes_low_value_consumable_flag } = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag', 'mes_material_categories', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag'));
material_classfication, mes_low_value_consumable_flag } = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag'));
const baseMaterialInfoList = ref<BaseMaterialInfoVO[]>([]);
const buttonLoading = ref(false);
@ -1133,7 +1224,7 @@ const getInfoOptions = async () => {
InfoOptions.value = proxy?.handleTree(res.data, "matrialTypeId", "parentId");
}
//点击左侧物料类型树节点,(选中左侧物料类型，点击“新增”，新增页面物料类型绑定)
//点击左侧物料类型树节点,(选中左侧物料类型，点击"新增"，新增页面物料类型绑定)
const handleTreeNodeClick = async (data: any) => {
queryParams.value.materialTypeId = data.matrialTypeId;
initFormData.materialTypeId = data.matrialTypeId;
@ -1266,6 +1357,7 @@ const getBaseMaterialCategorySelect = async () => {
materialCategoryOptions.value = res.data;
}
//根据物料类型id获取物料大类，选择物料类型时自动绑定该物料类型的物料大类;
const materialCategoryIdBymaterialTypeId = (materialTypeId: string | number) => {
const selectmaterialTypeId = materialTypeList.value.find(item => item.matrialTypeId === materialTypeId);
if (selectmaterialTypeId){

14
src/views/mes/baseMaterialType/index.vue
Unescape Escape View File

@ -60,9 +60,9 @@
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['mes:baseMaterialType:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>-->
<!-- </el-col>-->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
@ -108,9 +108,9 @@
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseMaterialType:edit']" />
</el-tooltip>
<el-tooltip content="新增" placement="top">
<el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseMaterialType:add']" />
</el-tooltip>
<!-- <el-tooltip content="新增" placement="top">-->
<!-- <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseMaterialType:add']" />-->
<!-- </el-tooltip>-->
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseMaterialType:remove']" />
</el-tooltip>
@ -206,7 +206,7 @@ type BaseMaterialTypeOption = {
const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
const { active_flag, mes_material_categories } = toRefs<any>(proxy?.useDict('active_flag', 'mes_material_categories'));
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag' ));
const baseMaterialTypeList = ref<BaseMaterialTypeVO[]>([]);
const baseMaterialTypeOptions = ref<BaseMaterialTypeOption[]>([]);

4
src/views/mes/baseMouldInfo/index.vue
Unescape Escape View File

@ -236,9 +236,9 @@ const data = reactive<PageData<BaseMouldInfoForm, BaseMouldInfoQuery>>({
mouldName: [
{ required: true, message: '模具名称不能为空', trigger: 'blur' }
],
machineId: [
/* machineId: [
{ required: true, message: '机台名称不能为空', trigger: 'blur' }
]
]*/
}
});

20
src/views/mes/planInfo/index.vue
Unescape Escape View File

@ -436,7 +436,7 @@
</el-input>
</el-form-item>
<el-form-item label='工序名称' prop='processId'>
<el-select v-model='form.processId' placeholder='请选择工序'>
<el-select v-model='form.processId' placeholder='请先选择工序，再选择机台' @change="getMachine">
<el-option
v-for='item in processList'
:key='item.processId'
@ -886,7 +886,8 @@ const getProcessSelect = async () => {
/*获取机台下拉框*/
const getReleaseSelect = async () => {
// machineQueryParams.value.processId = form.value.processId;
machineQueryParams.value.processId = form.value.processId;
// machineQueryParams.value.workshopId = workshopId.value;
let res = await getProdBaseMachineInfoList(machineQueryParams.value);
releaseList.value = res.data;
prodBaseMachineInfoList.value = res.data;
@ -1098,7 +1099,9 @@ const handleSfpBatchAdd = () => {
sfpBatchDialog.visible = true;
sfpBatchDialog.title = '添加半制品生产计划信息';
machineQueryParams.value = {};
getReleaseSelect();
/* if (form.value.processId != null ){
getReleaseSelect();
}*/
};
/** 新增成型按钮操作 */
@ -1309,12 +1312,21 @@ function handleMachineQuery() {
getReleaseSelect();
}
const getMachine = async () => {
console.log(form.value.processId)
if ( workshopId.value == 2 && form.value.processId != null ){
await getReleaseSelect();
}
};
onMounted(() => {
getWorkshopId();
getShiftSelect();
getClassTeamSelect();
getProcessSelect();
getReleaseSelect();
if (form.value.processId != null ){
getReleaseSelect();
}
getList();
});

90
src/views/mes/prodBaseMachineInfo/index.vue
Unescape Escape View File

@ -92,12 +92,22 @@
<el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[6].visible' />
<el-table-column label='机台规格' align='center' prop='machineSpec' v-if='columns[7].visible' />
<el-table-column label='供应商' align='center' prop='supplierId' v-if='columns[8].visible' />
<el-table-column label='所属车间' align='center' prop='workshopName' v-if='columns[16].visible' />
<el-table-column label='所属车间' align='center' prop='workshopName' v-if='columns[16].visible' width='120' />
<el-table-column label='机台状态' align='center' prop='machineStatus' v-if='columns[9].visible'>
<template #default='scope'>
<dict-tag :options='machine_status' :value='scope.row.machineStatus' />
</template>
</el-table-column>
<el-table-column label='设备模型' align='center' prop='deviceModeName' v-if='columns[17].visible' width='100' />
<el-table-column label='设备IP地址' align='center' prop='machineIp' v-if='columns[18].visible' width='100' />
<el-table-column label='设备端口' align='center' prop='machinePort' v-if='columns[19].visible' />
<el-table-column label='设备协议' align='center' prop='accessProtocol' v-if='columns[20].visible' />
<el-table-column label='寄存器地址' align='center' prop='registerAddress' v-if='columns[21].visible' width='100' />
<el-table-column label='数据类型' align='center' prop='dataType' v-if='columns[22].visible' />
<el-table-column label='数据长度' align='center' prop='dataLength' v-if='columns[23].visible' />
<el-table-column label='数据编码格式' align='center' prop='dataEncoding' v-if='columns[24].visible' width='120' />
<el-table-column label='请求间隔（毫秒）' align='center' prop='requestInterval' v-if='columns[25].visible'
width='130' />
<el-table-column label='备注' align='center' prop='remark' v-if='columns[10].visible' />
<el-table-column label='创建部门' align='center' prop='createDept' v-if='columns[11].visible' />
<el-table-column label='创建人' align='center' prop='createBy' v-if='columns[12].visible' />
@ -112,7 +122,7 @@
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</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' fixed='right' width='120'>
<template #default='scope'>
<el-button link type='primary' icon='Edit' @click='handleRelatedTires(scope.row)'
v-hasPermi="['mes:prodBaseMachineInfo:edit']">关联工序
@ -132,7 +142,7 @@
</el-card>
<!-- 添加或修改机台信息对话框 -->
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='prodBaseMachineInfoFormRef' :model='form' :rules='rules' label-width='80px'>
<el-form ref='prodBaseMachineInfoFormRef' :model='form' :rules='rules' label-width='140px'>
<!-- <el-form-item label="主键标识" prop="machineId">
<el-input v-model="form.machineId" placeholder="请输入主键标识" />
</el-form-item>-->
@ -177,6 +187,54 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label='设备模型' prop='deviceModeId'>
<el-select v-model='form.deviceModeId' placeholder='请选择设备模型'>
<el-option
v-for='item in deviceModeList'
:key='item.deviceModeId'
:label='item.deviceModeName'
:value='item.deviceModeId'
/>
</el-select>
</el-form-item>
<el-form-item label='设备IP地址' prop='machineIp'>
<el-input v-model='form.machineIp' placeholder='请输入设备IP地址' />
</el-form-item>
<el-form-item label='设备端口' prop='machinePort'>
<el-input v-model='form.machinePort' placeholder='请输入设备端口' />
</el-form-item>
<el-form-item label='设备协议' prop='accessProtocol'>
<el-input v-model='form.accessProtocol' placeholder='请输入设备协议' />
</el-form-item>
<el-form-item label='寄存器地址' prop='registerAddress'>
<el-input v-model='form.registerAddress' placeholder='请输入寄存器地址' />
</el-form-item>
<el-form-item label='数据类型' prop='dataType'>
<el-select v-model='form.dataType' placeholder='请选择数据类型'>
<el-option
v-for='dict in machine_data_type'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label='数据长度' prop='dataLength'>
<el-input-number v-model='form.dataLength' placeholder='请输入数据长度' style='width: 220px;' />
</el-form-item>
<el-form-item label='数据编码格式' prop='dataEncoding'>
<el-select v-model='form.dataEncoding' placeholder='请选择数据编码格式'>
<el-option
v-for='dict in machine_data_encoding'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label='请求间隔（毫秒）' prop='requestInterval'>
<el-input-number v-model='form.requestInterval' placeholder='请输入请求间隔' style='width: 220px;' />
</el-form-item>
<el-form-item label='备注' prop='remark'>
<el-input v-model='form.remark' placeholder='请输入备注' />
</el-form-item>
@ -257,9 +315,14 @@ import {
} from '@/api/mes/prodBaseMachineInfo/types';
import { getWorkshopList } from '@/api/mes/baseWorkshopInfo';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import { getDmsDeviceModeList } from '@/api/dms/deviceMode';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { machine_status } = toRefs<any>(proxy?.useDict('machine_status'));
const {
machine_status,
machine_data_type,
machine_data_encoding
} = toRefs<any>(proxy?.useDict('machine_status', 'machine_data_type', 'machine_data_encoding'));
const prodBaseMachineInfoList = ref<ProdBaseMachineInfoVO[]>([]);
const buttonLoading = ref(false);
@ -285,6 +348,13 @@ const getWorkshopListSelect = async () => {
workshopInfoList.value = res.data;
};
/** 查询设备模型下拉树结构 */
const deviceModeList = ref([]);
const getDmsDeviceModeListSelect = async () => {
let res = await getDmsDeviceModeList(null);
deviceModeList.value = res.data;
};
const relationOpen = ref(false);
const baseMachineProcessList = ref<any[]>([]);
const chekedMachineProcessList = ref<any[]>([]);
@ -314,7 +384,16 @@ const columns = ref<FieldOption[]>([
{ key: 13, label: `创建时间`, visible: false },
{ key: 14, label: `更新人`, visible: false },
{ key: 15, label: `更新时间`, visible: false },
{ key: 16, label: `所属车间`, visible: true }
{ key: 16, label: `所属车间`, visible: true },
{ key: 17, label: `设备模型`, visible: true },
{ key: 18, label: `设备IP地址`, visible: true },
{ key: 19, label: `设备端口`, visible: true },
{ key: 20, label: `设备协议`, visible: true },
{ key: 21, label: `寄存器地址`, visible: true },
{ key: 22, label: `数据类型`, visible: true },
{ key: 23, label: `数据长度`, visible: true },
{ key: 24, label: `数据编码格式`, visible: true },
{ key: 25, label: `请求间隔`, visible: true }
]);
const initFormData: ProdBaseMachineInfoForm = {
@ -512,6 +591,7 @@ const handleExport = () => {
onMounted(() => {
getProcessInfoListSelect();
getWorkshopListSelect();
getDmsDeviceModeListSelect();
getList();
});
</script>

Write Preview
Loading…
Cancel
Save