update qms质检任务页面关联检测类型

master
yinq 3 weeks ago
parent 7c3af0310e
commit ee5c9a9a3d

@ -21,11 +21,11 @@
<el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"/> <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="检类别" prop="inspectionType" v-if='inspectionTypeVisible'> <!-- <el-form-item label="检类别" prop="inspectionType" v-if='inspectionTypeVisible'>-->
<el-select v-model="queryParams.inspectionType" placeholder="请选择检验类别" > <!-- <el-select v-model="queryParams.qcInspectionType" placeholder="请选择检测类别" >-->
<el-option v-for="dict in qc_inspection_type" :key="dict.value" :label="dict.label" :value="dict.value"/> <!-- <el-option v-for="dict in qc_inspection_type" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable > <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable >
<el-option v-for="dict in qc_status" :key="dict.value" :label="dict.label" :value="dict.value"/> <el-option v-for="dict in qc_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
@ -103,11 +103,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="车间" align="center" prop="workshop" v-if="columns[12].visible"/> <el-table-column label="车间" align="center" prop="workshop" v-if="columns[12].visible"/>
<el-table-column label="检验类别" align="center" prop="inspectionType" v-if="columns[13].visible"> <el-table-column label="检测类别" align="center" prop="typeName" v-if="columns[13].visible" />
<template #default="scope">
<dict-tag :options="qc_inspection_type" :value="scope.row.inspectionType"/>
</template>
</el-table-column>
<el-table-column label="单据状态" align="center" prop="status" v-if="columns[14].visible"> <el-table-column label="单据状态" align="center" prop="status" v-if="columns[14].visible">
<template #default="scope"> <template #default="scope">
<dict-tag :options="qc_status" :value="scope.row.status"/> <dict-tag :options="qc_status" :value="scope.row.status"/>
@ -322,8 +318,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检类别" prop="inspectionType"> <el-form-item label="检类别" prop="inspectionType">
<el-select v-model="form.inspectionType" placeholder="请选择检类别"> <el-select v-model="form.inspectionType" placeholder="请选择检类别">
<el-option <el-option
v-for="dict in qc_inspection_type" v-for="dict in qc_inspection_type"
:key="dict.value" :key="dict.value"
@ -638,20 +634,18 @@ const inspectionResultDialog = reactive<DialogOption>({
title: '' title: ''
}); });
//0 1 2 3 4 5 6 7
//inspectionType = 1 2 3 //inspectionType = 1 2 3
const inspectionType = ref(); const inspectionType = ref();
const inspectionTypeVisible = ref(false);
const getInspectionType = async () => { const getInspectionType = async () => {
const router = useRouter(); const router = useRouter();
inspectionType.value = router.currentRoute._rawValue.query && router.currentRoute._rawValue.query.inspectionType; inspectionType.value = router.currentRoute._rawValue.query && router.currentRoute._rawValue.query.inspectionType;
if (inspectionType.value == 2){ if (inspectionType.value == 2){
queryParams.value.inspectionType = '4'; queryParams.value.qcInspectionType = '2';
} else if (inspectionType.value == 3){ } else if (inspectionType.value == 3){
queryParams.value.inspectionType = '7'; queryParams.value.qcInspectionType = '3';
} else { } else {
queryParams.value.inspectionType = '6'; queryParams.value.qcInspectionType = '1';
inspectionTypeVisible.value = true;
} }
}; };
@ -670,7 +664,7 @@ const columns = ref<FieldOption[]>([
{ key: 10, label: `不合格数`, visible: true }, { key: 10, label: `不合格数`, visible: true },
{ key: 11, label: `质检结果`, visible: true }, { key: 11, label: `质检结果`, visible: true },
{ key: 12, label: `车间`, visible: true }, { key: 12, label: `车间`, visible: true },
{ key: 13, label: `类别`, visible: true }, { key: 13, label: `类别`, visible: true },
{ key: 14, label: `单据状态`, visible: true }, { key: 14, label: `单据状态`, visible: true },
{ key: 15, label: `检测人员`, visible: true }, { key: 15, label: `检测人员`, visible: true },
{ key: 16, label: `班次`, visible: true }, { key: 16, label: `班次`, visible: true },
@ -754,7 +748,7 @@ const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
unqualifiedQty: undefined, unqualifiedQty: undefined,
result: undefined, result: undefined,
workshop: undefined, workshop: undefined,
inspectionType: undefined, qcInspectionType: undefined,
status: undefined, status: undefined,
inspector: undefined, inspector: undefined,
shift: undefined, shift: undefined,

Loading…
Cancel
Save