fix feeding record

main
chenshuichuan 2 years ago
parent 49312f12a7
commit b5a4c4677b

@ -8,60 +8,35 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="记录id" prop="recordId"> <el-form-item label="记录" prop="recordId">
<el-input <el-input
v-model="queryParams.recordId" v-model="queryParams.recordId"
placeholder="请输入记录id" placeholder="请输入记录"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="记录明细id" prop="recordDetailId">
<el-input <el-form-item label="计划" prop="planId">
v-model="queryParams.recordDetailId"
placeholder="请输入记录明细id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="计划id" prop="planId">
<el-input <el-input
v-model="queryParams.planId" v-model="queryParams.planId"
placeholder="请输入计划id" placeholder="请输入计划"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="原料id" prop="itemId"> <el-form-item label="原料" prop="itemId">
<el-input <el-input
v-model="queryParams.itemId" v-model="queryParams.itemId"
placeholder="请输入原料id" placeholder="请输入原料"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="重量" prop="weight">
<el-input
v-model="queryParams.weight"
placeholder="请输入重量"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="单位" prop="unitId">
<el-input
v-model="queryParams.unitId"
placeholder="请输入单位"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="记录人" prop="userId"> <el-form-item label="记录人" prop="userId">
<el-input <el-input
v-model="queryParams.userId" v-model="queryParams.userId"
@ -82,28 +57,18 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <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 @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
@click="openForm('create')" <!-- @click="openForm('create')"-->
v-hasPermi="['mes:feeding-record-plan:create']" <!-- v-hasPermi="['mes:feeding-record-plan:create']"-->
> <!-- >-->
<Icon icon="ep:plus" class="mr-5px" /> 新增 <!-- <Icon icon="ep:plus" class="mr-5px" /> 新增-->
</el-button> <!-- </el-button>-->
<el-button <el-button
type="success" type="success"
plain plain
@ -121,13 +86,13 @@
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" /> <el-table-column label="id" align="center" prop="id" />
<el-table-column label="记录id" align="center" prop="recordId" /> <el-table-column label="记录" align="center" prop="recordCode" />
<el-table-column label="记录明细id" align="center" prop="recordDetailId" /> <el-table-column label="记录明细" align="center" prop="recordDetailId" />
<el-table-column label="计划id" align="center" prop="planId" /> <el-table-column label="计划" align="center" prop="planCode" />
<el-table-column label="原料id" align="center" prop="itemId" /> <el-table-column label="原料" align="center" prop="itemName" />
<el-table-column label="重量" align="center" prop="weight" /> <el-table-column label="重量" align="center" prop="weight" />
<el-table-column label="单位" align="center" prop="unitId" /> <el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="记录人" align="center" prop="userId" /> <el-table-column label="记录人" align="center" prop="userName" />
<el-table-column <el-table-column
label="投料时间" label="投料时间"
align="center" align="center"
@ -135,23 +100,17 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button <!-- <el-button-->
link <!-- link-->
type="primary" <!-- type="primary"-->
@click="openForm('update', scope.row.id)" <!-- @click="openForm('update', scope.row.id)"-->
v-hasPermi="['mes:feeding-record-plan:update']" <!-- v-hasPermi="['mes:feeding-record-plan:update']"-->
> <!-- >-->
编辑 <!-- 编辑-->
</el-button> <!-- </el-button>-->
<el-button <el-button
link link
type="danger" type="danger"

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,19 +7,10 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="单号" prop="feedingRecordCode"> <el-form-item label="单号:" prop="feedingRecordCode">
<el-input v-model="formData.feedingRecordCode" placeholder="请输入单号" /> <el-input disabled v-model="formData.feedingRecordCode" placeholder="保存自动生成单号" />
</el-form-item> </el-form-item>
<el-form-item label="产品id" prop="productId"> <el-form-item label="制浆线:" prop="feedingPipeline">
<el-input v-model="formData.productId" placeholder="请输入产品id" />
</el-form-item>
<el-form-item label="计划id" prop="planId">
<el-input v-model="formData.planId" placeholder="请输入计划id" />
</el-form-item>
<el-form-item label="原料id" prop="itemId">
<el-input v-model="formData.itemId" placeholder="请输入原料id" />
</el-form-item>
<el-form-item label="制浆线" prop="feedingPipeline">
<el-radio-group v-model="formData.feedingPipeline"> <el-radio-group v-model="formData.feedingPipeline">
<el-radio <el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_PIPELINE)" v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_PIPELINE)"
@ -30,7 +21,7 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="投料类型" prop="feedingType"> <el-form-item label="投料类型:" prop="feedingType">
<el-radio-group v-model="formData.feedingType"> <el-radio-group v-model="formData.feedingType">
<el-radio <el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_TYPE)" v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_TYPE)"
@ -41,10 +32,11 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="重量" prop="weight"> <el-form-item label="重量(kg):" prop="weight" v-if="formData.feedingType !='org'">
<el-input v-model="formData.weight" placeholder="请输入重量" /> <el-input-number v-model="formData.weight" :min="0" :precision="2" class="!w-1/1" placeholder="请输入重量"
/>
</el-form-item> </el-form-item>
<el-form-item label="投料时间" prop="feedingTime"> <el-form-item label="投料时间:" prop="feedingTime">
<el-date-picker <el-date-picker
v-model="formData.feedingTime" v-model="formData.feedingTime"
type="date" type="date"
@ -52,26 +44,13 @@
placeholder="选择投料时间" placeholder="选择投料时间"
/> />
</el-form-item> </el-form-item>
<el-form-item label="记录人" prop="userId"> <el-form-item label="备注:" prop="remark">
<el-input v-model="formData.userId" placeholder="请输入记录人" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="recordStatus">
<el-radio-group v-model="formData.recordStatus">
<el-radio
v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_RECORD_STATUS)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form> </el-form>
<!-- 子表的表单 --> <!-- 子表的表单 -->
<el-tabs v-model="subTabsName"> <el-tabs v-model="subTabsName" v-if="formData.feedingType=='org'">
<el-tab-pane label="投料记录明细" name="feedingRecordDetail"> <el-tab-pane label="投料记录明细" name="feedingRecordDetail">
<FeedingRecordDetailForm ref="feedingRecordDetailFormRef" :record-id="formData.id" /> <FeedingRecordDetailForm ref="feedingRecordDetailFormRef" :record-id="formData.id" />
</el-tab-pane> </el-tab-pane>
@ -112,6 +91,7 @@ const formData = ref({
recordStatus: undefined, recordStatus: undefined,
}) })
const formRules = reactive({ const formRules = reactive({
feedingType: [{ required: true, message: '投料类型不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // Ref const formRef = ref() // Ref
@ -124,7 +104,10 @@ const open = async (type: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
formType.value = type formType.value = type
resetForm() resetForm()
formData.value.feedingType = 'org'
formData.value.feedingPipeline = 'zhijiang2'
// //
if (id) { if (id) {
formLoading.value = true formLoading.value = true

@ -9,49 +9,57 @@
> >
<el-table :data="formData" class="-mt-10px"> <el-table :data="formData" class="-mt-10px">
<el-table-column label="序号" type="index" width="100" /> <el-table-column label="序号" type="index" width="100" />
<el-table-column label="原料id" min-width="150"> <el-table-column label="原料" min-width="150">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.itemId`" :rules="formRules.itemId" class="mb-0px!"> <el-form-item :prop="`${$index}.itemId`" :rules="formRules.itemId" class="mb-0px!">
<el-input v-model="row.itemId" placeholder="请输入原料id" /> <el-select
</el-form-item> v-model="row.itemId"
</template> clearable
</el-table-column> filterable
<el-table-column label="重量" min-width="150"> placeholder="请选择原料"
<template #default="{ row, $index }"> >
<el-form-item :prop="`${$index}.weight`" :rules="formRules.weight" class="mb-0px!"> <el-option
<el-input v-model="row.weight" placeholder="请输入重量" /> v-for="item in productList"
</el-form-item> :key="item.id"
</template> :label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
</el-table-column> </el-table-column>
<el-table-column label="单位" min-width="150"> <el-table-column label="单位" min-width="80">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.unitId`" :rules="formRules.unitId" class="mb-0px!"> <el-form-item :prop="`${$index}.unitId`" :rules="formRules.unitId" class="mb-0px!">
<el-input v-model="row.unitId" placeholder="请输入单位" /> <el-select
</el-form-item> v-model="row.unitId"
</template> clearable
</el-table-column> filterable
<el-table-column label="记录人" min-width="150"> placeholder="请选择原料"
<template #default="{ row, $index }"> >
<el-form-item :prop="`${$index}.userId`" :rules="formRules.userId" class="mb-0px!"> <el-option
<el-input v-model="row.userId" placeholder="请输入记录人" /> v-for="item in unitList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投料时间" min-width="150"> <el-table-column label="重量" min-width="150">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.feedingTime`" :rules="formRules.feedingTime" class="mb-0px!"> <el-form-item :prop="`${$index}.weight`" :rules="formRules.weight" class="mb-0px!">
<el-date-picker <el-input-number v-model="row.weight" :min="0" :precision="2" class="!w-1/1" placeholder="请输入重量"
v-model="row.feedingTime"
type="date"
value-format="x"
placeholder="选择投料时间"
/> />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="60"> <el-table-column align="center" fixed="right" label="操作" width="60">
<template #default="{ $index }"> <template #default="{ $index }">
<el-button @click="handleDelete($index)" link></el-button> <el-button @click="handleDelete($index)" link type="danger">
<Icon icon="ep:delete" />
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -62,6 +70,11 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { FeedingRecordApi } from '@/api/mes/feedingrecord' import { FeedingRecordApi } from '@/api/mes/feedingrecord'
import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
import {ProductApi, ProductVO} from "@/api/erp/product/product";
const unitList = ref<ProductUnitVO[]>([]) //
const productList = ref<ProductVO[]>([]) //
const props = defineProps<{ const props = defineProps<{
recordId: undefined // id recordId: undefined // id
@ -69,9 +82,24 @@ const props = defineProps<{
const formLoading = ref(false) // const formLoading = ref(false) //
const formData = ref([]) const formData = ref([])
const formRules = reactive({ const formRules = reactive({
itemId: [{ required: true, message: '原料不能为空', trigger: 'blur' }],
unitId: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
weight: [{ required: true, message: '重量不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // Ref const formRef = ref() // Ref
/** 初始化 */
onMounted(async () => {
//
unitList.value = await ProductUnitApi.getProductUnitSimpleList()
productList.value = await ProductApi.getItemSimpleList()
//
if (formData.value.length === 0) {
handleAdd()
}
})
/** 监听主表的关联字段的变化,加载对应的子表数据 */ /** 监听主表的关联字段的变化,加载对应的子表数据 */
watch( watch(
() => props.recordId, () => props.recordId,
@ -99,7 +127,7 @@ const handleAdd = () => {
recordId: undefined, recordId: undefined,
itemId: undefined, itemId: undefined,
weight: undefined, weight: undefined,
unitId: undefined, unitId: 3,
userId: undefined, userId: undefined,
feedingTime: undefined, feedingTime: undefined,
} }

@ -2,25 +2,11 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="原料id" align="center" prop="itemId" /> <el-table-column label="原料" align="center" prop="itemName" />
<el-table-column label="重量" align="center" prop="weight" /> <el-table-column label="重量" align="center" prop="weight" />
<el-table-column label="单位" align="center" prop="unitId" /> <el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="记录人" align="center" prop="userId" />
<el-table-column
label="投料时间"
align="center"
prop="feedingTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
</el-table> </el-table>
</ContentWrap> </ContentWrap>
</template> </template>

@ -17,33 +17,7 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="产品id" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入产品id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="计划id" prop="planId">
<el-input
v-model="queryParams.planId"
placeholder="请输入计划id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="原料id" prop="itemId">
<el-input
v-model="queryParams.itemId"
placeholder="请输入原料id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="制浆线" prop="feedingPipeline"> <el-form-item label="制浆线" prop="feedingPipeline">
<el-select <el-select
v-model="queryParams.feedingPipeline" v-model="queryParams.feedingPipeline"
@ -74,7 +48,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="重量" prop="weight"> <el-form-item label="重量(kg)" prop="weight">
<el-input <el-input
v-model="queryParams.weight" v-model="queryParams.weight"
placeholder="请输入重量" placeholder="请输入重量"
@ -112,32 +86,6 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="recordStatus">
<el-select
v-model="queryParams.recordStatus"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_RECORD_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <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 @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -175,11 +123,7 @@
</el-tabs> </el-tabs>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="单号" align="center" prop="feedingRecordCode" /> <el-table-column label="单号" align="center" prop="feedingRecordCode" />
<el-table-column label="产品id" align="center" prop="productId" />
<el-table-column label="计划id" align="center" prop="planId" />
<el-table-column label="原料id" align="center" prop="itemId" />
<el-table-column label="制浆线" align="center" prop="feedingPipeline"> <el-table-column label="制浆线" align="center" prop="feedingPipeline">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" /> <dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
@ -190,14 +134,7 @@
<dict-tag :type="DICT_TYPE.MES_FEEDING_TYPE" :value="scope.row.feedingType" /> <dict-tag :type="DICT_TYPE.MES_FEEDING_TYPE" :value="scope.row.feedingType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量" align="center" prop="weight" /> <el-table-column label="重量(kg)" align="center" prop="weight" />
<el-table-column
label="投料时间"
align="center"
prop="feedingTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="记录人" align="center" prop="userId" /> <el-table-column label="记录人" align="center" prop="userId" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="状态" align="center" prop="recordStatus"> <el-table-column label="状态" align="center" prop="recordStatus">
@ -206,12 +143,19 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="创建时间" label="投料时间"
align="center" align="center"
prop="createTime" prop="feedingTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<!-- <el-table-column-->
<!-- label="创建时间"-->
<!-- align="center"-->
<!-- prop="createTime"-->
<!-- :formatter="dateFormatter"-->
<!-- width="180px"-->
<!-- />-->
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button <el-button
@ -219,6 +163,7 @@
type="primary" type="primary"
@click="openForm('update', scope.row.id)" @click="openForm('update', scope.row.id)"
v-hasPermi="['mes:feeding-record:update']" v-hasPermi="['mes:feeding-record:update']"
v-if="scope.row.recordStatus=='1'"
> >
编辑 编辑
</el-button> </el-button>
@ -227,6 +172,7 @@
type="danger" type="danger"
@click="handleDelete(scope.row.id)" @click="handleDelete(scope.row.id)"
v-hasPermi="['mes:feeding-record:delete']" v-hasPermi="['mes:feeding-record:delete']"
v-if="scope.row.recordStatus=='1'"
> >
删除 删除
</el-button> </el-button>
@ -243,7 +189,7 @@
</ContentWrap> </ContentWrap>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<FeedingRecordForm ref="formRef" @success="getList" /> <FeedingRecordForm ref="formRef" @success="getList" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">

Loading…
Cancel
Save