add record

main
chenyuan 2 years ago
parent 28e9815f11
commit c0e0076e71

File diff suppressed because it is too large Load Diff

@ -0,0 +1,105 @@
import request from '@/config/axios'
// 记录表 VO
export interface RecordTemplateVO {
id: number // 组织id
name: string // 名称
organizationId: number // 组织id
machineId: number // 对应机台id
workTeamId: number // 班组id
startTime: Date // 开始时间
endTime: Date // 结束时间
groupManagerApproveId1: number // 组长上午审批id
groupManagerApproveId2: number // 组长下午审批id
productionManagerApproveId1: number // 主管上午审批id
productionManagerApproveId2: number // 主管下午审批id
processInstanceId: string // 流程实例的编号
status: number // 状态
recordType: string // 记录类型(工序类型)
remark: string // 备注
isEnable: boolean // 是否启用
}
// 记录表 API
export const RecordTemplateApi = {
// 查询记录表分页
getRecordTemplatePage: async (params: any) => {
return await request.get({ url: `/mes/record-template/page`, params })
},
// 查询记录表详情
getRecordTemplate: async (id: number) => {
return await request.get({ url: `/mes/record-template/get?id=` + id })
},
// 新增记录表
createRecordTemplate: async (data: RecordTemplateVO) => {
return await request.post({ url: `/mes/record-template/create`, data })
},
// 修改记录表
updateRecordTemplate: async (data: RecordTemplateVO) => {
return await request.put({ url: `/mes/record-template/update`, data })
},
// 删除记录表
deleteRecordTemplate: async (id: number) => {
return await request.delete({ url: `/mes/record-template/delete?id=` + id })
},
// 导出记录表 Excel
exportRecordTemplate: async (params) => {
return await request.download({ url: `/mes/record-template/export-excel`, params })
},
// ==================== 子表(成型记录) ====================
// 获得成型记录分页
getRecordChengxingPage: async (params) => {
return await request.get({ url: `/mes/record-template/record-chengxing/page`, params })
},
// 新增成型记录
createRecordChengxing: async (data) => {
return await request.post({ url: `/mes/record-template/record-chengxing/create`, data })
},
// 修改成型记录
updateRecordChengxing: async (data) => {
return await request.put({ url: `/mes/record-template/record-chengxing/update`, data })
},
// 删除成型记录
deleteRecordChengxing: async (id: number) => {
return await request.delete({ url: `/mes/record-template/record-chengxing/delete?id=` + id })
},
// 获得成型记录
getRecordChengxing: async (id: number) => {
return await request.get({ url: `/mes/record-template/record-chengxing/get?id=` + id })
},
// ==================== 子表(碎浆记录) ====================
// 获得碎浆记录分页
getRecordSuijiangPage: async (params) => {
return await request.get({ url: `/mes/record-template/record-suijiang/page`, params })
},
// 新增碎浆记录
createRecordSuijiang: async (data) => {
return await request.post({ url: `/mes/record-template/record-suijiang/create`, data })
},
// 修改碎浆记录
updateRecordSuijiang: async (data) => {
return await request.put({ url: `/mes/record-template/record-suijiang/update`, data })
},
// 删除碎浆记录
deleteRecordSuijiang: async (id: number) => {
return await request.delete({ url: `/mes/record-template/record-suijiang/delete?id=` + id })
},
// 获得碎浆记录
getRecordSuijiang: async (id: number) => {
return await request.get({ url: `/mes/record-template/record-suijiang/get?id=` + id })
},
}

@ -244,5 +244,5 @@ MES_ORG_STATUS = "mes_org_status",
MES_TASK_STATUS = "mes_task_status", MES_TASK_STATUS = "mes_task_status",
MES_PLAN_STATUS = "mes_plan_status", MES_PLAN_STATUS = "mes_plan_status",
MES_RECORD_STATUS = "mes_record_status"
} }

@ -0,0 +1,201 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" />
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input v-model="formData.organizationId" placeholder="请输入组织id" />
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input v-model="formData.machineId" placeholder="请输入对应机台id" />
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input v-model="formData.workTeamId" placeholder="请输入班组id" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="formData.startTime"
type="date"
value-format="x"
placeholder="选择开始时间"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="formData.endTime"
type="date"
value-format="x"
placeholder="选择结束时间"
/>
</el-form-item>
<el-form-item label="组长上午审批id" prop="groupManagerApproveId1">
<el-input v-model="formData.groupManagerApproveId1" placeholder="请输入组长上午审批id" />
</el-form-item>
<el-form-item label="组长下午审批id" prop="groupManagerApproveId2">
<el-input v-model="formData.groupManagerApproveId2" placeholder="请输入组长下午审批id" />
</el-form-item>
<el-form-item label="主管上午审批id" prop="productionManagerApproveId1">
<el-input v-model="formData.productionManagerApproveId1" placeholder="请输入主管上午审批id" />
</el-form-item>
<el-form-item label="主管下午审批id" prop="productionManagerApproveId2">
<el-input v-model="formData.productionManagerApproveId2" placeholder="请输入主管下午审批id" />
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId">
<el-input v-model="formData.processInstanceId" placeholder="请输入流程实例的编号" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="记录类型(工序类型)" prop="recordType">
<el-select v-model="formData.recordType" placeholder="请选择记录类型(工序类型)">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-radio-group v-model="formData.isEnable">
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { RecordTemplateApi, RecordTemplateVO } from '@/api/mes/record'
/** 记录表 表单 */
defineOptions({ name: 'RecordTemplateForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
name: undefined,
organizationId: undefined,
machineId: undefined,
workTeamId: undefined,
startTime: undefined,
endTime: undefined,
groupManagerApproveId1: undefined,
groupManagerApproveId2: undefined,
productionManagerApproveId1: undefined,
productionManagerApproveId2: undefined,
processInstanceId: undefined,
status: undefined,
recordType: undefined,
remark: undefined,
isEnable: undefined,
})
const formRules = reactive({
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
organizationId: [{ required: true, message: '组织id不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
recordType: [{ required: true, message: '记录类型(工序类型)不能为空', trigger: 'change' }],
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await RecordTemplateApi.getRecordTemplate(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as RecordTemplateVO
if (formType.value === 'create') {
await RecordTemplateApi.createRecordTemplate(data)
message.success(t('common.createSuccess'))
} else {
await RecordTemplateApi.updateRecordTemplate(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
name: undefined,
organizationId: undefined,
machineId: undefined,
workTeamId: undefined,
startTime: undefined,
endTime: undefined,
groupManagerApproveId1: undefined,
groupManagerApproveId2: undefined,
productionManagerApproveId1: undefined,
productionManagerApproveId2: undefined,
processInstanceId: undefined,
status: undefined,
recordType: undefined,
remark: undefined,
isEnable: undefined,
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,375 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId">
<el-input
v-model="queryParams.processInstanceId"
placeholder="请输入流程实例的编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="记录类型(工序类型)" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录类型(工序类型)"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-select
v-model="queryParams.isEnable"
placeholder="请选择是否启用"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:record-template:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:record-template:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="结束时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型(工序类型)" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:record-template:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:record-template:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<RecordTemplateForm ref="formRef" @success="getList" />
<!-- 子表的列表 -->
<ContentWrap>
<el-tabs model-value="recordSuijiang">
<el-tab-pane label="碎浆记录" name="recordSuijiang">
<RecordSuijiangList :record-id="currentRow.id" />
</el-tab-pane>
</el-tabs>
</ContentWrap>
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { RecordTemplateApi, RecordTemplateVO } from '@/api/mes/record'
import RecordTemplateForm from './RecordTemplateForm.vue'
import RecordSuijiangList from './components/RecordSuijiangList.vue'
/** 记录表 列表 */
defineOptions({ name: 'RecordTemplate' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<RecordTemplateVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
organizationId: undefined,
machineId: undefined,
workTeamId: undefined,
startTime: [],
endTime: [],
groupManagerApproveId1: undefined,
groupManagerApproveId2: undefined,
productionManagerApproveId1: undefined,
productionManagerApproveId2: undefined,
processInstanceId: undefined,
status: undefined,
recordType: undefined,
remark: undefined,
isEnable: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await RecordTemplateApi.getRecordTemplatePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await RecordTemplateApi.deleteRecordTemplate(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await RecordTemplateApi.exportRecordTemplate(queryParams)
download.excel(data, '记录表.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 选中行操作 */
const currentRow = ref({}) //
const handleCurrentChange = (row) => {
currentRow.value = row
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

@ -0,0 +1,162 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="开机时间" prop="startTime">
<el-date-picker
v-model="formData.startTime"
type="date"
value-format="x"
placeholder="选择开机时间"
/>
</el-form-item>
<el-form-item label="停机时间" prop="endTime">
<el-date-picker
v-model="formData.endTime"
type="date"
value-format="x"
placeholder="选择停机时间"
/>
</el-form-item>
<el-form-item label="吸浆时间(S)" prop="xijiang">
<el-input v-model="formData.xijiang" placeholder="请输入吸浆时间(S)" />
</el-form-item>
<el-form-item label="脱水时间(S)" prop="tuoshui">
<el-input v-model="formData.tuoshui" placeholder="请输入脱水时间(S)" />
</el-form-item>
<el-form-item label="洗模时间(S)" prop="ximu">
<el-input v-model="formData.ximu" placeholder="请输入洗模时间(S)" />
</el-form-item>
<el-form-item label="产品id" prop="productId">
<el-input v-model="formData.productId" placeholder="请输入产品id" />
</el-form-item>
<el-form-item label="产品外观" prop="appearance">
<el-input v-model="formData.appearance" placeholder="请输入产品外观" />
</el-form-item>
<el-form-item label="湿重(g)" prop="productWeight">
<el-input v-model="formData.productWeight" placeholder="请输入湿重(g)" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-radio-group v-model="formData.isEnable">
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { RecordTemplateApi } from '@/api/mes/record'
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
recordId: undefined,
startTime: undefined,
endTime: undefined,
xijiang: undefined,
tuoshui: undefined,
ximu: undefined,
productId: undefined,
appearance: undefined,
productWeight: undefined,
remark: undefined,
isEnable: undefined,
})
const formRules = reactive({
recordId: [{ required: true, message: '记录id不能为空', trigger: 'blur' }],
xijiang: [{ required: true, message: '吸浆时间(S)不能为空', trigger: 'blur' }],
tuoshui: [{ required: true, message: '脱水时间(S)不能为空', trigger: 'blur' }],
ximu: [{ required: true, message: '洗模时间(S)不能为空', trigger: 'blur' }],
productId: [{ required: true, message: '产品id不能为空', trigger: 'blur' }],
appearance: [{ required: true, message: '产品外观不能为空', trigger: 'blur' }],
productWeight: [{ required: true, message: '湿重(g)不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
formData.value.recordId = recordId
//
if (id) {
formLoading.value = true
try {
formData.value = await RecordTemplateApi.getRecordChengxing(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value
if (formType.value === 'create') {
await RecordTemplateApi.createRecordChengxing(data)
message.success(t('common.createSuccess'))
} else {
await RecordTemplateApi.updateRecordChengxing(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
recordId: undefined,
startTime: undefined,
endTime: undefined,
xijiang: undefined,
tuoshui: undefined,
ximu: undefined,
productId: undefined,
appearance: undefined,
productWeight: undefined,
remark: undefined,
isEnable: undefined,
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,153 @@
<template>
<!-- 列表 -->
<ContentWrap>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:record-template:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="开机时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="吸浆时间(S)" align="center" prop="xijiang" />
<el-table-column label="脱水时间(S)" align="center" prop="tuoshui" />
<el-table-column label="洗模时间(S)" align="center" prop="ximu" />
<el-table-column label="产品id" align="center" prop="productId" />
<el-table-column label="产品外观" align="center" prop="appearance" />
<el-table-column label="湿重(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:record-template:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:record-template:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<RecordChengxingForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import { RecordTemplateApi } from '@/api/mes/record'
import RecordChengxingForm from './RecordChengxingForm.vue'
const { t } = useI18n() //
const message = useMessage() //
const props = defineProps<{
recordId?: number // id
}>()
const loading = ref(false) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
recordId: undefined as unknown
})
/** 监听主表的关联字段的变化,加载对应的子表数据 */
watch(
() => props.recordId,
(val: number) => {
if (!val) {
return
}
queryParams.recordId = val
handleQuery()
},
{ immediate: true, deep: true }
)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await RecordTemplateApi.getRecordChengxingPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
if (!props.recordId) {
message.error('请选择一个记录表')
return
}
formRef.value.open(type, id, props.recordId)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await RecordTemplateApi.deleteRecordChengxing(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
</script>

@ -0,0 +1,184 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="开机时间" prop="startTime">
<el-date-picker
v-model="formData.startTime"
type="date"
value-format="x"
placeholder="选择开机时间"
/>
</el-form-item>
<el-form-item label="停机时间" prop="endTime">
<el-date-picker
v-model="formData.endTime"
type="date"
value-format="x"
placeholder="选择停机时间"
/>
</el-form-item>
<el-form-item label="碎浆时间" prop="suijiangTime">
<el-date-picker
v-model="formData.suijiangTime"
type="date"
value-format="x"
placeholder="选择碎浆时间"
/>
</el-form-item>
<el-form-item label="碎浆时间" prop="suijiangCostTime">
<el-date-picker
v-model="formData.suijiangCostTime"
type="date"
value-format="x"
placeholder="选择碎浆时间"
/>
</el-form-item>
<el-form-item label="原料配比id" prop="ratioId">
<el-input v-model="formData.ratioId" placeholder="请输入原料配比id" />
</el-form-item>
<el-form-item label="原料配比" prop="ratio">
<el-input v-model="formData.ratio" placeholder="请输入原料配比" />
</el-form-item>
<el-form-item label="用水量kg" prop="waterUsage">
<el-input v-model="formData.waterUsage" placeholder="请输入用水量kg" />
</el-form-item>
<el-form-item label="放浆浓度%" prop="densityOut">
<el-input v-model="formData.densityOut" placeholder="请输入放浆浓度%" />
</el-form-item>
<el-form-item label="加药量kg" prop="addItemUsage">
<el-input v-model="formData.addItemUsage" placeholder="请输入加药量kg" />
</el-form-item>
<el-form-item label="出渣率%" prop="slagYield">
<el-input v-model="formData.slagYield" placeholder="请输入出渣率%" />
</el-form-item>
<el-form-item label="浓度%" prop="density">
<el-input v-model="formData.density" placeholder="请输入浓度%" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-radio-group v-model="formData.isEnable">
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { RecordTemplateApi } from '@/api/mes/record'
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
recordId: undefined,
startTime: undefined,
endTime: undefined,
suijiangTime: undefined,
suijiangCostTime: undefined,
ratioId: undefined,
ratio: undefined,
waterUsage: undefined,
densityOut: undefined,
addItemUsage: undefined,
slagYield: undefined,
density: undefined,
remark: undefined,
isEnable: undefined,
})
const formRules = reactive({
recordId: [{ required: true, message: '组织id不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '开机时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '停机时间不能为空', trigger: 'blur' }],
suijiangTime: [{ required: true, message: '碎浆时间不能为空', trigger: 'blur' }],
isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
formData.value.recordId = recordId
//
if (id) {
formLoading.value = true
try {
formData.value = await RecordTemplateApi.getRecordSuijiang(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value
if (formType.value === 'create') {
await RecordTemplateApi.createRecordSuijiang(data)
message.success(t('common.createSuccess'))
} else {
await RecordTemplateApi.updateRecordSuijiang(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
recordId: undefined,
startTime: undefined,
endTime: undefined,
suijiangTime: undefined,
suijiangCostTime: undefined,
ratioId: undefined,
ratio: undefined,
waterUsage: undefined,
densityOut: undefined,
addItemUsage: undefined,
slagYield: undefined,
density: undefined,
remark: undefined,
isEnable: undefined,
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,157 @@
<template>
<!-- 列表 -->
<ContentWrap>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:record-template:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="开机时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="碎浆时间"
align="center"
prop="suijiangTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="碎浆时间" align="center" prop="suijiangCostTime" />
<el-table-column label="原料配比id" align="center" prop="ratioId" />
<el-table-column label="原料配比" align="center" prop="ratio" />
<el-table-column label="用水量kg" align="center" prop="waterUsage" />
<el-table-column label="放浆浓度%" align="center" prop="densityOut" />
<el-table-column label="加药量kg" align="center" prop="addItemUsage" />
<el-table-column label="出渣率%" align="center" prop="slagYield" />
<el-table-column label="浓度%" align="center" prop="density" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:record-template:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:record-template:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<RecordSuijiangForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import { RecordTemplateApi } from '@/api/mes/record'
import RecordSuijiangForm from './RecordSuijiangForm.vue'
const { t } = useI18n() //
const message = useMessage() //
const props = defineProps<{
recordId?: number // id
}>()
const loading = ref(false) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
recordId: undefined as unknown
})
/** 监听主表的关联字段的变化,加载对应的子表数据 */
watch(
() => props.recordId,
(val: number) => {
if (!val) {
return
}
queryParams.recordId = val
handleQuery()
},
{ immediate: true, deep: true }
)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await RecordTemplateApi.getRecordSuijiangPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
if (!props.recordId) {
message.error('请选择一个记录表')
return
}
formRef.value.open(type, id, props.recordId)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await RecordTemplateApi.deleteRecordSuijiang(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
</script>

@ -0,0 +1,375 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId">
<el-input
v-model="queryParams.processInstanceId"
placeholder="请输入流程实例的编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="工序类型" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择工序类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-select
v-model="queryParams.isEnable"
placeholder="请选择是否启用"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:record-template:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:record-template:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="结束时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型(工序类型)" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:record-template:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:record-template:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<RecordTemplateForm ref="formRef" @success="getList" />
<!-- 子表的列表 -->
<ContentWrap>
<el-tabs model-value="recordChengxing">
<el-tab-pane label="成型记录" name="recordChengxing">
<RecordChengxingList :record-id="currentRow.id" />
</el-tab-pane>
</el-tabs>
</ContentWrap>
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { RecordTemplateApi, RecordTemplateVO } from '@/api/mes/record'
import RecordTemplateForm from './RecordTemplateForm.vue'
import RecordChengxingList from './components/RecordChengxingList.vue'
/** 记录表 列表 */
defineOptions({ name: 'RecordTemplate' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<RecordTemplateVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
organizationId: undefined,
machineId: undefined,
workTeamId: undefined,
startTime: [],
endTime: [],
groupManagerApproveId1: undefined,
groupManagerApproveId2: undefined,
productionManagerApproveId1: undefined,
productionManagerApproveId2: undefined,
processInstanceId: undefined,
status: undefined,
recordType: undefined,
remark: undefined,
isEnable: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await RecordTemplateApi.getRecordTemplatePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await RecordTemplateApi.deleteRecordTemplate(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await RecordTemplateApi.exportRecordTemplate(queryParams)
download.excel(data, '记录表.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 选中行操作 */
const currentRow = ref({}) //
const handleCurrentChange = (row) => {
currentRow.value = row
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
Loading…
Cancel
Save