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

add produce report

Browse Source
main
chenshuichuan 2 years ago
parent bc980dbbe5
commit 4246955cc2
5 changed files with 546 additions and 196 deletions
Show Stats Download Patch File Download Diff File

47
src/api/mes/producereport/index.ts
Unescape Escape View File

@ -1,16 +1,19 @@
import request from '@/config/axios' import request from '@/config/axios'
// 生产报工单 VO // 生产报工单 VO
export interface ProduceReportVO { export interface ProduceReportVO {
id: number // ID id: number // ID
processInstanceId: string // 流程实例的编号 processInstanceId: string // 流程实例编号
workTeamId: number // 组别ID reportCode: string // 编号
groupId: number // 班组ID userId: number // 用户ID
reportDate: Date // 报工日期 orgId: number // 工序ID
status: number // 状态 orgType: string // 工序
groupType: number // 白班/夜班 reportTime: string // 计件时段
totalTime: number // 总时长
reportStatus: number // 报工状态
remark: string // 备注 remark: string // 备注
isEnable: boolean // 是否启用 groupType: number // 班别
reportType: string // 报工类型
reportDate: Date // 报工日期
} }
// 生产报工单 API // 生产报工单 API
@ -47,32 +50,12 @@ export const ProduceReportApi = {
// ==================== 子表（生产报工明细） ==================== // ==================== 子表（生产报工明细） ====================
// 获得生产报工明细分页 // 获得生产报工明细列表
getProduceReportDetailPage: async (params) => { getProduceReportDetailListByReportId: async (reportId) => {
return await request.get({ url: `/mes/produce-report/produce-report-detail/page`, params }) return await request.get({ url: `/mes/produce-report/produce-report-detail/list-by-report-id?reportId=` + reportId })
}, }
// 新增生产报工明细
createProduceReportDetail: async (data) => {
return await request.post({ url: `/mes/produce-report/produce-report-detail/create`, data })
},
// 修改生产报工明细
updateProduceReportDetail: async (data) => {
return await request.put({ url: `/mes/produce-report/produce-report-detail/update`, data })
},
// 删除生产报工明细
deleteProduceReportDetail: async (id: number) => {
return await request.delete({ url: `/mes/produce-report/produce-report-detail/delete?id=` + id })
},
// 获得生产报工明细
getProduceReportDetail: async (id: number) => {
return await request.get({ url: `/mes/produce-report/produce-report-detail/get?id=` + id })
},
} }
// 生产报工明细 VO // 生产报工明细 VO
export interface ProduceReportDetailVO { export interface ProduceReportDetailVO {
id: number // ID id: number // ID

248
src/views/mes/producereport/ProduceReportForm.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
@ -7,49 +7,104 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="流程实例的编号" prop="processInstanceId"> <el-row>
<el-input v-model="formData.processInstanceId" placeholder="请输入流程实例的编号" /> <el-col :span="8">
</el-form-item> <el-form-item label="工人">
<el-form-item label="组别ID" prop="workTeamId"> {{userStore.getUser.nickname}}
<el-input v-model="formData.workTeamId" placeholder="请输入组别ID" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="班组ID" prop="groupId"> <el-col :span="8">
<el-input v-model="formData.groupId" placeholder="请输入班组ID" /> <el-form-item label="报工日期" prop="reportDate">
</el-form-item> <el-date-picker
<el-form-item label="报工日期" prop="reportDate"> :disabled="isDisableUpdate"
<el-date-picker v-model="formData.reportDate"
v-model="formData.reportDate" type="date"
type="date" value-format="YYYY-MM-DD HH:mm:ss"
value-format="x" placeholder="选择报工日期"
placeholder="选择报工日期" @change="changeDate"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> </el-col>
<el-radio-group v-model="formData.status"> <el-col :span="8">
<el-radio <el-form-item label="班别" prop="groupType">
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RECORD_STATUS)" <el-radio-group v-model="formData.groupType">
:key="dict.value" <el-radio
:label="dict.value" :disabled="isDisableUpdate"
> v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
{{ dict.label }} :key="dict.value"
</el-radio> :label="dict.value"
</el-radio-group> @change="changeDate"
</el-form-item> >
<el-form-item label="白班/夜班" prop="groupType"> {{ dict.label }}
<el-select v-model="formData.groupType" placeholder="请选择白班/夜班"> </el-radio>
<el-option </el-radio-group>
v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)" </el-form-item>
:key="dict.value" </el-col>
:label="dict.label" </el-row>
:value="dict.value" <el-row v-if="formData.groupType && formData.reportDate">
/> <el-col :span="8">
</el-select> <el-form-item label="工位" prop="orgId">
</el-form-item> <el-select
<el-form-item label="备注" prop="remark"> :disabled="isDisableUpdate"
<el-input v-model="formData.remark" placeholder="请输入备注" /> v-model="formData.orgId"
</el-form-item> clearable
filterable
placeholder="请选择工位"
>
<el-option
v-for="item in orgWorkerList"
:key="item.orgId"
:label="item.orgName"
:value="item.orgId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工序" prop="orgType">
<el-select
disabled
v-model="formData.orgType"
placeholder=""
clearable
>
<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-col>
<el-col :span="8" >
<el-text v-if="warningInfo" class="mx-1" type="warning">{{warningInfo}}</el-text>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="计件时段" prop="reportTime">
<el-input v-model="formData.reportTime" placeholder="请输入计件时段" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计件时长" prop="totalTime">
<el-input-number v-model="formData.totalTime" :min="0" :precision="2" placeholder="请输入时长" class="!w-260px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注"/>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<!-- 子表的表单 -->
<el-tabs v-model="subTabsName">
<el-tab-pane label="生产报工明细" name="produceReportDetail">
<ProduceReportDetailForm ref="produceReportDetailFormRef" :report-id="formData.id" />
</el-tab-pane>
</el-tabs>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
@ -57,15 +112,19 @@
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {getIntDictOptions, DICT_TYPE, getBoolDictOptions} from '@/utils/dict' import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { ProduceReportApi, ProduceReportVO } from '@/api/mes/producereport' import { ProduceReportApi, ProduceReportVO } from '@/api/mes/producereport'
import ProduceReportDetailForm from './components/ProduceReportDetailForm.vue'
import {useUserStore} from "@/store/modules/user";
import {OrgWorkerApi, OrgWorkerVO} from "@/api/mes/orgworker";
import {formatToDateTime} from "@/utils/dateUtil";
/** 生产报工单 表单 */ /** 生产报工单 表单 */
defineOptions({ name: 'ProduceReportForm' }) defineOptions({ name: 'ProduceReportForm' })
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const userStore = useUserStore()
const dialogVisible = ref(false) // 弹窗的是否展示 const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题 const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@ -73,37 +132,58 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
processInstanceId: undefined, processInstanceId: undefined,
workTeamId: undefined, reportCode: undefined,
groupId: undefined, userId: undefined,
reportDate: undefined, orgId: undefined,
status: undefined, orgType: undefined,
groupType: undefined, reportTime: undefined,
totalTime: undefined,
reportStatus: undefined,
remark: undefined, remark: undefined,
groupType: undefined,
reportType: undefined,
reportDateString: undefined,
reportDate: undefined
}) })
const formRules = reactive({ const formRules = reactive({
workTeamId: [{ required: true, message: '组别ID不能为空', trigger: 'blur' }], reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
groupId: [{ required: true, message: '班组ID不能为空', trigger: 'blur' }], groupType: [{ required: true, message: '班别不能为空', trigger: 'blur' }],
reportDate: [{ required: true, message: '报工日期不能为空', trigger: 'blur' }], productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }], userId: [{ required: true, message: '工人不能为空', trigger: 'blur' }],
groupType: [{ required: true, message: '白班/夜班不能为空', trigger: 'change' }], orgId: [{ required: true, message: '工位不能为空', trigger: 'blur' }],
orgType: [{ required: true, message: '工序不能为空', trigger: 'blur' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
const isDisableUpdate = ref(false)
/** 子表的表单 */
const subTabsName = ref('produceReportDetail')
const produceReportDetailFormRef = ref()
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number) => { 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.reportDate = getCurrentDate()
formData.value.groupType = 1
formData.value.userId = userStore.getUser.id
formData.value.reportType = "个人"
warningInfo.value = ''
isDisableUpdate.value = false
// 修改时，设置数据 // 修改时，设置数据
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await ProduceReportApi.getProduceReport(id) formData.value = await ProduceReportApi.getProduceReport(id)
formData.value.reportDate = formatToDateTime(new Date(formData.value.reportDate))
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
isDisableUpdate.value=true;
} }
await changeDate()
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -112,10 +192,20 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
const submitForm = async () => { const submitForm = async () => {
// 校验表单 // 校验表单
await formRef.value.validate() await formRef.value.validate()
// 校验子表单
try {
await produceReportDetailFormRef.value.validate()
} catch (e) {
subTabsName.value = 'produceReportDetail'
return
}
// 提交请求 // 提交请求
formLoading.value = true formLoading.value = true
try { try {
formData.value.reportDateString = formData.value.reportDate
const data = formData.value as unknown as ProduceReportVO const data = formData.value as unknown as ProduceReportVO
// 拼接子表的数据
data.produceReportDetails = produceReportDetailFormRef.value.getData()
if (formType.value === 'create') { if (formType.value === 'create') {
await ProduceReportApi.createProduceReport(data) await ProduceReportApi.createProduceReport(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
@ -136,14 +226,48 @@ const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
processInstanceId: undefined, processInstanceId: undefined,
workTeamId: undefined, reportCode: undefined,
groupId: undefined, userId: undefined,
reportDate: undefined, orgId: undefined,
status: undefined, orgType: undefined,
groupType: undefined, reportTime: undefined,
totalTime: undefined,
reportStatus: undefined,
remark: undefined, remark: undefined,
isEnable: undefined, groupType: undefined,
reportType: undefined,
reportDate: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
const warningInfo = ref()
const orgWorkerList = ref<OrgWorkerVO[]>([]) // 用户列表
//更改报工日期时查询用户在该日期绑定的工位信息
const changeDate = async () =>{
if(formData.value.reportDate && formData.value.groupType ){
orgWorkerList.value = await OrgWorkerApi.getOrgWorkerList1(formData.value)
if(orgWorkerList.value && orgWorkerList.value.length>0){
formData.value.orgId = orgWorkerList.value[0].orgId
formData.value.orgType = orgWorkerList.value[0].orgType
warningInfo.value=''
}
else{
formData.value.orgId = undefined
warningInfo.value = '该条件下未查询到工位安排信息！'
message.error(warningInfo.value)
}
}
}
const getCurrentDate = () =>{
let now = new Date();
let year = now.getFullYear();
let month = now.getMonth() + 1;
if(month<10){month = '0'+month}
let day = now.getDate();
if(day<10)day = '0'+day;
return year + "-" + month + "-" + day +" 00:00:00";
}
</script> </script>

181
src/views/mes/producereport/components/ProduceReportDetailForm.vue
Unescape Escape View File

@ -0,0 +1,181 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
v-loading="formLoading"
label-width="0px"
:inline-message="true"
>
<el-table :data="formData" class="-mt-10px">
<el-table-column label="序号" type="index" width="70" />
<el-table-column label="产品" min-width="180">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
<el-select v-model="row.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>
</template>
</el-table-column>
<el-table-column label="成品数量" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.qualityNumber`" :rules="formRules.qualityNumber" class="mb-0px!">
<el-input-number v-model="row.qualityNumber" :min="0" class="!w-1/1" placeholder="" @change="numberChange(row)"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="废品数量" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.wasteNumber`" :rules="formRules.wasteNumber" class="mb-0px!">
<el-input-number v-model="row.wasteNumber" :min="0" class="!w-1/1" placeholder="" @change="numberChange(row)"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="打包数量" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.packageNumber`" :rules="formRules.packageNumber" class="mb-0px!">
<el-input-number v-model="row.packageNumber" :min="0" class="!w-1/1" placeholder=""/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="总数量" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.totalNumber`" :rules="formRules.totalNumber" class="mb-0px!">
<el-input disabled v-model="row.totalNumber" placeholder="" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="成品率" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.qualityRate`" :rules="formRules.qualityRate" class="mb-0px!">
<el-input-number disabled v-model="row.qualityRate" :min="0" :precision="2" class="!w-1/1" placeholder=""/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="备注" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.remark`" :rules="formRules.remark" class="mb-0px!">
<el-input v-model="row.remark" placeholder="请输入备注" />
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="60">
<template #default="{ $index }">
<el-button type="danger" @click="handleDelete($index)" link>
<Icon icon="ep:delete" />
</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<el-row justify="center" class="mt-3">
<el-button @click="handleAdd" round>+ 添加生产报工明细</el-button>
</el-row>
</template>
<script setup lang="ts">
import { ProduceReportApi } from '@/api/mes/producereport'
import {ProductApi, ProductVO} from "@/api/erp/product/product";
import {PlanApi} from "@/api/mes/plan";
const props = defineProps<{
reportId: undefined // 报工单id（主表的关联字段）
}>()
const formLoading = ref(false) // 表单的加载中
const formData = ref([])
const formRules = reactive({
productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
qualityNumber: [{ required: true, message: '成品数量不能为空', trigger: 'blur' }],
wasteNumber: [{ required: true, message: '废品数量不能为空', trigger: 'blur' }],
})
const formRef = ref() // 表单 Ref
const productList = ref<ProductVO[]>([]) // 产品列表
/** 初始化 */
onMounted(async () => {
// 产品单位
productList.value = await PlanApi.getStartAndFinishPlanProduct()
// 默认添加一个
if (formData.value.length === 0) {
handleAdd()
if(productList.value.length ==1)
formData.value[0].productId = productList.value[0].id
}
})
/** 监听主表的关联字段的变化，加载对应的子表数据 */
watch(
() => props.reportId,
async (val) => {
// 1. 重置表单
formData.value = []
// 2. val 非空，则加载数据
if (!val) {
return;
}
try {
formLoading.value = true
formData.value = await ProduceReportApi.getProduceReportDetailListByReportId(val)
} finally {
formLoading.value = false
}
},
{ immediate: true }
)
/** 新增按钮操作 */
const handleAdd = () => {
const row = {
id: undefined,
reportId: undefined,
planId: undefined,
productId: undefined,
userId: undefined,
orgId: undefined,
qualityRate: undefined,
wasteReason: undefined,
totalTime: undefined,
packageNumber: undefined,
remark: undefined,
isEnable: undefined,
qualityNumber: 0,
wasteNumber: 0,
totalNumber: undefined,
reportDate: undefined,
reportTime: undefined,
reportStatus: undefined,
reportType: undefined,
groupType: undefined,
orgType: undefined
}
row.reportId = props.reportId
formData.value.push(row)
}
/** 删除按钮操作 */
const handleDelete = (index) => {
formData.value.splice(index, 1)
}
/** 表单校验 */
const validate = () => {
return formRef.value.validate()
}
/** 表单值 */
const getData = () => {
return formData.value
}
const numberChange = async (row) =>{
row.totalNumber = row.qualityNumber+row.wasteNumber
row.qualityRate = row.qualityNumber/row.totalNumber * 100
}
defineExpose({ validate, getData })
</script>

50
src/views/mes/producereport/components/ProduceReportDetailList.vue
Unescape Escape View File

@ -0,0 +1,50 @@
<template>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="产品" align="center" 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" />
<el-table-column label="打包数量" align="center" prop="packageNumber" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
</ContentWrap>
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import { ProduceReportApi } from '@/api/mes/producereport'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const props = defineProps<{
reportId?: number // 报工单id（主表的关联字段）
}>()
const loading = ref(false) // 列表的加载中
const list = ref([]) // 列表的数据
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
list.value = await ProduceReportApi.getProduceReportDetailListByReportId(props.reportId)
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

216
src/views/mes/producereport/index.vue
Unescape Escape View File

@ -8,62 +8,58 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-row>
<el-form-item label="组别ID" prop="workTeamId"> <el-col :span="7">
<el-input <el-form-item label="日期" prop="reportDate">
v-model="queryParams.workTeamId" <el-date-picker
placeholder="请输入组别ID" v-model="queryParams.reportDate"
clearable value-format="YYYY-MM-DD HH:mm:ss"
@keyup.enter="handleQuery" type="daterange"
class="!w-240px" start-placeholder="开始日期"
/> end-placeholder="结束日期"
</el-form-item> :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
<el-form-item label="班组ID" prop="groupId"> class="!w-240px"
<el-input />
v-model="queryParams.groupId" </el-form-item>
placeholder="请输入班组ID" </el-col>
clearable <el-col :span="6">
@keyup.enter="handleQuery" <el-form-item label="人员" prop="userId">
class="!w-240px" <el-select v-model="queryParams.userId" clearable filterable placeholder="请选择人员" class="!w-180px">
/> <el-option
</el-form-item> v-for="item in userList"
<el-form-item label="报工日期" prop="reportDate"> :key="item.id"
<el-date-picker :label="item.nickname"
v-model="queryParams.reportDate" :value="item.id"
value-format="YYYY-MM-DD HH:mm:ss" />
type="daterange" </el-select>
start-placeholder="开始日期" </el-form-item>
end-placeholder="结束日期" </el-col>
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" <el-col :span="6">
class="!w-240px" <el-form-item label="工位" prop="orgId">
/> <el-tree-select
</el-form-item> v-model="queryParams.orgId"
:data="organizationTree"
<el-form-item label="白班/夜班" prop="groupType"> :props="defaultProps"
<el-select check-strictly
v-model="queryParams.groupType" default-expand-all
placeholder="请选择白班/夜班" @change="handleQuery"
clearable placeholder="请选择工位"
class="!w-240px" class="!w-240px"
> />
<el-option </el-form-item>
v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)" </el-col>
:key="dict.value" <el-col :span="5">
:label="dict.label" <el-form-item label="备注" prop="remark">
:value="dict.value" <el-input
/> v-model="queryParams.remark"
</el-select> placeholder="请输入备注"
</el-form-item> clearable
<el-form-item label="备注" prop="remark"> @keyup.enter="handleQuery"
<el-input class="!w-180px"
v-model="queryParams.remark" />
placeholder="请输入备注" </el-form-item>
clearable </el-col>
@keyup.enter="handleQuery" </el-row>
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>
@ -90,38 +86,50 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table <!-- 子表的列表 -->
v-loading="loading" <el-table-column type="expand">
:data="list" <template #default="scope">
:stripe="true" <el-tabs model-value="produceReportDetail">
:show-overflow-tooltip="true" <el-tab-pane label="生产报工明细" name="produceReportDetail">
highlight-current-row <ProduceReportDetailList :report-id="scope.row.id" />
@current-change="handleCurrentChange" </el-tab-pane>
> </el-tabs>
<el-table-column label="ID" align="center" prop="id" /> </template>
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" /> </el-table-column>
<el-table-column label="组别ID" align="center" prop="workTeamId" /> <el-table-column label="编号" align="center" prop="reportCode" />
<el-table-column label="班组ID" align="center" prop="groupId" />
<el-table-column <el-table-column
label="报工日期" label="报工日期"
align="center" align="center"
prop="reportDate" prop="reportDate"
:formatter="dateFormatter" :formatter="dateFormatter2"
width="180px" width="180px"
/> />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="用户" align="center" prop="userId" />
<el-table-column label="工序" align="center" prop="orgType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="白班/夜班" align="center" prop="groupType"> <el-table-column label="工位" align="center" prop="orgId" />
<el-table-column label="计件时段" align="center" prop="reportTime" />
<el-table-column label="计件时长" align="center" prop="totalTime" />
<el-table-column label="状态" align="center" 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="groupType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" /> <dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="类型" align="center" prop="reportType">
<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" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -129,7 +137,7 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="操作" align="center" fixed="right" width="150"> <el-table-column label="操作" align="center" fixed="right" width="150px">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
@ -161,30 +169,27 @@
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<ProduceReportForm ref="formRef" @success="getList" /> <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>-->
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime' import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import { ProduceReportApi, ProduceReportVO } from '@/api/mes/producereport' import { ProduceReportApi, ProduceReportVO } from '@/api/mes/producereport'
import ProduceReportForm from './ProduceReportForm.vue' import ProduceReportForm from './ProduceReportForm.vue'
// import ProduceReportDetailList from './components/ProduceReportDetailList.vue' import ProduceReportDetailList from './components/ProduceReportDetailList.vue'
import {defaultProps, handleTree} from "@/utils/tree";
import * as UserApi from "@/api/system/user";
import {OrganizationApi} from "@/api/mes/organization";
import {checkPermi} from "@/utils/permission";
/** 生产报工单 列表 */ /** 生产报工单 列表 */
defineOptions({ name: 'ProduceReport' }) defineOptions({ name: 'ProduceReport' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const organizationTree = ref() // 树形结构
const loading = ref(true) // 列表的加载中 const loading = ref(true) // 列表的加载中
const list = ref<ProduceReportVO[]>([]) // 列表的数据 const list = ref<ProduceReportVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数 const total = ref(0) // 列表的总页数
@ -192,14 +197,18 @@ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
processInstanceId: undefined, processInstanceId: undefined,
workTeamId: undefined, reportCode: undefined,
groupId: undefined, userId: undefined,
reportDate: [], orgId: undefined,
status: undefined, orgType: undefined,
groupType: undefined, reportTime: [],
totalTime: [],
reportStatus: undefined,
remark: undefined, remark: undefined,
isEnable: undefined,
createTime: [], createTime: [],
groupType: undefined,
reportType: undefined,
reportDate: []
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中
@ -261,16 +270,19 @@ const handleExport = async () => {
exportLoading.value = false exportLoading.value = false
} }
} }
/** 获得产线工位树 */
/** 选中行操作 */ const getOrganizationTree = async () => {
const currentRow = ref({}) // 选中行 organizationTree.value = []
const handleCurrentChange = (row) => { const data = await OrganizationApi.getOrganizationList()
currentRow.value = row const root: Tree = { id: 0, name: 'ALL', children: [] }
root.children = handleTree(data, 'id', 'parentId')
organizationTree.value.push(root)
} }
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(async() => {
getList() await getList()
await getOrganizationTree()
// 加载用户列表
userList.value = await UserApi.getSimpleUserList()
}) })
</script> </script>

Write Preview
Loading…
Cancel
Save