add daily report

main
chenshuichuan 2 years ago
parent 14afad7cd4
commit 78dd856558

@ -105,7 +105,10 @@ export const ProduceReportDetailApi = {
getProduceReportDetailPage: async (params: any) => {
return await request.get({ url: `/mes/produce-report-detail/page`, params })
},
// 查询生产报工明细分页
getProduceReportDetailPageCenter: async (params: any) => {
return await request.get({ url: `/mes/produce-report-detail/pageCenter`, params })
},
// 查询生产报工明细详情
getProduceReportDetail: async (id: number) => {
return await request.get({ url: `/mes/produce-report-detail/get?id=` + id })

@ -112,11 +112,7 @@
<dict-tag v-if="notEmpty(scope.row.orgType)" :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<!-- <el-table-column align="center" label="组织状态" >-->
<!-- <template #default="scope">-->
<!-- <dict-tag v-if="notEmpty(scope.row.status) && scope.row.orgClass=='workplace'" :type="DICT_TYPE.MES_ORG_STATUS" :value="scope.row.status" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" fixed="right" label="操作" width="80">
<template #default="scope">
<el-button

@ -0,0 +1,289 @@
<template>
<ContentWrap>
<!--计时计件日报表搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-row>
<el-col :span="8">
<el-form-item label="日期" prop="reportDate">
<el-date-picker
v-model="queryParams.reportDate"
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="6">
<el-form-item label="工位" prop="orgId">
<el-tree-select
v-model="queryParams.orgId"
:data="organizationTree"
:props="defaultProps"
check-strictly
default-expand-all
@change="handleQuery"
placeholder="请选择工位"
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="产品" prop="productId">
<el-select v-model="queryParams.productId" @change="handleQuery" clearable filterable placeholder="请选择" class="!w-180px">
<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="5">
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-180px"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="成型" name="chengxing" />
<el-tab-pane label="烘干" name="honggan" />
<el-tab-pane label="转移" name="zhuanyi" />
<el-tab-pane label="加湿" name="jiashi" />
<el-tab-pane label="热压" name="reya" />
<el-tab-pane label="切边" name="qiebian" />
<el-tab-pane label="品检" name="pinjian" />
<el-tab-pane label="打包" name="dabao" />
<el-tab-pane label="贴标" name="tiebiao" />
<el-tab-pane label="塑封" name="sufeng" />
</el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column
label="报工日期"
align="center"
prop="reportDate"
:formatter="dateFormatter2"
width="120px"
/>
<el-table-column label="工人" align="center" width="80px" prop="userName" />
<el-table-column label="工位" align="center" width="100px" prop="orgName" />
<el-table-column align="center" label="工序" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column label="产品" align="center" width="120px" prop="productName" />
<el-table-column label="成品数量" align="center" prop="qualityNumber" />
<el-table-column label="废品数量" align="center" prop="wasteNumber" />
<el-table-column label="总数量" align="center" prop="totalNumber" />
<el-table-column label="成品率%" align="center" prop="qualityRate" :formatter="erpCountTableColumnFormatter"/>
<el-table-column label="打包数量" align="center" prop="packageNumber" />
<el-table-column label="总时长" align="center" prop="totalTime" />
<el-table-column label="计件时长" align="center" prop="reportTime" />
<el-table-column label="废品原因" align="center" prop="wasteReason" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="类型" align="center" prop="reportType" width="90px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_PRODUCE_REPORT_TYPE" :value="scope.row.reportType" />
</template>
</el-table-column>
<el-table-column label="状态" align="center" fixed="right" prop="reportStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" fixed="right" width="80px">
<template #default="scope">
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:produce-report-detail:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { ProduceReportDetailApi, ProduceReportDetailVO } from '@/api/mes/producereport'
import ProduceReportDetailForm from './ProduceReportDetailForm.vue'
import ReplaceForm from './components/ReplaceForm.vue'
import {defaultProps, handleTree} from "@/utils/tree";
import * as UserApi from "@/api/system/user";
import {OrganizationApi} from "@/api/mes/organization";
import {ProductApi, ProductVO} from "@/api/erp/product/product";
import {erpCountTableColumnFormatter} from "@/utils";
import {useUserStore} from "@/store/modules/user";
import {checkPermi} from "@/utils/permission";
/** 生产报工明细 列表 */
defineOptions({ name: 'DailyReportIndex' })
const userStore = useUserStore()
const message = useMessage() //
const { t } = useI18n() //
const userList = ref<UserApi.UserVO[]>([]) //
const organizationTree = ref() //
const productList = ref<ProductVO[]>([]) //
const loading = ref(true) //
const list = ref<ProduceReportDetailVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
reportId: undefined,
planId: undefined,
productId: undefined,
userId: undefined,
orgId: undefined,
orgType: undefined,
wasteReason: undefined,
remark: undefined,
isEnable: undefined,
createTime: [],
reportDate: [],
reportStatus: undefined,
reportType: undefined
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
//v
queryParams.reportStatus = 2
const data = await ProduceReportDetailApi.getProduceReportDetailPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ProduceReportDetailApi.deleteProduceReportDetail(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ProduceReportDetailApi.exportProduceReportDetail(queryParams)
download.excel(data, '生产报工明细.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 获得产线工位树 */
const getOrganizationTree = async () => {
organizationTree.value = []
const data = await OrganizationApi.getOrganizationList()
const root: Tree = { id: 0, name: 'ALL', children: [] }
root.children = handleTree(data, 'id', 'parentId')
organizationTree.value.push(root)
}
/** 初始化 **/
onMounted(async () => {
queryParams.orgType = 'chengxing'
await getList()
await getOrganizationTree()
//
userList.value = await UserApi.getSimpleUserList()
//
productList.value = await ProductApi.getMesProductSimpleList()
})
/** tab 切换 */
let activeName = 'chengxing'
const handleTabClick = (tab: TabsPaneContext) => {
queryParams.orgType = tab.paneName
handleQuery()
}
</script>

@ -100,8 +100,6 @@
<el-tab-pane label="代报工" name="代报工" v-if="checkPermi(['mes:produce-report-detail:replace'])"/>
</el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="报工单" align="center" prop="reportId" />
<el-table-column
label="报工日期"
align="center"
@ -109,9 +107,14 @@
:formatter="dateFormatter2"
width="120px"
/>
<el-table-column label="产品" align="center" width="120px" prop="productName" />
<el-table-column label="工人" align="center" width="80px" prop="userName" />
<el-table-column label="工位" align="center" width="90px" prop="orgName" />
<el-table-column label="工位" align="center" width="100px" prop="orgName" />
<el-table-column align="center" label="工序" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column label="产品" align="center" width="120px" prop="productName" />
<el-table-column label="成品数量" align="center" prop="qualityNumber" />
<el-table-column label="废品数量" align="center" prop="wasteNumber" />
<el-table-column label="总数量" align="center" prop="totalNumber" />
@ -168,6 +171,7 @@
>
驳回
</el-button>
<!-- 个人编辑自己的-->
<el-button
v-if="scope.row.reportStatus < 2 && scope.row.userId === userStore.getUser.id"
link
@ -177,6 +181,7 @@
>
编辑
</el-button>
<!-- 代报工编辑别人的-->
<el-button
v-else-if="scope.row.reportStatus < 2 && scope.row.userId !== userStore.getUser.id"
link
@ -264,7 +269,7 @@ const exportLoading = ref(false) // 导出的加载中
const getList = async () => {
loading.value = true
try {
const data = await ProduceReportDetailApi.getProduceReportDetailPage(queryParams)
const data = await ProduceReportDetailApi.getProduceReportDetailPageCenter(queryParams)
list.value = data.list
total.value = data.total
} finally {
@ -332,6 +337,7 @@ const getOrganizationTree = async () => {
}
/** 初始化 **/
onMounted(async () => {
queryParams.reportType = activeName
await getList()
await getOrganizationTree()
//

@ -162,13 +162,13 @@
<!-- 表单弹窗添加/修改 -->
<ProduceReportForm ref="formRef" @success="getList" />
<!-- 子表的列表 -->
<ContentWrap>
<el-tabs model-value="produceReportDetail">
<el-tab-pane label="生产报工明细" name="produceReportDetail">
<ProduceReportDetailList :report-id="currentRow.id" />
</el-tab-pane>
</el-tabs>
</ContentWrap>
<!-- <ContentWrap>-->
<!-- <el-tabs model-value="produceReportDetail">-->
<!-- <el-tab-pane label="生产报工明细" name="produceReportDetail">-->
<!-- <ProduceReportDetailList :report-id="currentRow.id" />-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
<!-- </ContentWrap>-->
</template>
<script setup lang="ts">
@ -177,7 +177,7 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { ProduceReportApi, ProduceReportVO } from '@/api/mes/producereport'
import ProduceReportForm from './ProduceReportForm.vue'
import ProduceReportDetailList from './components/ProduceReportDetailList.vue'
// import ProduceReportDetailList from './components/ProduceReportDetailList.vue'
/** 生产报工单 列表 */
defineOptions({ name: 'ProduceReport' })

Loading…
Cancel
Save