linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix record

Browse Source
liutao_branch
chenshuichuan 2 years ago
parent 84a521bbf8
commit 004fcbecd2
29 changed files with 1803 additions and 1922 deletions
Show Stats Download Patch File Download Diff File

28
src/views/mes/producereport/components/AdminReplaceForm.vue
Unescape Escape View File

@ -274,18 +274,14 @@ const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const changeDate = async () =>{ const changeDate = async () =>{
if(formData.value.reportDate && formData.value.groupType && formData.value.orgType){ if(formData.value.reportDate && formData.value.groupType && formData.value.orgType){
formData.value.userId = null formData.value.userId = null
formData.value.orgId = null
userList.value = await WorkTeamApi.getUserList(formData.value.orgType, formData.value.groupType) userList.value = await WorkTeamApi.getUserList(formData.value.orgType, formData.value.groupType)
if(userList.value && userList.value.length>0){ if(userList.value && userList.value.length>0){
formData.value.userId = userList.value[0].id formData.value.userId = userList.value[0].id
orgWorkerList.value = await OrgWorkerApi.getOrgWorkerList2(formData.value) if(!formData.value.orgId)
if(orgWorkerList.value && orgWorkerList.value.length>0){ await changeDateUser()
formData.value.orgId = orgWorkerList.value[0].orgId
warningInfo.value=''
}
} }
if(!formData.value.userId || !formData.value.orgId){ if(!formData.value.userId){
warningInfo.value = '该条件下未查询到工位安排信息！' warningInfo.value = '该条件下未查询到工人安排信息！'
message.error(warningInfo.value) message.error(warningInfo.value)
} }
} }
@ -299,5 +295,21 @@ const getCurrentDate = () =>{
if(day<10)day = '0'+day; if(day<10)day = '0'+day;
return year + "-" + month + "-" + day +" 00:00:00"; return year + "-" + month + "-" + day +" 00:00:00";
} }
//更改报工日期时查询用户在该日期绑定的工位信息
const changeDateUser = async () =>{
orgWorkerList.value = null
if(formData.value.reportDate && formData.value.groupType && formData.value.orgType && formData.value.userId){
formData.value.orgId = null
orgWorkerList.value = await OrgWorkerApi.getOrgWorkerList2(formData.value)
if(orgWorkerList.value && orgWorkerList.value.length>0){
formData.value.orgId = orgWorkerList.value[0].orgId
warningInfo.value=''
}
if(!formData.value.orgId){
warningInfo.value = '该条件下未查询到工位安排信息！'
message.error(warningInfo.value)
}
}
}
</script> </script>

240
src/views/mes/record/DabaoIndex.vue
Unescape Escape View File

@ -8,129 +8,105 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/> class="!w-240px"
</el-form-item> />
</el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-select <el-col :span="8">
v-model="queryParams.status" <el-form-item label="结束时间" prop="endTime">
placeholder="请选择状态" <el-date-picker
clearable v-model="queryParams.endTime"
class="!w-240px" value-format="YYYY-MM-DD HH:mm:ss"
> type="daterange"
<el-option start-placeholder="开始日期"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" end-placeholder="结束日期"
:key="dict.value" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
:label="dict.label" class="!w-240px"
:value="dict.value" />
/> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="记录工序" prop="recordType"> <el-form-item>
<el-select <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
v-model="queryParams.recordType" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
placeholder="请选择记录工序" <el-button
clearable type="primary"
class="!w-240px" plain
> @click="openForm('create')"
<el-option v-hasPermi="['mes:record-template:create']"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" >
:key="dict.value" <Icon icon="ep:plus" class="mr-5px" /> 新增
:label="dict.label" </el-button>
:value="dict.value" <el-button
/> type="success"
</el-select> plain
</el-form-item> @click="handleExport"
<el-form-item label="备注" prop="remark"> :loading="exportLoading"
<el-input v-hasPermi="['mes:record-template:export']"
v-model="queryParams.remark" >
placeholder="请输入备注" <Icon icon="ep:download" class="mr-5px" /> 导出
clearable </el-button>
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</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> </el-form>
</ContentWrap> </ContentWrap>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table <el-table
@ -141,11 +117,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -160,27 +135,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -188,7 +153,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -217,7 +182,6 @@
@pagination="getList" @pagination="getList"
/> />
</ContentWrap> </ContentWrap>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<RecordTemplateForm ref="formRef" @success="getList" /> <RecordTemplateForm ref="formRef" @success="getList" />
<!-- 子表的列表 --> <!-- 子表的列表 -->

240
src/views/mes/record/DajiangIndex.vue
Unescape Escape View File

@ -8,126 +8,103 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/> class="!w-240px"
</el-form-item> />
</el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-select <el-col :span="8">
v-model="queryParams.status" <el-form-item label="结束时间" prop="endTime">
placeholder="请选择状态" <el-date-picker
clearable v-model="queryParams.endTime"
class="!w-240px" value-format="YYYY-MM-DD HH:mm:ss"
> type="daterange"
<el-option start-placeholder="开始日期"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" end-placeholder="结束日期"
:key="dict.value" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
:label="dict.label" class="!w-240px"
:value="dict.value" />
/> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="记录类型（工序类型）" prop="recordType"> <el-form-item>
<el-select <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
v-model="queryParams.recordType" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
placeholder="请选择记录类型（工序类型）" <el-button
clearable type="primary"
class="!w-240px" plain
> @click="openForm('create')"
<el-option v-hasPermi="['mes:record-template:create']"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" >
:key="dict.value" <Icon icon="ep:plus" class="mr-5px" /> 新增
:label="dict.label" </el-button>
:value="dict.value" <el-button
/> type="success"
</el-select> plain
</el-form-item> @click="handleExport"
<el-form-item label="备注" prop="remark"> :loading="exportLoading"
<el-input v-hasPermi="['mes:record-template:export']"
v-model="queryParams.remark" >
placeholder="请输入备注" <Icon icon="ep:download" class="mr-5px" /> 导出
clearable </el-button>
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</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> </el-form>
</ContentWrap> </ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -338,4 +304,4 @@ const handleCurrentChange = (row) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

241
src/views/mes/record/GanzaoIndex.vue
Unescape Escape View File

@ -8,126 +8,103 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/> class="!w-240px"
</el-form-item> />
</el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-select <el-col :span="8">
v-model="queryParams.status" <el-form-item label="结束时间" prop="endTime">
placeholder="请选择状态" <el-date-picker
clearable v-model="queryParams.endTime"
class="!w-240px" value-format="YYYY-MM-DD HH:mm:ss"
> type="daterange"
<el-option start-placeholder="开始日期"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" end-placeholder="结束日期"
:key="dict.value" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
:label="dict.label" class="!w-240px"
:value="dict.value" />
/> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="记录类型（工序类型）" prop="recordType"> <el-form-item>
<el-select <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
v-model="queryParams.recordType" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
placeholder="请选择记录类型（工序类型）" <el-button
clearable type="primary"
class="!w-240px" plain
> @click="openForm('create')"
<el-option v-hasPermi="['mes:record-template:create']"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" >
:key="dict.value" <Icon icon="ep:plus" class="mr-5px" /> 新增
:label="dict.label" </el-button>
:value="dict.value" <el-button
/> type="success"
</el-select> plain
</el-form-item> @click="handleExport"
<el-form-item label="备注" prop="remark"> :loading="exportLoading"
<el-input v-hasPermi="['mes:record-template:export']"
v-model="queryParams.remark" >
placeholder="请输入备注" <Icon icon="ep:download" class="mr-5px" /> 导出
clearable </el-button>
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</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> </el-form>
</ContentWrap> </ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -217,7 +183,6 @@
@pagination="getList" @pagination="getList"
/> />
</ContentWrap> </ContentWrap>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<RecordTemplateForm ref="formRef" @success="getList" /> <RecordTemplateForm ref="formRef" @success="getList" />
<!-- 子表的列表 --> <!-- 子表的列表 -->
@ -338,4 +303,4 @@ const handleCurrentChange = (row) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

239
src/views/mes/record/JiashiIndex.vue
Unescape Escape View File

@ -8,125 +8,103 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/> class="!w-240px"
</el-form-item> />
</el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-select <el-col :span="8">
v-model="queryParams.status" <el-form-item label="结束时间" prop="endTime">
placeholder="请选择状态" <el-date-picker
clearable v-model="queryParams.endTime"
class="!w-240px" value-format="YYYY-MM-DD HH:mm:ss"
> type="daterange"
<el-option start-placeholder="开始日期"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" end-placeholder="结束日期"
:key="dict.value" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
:label="dict.label" class="!w-240px"
:value="dict.value" />
/> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="记录类型（工序类型）" prop="recordType"> <el-form-item>
<el-select <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
v-model="queryParams.recordType" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
placeholder="请选择记录类型（工序类型）" <el-button
clearable type="primary"
class="!w-240px" plain
> @click="openForm('create')"
<el-option v-hasPermi="['mes:record-template:create']"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" >
:key="dict.value" <Icon icon="ep:plus" class="mr-5px" /> 新增
:label="dict.label" </el-button>
:value="dict.value" <el-button
/> type="success"
</el-select> plain
</el-form-item> @click="handleExport"
<el-form-item label="备注" prop="remark"> :loading="exportLoading"
<el-input v-hasPermi="['mes:record-template:export']"
v-model="queryParams.remark" >
placeholder="请输入备注" <Icon icon="ep:download" class="mr-5px" /> 导出
clearable </el-button>
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</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> </el-form>
</ContentWrap> </ContentWrap>
@ -140,11 +118,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -159,27 +136,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -187,7 +154,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -337,4 +304,4 @@ const handleCurrentChange = (row) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

240
src/views/mes/record/PinjianIndex.vue
Unescape Escape View File

@ -8,126 +8,103 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/> class="!w-240px"
</el-form-item> />
</el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-select <el-col :span="8">
v-model="queryParams.status" <el-form-item label="结束时间" prop="endTime">
placeholder="请选择状态" <el-date-picker
clearable v-model="queryParams.endTime"
class="!w-240px" value-format="YYYY-MM-DD HH:mm:ss"
> type="daterange"
<el-option start-placeholder="开始日期"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" end-placeholder="结束日期"
:key="dict.value" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
:label="dict.label" class="!w-240px"
:value="dict.value" />
/> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="记录类型（工序类型）" prop="recordType"> <el-form-item>
<el-select <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
v-model="queryParams.recordType" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
placeholder="请选择记录类型（工序类型）" <el-button
clearable type="primary"
class="!w-240px" plain
> @click="openForm('create')"
<el-option v-hasPermi="['mes:record-template:create']"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" >
:key="dict.value" <Icon icon="ep:plus" class="mr-5px" /> 新增
:label="dict.label" </el-button>
:value="dict.value" <el-button
/> type="success"
</el-select> plain
</el-form-item> @click="handleExport"
<el-form-item label="备注" prop="remark"> :loading="exportLoading"
<el-input v-hasPermi="['mes:record-template:export']"
v-model="queryParams.remark" >
placeholder="请输入备注" <Icon icon="ep:download" class="mr-5px" /> 导出
clearable </el-button>
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</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> </el-form>
</ContentWrap> </ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -338,4 +304,4 @@ const handleCurrentChange = (row) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

239
src/views/mes/record/QieBianIndex.vue
Unescape Escape View File

@ -8,125 +8,103 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :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="status"> </el-form-item>
<el-select </el-col>
v-model="queryParams.status" <el-col :span="8">
placeholder="请选择状态" <el-form-item label="结束时间" prop="endTime">
clearable <el-date-picker
class="!w-240px" v-model="queryParams.endTime"
> value-format="YYYY-MM-DD HH:mm:ss"
<el-option type="daterange"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" start-placeholder="开始日期"
:key="dict.value" end-placeholder="结束日期"
:label="dict.label" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
:value="dict.value" class="!w-240px"
/> />
</el-select> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="工序类型" prop="recordType"> <el-col :span="8">
<el-select <el-form-item>
v-model="queryParams.recordType" <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
placeholder="请选择记录类型（工序类型）" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
clearable <el-button
class="!w-240px" type="primary"
> plain
<el-option @click="openForm('create')"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" v-hasPermi="['mes:record-template:create']"
:key="dict.value" >
:label="dict.label" <Icon icon="ep:plus" class="mr-5px" /> 新增
:value="dict.value" </el-button>
/> <el-button
</el-select> type="success"
</el-form-item> plain
<el-form-item label="备注" prop="remark"> @click="handleExport"
<el-input :loading="exportLoading"
v-model="queryParams.remark" v-hasPermi="['mes:record-template:export']"
placeholder="请输入备注" >
clearable <Icon icon="ep:download" class="mr-5px" /> 导出
@keyup.enter="handleQuery" </el-button>
class="!w-240px" </el-form-item>
/> </el-col>
</el-form-item> </el-row>
<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> </el-form>
</ContentWrap> </ContentWrap>
@ -140,11 +118,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -159,27 +136,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -187,7 +154,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -337,4 +304,4 @@ const handleCurrentChange = (row) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

55
src/views/mes/record/RecordTemplateForm.vue
Unescape Escape View File

@ -7,18 +7,16 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="名称" prop="name"> <el-form-item label="班组" prop="workTeamId">
<el-input v-model="formData.name" placeholder="请输入名称" /> <el-input v-model="formData.workTeamId" placeholder="请输入班组" />
</el-form-item> </el-form-item>
<el-form-item label="组织id" prop="organizationId"> <el-form-item label="工位" prop="organizationId">
<el-input v-model="formData.organizationId" placeholder="请输入组织id" /> <el-input v-model="formData.organizationId" placeholder="请输入工位" />
</el-form-item> </el-form-item>
<el-form-item label="对应机台id" prop="machineId"> <el-form-item label="机台" prop="machineId">
<el-input v-model="formData.machineId" placeholder="请输入对应机台id" /> <el-input v-model="formData.machineId" placeholder="请输入机台" />
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input v-model="formData.workTeamId" placeholder="请输入班组id" />
</el-form-item> </el-form-item>
<el-form-item label="开始时间" prop="startTime"> <el-form-item label="开始时间" prop="startTime">
<el-date-picker <el-date-picker
v-model="formData.startTime" v-model="formData.startTime"
@ -35,21 +33,6 @@
placeholder="选择结束时间" placeholder="选择结束时间"
/> />
</el-form-item> </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-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status"> <el-radio-group v-model="formData.status">
<el-radio <el-radio
@ -61,8 +44,8 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="记录类型（工序类型）" prop="recordType"> <el-form-item label="工序" prop="recordType">
<el-select v-model="formData.recordType" placeholder="请选择记录类型（工序类型）"> <el-select v-model="formData.recordType" placeholder="请选择工序">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value" :key="dict.value"
@ -74,17 +57,7 @@
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item> </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> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -125,12 +98,10 @@ const formData = ref({
isEnable: undefined, isEnable: undefined,
}) })
const formRules = reactive({ const formRules = reactive({
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }], organizationId: [{ required: true, message: '工位不能为空', trigger: 'blur' }],
organizationId: [{ required: true, message: '组织id不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }], startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }], endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }], recordType: [{ required: true, message: '工序不能为空', trigger: 'change' }],
recordType: [{ required: true, message: '记录类型（工序类型）不能为空', trigger: 'change' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
@ -198,4 +169,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

240
src/views/mes/record/ReyaIndex.vue
Unescape Escape View File

@ -8,126 +8,103 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/> class="!w-240px"
</el-form-item> />
</el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-select <el-col :span="8">
v-model="queryParams.status" <el-form-item label="结束时间" prop="endTime">
placeholder="请选择状态" <el-date-picker
clearable v-model="queryParams.endTime"
class="!w-240px" value-format="YYYY-MM-DD HH:mm:ss"
> type="daterange"
<el-option start-placeholder="开始日期"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" end-placeholder="结束日期"
:key="dict.value" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
:label="dict.label" class="!w-240px"
:value="dict.value" />
/> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="记录类型（工序类型）" prop="recordType"> <el-form-item>
<el-select <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
v-model="queryParams.recordType" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
placeholder="请选择记录类型（工序类型）" <el-button
clearable type="primary"
class="!w-240px" plain
> @click="openForm('create')"
<el-option v-hasPermi="['mes:record-template:create']"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" >
:key="dict.value" <Icon icon="ep:plus" class="mr-5px" /> 新增
:label="dict.label" </el-button>
:value="dict.value" <el-button
/> type="success"
</el-select> plain
</el-form-item> @click="handleExport"
<el-form-item label="备注" prop="remark"> :loading="exportLoading"
<el-input v-hasPermi="['mes:record-template:export']"
v-model="queryParams.remark" >
placeholder="请输入备注" <Icon icon="ep:download" class="mr-5px" /> 导出
clearable </el-button>
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</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> </el-form>
</ContentWrap> </ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -338,4 +304,4 @@ const handleCurrentChange = (row) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

241
src/views/mes/record/SuijiangIndex.vue
Unescape Escape View File

@ -8,126 +8,103 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/> class="!w-240px"
</el-form-item> />
</el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-select <el-col :span="8">
v-model="queryParams.status" <el-form-item label="结束时间" prop="endTime">
placeholder="请选择状态" <el-date-picker
clearable v-model="queryParams.endTime"
class="!w-240px" value-format="YYYY-MM-DD HH:mm:ss"
> type="daterange"
<el-option start-placeholder="开始日期"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" end-placeholder="结束日期"
:key="dict.value" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
:label="dict.label" class="!w-240px"
:value="dict.value" />
/> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="记录类型（工序类型）" prop="recordType"> <el-form-item>
<el-select <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
v-model="queryParams.recordType" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
placeholder="请选择记录类型（工序类型）" <el-button
clearable type="primary"
class="!w-240px" plain
> @click="openForm('create')"
<el-option v-hasPermi="['mes:record-template:create']"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" >
:key="dict.value" <Icon icon="ep:plus" class="mr-5px" /> 新增
:label="dict.label" </el-button>
:value="dict.value" <el-button
/> type="success"
</el-select> plain
</el-form-item> @click="handleExport"
<el-form-item label="备注" prop="remark"> :loading="exportLoading"
<el-input v-hasPermi="['mes:record-template:export']"
v-model="queryParams.remark" >
placeholder="请输入备注" <Icon icon="ep:download" class="mr-5px" /> 导出
clearable </el-button>
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</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> </el-form>
</ContentWrap> </ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -217,7 +183,6 @@
@pagination="getList" @pagination="getList"
/> />
</ContentWrap> </ContentWrap>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<RecordTemplateForm ref="formRef" @success="getList" /> <RecordTemplateForm ref="formRef" @success="getList" />
<!-- 子表的列表 --> <!-- 子表的列表 -->
@ -338,4 +303,4 @@ const handleCurrentChange = (row) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

124
src/views/mes/record/components/RecordChengxingForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,54 +7,75 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="开机时间" prop="startTime"> <el-row>
<el-date-picker <el-col :span="12">
v-model="formData.startTime" <el-form-item label="开机时间" prop="startTime">
type="date" <el-date-picker
value-format="x" v-model="formData.startTime"
placeholder="选择开机时间" type="date"
/> value-format="x"
</el-form-item> placeholder="选择开机时间"
<el-form-item label="停机时间" prop="endTime"> />
<el-date-picker </el-form-item>
v-model="formData.endTime" </el-col>
type="date" <el-col :span="12">
value-format="x" <el-form-item label="停机时间" prop="endTime">
placeholder="选择停机时间" <el-date-picker
/> v-model="formData.endTime"
</el-form-item> type="date"
<el-form-item label="吸浆时间(S)" prop="xijiang"> value-format="x"
<el-input v-model="formData.xijiang" placeholder="请输入吸浆时间(S)" /> placeholder="选择停机时间"
</el-form-item> />
<el-form-item label="脱水时间(S)" prop="tuoshui"> </el-form-item>
<el-input v-model="formData.tuoshui" placeholder="请输入脱水时间(S)" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="洗模时间(S)" prop="ximu"> <el-row>
<el-input v-model="formData.ximu" placeholder="请输入洗模时间(S)" /> <el-col :span="12">
</el-form-item> <el-form-item label="吸浆时间(S)" prop="xijiang">
<el-form-item label="产品id" prop="productId"> <el-input v-model="formData.xijiang" placeholder="请输入吸浆时间(S)" />
<el-input v-model="formData.productId" placeholder="请输入产品id" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="产品外观" prop="appearance"> <el-col :span="12">
<el-input v-model="formData.appearance" placeholder="请输入产品外观" /> <el-form-item label="脱水时间(S)" prop="tuoshui">
</el-form-item> <el-input v-model="formData.tuoshui" placeholder="请输入脱水时间(S)" />
<el-form-item label="湿重(g)" prop="productWeight"> </el-form-item>
<el-input v-model="formData.productWeight" placeholder="请输入湿重(g)" /> </el-col>
</el-form-item> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="洗模时间(S)" prop="ximu">
<el-input v-model="formData.ximu" placeholder="请输入洗模时间(S)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品" prop="productId">
<el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
<el-option
v-for="item in productList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品外观" prop="appearance">
<el-input v-model="formData.appearance" placeholder="请输入产品外观" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="湿重(g)" prop="productWeight">
<el-input v-model="formData.productWeight" placeholder="请输入湿重(g)" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item> </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> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -65,6 +86,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict' import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { RecordTemplateApi } from '@/api/mes/record' import { RecordTemplateApi } from '@/api/mes/record'
import {ProductVO} from "@/api/erp/product/product";
import {PlanApi} from "@/api/mes/plan";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -92,12 +115,12 @@ const formRules = reactive({
xijiang: [{ required: true, message: '吸浆时间(S)不能为空', trigger: 'blur' }], xijiang: [{ required: true, message: '吸浆时间(S)不能为空', trigger: 'blur' }],
tuoshui: [{ required: true, message: '脱水时间(S)不能为空', trigger: 'blur' }], tuoshui: [{ required: true, message: '脱水时间(S)不能为空', trigger: 'blur' }],
ximu: [{ required: true, message: '洗模时间(S)不能为空', trigger: 'blur' }], ximu: [{ required: true, message: '洗模时间(S)不能为空', trigger: 'blur' }],
productId: [{ required: true, message: '产品id不能为空', trigger: 'blur' }], productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
appearance: [{ required: true, message: '产品外观不能为空', trigger: 'blur' }], appearance: [{ required: true, message: '产品外观不能为空', trigger: 'blur' }],
productWeight: [{ required: true, message: '湿重(g)不能为空', trigger: 'blur' }], productWeight: [{ required: true, message: '湿重(g)不能为空', trigger: 'blur' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const productList = ref<ProductVO[]>([]) // 产品列表
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => { const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true dialogVisible.value = true
@ -114,6 +137,9 @@ const open = async (type: string, id?: number, recordId: number) => {
formLoading.value = false formLoading.value = false
} }
} }
productList.value = await PlanApi.getStartAndFinishPlanProduct()
if(productList.value.length ==1)
formData.value.productId = productList.value[0].id
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -159,4 +185,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

36
src/views/mes/record/components/RecordChengxingList.vue
Unescape Escape View File

@ -10,41 +10,37 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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 <el-table-column
label="停机时间" label="创建时间"
align="center" align="center"
prop="endTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
sortable
/> />
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="吸浆时间(S)" align="center" prop="xijiang" /> <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="tuoshui" />
<el-table-column label="洗模时间(S)" align="center" prop="ximu" /> <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="productId" />
<el-table-column label="产品外观" align="center" prop="appearance" /> <el-table-column label="产品外观" align="center" prop="appearance" />
<el-table-column label="湿重(g)" align="center" prop="productWeight" /> <el-table-column label="湿重(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="开机时间"
align="center" align="center"
prop="createTime" prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -150,4 +146,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

83
src/views/mes/record/components/RecordDabaoForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,35 +7,49 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="产品id" prop="productId"> <el-row>
<el-input v-model="formData.productId" placeholder="请输入产品id" /> <el-col :span="12">
</el-form-item> <el-form-item label="产品" prop="productId">
<el-form-item label="产量" prop="totalNumber"> <el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
<el-input v-model="formData.totalNumber" placeholder="请输入产量" /> <el-option
</el-form-item> v-for="item in productList"
<el-form-item label="包装材料用量" prop="packageItemUsage"> :key="item.id"
<el-input v-model="formData.packageItemUsage" placeholder="请输入包装材料用量" /> :label="item.name"
</el-form-item> :value="item.id"
<el-form-item label="每包产品数" prop="packageSize"> />
<el-input v-model="formData.packageSize" placeholder="请输入每包产品数" /> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="包装材料规格" prop="packageItemSpecification"> </el-col>
<el-input v-model="formData.packageItemSpecification" placeholder="请输入包装材料规格" /> <el-col :span="12">
</el-form-item> <el-form-item label="产量" prop="totalNumber">
<el-form-item label="备注" prop="remark"> <el-input v-model="formData.totalNumber" placeholder="请输入产量" />
<el-input v-model="formData.remark" placeholder="请输入备注" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="是否启用" prop="isEnable"> </el-row>
<el-radio-group v-model="formData.isEnable"> <el-row>
<el-radio <el-col :span="12">
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" <el-form-item label="包装材料用量" prop="packageItemUsage">
:key="dict.value" <el-input v-model="formData.packageItemUsage" placeholder="请输入包装材料用量" />
:label="dict.value" </el-form-item>
> </el-col>
{{ dict.label }} <el-col :span="12">
</el-radio> <el-form-item label="每包产品数" prop="packageSize">
</el-radio-group> <el-input v-model="formData.packageSize" placeholder="请输入每包产品数" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="包装材料规格" prop="packageItemSpecification">
<el-input v-model="formData.packageItemSpecification" placeholder="请输入包装材料规格" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -46,6 +60,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict' import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { RecordTemplateApi } from '@/api/mes/record' import { RecordTemplateApi } from '@/api/mes/record'
import {ProductVO} from "@/api/erp/product/product";
import {PlanApi} from "@/api/mes/plan";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -72,7 +88,7 @@ const formRules = reactive({
packageSize: [{ required: true, message: '每包产品数不能为空', trigger: 'blur' }] packageSize: [{ required: true, message: '每包产品数不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const productList = ref<ProductVO[]>([]) // 产品列表
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => { const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true dialogVisible.value = true
@ -89,6 +105,9 @@ const open = async (type: string, id?: number, recordId: number) => {
formLoading.value = false formLoading.value = false
} }
} }
productList.value = await PlanApi.getStartAndFinishPlanProduct()
if(productList.value.length ==1)
formData.value.productId = productList.value[0].id
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -131,4 +150,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

25
src/views/mes/record/components/RecordDabaoList.vue
Unescape Escape View File

@ -10,26 +10,23 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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="产品id" align="center" prop="productId" />
<el-table-column label="产量" align="center" prop="totalNumber" />
<el-table-column label="包装材料用量" align="center" prop="packageItemUsage" />
<el-table-column label="每包产品数" align="center" prop="packageSize" />
<el-table-column label="包装材料规格" align="center" prop="packageItemSpecification" />
<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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
prop="createTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
sortable
/> />
<el-table-column label="操作" align="center"> <el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="产品" align="center" prop="productId" />
<el-table-column label="产量" align="center" prop="totalNumber" />
<el-table-column label="包装材料用量" align="center" prop="packageItemUsage" />
<el-table-column label="每包产品数" align="center" prop="packageSize" />
<el-table-column label="包装材料规格" align="center" prop="packageItemSpecification" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -135,4 +132,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

125
src/views/mes/record/components/RecordDajiangForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,57 +7,76 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="开机时间" prop="startTime"> <el-row>
<el-date-picker <el-col :span="12">
v-model="formData.startTime" <el-form-item label="开机时间" prop="startTime">
type="date" <el-date-picker
value-format="x" v-model="formData.startTime"
placeholder="选择开机时间" type="date"
/> value-format="x"
</el-form-item> placeholder="选择开机时间"
<el-form-item label="停机时间" prop="endTime"> />
<el-date-picker </el-form-item>
v-model="formData.endTime" </el-col>
type="date" <el-col :span="12">
value-format="x" <el-form-item label="停机时间" prop="endTime">
placeholder="选择停机时间" <el-date-picker
/> v-model="formData.endTime"
</el-form-item> type="date"
<el-form-item label="浓度%" prop="density"> value-format="x"
<el-input v-model="formData.density" placeholder="请输入浓度%" /> placeholder="选择停机时间"
</el-form-item> />
<el-form-item label="电流A" prop="electricCurrent"> </el-form-item>
<el-input v-model="formData.electricCurrent" placeholder="请输入电流A" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="进浆叩解度︒SR" prop="beatingDegreeIn"> <el-row>
<el-input v-model="formData.beatingDegreeIn" placeholder="请输入进浆叩解度︒SR" /> <el-col :span="12">
</el-form-item> <el-form-item label="浓度%" prop="density">
<el-form-item label="出浆叩解度︒SR" prop="beatingDegreeOut"> <el-input v-model="formData.density" placeholder="请输入浓度%" />
<el-input v-model="formData.beatingDegreeOut" placeholder="请输入出浆叩解度︒SR" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="湿重" prop="wetWeight"> <el-col :span="12">
<el-input v-model="formData.wetWeight" placeholder="请输入湿重" /> <el-form-item label="电流A" prop="electricCurrent">
</el-form-item> <el-input v-model="formData.electricCurrent" placeholder="请输入电流A" />
<el-form-item label="5浆罐浓度%" prop="density5"> </el-form-item>
<el-input v-model="formData.density5" placeholder="请输入5浆罐浓度%" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="产浆量T" prop="jiangWeight"> <el-row>
<el-input v-model="formData.jiangWeight" placeholder="请输入产浆量T" /> <el-col :span="12">
</el-form-item> <el-form-item label="进浆叩解度︒SR" prop="beatingDegreeIn">
<el-form-item label="备注" prop="remark"> <el-input v-model="formData.beatingDegreeIn" placeholder="请输入进浆叩解度︒SR" />
<el-input v-model="formData.remark" placeholder="请输入备注" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="是否启用" prop="isEnable"> <el-col :span="12">
<el-radio-group v-model="formData.isEnable"> <el-form-item label="出浆叩解度︒SR" prop="beatingDegreeOut">
<el-radio <el-input v-model="formData.beatingDegreeOut" placeholder="请输入出浆叩解度︒SR" />
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" </el-form-item>
:key="dict.value" </el-col>
:label="dict.value" </el-row>
> <el-row>
{{ dict.label }} <el-col :span="12">
</el-radio> <el-form-item label="湿重" prop="wetWeight">
</el-radio-group> <el-input v-model="formData.wetWeight" placeholder="请输入湿重" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="5浆罐浓度%" prop="density5">
<el-input v-model="formData.density5" placeholder="请输入5浆罐浓度%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产浆量T" prop="jiangWeight">
<el-input v-model="formData.jiangWeight" placeholder="请输入产浆量T" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -160,4 +179,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

35
src/views/mes/record/components/RecordDajiangList.vue
Unescape Escape View File

@ -10,21 +10,16 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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 <el-table-column
label="停机时间" label="创建时间"
align="center" align="center"
prop="endTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
sortable
/> />
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="浓度%" align="center" prop="density" /> <el-table-column label="浓度%" align="center" prop="density" />
<el-table-column label="电流A" align="center" prop="electricCurrent" /> <el-table-column label="电流A" align="center" prop="electricCurrent" />
<el-table-column label="进浆叩解度︒SR" align="center" prop="beatingDegreeIn" /> <el-table-column label="进浆叩解度︒SR" align="center" prop="beatingDegreeIn" />
@ -33,19 +28,21 @@
<el-table-column label="5浆罐浓度%" align="center" prop="density5" /> <el-table-column label="5浆罐浓度%" align="center" prop="density5" />
<el-table-column label="产浆量T" align="center" prop="jiangWeight" /> <el-table-column label="产浆量T" align="center" prop="jiangWeight" />
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="开机时间"
align="center" align="center"
prop="createTime" prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -151,4 +148,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

121
src/views/mes/record/components/RecordGanzaoForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,51 +7,71 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="开机时间" prop="startTime"> <el-row>
<el-date-picker <el-col :span="12">
v-model="formData.startTime" <el-form-item label="开机时间" prop="startTime">
type="date" <el-date-picker
value-format="x" v-model="formData.startTime"
placeholder="选择开机时间" type="date"
/> value-format="x"
</el-form-item> placeholder="选择开机时间"
<el-form-item label="停机时间" prop="endTime"> />
<el-date-picker </el-form-item>
v-model="formData.endTime" </el-col>
type="date" <el-col :span="12">
value-format="x" <el-form-item label="停机时间" prop="endTime">
placeholder="选择停机时间" <el-date-picker
/> v-model="formData.endTime"
</el-form-item> type="date"
<el-form-item label="速度(赫兹)" prop="speed"> value-format="x"
<el-input v-model="formData.speed" placeholder="请输入速度(赫兹)" /> placeholder="选择停机时间"
</el-form-item> />
<el-form-item label="温度℃" prop="temperature"> </el-form-item>
<el-input v-model="formData.temperature" placeholder="请输入温度℃" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="产品id" prop="productId"> <el-row>
<el-input v-model="formData.productId" placeholder="请输入产品id" /> <el-col :span="12">
</el-form-item> <el-form-item label="速度(赫兹)" prop="speed">
<el-form-item label="产品外观" prop="appearance"> <el-input v-model="formData.speed" placeholder="请输入速度(赫兹)" />
<el-input v-model="formData.appearance" placeholder="请输入产品外观" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="产品重量(g)" prop="productWeight"> <el-col :span="12">
<el-input v-model="formData.productWeight" placeholder="请输入产品重量(g)" /> <el-form-item label="温度℃" prop="temperature">
</el-form-item> <el-input v-model="formData.temperature" placeholder="请输入温度℃" />
<el-form-item label="备注" prop="remark"> </el-form-item>
<el-input v-model="formData.remark" placeholder="请输入备注" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="是否启用" prop="isEnable"> <el-row>
<el-radio-group v-model="formData.isEnable"> <el-col :span="12">
<el-radio <el-form-item label="产品" prop="productId">
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" <el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
:key="dict.value" <el-option
:label="dict.value" v-for="item in productList"
> :key="item.id"
{{ dict.label }} :label="item.name"
</el-radio> :value="item.id"
</el-radio-group> />
</el-form-item> </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品外观" prop="appearance">
<el-input v-model="formData.appearance" placeholder="请输入产品外观" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品重量(g)" prop="productWeight">
<el-input v-model="formData.productWeight" placeholder="请输入产品重量(g)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -62,6 +82,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict' import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { RecordTemplateApi } from '@/api/mes/record' import { RecordTemplateApi } from '@/api/mes/record'
import {ProductVO} from "@/api/erp/product/product";
import {PlanApi} from "@/api/mes/plan";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -90,7 +112,7 @@ const formRules = reactive({
productId: [{ required: true, message: '产品id不能为空', trigger: 'blur' }] productId: [{ required: true, message: '产品id不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const productList = ref<ProductVO[]>([]) // 产品列表
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => { const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true dialogVisible.value = true
@ -107,6 +129,9 @@ const open = async (type: string, id?: number, recordId: number) => {
formLoading.value = false formLoading.value = false
} }
} }
productList.value = await PlanApi.getStartAndFinishPlanProduct()
if(productList.value.length ==1)
formData.value.productId = productList.value[0].id
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -151,4 +176,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

34
src/views/mes/record/components/RecordGanzaoList.vue
Unescape Escape View File

@ -10,40 +10,36 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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 <el-table-column
label="停机时间" label="创建时间"
align="center" align="center"
prop="endTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
sortable
/> />
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="速度(赫兹)" align="center" prop="speed" /> <el-table-column label="速度(赫兹)" align="center" prop="speed" />
<el-table-column label="温度℃" align="center" prop="temperature" /> <el-table-column label="温度℃" align="center" prop="temperature" />
<el-table-column label="产品id" align="center" prop="productId" /> <el-table-column label="产品id" align="center" prop="productId" />
<el-table-column label="产品外观" align="center" prop="appearance" /> <el-table-column label="产品外观" align="center" prop="appearance" />
<el-table-column label="产品重量(g)" align="center" prop="productWeight" /> <el-table-column label="产品重量(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="开机时间"
align="center" align="center"
prop="createTime" prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -149,4 +145,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

149
src/views/mes/record/components/RecordJiashiForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,69 +7,87 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="开机时间" prop="startTime"> <el-row>
<el-date-picker <el-col :span="12">
v-model="formData.startTime" <el-form-item label="开机时间" prop="startTime">
type="date" <el-date-picker
value-format="x" v-model="formData.startTime"
placeholder="选择开机时间" type="date"
/> value-format="x"
</el-form-item> placeholder="选择开机时间"
<el-form-item label="停机时间" prop="endTime"> />
<el-date-picker </el-form-item>
v-model="formData.endTime" </el-col>
type="date" <el-col :span="12">
value-format="x" <el-form-item label="停机时间" prop="endTime">
placeholder="选择停机时间" <el-date-picker
/> v-model="formData.endTime"
</el-form-item> type="date"
<el-form-item label="开机时间(S)" prop="machineStartTime"> value-format="x"
<el-date-picker placeholder="选择停机时间"
v-model="formData.machineStartTime" />
type="date" </el-form-item>
value-format="x" </el-col>
placeholder="选择开机时间(S)" </el-row>
/> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label="停机时间(S)" prop="machineEndTime"> <el-form-item label="开机时间(S)" prop="machineStartTime">
<el-date-picker <el-input v-model="formData.machineStartTime" placeholder="开机时间" />
v-model="formData.machineEndTime" </el-form-item>
type="date" </el-col>
value-format="x" <el-col :span="12">
placeholder="选择停机时间(S)" <el-form-item label="停机时间(S)" prop="machineEndTime">
/> <el-input v-model="formData.machineEndTime" placeholder="请输入停机时间" />
</el-form-item> </el-form-item>
<el-form-item label="加湿时间(S)" prop="wetTime"> </el-col>
<el-date-picker </el-row>
v-model="formData.wetTime" <el-row>
type="date" <el-col :span="12">
value-format="x" <el-form-item label="加湿时间(S)" prop="wetTime">
placeholder="选择加湿时间(S)" <el-input v-model="formData.wetTime" placeholder="请输入加湿时间" />
/> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="产品id" prop="productId"> <el-col :span="12">
<el-input v-model="formData.productId" placeholder="请输入产品id" /> <el-form-item label="产品" prop="productId">
</el-form-item> <el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
<el-form-item label="产品进入水分" prop="weightIn"> <el-option
<el-input v-model="formData.weightIn" placeholder="请输入产品进入水分" /> v-for="item in productList"
</el-form-item> :key="item.id"
<el-form-item label="产品取出水分" prop="weightOut"> :label="item.name"
<el-input v-model="formData.weightOut" placeholder="请输入产品取出水分" /> :value="item.id"
</el-form-item> />
<el-form-item label="产量" prop="productNumber"> </el-select>
<el-input v-model="formData.productNumber" placeholder="请输入产量" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="单重(g)" prop="productWeight"> </el-row>
<el-input v-model="formData.productWeight" placeholder="请输入单重(g)" /> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label="产品进入水分" prop="weightIn">
<el-input v-model="formData.weightIn" placeholder="请输入产品进入水分" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品取出水分" prop="weightOut">
<el-input v-model="formData.weightOut" placeholder="请输入产品取出水分" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单重(g)" prop="productWeight">
<el-input v-model="formData.productWeight" placeholder="请输入单重(g)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产量" prop="productNumber">
<el-input v-model="formData.productNumber" placeholder="请输入产量" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-radio-group v-model="formData.isEnable">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -79,6 +97,8 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { RecordTemplateApi } from '@/api/mes/record' import { RecordTemplateApi } from '@/api/mes/record'
import {ProductVO} from "@/api/erp/product/product";
import {PlanApi} from "@/api/mes/plan";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -115,7 +135,7 @@ const formRules = reactive({
isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }] isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const productList = ref<ProductVO[]>([]) // 产品列表
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => { const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true dialogVisible.value = true
@ -132,6 +152,9 @@ const open = async (type: string, id?: number, recordId: number) => {
formLoading.value = false formLoading.value = false
} }
} }
productList.value = await PlanApi.getStartAndFinishPlanProduct()
if(productList.value.length ==1)
formData.value.productId = productList.value[0].id
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -179,4 +202,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

33
src/views/mes/record/components/RecordJiashiList.vue
Unescape Escape View File

@ -10,39 +10,40 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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 <el-table-column
label="停机时间" label="创建时间"
align="center" align="center"
prop="endTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
sortable
/> />
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="开机时间(S)" align="center" prop="machineStartTime" /> <el-table-column label="开机时间(S)" align="center" prop="machineStartTime" />
<el-table-column label="停机时间(S)" align="center" prop="machineEndTime" /> <el-table-column label="停机时间(S)" align="center" prop="machineEndTime" />
<el-table-column label="加湿时间(S)" align="center" prop="wetTime" /> <el-table-column label="加湿时间(S)" align="center" prop="wetTime" />
<el-table-column label="产品id" align="center" prop="productId" /> <el-table-column label="产品" align="center" prop="productId" />
<el-table-column label="产品进入水分" align="center" prop="weightIn" /> <el-table-column label="产品进入水分" align="center" prop="weightIn" />
<el-table-column label="产品取出水分" align="center" prop="weightOut" /> <el-table-column label="产品取出水分" align="center" prop="weightOut" />
<el-table-column label="产量" align="center" prop="productNumber" /> <el-table-column label="产量" align="center" prop="productNumber" />
<el-table-column label="单重(g)" align="center" prop="productWeight" /> <el-table-column label="单重(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable" />
<el-table-column <el-table-column
label="创建时间" label="开机时间"
align="center" align="center"
prop="createTime" prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -147,4 +148,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

119
src/views/mes/record/components/RecordPinjianForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,47 +7,73 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="产品id" prop="productId"> <el-row>
<el-input v-model="formData.productId" placeholder="请输入产品id" /> <el-col :span="12">
</el-form-item> <el-form-item label="产品" prop="productId">
<el-form-item label="外观" prop="appearance"> <el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
<el-input v-model="formData.appearance" placeholder="请输入外观" /> <el-option
</el-form-item> v-for="item in productList"
<el-form-item label="单重(g)" prop="productWeight"> :key="item.id"
<el-input v-model="formData.productWeight" placeholder="请输入单重(g)" /> :label="item.name"
</el-form-item> :value="item.id"
<el-form-item label="防水" prop="waterproof"> />
<el-input v-model="formData.waterproof" placeholder="请输入防水" /> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="合格品量" prop="qualifiedNumber"> </el-col>
<el-input v-model="formData.qualifiedNumber" placeholder="请输入合格品量" /> <el-col :span="12">
</el-form-item> <el-form-item label="外观" prop="appearance">
<el-form-item label="废品量" prop="unqualifiedNumber"> <el-input v-model="formData.appearance" placeholder="请输入外观" />
<el-input v-model="formData.unqualifiedNumber" placeholder="请输入废品量" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="总产量" prop="totalNumber"> </el-row>
<el-input v-model="formData.totalNumber" placeholder="请输入总产量" /> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label="合格率%" prop="qualifiedRate"> <el-form-item label="单重(g)" prop="productWeight">
<el-input v-model="formData.qualifiedRate" placeholder="请输入合格率%" /> <el-input v-model="formData.productWeight" placeholder="请输入单重(g)" />
</el-form-item> </el-form-item>
<el-form-item label="废品原因" prop="unqualifiedReason"> </el-col>
<el-input v-model="formData.unqualifiedReason" placeholder="请输入废品原因" /> <el-col :span="12">
</el-form-item> <el-form-item label="防水" prop="waterproof">
<el-form-item label="备注" prop="remark"> <el-input v-model="formData.waterproof" placeholder="请输入防水" />
<el-input v-model="formData.remark" placeholder="请输入备注" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="是否启用" prop="isEnable"> </el-row>
<el-radio-group v-model="formData.isEnable"> <el-row>
<el-radio <el-col :span="12">
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" <el-form-item label="合格品量" prop="qualifiedNumber">
:key="dict.value" <el-input v-model="formData.qualifiedNumber" placeholder="请输入合格品量" />
:label="dict.value" </el-form-item>
> </el-col>
{{ dict.label }} <el-col :span="12">
</el-radio> <el-form-item label="废品量" prop="unqualifiedNumber">
</el-radio-group> <el-input v-model="formData.unqualifiedNumber" placeholder="请输入废品量" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="总产量" prop="totalNumber">
<el-input v-model="formData.totalNumber" placeholder="请输入总产量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合格率%" prop="qualifiedRate">
<el-input v-model="formData.qualifiedRate" placeholder="请输入合格率%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="废品原因" prop="unqualifiedReason">
<el-input v-model="formData.unqualifiedReason" placeholder="请输入废品原因" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -58,6 +84,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict' import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { RecordTemplateApi } from '@/api/mes/record' import { RecordTemplateApi } from '@/api/mes/record'
import {ProductVO} from "@/api/erp/product/product";
import {PlanApi} from "@/api/mes/plan";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -88,7 +116,7 @@ const formRules = reactive({
totalNumber: [{ required: true, message: '总产量不能为空', trigger: 'blur' }] totalNumber: [{ required: true, message: '总产量不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const productList = ref<ProductVO[]>([]) // 产品列表
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => { const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true dialogVisible.value = true
@ -105,6 +133,9 @@ const open = async (type: string, id?: number, recordId: number) => {
formLoading.value = false formLoading.value = false
} }
} }
productList.value = await PlanApi.getStartAndFinishPlanProduct()
if(productList.value.length ==1)
formData.value.productId = productList.value[0].id
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -151,4 +182,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

29
src/views/mes/record/components/RecordPinjianList.vue
Unescape Escape View File

@ -10,8 +10,16 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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
<el-table-column label="产品id" align="center" prop="productId" /> label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="产品" align="center" prop="productId" />
<el-table-column label="外观" align="center" prop="appearance" /> <el-table-column label="外观" align="center" prop="appearance" />
<el-table-column label="单重(g)" align="center" prop="productWeight" /> <el-table-column label="单重(g)" align="center" prop="productWeight" />
<el-table-column label="防水" align="center" prop="waterproof" /> <el-table-column label="防水" align="center" prop="waterproof" />
@ -21,19 +29,8 @@
<el-table-column label="合格率%" align="center" prop="qualifiedRate" /> <el-table-column label="合格率%" align="center" prop="qualifiedRate" />
<el-table-column label="废品原因" align="center" prop="unqualifiedReason" /> <el-table-column label="废品原因" align="center" prop="unqualifiedReason" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope"> <el-table-column label="操作" align="center" fixed="right" width="120px">
<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"> <template #default="scope">
<el-button <el-button
link link
@ -139,4 +136,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

140
src/views/mes/record/components/RecordQiebianForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,57 +7,84 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="开机时间" prop="startTime"> <el-row>
<el-date-picker <el-col :span="12">
v-model="formData.startTime" <el-form-item label="开机时间" prop="startTime">
type="date" <el-date-picker
value-format="x" v-model="formData.startTime"
placeholder="选择开机时间" type="date"
/> value-format="x"
</el-form-item> placeholder="选择开机时间"
<el-form-item label="停机时间" prop="endTime"> />
<el-date-picker </el-form-item>
v-model="formData.endTime" </el-col>
type="date" <el-col :span="12">
value-format="x" <el-form-item label="停机时间" prop="endTime">
placeholder="选择停机时间" <el-date-picker
/> v-model="formData.endTime"
</el-form-item> type="date"
<el-form-item label="机台" prop="machineId"> value-format="x"
<el-input v-model="formData.machineId" placeholder="请输入机台" /> placeholder="选择停机时间"
</el-form-item> />
<el-form-item label="切边前单重g" prop="productWeightBefore"> </el-form-item>
<el-input v-model="formData.productWeightBefore" placeholder="请输入切边前单重g" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="产品id" prop="productId"> <el-row>
<el-input v-model="formData.productId" placeholder="请输入产品id" /> <el-col :span="12">
</el-form-item> <el-form-item label="机台" prop="machineId">
<el-form-item label="外观" prop="appearance"> <el-input v-model="formData.machineId" placeholder="请输入机台" />
<el-input v-model="formData.appearance" placeholder="请输入外观" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="湿度" prop="wetDegree"> <el-col :span="12">
<el-input v-model="formData.wetDegree" placeholder="请输入湿度" /> <el-form-item label="切边前单重g" prop="productWeightBefore">
</el-form-item> <el-input v-model="formData.productWeightBefore" placeholder="请输入切边前单重g" />
<el-form-item label="单重(g)" prop="productWeight"> </el-form-item>
<el-input v-model="formData.productWeight" placeholder="请输入单重(g)" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="切边时间(S)" prop="cutTime"> <el-row>
<el-input v-model="formData.cutTime" placeholder="请输入切边时间(S)" /> <el-col :span="12">
</el-form-item> <el-form-item label="产品" prop="productId">
<el-form-item label="备注" prop="remark"> <el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-option
</el-form-item> v-for="item in productList"
<el-form-item label="是否启用" prop="isEnable"> :key="item.id"
<el-radio-group v-model="formData.isEnable"> :label="item.name"
<el-radio :value="item.id"
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" />
:key="dict.value" </el-select>
:label="dict.value" </el-form-item>
> </el-col>
{{ dict.label }} <el-col :span="12">
</el-radio> <el-form-item label="外观" prop="appearance">
</el-radio-group> <el-input v-model="formData.appearance" placeholder="请输入外观" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="湿度" prop="wetDegree">
<el-input v-model="formData.wetDegree" placeholder="请输入湿度" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单重(g)" prop="productWeight">
<el-input v-model="formData.productWeight" placeholder="请输入单重(g)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="切边时间(S)" prop="cutTime">
<el-input v-model="formData.cutTime" placeholder="请输入切边时间(S)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -68,6 +95,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict' import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { RecordTemplateApi } from '@/api/mes/record' import { RecordTemplateApi } from '@/api/mes/record'
import {ProductVO} from "@/api/erp/product/product";
import {PlanApi} from "@/api/mes/plan";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -101,7 +130,7 @@ const formRules = reactive({
isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }], isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const productList = ref<ProductVO[]>([]) // 产品列表
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => { const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true dialogVisible.value = true
@ -118,6 +147,9 @@ const open = async (type: string, id?: number, recordId: number) => {
formLoading.value = false formLoading.value = false
} }
} }
productList.value = await PlanApi.getStartAndFinishPlanProduct()
if(productList.value.length ==1)
formData.value.productId = productList.value[0].id
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -164,4 +196,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

36
src/views/mes/record/components/RecordQiebianList.vue
Unescape Escape View File

@ -10,43 +10,39 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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 <el-table-column
label="停机时间" label="创建时间"
align="center" align="center"
prop="endTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
sortable
/> />
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="机台" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="切边前单重g" align="center" prop="productWeightBefore" /> <el-table-column label="切边前单重g" align="center" prop="productWeightBefore" />
<el-table-column label="产品id" align="center" prop="productId" /> <el-table-column label="产品" align="center" prop="productId" />
<el-table-column label="外观" align="center" prop="appearance" /> <el-table-column label="外观" align="center" prop="appearance" />
<el-table-column label="湿度" align="center" prop="wetDegree" /> <el-table-column label="湿度" align="center" prop="wetDegree" />
<el-table-column label="单重(g)" align="center" prop="productWeight" /> <el-table-column label="单重(g)" align="center" prop="productWeight" />
<el-table-column label="切边时间(S)" align="center" prop="cutTime" /> <el-table-column label="切边时间(S)" align="center" prop="cutTime" />
<el-table-column label="备注" align="center" prop="remark" /> <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="creator" /> <el-table-column label="创建者" align="center" prop="creator" />
<el-table-column <el-table-column
label="创建时间" label="开机时间"
align="center" align="center"
prop="createTime" prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -152,4 +148,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

161
src/views/mes/record/components/RecordReyaForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,65 +7,97 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="开机时间" prop="startTime"> <el-row>
<el-date-picker <el-col :span="12">
v-model="formData.startTime" <el-form-item label="开机时间" prop="startTime">
type="date" <el-date-picker
value-format="x" v-model="formData.startTime"
placeholder="选择开机时间" type="date"
/> value-format="x"
</el-form-item> placeholder="选择开机时间"
<el-form-item label="停机时间" prop="endTime"> />
<el-date-picker </el-form-item>
v-model="formData.endTime" </el-col>
type="date" <el-col :span="12">
value-format="x" <el-form-item label="停机时间" prop="endTime">
placeholder="选择停机时间" <el-date-picker
/> v-model="formData.endTime"
</el-form-item> type="date"
<el-form-item label="机台" prop="machineId"> value-format="x"
<el-input v-model="formData.machineId" placeholder="请输入机台" /> placeholder="选择停机时间"
</el-form-item> />
<el-form-item label="热压时间(S)" prop="reyaTime"> </el-form-item>
<el-input v-model="formData.reyaTime" placeholder="请输入热压时间(S)" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="上模温度℃" prop="temperatureMoldUp"> <el-row>
<el-input v-model="formData.temperatureMoldUp" placeholder="请输入上模温度℃" /> <el-col :span="12">
</el-form-item> <el-form-item label="机台" prop="machineId">
<el-form-item label="下模温度℃" prop="temperatureMoldDown"> <el-input v-model="formData.machineId" placeholder="请输入机台" />
<el-input v-model="formData.temperatureMoldDown" placeholder="请输入下模温度℃" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="主缸压力KG" prop="mainStress"> <el-col :span="12">
<el-input v-model="formData.mainStress" placeholder="请输入主缸压力KG" /> <el-form-item label="热压时间(S)" prop="reyaTime">
</el-form-item> <el-input v-model="formData.reyaTime" placeholder="请输入热压时间(S)" />
<el-form-item label="产品id" prop="productId"> </el-form-item>
<el-select v-model="formData.productId" placeholder="请选择产品id"> </el-col>
<el-option label="请选择字典生成" value="" /> </el-row>
</el-select> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label="外观" prop="appearance"> <el-form-item label="上模温度℃" prop="temperatureMoldUp">
<el-input v-model="formData.appearance" placeholder="请输入外观" /> <el-input v-model="formData.temperatureMoldUp" placeholder="请输入上模温度℃" />
</el-form-item> </el-form-item>
<el-form-item label="湿度" prop="wetDegree"> </el-col>
<el-input v-model="formData.wetDegree" placeholder="请输入湿度" /> <el-col :span="12">
</el-form-item> <el-form-item label="下模温度℃" prop="temperatureMoldDown">
<el-form-item label="单重(g)" prop="productWeight"> <el-input v-model="formData.temperatureMoldDown" placeholder="请输入下模温度℃" />
<el-input v-model="formData.productWeight" placeholder="请输入单重(g)" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="备注" prop="remark"> </el-row>
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item> <el-row>
<el-form-item label="是否启用" prop="isEnable"> <el-col :span="12">
<el-radio-group v-model="formData.isEnable"> <el-form-item label="主缸压力KG" prop="mainStress">
<el-radio <el-input v-model="formData.mainStress" placeholder="请输入主缸压力KG" />
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" </el-form-item>
:key="dict.value" </el-col>
:label="dict.value" <el-col :span="12">
> <el-form-item label="产品" prop="productId">
{{ dict.label }} <el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
</el-radio> <el-option
</el-radio-group> v-for="item in productList"
</el-form-item> :key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="外观" prop="appearance">
<el-input v-model="formData.appearance" placeholder="请输入外观" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="湿度" prop="wetDegree">
<el-input v-model="formData.wetDegree" placeholder="请输入湿度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单重(g)" prop="productWeight">
<el-input v-model="formData.productWeight" placeholder="请输入单重(g)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -76,6 +108,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict' import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import { RecordTemplateApi } from '@/api/mes/record' import { RecordTemplateApi } from '@/api/mes/record'
import {ProductVO} from "@/api/erp/product/product";
import {PlanApi} from "@/api/mes/plan";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -111,7 +145,7 @@ const formRules = reactive({
isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }], isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const productList = ref<ProductVO[]>([]) // 产品列表
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, recordId: number) => { const open = async (type: string, id?: number, recordId: number) => {
dialogVisible.value = true dialogVisible.value = true
@ -128,6 +162,9 @@ const open = async (type: string, id?: number, recordId: number) => {
formLoading.value = false formLoading.value = false
} }
} }
productList.value = await PlanApi.getStartAndFinishPlanProduct()
if(productList.value.length ==1)
formData.value.productId = productList.value[0].id
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -176,4 +213,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

29
src/views/mes/record/components/RecordReyaList.vue
Unescape Escape View File

@ -10,7 +10,15 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column <el-table-column
label="开机时间" label="开机时间"
align="center" align="center"
@ -30,24 +38,13 @@
<el-table-column label="上模温度℃" align="center" prop="temperatureMoldUp" /> <el-table-column label="上模温度℃" align="center" prop="temperatureMoldUp" />
<el-table-column label="下模温度℃" align="center" prop="temperatureMoldDown" /> <el-table-column label="下模温度℃" align="center" prop="temperatureMoldDown" />
<el-table-column label="主缸压力KG" align="center" prop="mainStress" /> <el-table-column label="主缸压力KG" align="center" prop="mainStress" />
<el-table-column label="产品id" align="center" prop="productId" /> <el-table-column label="产品" align="center" prop="productId" />
<el-table-column label="外观" align="center" prop="appearance" /> <el-table-column label="外观" align="center" prop="appearance" />
<el-table-column label="湿度" align="center" prop="wetDegree" /> <el-table-column label="湿度" align="center" prop="wetDegree" />
<el-table-column label="单重(g)" align="center" prop="productWeight" /> <el-table-column label="单重(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope"> <el-table-column label="操作" align="center" fixed="right" width="120px">
<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"> <template #default="scope">
<el-button <el-button
link link
@ -153,4 +150,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

167
src/views/mes/record/components/RecordSuijiangForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,73 +7,102 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="开机时间" prop="startTime"> <el-row>
<el-date-picker <el-col :span="12">
v-model="formData.startTime" <el-form-item label="开机时间" prop="startTime">
type="date" <el-date-picker
value-format="x" v-model="formData.startTime"
placeholder="选择开机时间" type="date"
/> value-format="x"
</el-form-item> placeholder="选择开机时间"
<el-form-item label="停机时间" prop="endTime"> />
<el-date-picker </el-form-item>
v-model="formData.endTime" </el-col>
type="date" <el-col :span="12">
value-format="x" <el-form-item label="停机时间" prop="endTime">
placeholder="选择停机时间" <el-date-picker
/> v-model="formData.endTime"
</el-form-item> type="date"
<el-form-item label="碎浆时间" prop="suijiangTime"> value-format="x"
<el-date-picker placeholder="选择停机时间"
v-model="formData.suijiangTime" />
type="date" </el-form-item>
value-format="x" </el-col>
placeholder="选择碎浆时间" </el-row>
/> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label="碎浆时间" prop="suijiangCostTime"> <el-form-item label="碎浆时间" prop="suijiangTime">
<el-date-picker <el-date-picker
v-model="formData.suijiangCostTime" v-model="formData.suijiangTime"
type="date" type="date"
value-format="x" value-format="x"
placeholder="选择碎浆时间" placeholder="选择碎浆时间"
/> />
</el-form-item> </el-form-item>
<el-form-item label="原料配比id" prop="ratioId"> </el-col>
<el-input v-model="formData.ratioId" placeholder="请输入原料配比id" /> <el-col :span="12">
</el-form-item> <el-form-item label="碎浆时间" prop="suijiangCostTime">
<el-form-item label="原料配比" prop="ratio"> <el-date-picker
<el-input v-model="formData.ratio" placeholder="请输入原料配比" /> v-model="formData.suijiangCostTime"
</el-form-item> type="date"
<el-form-item label="用水量kg" prop="waterUsage"> value-format="x"
<el-input v-model="formData.waterUsage" placeholder="请输入用水量kg" /> placeholder="选择碎浆时间"
</el-form-item> />
<el-form-item label="放浆浓度%" prop="densityOut"> </el-form-item>
<el-input v-model="formData.densityOut" placeholder="请输入放浆浓度%" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="加药量kg" prop="addItemUsage"> <el-row>
<el-input v-model="formData.addItemUsage" placeholder="请输入加药量kg" /> <el-col :span="12">
</el-form-item> <el-form-item label="原料配比id" prop="ratioId">
<el-form-item label="出渣率%" prop="slagYield"> <el-input v-model="formData.ratioId" placeholder="请输入原料配比id" />
<el-input v-model="formData.slagYield" placeholder="请输入出渣率%" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="浓度%" prop="density"> <el-col :span="12">
<el-input v-model="formData.density" placeholder="请输入浓度%" /> <el-form-item label="原料配比" prop="ratio">
</el-form-item> <el-input v-model="formData.ratio" placeholder="请输入原料配比" />
<el-form-item label="备注" prop="remark"> </el-form-item>
<el-input v-model="formData.remark" placeholder="请输入备注" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="是否启用" prop="isEnable"> <el-row>
<el-radio-group v-model="formData.isEnable"> <el-col :span="12">
<el-radio <el-form-item label="用水量kg" prop="waterUsage">
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" <el-input v-model="formData.waterUsage" placeholder="请输入用水量kg" />
:key="dict.value" </el-form-item>
:label="dict.value"
> </el-col>
{{ dict.label }} <el-col :span="12">
</el-radio> <el-form-item label="放浆浓度%" prop="densityOut">
</el-radio-group> <el-input v-model="formData.densityOut" placeholder="请输入放浆浓度%" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="加药量kg" prop="addItemUsage">
<el-input v-model="formData.addItemUsage" placeholder="请输入加药量kg" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出渣率%" prop="slagYield">
<el-input v-model="formData.slagYield" placeholder="请输入出渣率%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="浓度%" prop="density">
<el-input v-model="formData.density" placeholder="请输入浓度%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -181,4 +210,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

27
src/views/mes/record/components/RecordSuijiangList.vue
Unescape Escape View File

@ -10,7 +10,15 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column <el-table-column
label="开机时间" label="开机时间"
align="center" align="center"
@ -41,19 +49,8 @@
<el-table-column label="出渣率%" align="center" prop="slagYield" /> <el-table-column label="出渣率%" align="center" prop="slagYield" />
<el-table-column label="浓度%" align="center" prop="density" /> <el-table-column label="浓度%" align="center" prop="density" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope"> <el-table-column label="操作" align="center" fixed="right" width="120px">
<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"> <template #default="scope">
<el-button <el-button
link link
@ -159,4 +156,4 @@ const handleDelete = async (id: number) => {
await getList() await getList()
} catch {} } catch {}
} }
</script> </script>

249
src/views/mes/record/index.vue
Unescape Escape View File

@ -8,135 +8,103 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="名称" prop="name"> <el-row>
<el-input <el-col :span="6">
v-model="queryParams.name" <el-form-item label="工位" prop="organizationId">
placeholder="请输入名称" <el-input
clearable v-model="queryParams.organizationId"
@keyup.enter="handleQuery" placeholder="请输入工位"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="组织id" prop="organizationId"> />
<el-input </el-form-item>
v-model="queryParams.organizationId" </el-col>
placeholder="请输入组织id" <el-col :span="6">
clearable <el-form-item label="机台" prop="machineId">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.machineId"
/> placeholder="请输入机台"
</el-form-item> clearable
<el-form-item label="对应机台id" prop="machineId"> @keyup.enter="handleQuery"
<el-input class="!w-240px"
v-model="queryParams.machineId" />
placeholder="请输入对应机台id" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" <el-col :span="6">
class="!w-240px" <el-form-item label="班组" prop="workTeamId">
/> <el-input
</el-form-item> v-model="queryParams.workTeamId"
<el-form-item label="班组id" prop="workTeamId"> placeholder="请输入班组"
<el-input clearable
v-model="queryParams.workTeamId" @keyup.enter="handleQuery"
placeholder="请输入班组id" class="!w-240px"
clearable />
@keyup.enter="handleQuery" </el-form-item>
class="!w-240px" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="备注" prop="remark">
<el-form-item label="开始时间" prop="startTime"> <el-input
<el-date-picker v-model="queryParams.remark"
v-model="queryParams.startTime" placeholder="请输入备注"
value-format="YYYY-MM-DD HH:mm:ss" clearable
type="daterange" @keyup.enter="handleQuery"
start-placeholder="开始日期" class="!w-240px"
end-placeholder="结束日期" />
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" </el-form-item>
class="!w-240px" </el-col>
/> </el-row>
</el-form-item> <el-row>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="8">
<el-date-picker <el-form-item label="开始时间" prop="startTime">
v-model="queryParams.endTime" <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" v-model="queryParams.startTime"
type="daterange" value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" start-placeholder="开始日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" end-placeholder="结束日期"
class="!w-240px" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/> class="!w-240px"
</el-form-item> />
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId"> </el-col>
<el-input <el-col :span="8">
v-model="queryParams.processInstanceId" <el-form-item label="结束时间" prop="endTime">
placeholder="请输入流程实例的编号" <el-date-picker
clearable v-model="queryParams.endTime"
@keyup.enter="handleQuery" value-format="YYYY-MM-DD HH:mm:ss"
class="!w-240px" type="daterange"
/> start-placeholder="开始日期"
</el-form-item> end-placeholder="结束日期"
<el-form-item label="状态" prop="status"> :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
<el-select class="!w-240px"
v-model="queryParams.status" />
placeholder="请选择状态" </el-form-item>
clearable </el-col>
class="!w-240px" <el-col :span="8">
> <el-form-item>
<el-option <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
:key="dict.value" <el-button
:label="dict.label" type="primary"
:value="dict.value" plain
/> @click="openForm('create')"
</el-select> v-hasPermi="['mes:record-template:create']"
</el-form-item> >
<el-form-item label="工序类型" prop="recordType"> <Icon icon="ep:plus" class="mr-5px" /> 新增
<el-select </el-button>
v-model="queryParams.recordType" <el-button
placeholder="请选择工序类型" type="success"
clearable plain
class="!w-240px" @click="handleExport"
> :loading="exportLoading"
<el-option v-hasPermi="['mes:record-template:export']"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)" >
:key="dict.value" <Icon icon="ep:download" class="mr-5px" /> 导出
:label="dict.label" </el-button>
:value="dict.value" </el-form-item>
/> </el-col>
</el-select> </el-row>
</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>
<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> </el-form>
</ContentWrap> </ContentWrap>
@ -150,11 +118,10 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" /> <el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" /> <el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" /> <el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
align="center" align="center"
@ -169,27 +136,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" 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"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType"> <el-table-column label="工序" align="center" prop="recordType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <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 <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -197,7 +154,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -347,4 +304,4 @@ const handleCurrentChange = (row) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

Write Preview
Loading…
Cancel
Save