update mes班次信息页面加班制(两班、三班)、机台信息选班制

master
yinq 3 weeks ago
parent 85a34a9cb0
commit 008012a588

@ -4,11 +4,6 @@ export interface BaseShiftInfoVO {
*/
shiftId: string | number;
/**
*
*/
tenantId: string | number;
/**
*
*/
@ -50,29 +45,9 @@ export interface BaseShiftInfoVO {
activeFlag: string;
/**
*
* (2 3)
*/
createDept: number;
/**
*
*/
createBy: number;
/**
*
*/
createTime: string;
/**
*
*/
updateBy: number;
/**
*
*/
updateTime: string;
classType: string;
}
@ -82,11 +57,6 @@ export interface BaseShiftInfoForm extends BaseEntity {
*/
shiftId?: string | number;
/**
*
*/
tenantId?: string | number;
/**
*
*/
@ -128,35 +98,9 @@ export interface BaseShiftInfoForm extends BaseEntity {
activeFlag?: string;
/**
*
* (2 3)
*/
createDept?: number;
/**
*
*/
createBy?: number;
/**
*
*/
createTime?: string;
/**
*
*/
updateBy?: number;
/**
*
*/
updateTime?: string;
productionTimeDays?: number;
productionTimeHours?: number;
productionTimeMinutes?: number;
classType?: string;
}
@ -167,11 +111,6 @@ export interface BaseShiftInfoQuery extends PageQuery {
*/
shiftId?: string | number;
/**
*
*/
tenantId?: string | number;
/**
*
*/
@ -213,34 +152,14 @@ export interface BaseShiftInfoQuery extends PageQuery {
activeFlag?: string;
/**
*
* (2 3)
*/
createDept?: number;
classType?: string;
/**
*
*
*/
createBy?: number;
/**
*
*/
createTime?: string;
/**
*
*/
updateBy?: number;
/**
*
*/
updateTime?: string;
/**
*
*/
params?: any;
params?: any;
}

@ -4,11 +4,6 @@ export interface ProdBaseMachineInfoVO {
*/
machineId: string | number;
/**
*
*/
tenantId: string | number;
/**
*
*/
@ -55,29 +50,64 @@ export interface ProdBaseMachineInfoVO {
remark: string;
/**
*
* ID
*/
createDept: number;
workshopId: string | number;
/**
*
* dms_device_mode
*/
createBy: number;
deviceModeId: string | number;
/**
*
* IP
*/
createTime: string;
machineIp: string;
/**
*
*
*/
updateBy: number;
machinePort: number;
/**
*
*
*/
updateTime: string;
accessProtocol: string;
/**
*
*/
registerAddress: string;
/**
* 1bool2short3int4long5float6byte7ushort8uint9ulong10double11
*/
dataType: string;
/**
*
*/
dataLength: number;
/**
* 1ASCII,2Unicode,3Unicode-big,4UTF-8,5UTF-32,6ANSI,7GB2312
*/
dataEncoding: string;
/**
*
*/
requestInterval: number;
/**
* 1 2
*/
instockType: string;
/**
* (2 3)
*/
classType: string;
}
@ -132,7 +162,65 @@ export interface ProdBaseMachineInfoForm extends BaseEntity {
*/
remark?: string;
baseMachineProcessList?: [];
/**
* ID
*/
workshopId?: string | number;
/**
* dms_device_mode
*/
deviceModeId?: string | number;
/**
* IP
*/
machineIp?: string;
/**
*
*/
machinePort?: number;
/**
*
*/
accessProtocol?: string;
/**
*
*/
registerAddress?: string;
/**
* 1bool2short3int4long5float6byte7ushort8uint9ulong10double11
*/
dataType?: string;
/**
*
*/
dataLength?: number;
/**
* 1ASCII,2Unicode,3Unicode-big,4UTF-8,5UTF-32,6ANSI,7GB2312
*/
dataEncoding?: string;
/**
*
*/
requestInterval?: number;
/**
* 1 2
*/
instockType?: string;
/**
* (2 3)
*/
classType?: string;
}
@ -183,10 +271,70 @@ export interface ProdBaseMachineInfoQuery extends PageQuery {
*/
machineStatus?: string;
/**
*
*/
params?: any;
/**
* ID
*/
workshopId?: string | number;
/**
* dms_device_mode
*/
deviceModeId?: string | number;
/**
* IP
*/
machineIp?: string;
/**
*
*/
machinePort?: number;
/**
*
*/
accessProtocol?: string;
/**
*
*/
registerAddress?: string;
/**
* 1bool2short3int4long5float6byte7ushort8uint9ulong10double11
*/
dataType?: string;
/**
*
*/
dataLength?: number;
/**
* 1ASCII,2Unicode,3Unicode-big,4UTF-8,5UTF-32,6ANSI,7GB2312
*/
dataEncoding?: string;
/**
*
*/
requestInterval?: number;
/**
* 1 2
*/
instockType?: string;
/**
* (2 3)
*/
classType?: string;
/**
*
*/
params?: any;
}

@ -13,6 +13,11 @@
<el-form-item label="班次编号" prop="shiftCode">
<el-input v-model="queryParams.shiftCode" placeholder="请输入班次编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="班制类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择班制类型" clearable >
<el-option v-for="dict in mes_class_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="班次名称" prop="shiftName">
<el-input v-model="queryParams.shiftName" placeholder="请输入班次名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -99,6 +104,11 @@
<el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
<el-table-column label="班次编号" align="center" prop="shiftCode" v-if="columns[0].visible"/>
<el-table-column label="班次名称" align="center" prop="shiftName" v-if="columns[1].visible"/>
<el-table-column label="班制类型" align="center" prop="classType" v-if="columns[8].visible">
<template #default="scope">
<dict-tag :options="mes_class_type" :value="scope.row.classType"/>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="startTime" v-if="columns[2].visible"/>
<el-table-column label="开始跨天标识" align="center" prop="startCrossFlag" v-if="columns[3].visible">
<template #default="scope">
@ -164,6 +174,15 @@
<el-form-item label="班次名称" prop="shiftName">
<el-input v-model="form.shiftName" placeholder="请输入班次名称" />
</el-form-item>
<el-form-item label="班制类型" prop="classType">
<el-radio-group v-model="form.classType">
<el-radio
v-for="dict in mes_class_type"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<!-- <el-input v-model="form.startTime" placeholder="请输入开始时间" />-->
<el-time-picker
@ -271,7 +290,8 @@ import { BaseShiftInfoVO, BaseShiftInfoQuery, BaseShiftInfoForm } from '@/api/me
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag, mes_start_cross_flag, mes_end_cross_flag } = toRefs<any>(proxy?.useDict('active_flag', 'mes_start_cross_flag', 'mes_end_cross_flag'));
const { active_flag, mes_start_cross_flag, mes_end_cross_flag, mes_class_type } = toRefs<any>(proxy?.useDict('active_flag', 'mes_start_cross_flag', 'mes_end_cross_flag', 'mes_class_type'));
const baseShiftInfoList = ref<BaseShiftInfoVO[]>([]);
const buttonLoading = ref(false);
@ -307,6 +327,7 @@ const columns = ref<FieldOption[]>([
{ key: 12, label: `创建时间`, visible: true },
{ key: 13, label: `更新人`, visible: true },
{ key: 14, label: `更新时间`, visible: true },*/
{ key: 8, label: `班制类型`, visible: true },
]);
const initFormData: BaseShiftInfoForm = {
@ -380,6 +401,9 @@ const data = reactive<PageData<BaseShiftInfoForm, BaseShiftInfoQuery>>({
activeFlag: [
{ required: true, message: "激活标识不能为空", trigger: "change" }
],
classType: [
{ required: true, message: "班制类型不能为空", trigger: "change" }
]
}
});

@ -44,6 +44,11 @@
<el-option v-for='dict in machine_status' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<el-form-item label="班制类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择班制类型" clearable >
<el-option v-for="dict in mes_class_type" :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>
@ -87,6 +92,11 @@
<el-table-column label='租户编号' align='center' prop='tenantId' v-if='columns[1].visible' />
<el-table-column label='机台编号' align='center' prop='machineCode' v-if='columns[2].visible' />
<el-table-column label='机台名称' align='center' prop='machineName' v-if='columns[3].visible' />
<el-table-column label="班制类型" align="center" prop="classType" v-if="columns[27].visible">
<template #default="scope">
<dict-tag :options="mes_class_type" :value="scope.row.classType"/>
</template>
</el-table-column>
<el-table-column label='资产编号' align='center' prop='assetNumber' v-if='columns[4].visible' />
<el-table-column label='机台位置' align='center' prop='machineLocation' v-if='columns[5].visible' />
<el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[6].visible' />
@ -157,6 +167,15 @@
<el-form-item label='机台名称' prop='machineName'>
<el-input v-model='form.machineName' placeholder='请输入机台名称' />
</el-form-item>
<el-form-item label="班制类型" prop="classType">
<el-radio-group v-model="form.classType">
<el-radio
v-for="dict in mes_class_type"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label='资产编号' prop='assetNumber'>
<el-input v-model='form.assetNumber' placeholder='请输入资产编号' />
</el-form-item>
@ -346,8 +365,9 @@ const {
machine_status,
machine_data_type,
machine_data_encoding,
mes_class_type,
mes_instock_type
} = toRefs<any>(proxy?.useDict('machine_status', 'machine_data_type', 'machine_data_encoding', 'mes_instock_type'));
} = toRefs<any>(proxy?.useDict('machine_status', 'machine_data_type', 'machine_data_encoding', 'mes_class_type', 'mes_instock_type'));
const prodBaseMachineInfoList = ref<ProdBaseMachineInfoVO[]>([]);
const buttonLoading = ref(false);
@ -420,6 +440,7 @@ const columns = ref<FieldOption[]>([
{ key: 24, label: `数据编码格式`, visible: true },
{ key: 25, label: `请求间隔`, visible: true },
{ key: 26, label: `入库类型`, visible: true },
{ key: 27, label: `班制类型`, visible: true },
]);
const initFormData: ProdBaseMachineInfoForm = {
@ -458,6 +479,9 @@ const data = reactive<PageData<ProdBaseMachineInfoForm, ProdBaseMachineInfoQuery
],
machineName: [
{ required: true, message: '机台名称不能为空', trigger: 'blur' }
],
classType: [
{ required: true, message: '班制类型不能为空', trigger: 'blur' }
]
}
});

Loading…
Cancel
Save