|
|
|
@ -17,24 +17,17 @@
|
|
|
|
class="!w-240px"
|
|
|
|
class="!w-240px"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item label="制浆线" prop="feedingPipeline">
|
|
|
|
<el-form-item label="制浆线" prop="feedingPipeline">
|
|
|
|
<el-select
|
|
|
|
<el-tree-select
|
|
|
|
v-model="queryParams.feedingPipeline"
|
|
|
|
v-model="queryParams.feedingPipeline"
|
|
|
|
placeholder="请选择制浆线"
|
|
|
|
:data="organizationTree"
|
|
|
|
clearable
|
|
|
|
:props="defaultProps"
|
|
|
|
@change="handleQuery"
|
|
|
|
check-strictly
|
|
|
|
class="!w-240px"
|
|
|
|
default-expand-all
|
|
|
|
>
|
|
|
|
placeholder="请选择制浆线"
|
|
|
|
<el-option
|
|
|
|
class="!w-240px"
|
|
|
|
v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_PIPELINE)"
|
|
|
|
/>
|
|
|
|
:key="dict.value"
|
|
|
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
|
|
|
|
</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="queryParams.feedingTime"
|
|
|
|
v-model="queryParams.feedingTime"
|
|
|
|
@ -109,17 +102,13 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="单号" align="center" prop="feedingRecordCode" width="150px"/>
|
|
|
|
<el-table-column label="单号" align="center" prop="feedingRecordCode" width="150px"/>
|
|
|
|
<el-table-column label="制浆线" align="center" prop="feedingPipeline" sortable>
|
|
|
|
<el-table-column label="制浆线" align="center" prop="feedingPipelineName" sortable/>
|
|
|
|
<template #default="scope">
|
|
|
|
|
|
|
|
<dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="投料类型" align="center" prop="feedingType" sortable>
|
|
|
|
<el-table-column label="投料类型" align="center" prop="feedingType" sortable>
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<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="重量(kg)" align="center" prop="weight" />
|
|
|
|
<el-table-column label="数量" align="center" prop="weight" />
|
|
|
|
<el-table-column label="记录人" align="center" prop="userName" />
|
|
|
|
<el-table-column label="记录人" align="center" prop="userName" />
|
|
|
|
<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">
|
|
|
|
@ -135,7 +124,7 @@
|
|
|
|
width="180px"
|
|
|
|
width="180px"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
|
|
<el-table-column label="操作" align="center" width="150px">
|
|
|
|
<el-table-column label="操作" align="center" width="200px">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
link
|
|
|
|
link
|
|
|
|
@ -162,7 +151,7 @@
|
|
|
|
v-hasPermi="['mes:feeding-record:update']"
|
|
|
|
v-hasPermi="['mes:feeding-record:update']"
|
|
|
|
v-if="scope.row.recordStatus=='1'"
|
|
|
|
v-if="scope.row.recordStatus=='1'"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
提交
|
|
|
|
投料
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
@ -187,13 +176,14 @@ import download from '@/utils/download'
|
|
|
|
import { FeedingRecordApi, FeedingRecordVO } from '@/api/mes/feedingrecord'
|
|
|
|
import { FeedingRecordApi, FeedingRecordVO } from '@/api/mes/feedingrecord'
|
|
|
|
import FeedingRecordForm from './FeedingRecordForm.vue'
|
|
|
|
import FeedingRecordForm from './FeedingRecordForm.vue'
|
|
|
|
import FeedingRecordDetailList from './components/FeedingRecordDetailList.vue'
|
|
|
|
import FeedingRecordDetailList from './components/FeedingRecordDetailList.vue'
|
|
|
|
|
|
|
|
import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
|
|
|
|
|
|
|
|
import { defaultProps, handleTree } from '@/utils/tree'
|
|
|
|
/** 投料记录 列表 */
|
|
|
|
/** 投料记录 列表 */
|
|
|
|
defineOptions({ name: 'FeedingRecord' })
|
|
|
|
defineOptions({ name: 'FeedingRecord' })
|
|
|
|
|
|
|
|
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
|
const { t } = useI18n() // 国际化
|
|
|
|
const { t } = useI18n() // 国际化
|
|
|
|
|
|
|
|
const organizationTree = ref() // 树形结构
|
|
|
|
const loading = ref(true) // 列表的加载中
|
|
|
|
const loading = ref(true) // 列表的加载中
|
|
|
|
const list = ref<FeedingRecordVO[]>([]) // 列表的数据
|
|
|
|
const list = ref<FeedingRecordVO[]>([]) // 列表的数据
|
|
|
|
const total = ref(0) // 列表的总页数
|
|
|
|
const total = ref(0) // 列表的总页数
|
|
|
|
@ -276,6 +266,8 @@ const handleExport = async () => {
|
|
|
|
|
|
|
|
|
|
|
|
/** 初始化 **/
|
|
|
|
/** 初始化 **/
|
|
|
|
onMounted(() => {
|
|
|
|
onMounted(() => {
|
|
|
|
|
|
|
|
// 加载组织
|
|
|
|
|
|
|
|
getOrganizationTree()
|
|
|
|
getList()
|
|
|
|
getList()
|
|
|
|
})
|
|
|
|
})
|
|
|
|
/** 提交记录操作 */
|
|
|
|
/** 提交记录操作 */
|
|
|
|
@ -283,7 +275,6 @@ const handleUpdateStatus = async (id: number, status:string) => {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
// 二次确认
|
|
|
|
// 二次确认
|
|
|
|
await message.confirm("确认提交投料记录？", "一旦提交成功无法撤回！")
|
|
|
|
await message.confirm("确认提交投料记录？", "一旦提交成功无法撤回！")
|
|
|
|
// 发起删除
|
|
|
|
|
|
|
|
await FeedingRecordApi.updateFeedingRecordStatus(id,status)
|
|
|
|
await FeedingRecordApi.updateFeedingRecordStatus(id,status)
|
|
|
|
message.success("提交成功！")
|
|
|
|
message.success("提交成功！")
|
|
|
|
// 刷新列表
|
|
|
|
// 刷新列表
|
|
|
|
@ -297,4 +288,14 @@ const handleTabClick = (tab: TabsPaneContext) => {
|
|
|
|
queryParams.feedingType = tab.paneName
|
|
|
|
queryParams.feedingType = tab.paneName
|
|
|
|
handleQuery()
|
|
|
|
handleQuery()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** 获得产线工位树 */
|
|
|
|
|
|
|
|
const getOrganizationTree = async () => {
|
|
|
|
|
|
|
|
organizationTree.value = []
|
|
|
|
|
|
|
|
const req = {orgClass:'pipeline'}
|
|
|
|
|
|
|
|
const data = await OrganizationApi.getOrganizationList(req)
|
|
|
|
|
|
|
|
const root: Tree = { id: 0, name: '顶级产线工位', children: [] }
|
|
|
|
|
|
|
|
root.children = handleTree(data, 'id', 'parentId')
|
|
|
|
|
|
|
|
organizationTree.value.push(root)
|
|
|
|
|
|
|
|
}
|
|
|
|
</script>
|
|
|
|
</script>
|
|
|
|
|
kkk-ops
4 months ago