refactor(qms): 重构质检任务页面

master
zch 5 months ago
parent af6029d1a4
commit 62eacaff7e

@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios';
import { QcInspectionMainVO, QcInspectionMainForm, QcInspectionMainQuery } from '@/api/qms/QcInspectionMain/types';
/**
*
*
* @param query
* @returns {*}
*/
@ -17,7 +17,7 @@ export const listQcInspectionMain = (query?: QcInspectionMainQuery): AxiosPromis
};
/**
*
*
* @param inspectionId
*/
export const getQcInspectionMain = (inspectionId: string | number): AxiosPromise<QcInspectionMainVO> => {
@ -28,7 +28,7 @@ export const getQcInspectionMain = (inspectionId: string | number): AxiosPromise
};
/**
*
*
* @param data
*/
export const addQcInspectionMain = (data: QcInspectionMainForm) => {
@ -40,7 +40,7 @@ export const addQcInspectionMain = (data: QcInspectionMainForm) => {
};
/**
*
*
* @param data
*/
export const updateQcInspectionMain = (data: QcInspectionMainForm) => {
@ -52,7 +52,7 @@ export const updateQcInspectionMain = (data: QcInspectionMainForm) => {
};
/**
*
*
* @param inspectionId
*/
export const delQcInspectionMain = (inspectionId: string | number | Array<string | number>) => {
@ -64,7 +64,7 @@ export const delQcInspectionMain = (inspectionId: string | number | Array<string
/**
*
*
* @param query
* @returns {*}
*/
@ -75,20 +75,3 @@ export function getQcInspectionMainList (query) {
params: query
});
};
/**
*
*
* @param file
* @param updateSupport
*/
export const importData = (file: File, updateSupport: boolean) => {
const formData = new FormData();
formData.append('file', file);
formData.append('updateSupport', updateSupport.toString());
return request({
url: '/qms/QcInspectionMain/importData',
method: 'post',
data: formData
});
};

@ -9,6 +9,11 @@ export interface QcInspectionMainVO {
*/
inspectionNo: string;
/**
* ID
*/
templateId: string | number;
/**
*
*/
@ -60,9 +65,9 @@ export interface QcInspectionMainVO {
workshop: string;
/**
*
* /
*/
typeId: string | number;
inspectionType: number;
/**
* 0/1
@ -114,22 +119,11 @@ export interface QcInspectionMainVO {
*/
remark: string;
/**
*
/**
*
*/
qcInspectionType: string;
templateName: string;//join
/**
*
*/
typeName: string;
/**
*
*/
typeCode: string;
}
@ -144,6 +138,11 @@ export interface QcInspectionMainForm extends BaseEntity {
*/
inspectionNo?: string;
/**
* ID
*/
templateId?: string | number;
/**
*
*/
@ -195,9 +194,9 @@ export interface QcInspectionMainForm extends BaseEntity {
workshop?: string;
/**
*
* /
*/
typeId?: string | number;
inspectionType?: number;
/**
* 0/1
@ -249,25 +248,10 @@ export interface QcInspectionMainForm extends BaseEntity {
*/
remark?: string;
/**
*
/**
*
*/
qcInspectionType?: string;
/**
*
*/
typeName?: string;
/**
*
*/
typeCode?: string;
templateName?: string;//join
}
@ -283,6 +267,11 @@ export interface QcInspectionMainQuery extends PageQuery {
*/
inspectionNo?: string;
/**
* ID
*/
templateId?: string | number;
/**
*
*/
@ -334,9 +323,9 @@ export interface QcInspectionMainQuery extends PageQuery {
workshop?: string;
/**
*
* /
*/
typeId?: string | number;
inspectionType?: number;
/**
* 0/1
@ -383,25 +372,12 @@ export interface QcInspectionMainQuery extends PageQuery {
*/
supplierName?: string;
/**
*
*/
qcInspectionType?: string;
/**
*
*/
typeName?: string;
/**
*
*/
typeCode?: string;
/**
*
*/
templateName?: string;//join
/**
*

@ -75,20 +75,3 @@ export function getQcInspectionResultList (query) {
params: query
});
};
/**
*
*
* @param file
* @param updateSupport
*/
export const importData = (file: File, updateSupport: boolean) => {
const formData = new FormData();
formData.append('file', file);
formData.append('updateSupport', updateSupport.toString());
return request({
url: '/qms/qcInspectionResult/importData',
method: 'post',
data: formData
});
};

@ -34,6 +34,76 @@ export interface QcInspectionResultVO {
*/
problemDetail: string;
/**
*
*/
itemCode: string;
/**
*
*/
itemName: string;
/**
*
*/
inspectionPosition: string;
/**
*
*/
categoryName: string;
/**
*
*/
typeId: string | number;
/**
* 0,1
*/
detectType: number;
/**
* (0,1)
*/
controlType: number;
/**
*
*/
standardValue: number;
/**
*
*/
upperLimit: number;
/**
*
*/
lowerLimit: number;
/**
*
*/
specName: string;
/**
*
*/
specUpper: number;
/**
*
*/
specLower: number;
/**
*
*/
description: string;
}
export interface QcInspectionResultForm extends BaseEntity {
@ -72,6 +142,76 @@ export interface QcInspectionResultForm extends BaseEntity {
*/
problemDetail?: string;
/**
*
*/
itemCode?: string;
/**
*
*/
itemName?: string;
/**
*
*/
inspectionPosition?: string;
/**
*
*/
categoryName?: string;
/**
*
*/
typeId?: string | number;
/**
* 0,1
*/
detectType?: number;
/**
* (0,1)
*/
controlType?: number;
/**
*
*/
standardValue?: number;
/**
*
*/
upperLimit?: number;
/**
*
*/
lowerLimit?: number;
/**
*
*/
specName?: string;
/**
*
*/
specUpper?: number;
/**
*
*/
specLower?: number;
/**
*
*/
description?: string;
}
export interface QcInspectionResultQuery extends PageQuery {
@ -111,6 +251,76 @@ export interface QcInspectionResultQuery extends PageQuery {
*/
problemDetail?: string;
/**
*
*/
itemCode?: string;
/**
*
*/
itemName?: string;
/**
*
*/
inspectionPosition?: string;
/**
*
*/
categoryName?: string;
/**
*
*/
typeId?: string | number;
/**
* 0,1
*/
detectType?: number;
/**
* (0,1)
*/
controlType?: number;
/**
*
*/
standardValue?: number;
/**
*
*/
upperLimit?: number;
/**
*
*/
lowerLimit?: number;
/**
*
*/
specName?: string;
/**
*
*/
specUpper?: number;
/**
*
*/
specLower?: number;
/**
*
*/
description?: string;
/**
*
*/

File diff suppressed because it is too large Load Diff

@ -3,7 +3,7 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
<el-form ref="queryFormRef" :model="queryParams" :inline="true" >
<!-- <el-form-item label="结果主键" prop="resultId">
<el-input v-model="queryParams.resultId" placeholder="请输入结果主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -12,13 +12,13 @@
</el-form-item>
<el-form-item label="关联检测项ID" prop="itemId">
<el-input v-model="queryParams.itemId" placeholder="请输入关联检测项ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form-item> -->
<el-form-item label="检测结果" prop="detectResult">
<el-select v-model="queryParams.detectResult" placeholder="请选择检测结果" clearable >
<el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="定量检测值" prop="detectValue">
<!-- <el-form-item label="定量检测值" prop="detectValue">
<el-input v-model="queryParams.detectValue" placeholder="请输入定量检测值" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格质检值" prop="specInspection">
@ -26,6 +26,52 @@
</el-form-item>
<el-form-item label="定性不合格明细" prop="problemDetail">
<el-input v-model="queryParams.problemDetail" placeholder="请输入定性不合格明细" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测项编码" prop="itemCode">
<el-input v-model="queryParams.itemCode" placeholder="请输入检测项编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测项名称" prop="itemName">
<el-input v-model="queryParams.itemName" placeholder="请输入检测项名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测位置" prop="inspectionPosition">
<el-input v-model="queryParams.inspectionPosition" placeholder="请输入检测位置" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测项目类别" prop="categoryName">
<el-input v-model="queryParams.categoryName" placeholder="请输入检测项目类别" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="关联检测类型表" prop="typeId">
<el-input v-model="queryParams.typeId" placeholder="请输入关联检测类型表" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="检测方式" prop="detectType">
<el-select v-model="queryParams.detectType" placeholder="请选择检测方式" clearable >
<el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="控制类型(0手动,1自动)" prop="controlType">
<el-select v-model="queryParams.controlType" placeholder="请选择控制类型(0手动,1自动)" clearable >
<el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="标准值" prop="standardValue">
<el-input v-model="queryParams.standardValue" placeholder="请输入标准值" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="控制上限" prop="upperLimit">
<el-input v-model="queryParams.upperLimit" placeholder="请输入控制上限" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="控制下限" prop="lowerLimit">
<el-input v-model="queryParams.lowerLimit" placeholder="请输入控制下限" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格名称" prop="specName">
<el-input v-model="queryParams.specName" placeholder="请输入规格名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格上限" prop="specUpper">
<el-input v-model="queryParams.specUpper" placeholder="请输入规格上限" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格下限" prop="specLower">
<el-input v-model="queryParams.specLower" placeholder="请输入规格下限" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测项说明" prop="description">
<el-input v-model="queryParams.description" placeholder="请输入检测项说明" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
@ -57,9 +103,11 @@
<el-table v-loading="loading" :data="qcInspectionResultList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="resultId" v-if="columns[0].visible"/>
<el-table-column label="关联质检主表ID" align="center" prop="inspectionId" v-if="columns[1].visible"/>
<el-table-column label="关联检测项ID" align="center" prop="itemId" v-if="columns[2].visible"/>
<!-- <el-table-column label="结果主键" align="center" prop="resultId" v-if="columns[0].visible"/> -->
<!-- 自动序号 -->
<el-table-column label="序号" align="center" type="index" width="55" v-if="columns[0].visible"/>
<el-table-column label="关联质检主表" align="center" prop="inspectionId" v-if="columns[1].visible"/>
<el-table-column label="关联检测项" align="center" prop="itemName" v-if="columns[2].visible"/>
<el-table-column label="检测结果" align="center" prop="detectResult" v-if="columns[3].visible">
<template #default="scope">
<dict-tag :options="qc_result" :value="scope.row.detectResult"/>
@ -68,6 +116,28 @@
<el-table-column label="定量检测值" align="center" prop="detectValue" v-if="columns[4].visible"/>
<el-table-column label="规格质检值" align="center" prop="specInspection" v-if="columns[5].visible"/>
<el-table-column label="定性不合格明细" align="center" prop="problemDetail" v-if="columns[6].visible"/>
<el-table-column label="检测项编码" align="center" prop="itemCode" v-if="columns[7].visible"/>
<el-table-column label="检测项名称" align="center" prop="itemName" v-if="columns[8].visible"/>
<el-table-column label="检测位置" align="center" prop="inspectionPosition" v-if="columns[9].visible"/>
<el-table-column label="检测项目类别" align="center" prop="categoryName" v-if="columns[10].visible"/>
<el-table-column label="关联检测类型表" align="center" prop="typeId" v-if="columns[11].visible"/>
<el-table-column label="检测方式" align="center" prop="detectType" v-if="columns[12].visible">
<template #default="scope">
<dict-tag :options="detect_type" :value="scope.row.detectType"/>
</template>
</el-table-column>
<el-table-column label="控制类型(0手动,1自动)" align="center" prop="controlType" v-if="columns[13].visible">
<template #default="scope">
<dict-tag :options="control_type" :value="scope.row.controlType"/>
</template>
</el-table-column>
<el-table-column label="标准值" align="center" prop="standardValue" v-if="columns[14].visible"/>
<el-table-column label="控制上限" align="center" prop="upperLimit" v-if="columns[15].visible"/>
<el-table-column label="控制下限" align="center" prop="lowerLimit" v-if="columns[16].visible"/>
<el-table-column label="规格名称" align="center" prop="specName" v-if="columns[17].visible"/>
<el-table-column label="规格上限" align="center" prop="specUpper" v-if="columns[18].visible"/>
<el-table-column label="规格下限" align="center" prop="specLower" v-if="columns[19].visible"/>
<el-table-column label="检测项说明" align="center" prop="description" v-if="columns[20].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -82,17 +152,32 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改质检结果子表对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="qcInspectionResultFormRef" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="结果主键" prop="resultId">
<el-input v-model="form.resultId" placeholder="请输入结果主键" />
</el-form-item> -->
<el-form-item label="关联质检主表ID" prop="inspectionId">
<el-input v-model="form.inspectionId" placeholder="请输入关联质检主表ID" />
<el-form-item label="关联质检主表" prop="inspectionId">
<el-select v-model="form.inspectionId" placeholder="请选择关联质检主表">
<el-option
v-for="item in inspectionMainList"
:key="item.inspectionId"
:label="item.inspectionNo"
:value="item.inspectionId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联检测项ID" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入关联检测项ID" />
<el-form-item label="关联检测项" prop="itemId">
<el-select v-model="form.itemId" placeholder="请选择关联检测项">
<el-option
v-for="item in inspectionItemList"
:key="item.itemId"
:label="item.itemName"
:value="item.itemId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="检测结果" prop="detectResult">
<el-radio-group v-model="form.detectResult">
@ -112,6 +197,62 @@
<el-form-item label="定性不合格明细" prop="problemDetail">
<el-input v-model="form.problemDetail" placeholder="请输入定性不合格明细" />
</el-form-item>
<el-form-item label="检测项编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入检测项编码" />
</el-form-item>
<el-form-item label="检测项名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入检测项名称" />
</el-form-item>
<el-form-item label="检测位置" prop="inspectionPosition">
<el-input v-model="form.inspectionPosition" placeholder="请输入检测位置" />
</el-form-item>
<el-form-item label="检测项目类别" prop="categoryName">
<el-input v-model="form.categoryName" placeholder="请输入检测项目类别" />
</el-form-item>
<el-form-item label="关联检测类型表" prop="typeId">
<el-input v-model="form.typeId" placeholder="请输入关联检测类型表" />
</el-form-item>
<el-form-item label="检测方式" prop="detectType">
<el-select v-model="form.detectType" placeholder="请选择检测方式">
<el-option
v-for="dict in detect_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="控制类型(0手动,1自动)" prop="controlType">
<el-select v-model="form.controlType" placeholder="请选择控制类型(0手动,1自动)">
<el-option
v-for="dict in control_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准值" prop="standardValue">
<el-input v-model="form.standardValue" placeholder="请输入标准值" />
</el-form-item>
<el-form-item label="控制上限" prop="upperLimit">
<el-input v-model="form.upperLimit" placeholder="请输入控制上限" />
</el-form-item>
<el-form-item label="控制下限" prop="lowerLimit">
<el-input v-model="form.lowerLimit" placeholder="请输入控制下限" />
</el-form-item>
<el-form-item label="规格名称" prop="specName">
<el-input v-model="form.specName" placeholder="请输入规格名称" />
</el-form-item>
<el-form-item label="规格上限" prop="specUpper">
<el-input v-model="form.specUpper" placeholder="请输入规格上限" />
</el-form-item>
<el-form-item label="规格下限" prop="specLower">
<el-input v-model="form.specLower" placeholder="请输入规格下限" />
</el-form-item>
<el-form-item label="检测项说明" prop="description">
<el-input v-model="form.description" placeholder="请输入检测项说明" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -126,9 +267,11 @@
<script setup name="QcInspectionResult" lang="ts">
import { listQcInspectionResult, getQcInspectionResult, delQcInspectionResult, addQcInspectionResult, updateQcInspectionResult } from '@/api/qms/qcInspectionResult';
import { QcInspectionResultVO, QcInspectionResultQuery, QcInspectionResultForm } from '@/api/qms/qcInspectionResult/types';
import { getQcInspectionMainList } from '@/api/qms/qcInspectionMain';
import { getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { qc_result } = toRefs<any>(proxy?.useDict('qc_result'));
const { detect_type, qc_result, control_type } = toRefs<any>(proxy?.useDict('detect_type', 'qc_result', 'control_type'));
const qcInspectionResultList = ref<QcInspectionResultVO[]>([]);
const buttonLoading = ref(false);
@ -150,19 +293,26 @@ const dialog = reactive<DialogOption>({
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `序号`, visible: true },
{ key: 1, label: `检测单号/卡号`, visible: true },
{ key: 2, label: `关联质检主表ID`, visible: true },
{ key: 3, label: `关联检测项ID`, visible: true },
{ key: 4, label: `检测结果`, visible: true },
{ key: 5, label: `定量检测值`, visible: true },
{ key: 6, label: `规格质检值`, visible: true },
{ key: 7, label: `定性不合格明细`, visible: true },
// { key: 8, label: ``, visible: true },
// { key: 9, label: ``, visible: true },
// { key: 10, label: ``, visible: true },
// { key: 11, label: ``, visible: true },
// { key: 12, label: ``, visible: true },
// { key: 13, label: ``, visible: true },
{ key: 1, label: `关联质检主表`, visible: true },
{ key: 2, label: `关联检测项`, visible: true },
{ key: 3, label: `检测结果`, visible: true },
{ key: 4, label: `定量检测值`, visible: true },
{ key: 5, label: `规格质检值`, visible: true },
{ key: 6, label: `定性不合格明细`, visible: true },
{ key: 7, label: `检测项编码`, visible: true },
{ key: 8, label: `检测项名称`, visible: true },
{ key: 9, label: `检测位置`, visible: true },
{ key: 10, label: `检测项目类别`, visible: true },
{ key: 11, label: `关联检测类型表`, visible: true },
{ key: 12, label: `检测方式`, visible: true },
{ key: 13, label: `控制类型(0手动,1自动)`, visible: true },
{ key: 14, label: `标准值`, visible: true },
{ key: 15, label: `控制上限`, visible: true },
{ key: 16, label: `控制下限`, visible: true },
{ key: 17, label: `规格名称`, visible: true },
{ key: 18, label: `规格上限`, visible: true },
{ key: 19, label: `规格下限`, visible: true },
{ key: 20, label: `检测项说明`, visible: true },
]);
const initFormData: QcInspectionResultForm = {
@ -173,6 +323,20 @@ const initFormData: QcInspectionResultForm = {
detectValue: undefined,
specInspection: undefined,
problemDetail: undefined,
itemCode: undefined,
itemName: undefined,
inspectionPosition: undefined,
categoryName: undefined,
typeId: undefined,
detectType: undefined,
controlType: undefined,
standardValue: undefined,
upperLimit: undefined,
lowerLimit: undefined,
specName: undefined,
specUpper: undefined,
specLower: undefined,
description: undefined,
}
const data = reactive<PageData<QcInspectionResultForm, QcInspectionResultQuery>>({
form: {...initFormData},
@ -186,13 +350,24 @@ const data = reactive<PageData<QcInspectionResultForm, QcInspectionResultQuery>>
detectValue: undefined,
specInspection: undefined,
problemDetail: undefined,
itemCode: undefined,
itemName: undefined,
inspectionPosition: undefined,
categoryName: undefined,
typeId: undefined,
detectType: undefined,
controlType: undefined,
standardValue: undefined,
upperLimit: undefined,
lowerLimit: undefined,
specName: undefined,
specUpper: undefined,
specLower: undefined,
description: undefined,
params: {
}
},
rules: {
resultId: [
{ required: true, message: "结果主键不能为空", trigger: "blur" }
],
}
});
@ -288,7 +463,25 @@ const handleExport = () => {
}, `qcInspectionResult_${new Date().getTime()}.xlsx`)
}
//
let inspectionMainList = ref([]);
const getInspectionMain = async () => {
const res = await getQcInspectionMainList(null);
inspectionMainList.value = res.data;
}
//
let inspectionItemList = ref([]);
const getInspectionItem = async () => {
const res = await getQcInspectionItemList(null);
inspectionItemList.value = res.data;
}
onMounted(() => {
getList();
getInspectionMain();
getInspectionItem();
});
</script>

Loading…
Cancel
Save