feat(mes): add RQC line request and response VO, and implement RQC line controller and service
YunaiV
parent
479f35ffb8
commit
52785c5c08
|
|
@ -0,0 +1,78 @@
|
|||
import request from '@/config/axios'
|
||||
|
||||
// MES 出货检验单 VO
|
||||
export interface QcOqcVO {
|
||||
id: number // 编号
|
||||
code: string // 检验单编号
|
||||
name: string // 检验单名称
|
||||
templateId: number // 检验模板 ID
|
||||
sourceDocId: number // 来源单据 ID
|
||||
sourceDocType: string // 来源单据类型
|
||||
sourceDocCode: string // 来源单据编号
|
||||
sourceLineId: number // 来源单据行 ID
|
||||
clientId: number // 客户 ID
|
||||
clientNickname: string // 客户简称（关联查询）
|
||||
batchCode: string // 批次号
|
||||
itemId: number // 产品物料 ID
|
||||
itemCode: string // 产品物料编码（关联查询）
|
||||
itemName: string // 产品物料名称（关联查询）
|
||||
itemSpecification: string // 规格型号（关联查询）
|
||||
unitName: string // 单位名称（关联查询）
|
||||
minCheckQuantity: number // 最低检测数
|
||||
maxUnqualifiedQuantity: number // 最大不合格数
|
||||
outQuantity: number // 本次出货数量
|
||||
checkQuantity: number // 本次检测数量
|
||||
qualifiedQuantity: number // 合格品数量
|
||||
unqualifiedQuantity: number // 不合格品数量
|
||||
criticalRate: number // 致命缺陷率（%）
|
||||
majorRate: number // 严重缺陷率（%）
|
||||
minorRate: number // 轻微缺陷率（%）
|
||||
criticalQuantity: number // 致命缺陷数量
|
||||
majorQuantity: number // 严重缺陷数量
|
||||
minorQuantity: number // 轻微缺陷数量
|
||||
checkResult: string // 检测结果
|
||||
outDate: Date // 出货日期
|
||||
inspectDate: Date // 检测日期
|
||||
inspectorUserId: number // 检测人员用户 ID
|
||||
inspectorNickname: string // 检测人员昵称（关联查询）
|
||||
status: number // 状态
|
||||
remark: string // 备注
|
||||
}
|
||||
|
||||
// MES 出货检验单 API
|
||||
export const QcOqcApi = {
|
||||
// 查询出货检验单分页
|
||||
getOqcPage: async (params: any) => {
|
||||
return await request.get({ url: `/mes/qc/oqc/page`, params })
|
||||
},
|
||||
|
||||
// 查询出货检验单详情
|
||||
getOqc: async (id: number) => {
|
||||
return await request.get({ url: `/mes/qc/oqc/get?id=` + id })
|
||||
},
|
||||
|
||||
// 新增出货检验单
|
||||
createOqc: async (data: QcOqcVO) => {
|
||||
return await request.post({ url: `/mes/qc/oqc/create`, data })
|
||||
},
|
||||
|
||||
// 修改出货检验单
|
||||
updateOqc: async (data: QcOqcVO) => {
|
||||
return await request.put({ url: `/mes/qc/oqc/update`, data })
|
||||
},
|
||||
|
||||
// 完成出货检验单
|
||||
completeOqc: async (id: number) => {
|
||||
return await request.put({ url: `/mes/qc/oqc/complete?id=` + id })
|
||||
},
|
||||
|
||||
// 删除出货检验单
|
||||
deleteOqc: async (id: number) => {
|
||||
return await request.delete({ url: `/mes/qc/oqc/delete?id=` + id })
|
||||
},
|
||||
|
||||
// 导出出货检验单 Excel
|
||||
exportOqc: async (params: any) => {
|
||||
return await request.download({ url: `/mes/qc/oqc/export-excel`, params })
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
import request from '@/config/axios'
|
||||
|
||||
// MES 出货检验单行 VO
|
||||
export interface QcOqcLineVO {
|
||||
id: number // 编号
|
||||
oqcId: number // 出货检验单 ID
|
||||
indicatorId: number // 检测指标 ID
|
||||
indicatorCode: string // 检测指标编码（关联查询）
|
||||
indicatorName: string // 检测指标名称（关联查询）
|
||||
indicatorType: string // 检测指标类型（关联查询）
|
||||
checkMethod: string // 检测方法
|
||||
standardValue: number // 标准值
|
||||
unitMeasureId: number // 计量单位 ID
|
||||
unitMeasureName: string // 计量单位名称（关联查询）
|
||||
maxThreshold: number // 误差上限
|
||||
minThreshold: number // 误差下限
|
||||
criticalQuantity: number // 致命缺陷数量
|
||||
majorQuantity: number // 严重缺陷数量
|
||||
minorQuantity: number // 轻微缺陷数量
|
||||
remark: string // 备注
|
||||
}
|
||||
|
||||
// MES 出货检验单行 API
|
||||
export const QcOqcLineApi = {
|
||||
// 查询出货检验单行分页
|
||||
getOqcLinePage: async (params: any) => {
|
||||
return await request.get({ url: `/mes/qc/oqc/line/page`, params })
|
||||
},
|
||||
|
||||
// 查询出货检验单行详情
|
||||
getOqcLine: async (id: number) => {
|
||||
return await request.get({ url: `/mes/qc/oqc/line/get?id=` + id })
|
||||
}
|
||||
}
|
||||
|
|
@ -250,15 +250,6 @@
|
|||
>
|
||||
保 存
|
||||
</el-button>
|
||||
<!-- TODO @AI：这里去掉，用不到；只需要在 index.vue 有就可以了 -->
|
||||
<el-button
|
||||
@click="handleComplete"
|
||||
type="success"
|
||||
:disabled="formLoading"
|
||||
v-if="formType === 'update' && formData.id && formData.status === 0"
|
||||
>
|
||||
完 成
|
||||
</el-button>
|
||||
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
|
|
@ -372,24 +363,6 @@ const submitForm = async () => {
|
|||
}
|
||||
}
|
||||
|
||||
/** 完成操作 */
|
||||
const handleComplete = async () => {
|
||||
try {
|
||||
await message.confirm('确认完成该过程检验单？完成后不可修改。')
|
||||
formLoading.value = true
|
||||
// 先保存
|
||||
await QcIpqcApi.updateIpqc(formData.value as unknown as QcIpqcVO)
|
||||
// 再完成
|
||||
await QcIpqcApi.completeIpqc(formData.value.id!)
|
||||
message.success('完成成功')
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} catch {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,357 @@
|
|||
<!-- MES 出货检验单表单 -->
|
||||
<template>
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1080px">
|
||||
<!-- 基本信息表单 -->
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="120px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="检验单编号" prop="code">
|
||||
<el-input v-model="formData.code" placeholder="请输入检验单编号">
|
||||
<template #append>
|
||||
<el-button @click="generateCode" :disabled="formType === 'update'">
|
||||
生成
|
||||
</el-button>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="检验单名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入检验单名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="质检方案" prop="templateId">
|
||||
<QcTemplateSelect v-model="formData.templateId" class="!w-1/1" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-divider content-position="left">物料与客户</el-divider>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="产品物料" prop="itemId">
|
||||
<MdItemSelect v-model="formData.itemId" placeholder="请选择产品物料" class="!w-1/1" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="客户" prop="clientId">
|
||||
<MdClientSelect v-model="formData.clientId" placeholder="请选择客户" class="!w-1/1" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="批次号" prop="batchCode">
|
||||
<el-input v-model="formData.batchCode" placeholder="请输入批次号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-divider content-position="left">检测情况</el-divider>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="8">
|
||||
<!-- TODO @AI：发货数量 -->
|
||||
<el-form-item label="出货数量" prop="outQuantity">
|
||||
<el-input-number
|
||||
v-model="formData.outQuantity"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
placeholder="请输入"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- TODO @AI：检测数量 -->
|
||||
<el-col :span="8">
|
||||
<el-form-item label="合格品数量" prop="qualifiedQuantity">
|
||||
<el-input-number
|
||||
v-model="formData.qualifiedQuantity"
|
||||
:min="0"
|
||||
placeholder="请输入"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="不合格品数量" prop="unqualifiedQuantity">
|
||||
<el-input-number
|
||||
v-model="formData.unqualifiedQuantity"
|
||||
:min="0"
|
||||
placeholder="请输入"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="出货日期" prop="outDate">
|
||||
<el-date-picker
|
||||
v-model="formData.outDate"
|
||||
type="datetime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
placeholder="请选择出货日期"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="检测日期" prop="inspectDate">
|
||||
<el-date-picker
|
||||
v-model="formData.inspectDate"
|
||||
type="datetime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
placeholder="请选择检测日期"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="检测人员" prop="inspectorUserId">
|
||||
<UserSelect
|
||||
v-model="formData.inspectorUserId"
|
||||
placeholder="请选择检测人员"
|
||||
class="!w-1/1"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="检测结论" prop="checkResult">
|
||||
<el-select
|
||||
v-model="formData.checkResult"
|
||||
placeholder="请选择检测结论"
|
||||
clearable
|
||||
class="!w-1/1"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="16">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 缺陷统计（只读） -->
|
||||
<template v-if="formType === 'update' && formData.id">
|
||||
<el-divider content-position="left">缺陷情况</el-divider>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="致命缺陷数">
|
||||
<el-input :model-value="formData.criticalQuantity" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="严重缺陷数">
|
||||
<el-input :model-value="formData.majorQuantity" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="轻微缺陷数">
|
||||
<el-input :model-value="formData.minorQuantity" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="致命缺陷率">
|
||||
<el-input :model-value="formData.criticalRate + '%'" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="严重缺陷率">
|
||||
<el-input :model-value="formData.majorRate + '%'" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="轻微缺陷率">
|
||||
<el-input :model-value="formData.minorRate + '%'" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</template>
|
||||
</el-form>
|
||||
|
||||
<!-- 子表标签页（编辑模式下显示） -->
|
||||
<template v-if="formType === 'update' && formData.id">
|
||||
<el-divider />
|
||||
<el-tabs v-model="activeTab">
|
||||
<el-tab-pane label="检验项" name="line">
|
||||
<OqcLineList :oqc-id="formData.id" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="检测结果" name="result">
|
||||
<QcIndicatorResultList :qc-id="formData.id!" :qc-type="MesQcTypeEnum.OQC" />
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</template>
|
||||
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading"> 保 存 </el-button>
|
||||
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
||||
import { generateRandomStr } from '@/utils'
|
||||
import { QcOqcApi, QcOqcVO } from '@/api/mes/qc/oqc'
|
||||
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
||||
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||
import QcTemplateSelect from '@/views/mes/qc/template/components/QcTemplateSelect.vue'
|
||||
import OqcLineList from './OqcLineList.vue'
|
||||
import QcIndicatorResultList from '@/views/mes/qc/indicatorresult/components/QcIndicatorResultList.vue'
|
||||
import { MesQcTypeEnum } from '@/views/mes/utils/constants'
|
||||
|
||||
defineOptions({ name: 'OqcForm' })
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const activeTab = ref('line') // 当前激活的标签页
|
||||
|
||||
const formData = ref({
|
||||
id: undefined as number | undefined,
|
||||
code: undefined,
|
||||
name: undefined,
|
||||
templateId: undefined,
|
||||
sourceDocId: undefined,
|
||||
sourceDocType: undefined,
|
||||
sourceDocCode: undefined,
|
||||
sourceLineId: undefined,
|
||||
clientId: undefined,
|
||||
batchCode: undefined,
|
||||
itemId: undefined,
|
||||
minCheckQuantity: undefined,
|
||||
maxUnqualifiedQuantity: undefined,
|
||||
outQuantity: undefined,
|
||||
checkQuantity: undefined,
|
||||
qualifiedQuantity: undefined,
|
||||
unqualifiedQuantity: undefined,
|
||||
checkResult: undefined,
|
||||
outDate: undefined,
|
||||
inspectDate: undefined,
|
||||
inspectorUserId: undefined,
|
||||
remark: undefined,
|
||||
// 缺陷统计（只读）
|
||||
criticalRate: 0,
|
||||
majorRate: 0,
|
||||
minorRate: 0,
|
||||
criticalQuantity: 0,
|
||||
majorQuantity: 0,
|
||||
minorQuantity: 0
|
||||
})
|
||||
const formRules = reactive({
|
||||
code: [{ required: true, message: '检验单编号不能为空', trigger: 'blur' }],
|
||||
name: [{ required: true, message: '检验单名称不能为空', trigger: 'blur' }],
|
||||
templateId: [{ required: true, message: '检验模板不能为空', trigger: 'change' }],
|
||||
clientId: [{ required: true, message: '客户不能为空', trigger: 'change' }],
|
||||
itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }],
|
||||
outQuantity: [{ required: true, message: '出货数量不能为空', trigger: 'blur' }]
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
/** 生成检验单编号 */
|
||||
const generateCode = () => {
|
||||
formData.value.code = 'OQC' + generateRandomStr(10)
|
||||
}
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (type: string, id?: number) => {
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = t('action.' + type)
|
||||
formType.value = type
|
||||
activeTab.value = 'line'
|
||||
resetForm()
|
||||
// 修改时，设置数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
formData.value = await QcOqcApi.getOqc(id)
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
||||
|
||||
/** 提交表单 */
|
||||
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
||||
const submitForm = async () => {
|
||||
// 校验表单
|
||||
if (!formRef) return
|
||||
const valid = await formRef.value.validate()
|
||||
if (!valid) return
|
||||
// 提交请求
|
||||
formLoading.value = true
|
||||
try {
|
||||
const data = formData.value as unknown as QcOqcVO
|
||||
if (formType.value === 'create') {
|
||||
await QcOqcApi.createOqc(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
} else {
|
||||
await QcOqcApi.updateOqc(data)
|
||||
message.success(t('common.updateSuccess'))
|
||||
}
|
||||
dialogVisible.value = false
|
||||
// 发送操作成功的事件
|
||||
emit('success')
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
code: undefined,
|
||||
name: undefined,
|
||||
templateId: undefined,
|
||||
sourceDocId: undefined,
|
||||
sourceDocType: undefined,
|
||||
sourceDocCode: undefined,
|
||||
sourceLineId: undefined,
|
||||
clientId: undefined,
|
||||
batchCode: undefined,
|
||||
itemId: undefined,
|
||||
minCheckQuantity: undefined,
|
||||
maxUnqualifiedQuantity: undefined,
|
||||
outQuantity: undefined,
|
||||
checkQuantity: undefined,
|
||||
qualifiedQuantity: undefined,
|
||||
unqualifiedQuantity: undefined,
|
||||
checkResult: undefined,
|
||||
outDate: undefined,
|
||||
inspectDate: undefined,
|
||||
inspectorUserId: undefined,
|
||||
remark: undefined,
|
||||
criticalRate: 0,
|
||||
majorRate: 0,
|
||||
minorRate: 0,
|
||||
criticalQuantity: 0,
|
||||
majorQuantity: 0,
|
||||
minorQuantity: 0
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
</script>
|
||||
|
|
@ -0,0 +1,90 @@
|
|||
<!-- MES 出货检验单行 子列表（只读） -->
|
||||
<template>
|
||||
<div>
|
||||
<!-- 列表 -->
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="检测指标编码" align="center" prop="indicatorCode" width="140" />
|
||||
<el-table-column label="检测指标名称" align="center" prop="indicatorName" min-width="150" />
|
||||
<el-table-column label="检测指标类型" align="center" prop="indicatorType" width="120">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.MES_INDICATOR_TYPE" :value="scope.row.indicatorType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="检测方法" align="center" prop="checkMethod" min-width="180" />
|
||||
<el-table-column label="标准值" align="center" prop="standardValue" width="100" />
|
||||
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
||||
<el-table-column label="误差上限" align="center" prop="maxThreshold" width="100" />
|
||||
<el-table-column label="误差下限" align="center" prop="minThreshold" width="100" />
|
||||
<el-table-column label="致命缺陷数" align="center" prop="criticalQuantity" width="100" />
|
||||
<el-table-column label="严重缺陷数" align="center" prop="majorQuantity" width="100" />
|
||||
<el-table-column label="轻微缺陷数" align="center" prop="minorQuantity" width="100" />
|
||||
<el-table-column label="操作" align="center" width="100" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" @click="openDefectDialog(scope.row)"> 缺陷列表 </el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 缺陷记录弹窗（内联编辑） -->
|
||||
<DefectRecordInlineList ref="defectListRef" @refresh="getList" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { DICT_TYPE } from '@/utils/dict'
|
||||
import { QcOqcLineApi, QcOqcLineVO } from '@/api/mes/qc/oqc/line'
|
||||
import DefectRecordInlineList from '@/views/mes/qc/defectrecord/components/DefectRecordInlineList.vue'
|
||||
import { MesQcTypeEnum } from '@/views/mes/utils/constants'
|
||||
|
||||
defineOptions({ name: 'OqcLineList' })
|
||||
|
||||
const props = defineProps<{ oqcId: number }>()
|
||||
|
||||
const loading = ref(false) // 列表的加载中
|
||||
const list = ref<QcOqcLineVO[]>([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
oqcId: undefined as number | undefined
|
||||
})
|
||||
const defectListRef = ref() // 缺陷记录弹窗 Ref
|
||||
|
||||
/** 打开缺陷记录弹窗 */
|
||||
const openDefectDialog = (row: QcOqcLineVO) => {
|
||||
defectListRef.value.open(MesQcTypeEnum.OQC, props.oqcId, row.id)
|
||||
}
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
if (!props.oqcId) {
|
||||
return
|
||||
}
|
||||
queryParams.oqcId = props.oqcId
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await QcOqcLineApi.getOqcLinePage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 监听 oqcId 变化，重新加载列表 */
|
||||
watch(
|
||||
() => props.oqcId,
|
||||
() => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
</script>
|
||||
|
|
@ -0,0 +1,308 @@
|
|||
<!-- MES 出货检验单（OQC）列表 -->
|
||||
<template>
|
||||
<ContentWrap>
|
||||
<!-- 搜索工作栏 -->
|
||||
<el-form
|
||||
class="-mb-15px"
|
||||
:model="queryParams"
|
||||
ref="queryFormRef"
|
||||
:inline="true"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item label="检验单编号" prop="code">
|
||||
<el-input
|
||||
v-model="queryParams.code"
|
||||
placeholder="请输入检验单编号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="客户" prop="clientId">
|
||||
<MdClientSelect
|
||||
v-model="queryParams.clientId"
|
||||
placeholder="请选择客户"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="批次号" prop="batchCode">
|
||||
<el-input
|
||||
v-model="queryParams.batchCode"
|
||||
placeholder="请输入批次号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品物料" prop="itemId">
|
||||
<MdItemSelect
|
||||
v-model="queryParams.itemId"
|
||||
placeholder="请选择产品物料"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="检测结论" prop="checkResult">
|
||||
<el-select
|
||||
v-model="queryParams.checkResult"
|
||||
placeholder="请选择检测结论"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="出货日期" prop="outDate">
|
||||
<el-date-picker
|
||||
v-model="queryParams.outDate"
|
||||
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="inspectDate">
|
||||
<el-date-picker
|
||||
v-model="queryParams.inspectDate"
|
||||
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="inspectorUserId">
|
||||
<UserSelect
|
||||
v-model="queryParams.inspectorUserId"
|
||||
placeholder="请选择检测人员"
|
||||
clearable
|
||||
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:qc-oqc:create']"
|
||||
>
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||
</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
@click="handleExport"
|
||||
:loading="exportLoading"
|
||||
v-hasPermi="['mes:qc-oqc:export']"
|
||||
>
|
||||
<Icon icon="ep:download" class="mr-5px" /> 导出
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 列表 -->
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="出货检验单编号" align="center" prop="code" width="160" />
|
||||
<el-table-column label="出货检验单名称" align="center" prop="name" min-width="180" />
|
||||
<el-table-column label="客户简称" align="center" prop="clientNickname" width="120" />
|
||||
<el-table-column label="批次号" align="center" prop="batchCode" width="130" />
|
||||
<el-table-column label="产品物料编码" align="center" prop="itemCode" width="130" />
|
||||
<el-table-column label="产品物料名称" align="center" prop="itemName" min-width="150" />
|
||||
<!-- TODO @AI：出货数量，改成发货数量-->
|
||||
<el-table-column label="出货数量" align="center" prop="outQuantity" width="100" />
|
||||
<el-table-column label="检测数量" align="center" prop="checkQuantity" width="100" />
|
||||
<el-table-column label="不合格数" align="center" prop="unqualifiedQuantity" width="100" />
|
||||
<el-table-column label="检测结论" align="center" prop="checkResult" width="100">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.MES_QC_CHECK_RESULT" :value="scope.row.checkResult" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- TODO @AI：出货日期，改成发货日期-->
|
||||
<el-table-column
|
||||
label="出货日期"
|
||||
align="center"
|
||||
prop="outDate"
|
||||
:formatter="dateFormatter2"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column
|
||||
label="检测日期"
|
||||
align="center"
|
||||
prop="inspectDate"
|
||||
:formatter="dateFormatter2"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="检测人员" align="center" prop="inspectorNickname" width="100" />
|
||||
<el-table-column label="单据状态" align="center" prop="status" width="80">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.MES_QC_IQC_STATUS" :value="scope.row.status" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="180" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['mes:qc-oqc:update']"
|
||||
v-if="scope.row.status === MesQcOqcStatusEnum.PREPARE"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="success"
|
||||
@click="handleComplete(scope.row.id)"
|
||||
v-hasPermi="['mes:qc-oqc:update']"
|
||||
v-if="scope.row.status === MesQcOqcStatusEnum.PREPARE"
|
||||
>
|
||||
完成
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-if="scope.row.status !== MesQcOqcStatusEnum.PREPARE"
|
||||
>
|
||||
查看报表
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['mes:qc-oqc:delete']"
|
||||
v-if="scope.row.status === MesQcOqcStatusEnum.PREPARE"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 表单弹窗：添加/修改 -->
|
||||
<OqcForm ref="formRef" @success="getList" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter2 } from '@/utils/formatTime'
|
||||
import download from '@/utils/download'
|
||||
import { QcOqcApi, QcOqcVO } from '@/api/mes/qc/oqc'
|
||||
import OqcForm from './OqcForm.vue'
|
||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
||||
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
||||
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||
import { MesQcOqcStatusEnum } from '@/views/mes/utils/constants'
|
||||
|
||||
defineOptions({ name: 'MesQcOqc' })
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const list = ref<QcOqcVO[]>([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
code: undefined,
|
||||
clientId: undefined,
|
||||
batchCode: undefined,
|
||||
itemId: undefined,
|
||||
checkResult: undefined,
|
||||
outDate: undefined,
|
||||
inspectDate: undefined,
|
||||
inspectorUserId: undefined
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await QcOqcApi.getOqcPage(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 formRef = ref()
|
||||
const openForm = (type: string, id?: number) => {
|
||||
formRef.value.open(type, id)
|
||||
}
|
||||
|
||||
/** 完成操作 */
|
||||
const handleComplete = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('是否完成出货检验单编制？【完成后将不能更改】')
|
||||
await QcOqcApi.completeOqc(id)
|
||||
message.success('完成成功')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
await message.delConfirm()
|
||||
await QcOqcApi.deleteOqc(id)
|
||||
message.success(t('common.delSuccess'))
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 导出按钮操作 */
|
||||
const handleExport = async () => {
|
||||
try {
|
||||
await message.exportConfirm()
|
||||
exportLoading.value = true
|
||||
const data = await QcOqcApi.exportOqc(queryParams)
|
||||
download.excel(data, '出货检验单.xls')
|
||||
} catch {
|
||||
} finally {
|
||||
exportLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
Loading…
Reference in New Issue