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

fix record

Browse Source
main
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 () =>{
if(formData.value.reportDate && formData.value.groupType && formData.value.orgType){
formData.value.userId = null
formData.value.orgId = null
userList.value = await WorkTeamApi.getUserList(formData.value.orgType, formData.value.groupType)
if(userList.value && userList.value.length>0){
formData.value.userId = userList.value[0].id
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)
await changeDateUser()
}
if(!formData.value.userId || !formData.value.orgId){
warningInfo.value = '该条件下未查询到工位安排信息！'
if(!formData.value.userId){
warningInfo.value = '该条件下未查询到工人安排信息！'
message.error(warningInfo.value)
}
}
@ -299,5 +295,21 @@ const getCurrentDate = () =>{
if(day<10)day = '0'+day;
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>

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

@ -8,129 +8,105 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="记录工序" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录工序"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
@ -141,11 +117,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -160,27 +135,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -188,7 +153,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link
@ -217,7 +182,6 @@
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<RecordTemplateForm ref="formRef" @success="getList" />
<!-- 子表的列表 -->

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

@ -8,126 +8,103 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="记录类型（工序类型）" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录类型（工序类型）"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link

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

@ -8,126 +8,103 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="记录类型（工序类型）" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录类型（工序类型）"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link
@ -217,7 +183,6 @@
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<RecordTemplateForm ref="formRef" @success="getList" />
<!-- 子表的列表 -->

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

@ -8,125 +8,103 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="记录类型（工序类型）" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录类型（工序类型）"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
@ -140,11 +118,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -159,27 +136,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -187,7 +154,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link

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

@ -8,126 +8,103 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="记录类型（工序类型）" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录类型（工序类型）"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link

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

@ -8,125 +8,103 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="工序类型" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录类型（工序类型）"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
@ -140,11 +118,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -159,27 +136,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -187,7 +154,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link

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

@ -7,18 +7,16 @@
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" />
<el-form-item label="班组" prop="workTeamId">
<el-input v-model="formData.workTeamId" placeholder="请输入班组" />
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input v-model="formData.organizationId" placeholder="请输入组织id" />
<el-form-item label="工位" prop="organizationId">
<el-input v-model="formData.organizationId" placeholder="请输入工位" />
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input v-model="formData.machineId" placeholder="请输入对应机台id" />
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input v-model="formData.workTeamId" placeholder="请输入班组id" />
<el-form-item label="机台" prop="machineId">
<el-input v-model="formData.machineId" placeholder="请输入机台" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="formData.startTime"
@ -35,21 +33,6 @@
placeholder="选择结束时间"
/>
</el-form-item>
<el-form-item label="组长上午审批id" prop="groupManagerApproveId1">
<el-input v-model="formData.groupManagerApproveId1" placeholder="请输入组长上午审批id" />
</el-form-item>
<el-form-item label="组长下午审批id" prop="groupManagerApproveId2">
<el-input v-model="formData.groupManagerApproveId2" placeholder="请输入组长下午审批id" />
</el-form-item>
<el-form-item label="主管上午审批id" prop="productionManagerApproveId1">
<el-input v-model="formData.productionManagerApproveId1" placeholder="请输入主管上午审批id" />
</el-form-item>
<el-form-item label="主管下午审批id" prop="productionManagerApproveId2">
<el-input v-model="formData.productionManagerApproveId2" placeholder="请输入主管下午审批id" />
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId">
<el-input v-model="formData.processInstanceId" placeholder="请输入流程实例的编号" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio
@ -61,8 +44,8 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="记录类型（工序类型）" prop="recordType">
<el-select v-model="formData.recordType" placeholder="请选择记录类型（工序类型）">
<el-form-item label="工序" prop="recordType">
<el-select v-model="formData.recordType" placeholder="请选择工序">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
@ -74,17 +57,7 @@
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-radio-group v-model="formData.isEnable">
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -125,12 +98,10 @@ const formData = ref({
isEnable: undefined,
})
const formRules = reactive({
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
organizationId: [{ required: true, message: '组织id不能为空', trigger: 'blur' }],
organizationId: [{ required: true, message: '工位不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
recordType: [{ required: true, message: '记录类型（工序类型）不能为空', trigger: 'change' }],
recordType: [{ required: true, message: '工序不能为空', trigger: 'change' }],
})
const formRef = ref() // 表单 Ref

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

@ -8,126 +8,103 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="记录类型（工序类型）" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录类型（工序类型）"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link

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

@ -8,126 +8,103 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="记录类型（工序类型）" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择记录类型（工序类型）"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
@ -141,11 +118,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -160,27 +136,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -188,7 +154,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link
@ -217,7 +183,6 @@
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<RecordTemplateForm ref="formRef" @success="getList" />
<!-- 子表的列表 -->

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

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

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

@ -10,41 +10,37 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="开机时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
label="创建时间"
align="center"
prop="endTime"
prop="createTime"
:formatter="dateFormatter"
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="tuoshui" />
<el-table-column label="洗模时间(S)" align="center" prop="ximu" />
<el-table-column label="产品id" align="center" prop="productId" />
<el-table-column label="产品" align="center" prop="productId" />
<el-table-column label="产品外观" align="center" prop="appearance" />
<el-table-column label="湿重(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
label="开机时间"
align="center"
prop="createTime"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope">
<el-button
link

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

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

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

@ -10,26 +10,23 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="产品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
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
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">
<el-button
link

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

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

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

@ -10,21 +10,16 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="开机时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
label="创建时间"
align="center"
prop="endTime"
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="浓度%" align="center" prop="density" />
<el-table-column label="电流A" align="center" prop="electricCurrent" />
<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="产浆量T" align="center" prop="jiangWeight" />
<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="创建时间"
label="开机时间"
align="center"
prop="createTime"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope">
<el-button
link

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

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

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

@ -10,40 +10,36 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="开机时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
label="创建时间"
align="center"
prop="endTime"
prop="createTime"
:formatter="dateFormatter"
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="temperature" />
<el-table-column label="产品id" align="center" prop="productId" />
<el-table-column label="产品外观" align="center" prop="appearance" />
<el-table-column label="产品重量(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
label="开机时间"
align="center"
prop="createTime"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope">
<el-button
link

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

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

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

@ -10,39 +10,40 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="开机时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
label="创建时间"
align="center"
prop="endTime"
prop="createTime"
:formatter="dateFormatter"
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="machineEndTime" />
<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="weightOut" />
<el-table-column label="产量" align="center" prop="productNumber" />
<el-table-column label="单重(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable" />
<el-table-column
label="创建时间"
label="开机时间"
align="center"
prop="createTime"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope">
<el-button
link

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

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

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

@ -10,8 +10,16 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="产品id" align="center" prop="productId" />
<el-table-column
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="单重(g)" align="center" prop="productWeight" />
<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="unqualifiedReason" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope">
<el-button
link

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

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

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

@ -10,43 +10,39 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="开机时间"
align="center"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
label="创建时间"
align="center"
prop="endTime"
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column label="机台" align="center" prop="machineId" />
<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="wetDegree" />
<el-table-column label="单重(g)" align="center" prop="productWeight" />
<el-table-column label="切边时间(S)" align="center" prop="cutTime" />
<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="创建时间"
label="开机时间"
align="center"
prop="createTime"
prop="startTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="停机时间"
align="center"
prop="endTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope">
<el-button
link

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

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

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

@ -10,7 +10,15 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column
label="开机时间"
align="center"
@ -30,24 +38,13 @@
<el-table-column label="上模温度℃" align="center" prop="temperatureMoldUp" />
<el-table-column label="下模温度℃" align="center" prop="temperatureMoldDown" />
<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="wetDegree" />
<el-table-column label="单重(g)" align="center" prop="productWeight" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope">
<el-button
link

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

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

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

@ -10,7 +10,15 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column
label="开机时间"
align="center"
@ -41,19 +49,8 @@
<el-table-column label="出渣率%" align="center" prop="slagYield" />
<el-table-column label="浓度%" align="center" prop="density" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="120px">
<template #default="scope">
<el-button
link

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

@ -8,135 +8,103 @@
:inline="true"
label-width="68px"
>
<el-form-item label="名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织id" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入组织id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="对应机台id" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入对应机台id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组id" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId">
<el-input
v-model="queryParams.processInstanceId"
placeholder="请输入流程实例的编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="工序类型" prop="recordType">
<el-select
v-model="queryParams.recordType"
placeholder="请选择工序类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<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-row>
<el-col :span="6">
<el-form-item label="工位" prop="organizationId">
<el-input
v-model="queryParams.organizationId"
placeholder="请输入工位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
placeholder="请输入机台"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班组" prop="workTeamId">
<el-input
v-model="queryParams.workTeamId"
placeholder="请输入班组"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="queryParams.endTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<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-col>
</el-row>
</el-form>
</ContentWrap>
@ -150,11 +118,10 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="组织id" align="center" prop="id" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="组织id" align="center" prop="organizationId" />
<el-table-column label="对应机台id" align="center" prop="machineId" />
<el-table-column label="班组id" align="center" prop="workTeamId" />
<el-table-column label="工位" align="center" prop="organizationId" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="班组" align="center" prop="workTeamId" />
<el-table-column
label="开始时间"
align="center"
@ -169,27 +136,17 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="组长上午审批id" align="center" prop="groupManagerApproveId1" />
<el-table-column label="组长下午审批id" align="center" prop="groupManagerApproveId2" />
<el-table-column label="主管上午审批id" align="center" prop="productionManagerApproveId1" />
<el-table-column label="主管下午审批id" align="center" prop="productionManagerApproveId2" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="记录类型（工序类型）" align="center" prop="recordType">
<el-table-column label="工序" align="center" prop="recordType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.recordType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -197,7 +154,7 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="130px">
<template #default="scope">
<el-button
link

Write Preview
Loading…
Cancel
Save