xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
夜笙歌 2 weeks ago
parent 87e5f96048 fb342f236d
commit 7a9599b96d
13 changed files with 147 additions and 98 deletions
Show Stats Download Patch File Download Diff File

12
src/api/qms/qcInspectionItem/types.ts
Unescape Escape View File

@ -67,12 +67,12 @@ export interface QcInspectionItemVO {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper: number; specUpper: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower: number; specLower: string;
/** /**
* 检测项说明 * 检测项说明
@ -174,12 +174,12 @@ export interface QcInspectionItemForm extends BaseEntity {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper?: number; specUpper?: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower?: number; specLower?: string;
/** /**
* 检测项说明 * 检测项说明
@ -283,12 +283,12 @@ export interface QcInspectionItemQuery extends PageQuery {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper?: number; specUpper?: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower?: number; specLower?: string;
/** /**
* 检测项说明 * 检测项说明

12
src/api/qms/qcInspectionResult/types.ts
Unescape Escape View File

@ -92,12 +92,12 @@ export interface QcInspectionResultVO {
/** /**
* 规格上限（快照） * 规格上限（快照）
*/ */
specUpper: number; specUpper: string;
/** /**
* 规格下限（快照） * 规格下限（快照）
*/ */
specLower: number; specLower: string;
/** /**
* 检测项说明（快照） * 检测项说明（快照）
@ -200,12 +200,12 @@ export interface QcInspectionResultForm extends BaseEntity {
/** /**
* 规格上限（快照） * 规格上限（快照）
*/ */
specUpper?: number; specUpper?: string;
/** /**
* 规格下限（快照） * 规格下限（快照）
*/ */
specLower?: number; specLower?: string;
/** /**
* 检测项说明（快照） * 检测项说明（快照）
@ -309,12 +309,12 @@ export interface QcInspectionResultQuery extends PageQuery {
/** /**
* 规格上限（快照） * 规格上限（快照）
*/ */
specUpper?: number; specUpper?: string;
/** /**
* 规格下限（快照） * 规格下限（快照）
*/ */
specLower?: number; specLower?: string;
/** /**
* 检测项说明（快照） * 检测项说明（快照）

12
src/api/qms/qcTemplateItem/types.ts
Unescape Escape View File

@ -72,12 +72,12 @@ export interface QcTemplateItemVO {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper: number; specUpper: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower: number; specLower: string;
/** /**
* 检测项说明 * 检测项说明
@ -160,12 +160,12 @@ export interface QcTemplateItemForm extends BaseEntity {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper?: number; specUpper?: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower?: number; specLower?: string;
/** /**
* 检测项说明 * 检测项说明
@ -249,12 +249,12 @@ export interface QcTemplateItemQuery extends PageQuery {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper?: number; specUpper?: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower?: number; specLower?: string;
/** /**
* 检测项说明 * 检测项说明

15
src/api/qms/qcUnqualifiedRecord/types.ts
Unescape Escape View File

@ -28,6 +28,7 @@ export interface QcUnqualifiedRecordVO {
* 检测项目类别 * 检测项目类别
*/ */
categoryName: number; categoryName: number;
categoryId: string | number;
/** /**
* 关联检测类型表 * 关联检测类型表
@ -72,12 +73,12 @@ export interface QcUnqualifiedRecordVO {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper: number; specUpper: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower: number; specLower: string;
/** /**
* 检查项说明 * 检查项说明
@ -116,6 +117,7 @@ export interface QcUnqualifiedRecordForm extends BaseEntity {
* 检测项目类别 * 检测项目类别
*/ */
categoryName?: number; categoryName?: number;
categoryId?: string | number;
/** /**
* 关联检测类型表 * 关联检测类型表
@ -160,12 +162,12 @@ export interface QcUnqualifiedRecordForm extends BaseEntity {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper?: number; specUpper?: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower?: number; specLower?: string;
/** /**
* 检查项说明 * 检查项说明
@ -205,6 +207,7 @@ export interface QcUnqualifiedRecordQuery extends PageQuery {
* 检测项目类别 * 检测项目类别
*/ */
categoryName?: number; categoryName?: number;
categoryId?: string | number;
/** /**
* 关联检测类型表 * 关联检测类型表
@ -249,12 +252,12 @@ export interface QcUnqualifiedRecordQuery extends PageQuery {
/** /**
* 规格上限 * 规格上限
*/ */
specUpper?: number; specUpper?: string;
/** /**
* 规格下限 * 规格下限
*/ */
specLower?: number; specLower?: string;
/** /**
* 检查项说明 * 检查项说明

12
src/api/qms/qcUnqualifiedReview/index.ts
Unescape Escape View File

@ -75,3 +75,15 @@ export function getQcUnqualifiedReviewList (query) {
params: query params: query
}); });
}; };
/**
* 删除不合格品待评审
* @param dispositionType
* @param reviewId
*/
export const handleUnqualified = (dispositionType: string | number, reviewId: string | number | Array<string | number>) => {
return request({
url: '/qms/qcMobile/handleUnqualified/' + dispositionType + '/' + reviewId,
method: 'get'
});
};

56
src/views/qms/QcInspectionMain/index.vue
Unescape Escape View File

@ -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"/>
@ -297,7 +293,7 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="不合格数" prop="unqualifiedQty"> <el-form-item label="不合格数" prop="unqualifiedQty" v-if="form.result == 1">
<el-input v-model="form.unqualifiedQty" placeholder="请输入不合格数" /> <el-input v-model="form.unqualifiedQty" placeholder="请输入不合格数" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -308,7 +304,7 @@
v-for="dict in qc_result" v-for="dict in qc_result"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -322,13 +318,13 @@
</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"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -339,7 +335,7 @@
<el-radio <el-radio
v-for="dict in qc_status" v-for="dict in qc_status"
:key="dict.value" :key="dict.value"
:value="parseInt(dict.value)" :value="dict.value"
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -466,7 +462,7 @@
<el-form-item label="检测方式" prop="detectType"> <el-form-item label="检测方式" prop="detectType">
<el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top"> <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
<el-select v-model="inspectionResultForm.detectType" placeholder="检测方式" style="width: 100%;" :disabled="true"> <el-select v-model="inspectionResultForm.detectType" placeholder="检测方式" style="width: 100%;" :disabled="true">
<el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
@ -475,7 +471,7 @@
<el-form-item label="控制类型" prop="controlType"> <el-form-item label="控制类型" prop="controlType">
<el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top"> <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
<el-select v-model="inspectionResultForm.controlType" placeholder="控制类型" style="width: 100%;" :disabled="true"> <el-select v-model="inspectionResultForm.controlType" placeholder="控制类型" style="width: 100%;" :disabled="true">
<el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
@ -529,7 +525,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="检测结果" prop="detectResult"> <el-form-item label="检测结果" prop="detectResult">
<el-select v-model="inspectionResultForm.detectResult" placeholder="请选择检测结果"> <el-select v-model="inspectionResultForm.detectResult" placeholder="请选择检测结果">
<el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -571,7 +567,7 @@
<!-- 添加物料信息对话框 --> <!-- 添加物料信息对话框 -->
<el-dialog title="选择物料信息" v-model="materialOpen" width="1200px" append-to-body> <el-dialog title="选择物料信息" v-model="materialOpen" width="1200px" append-to-body>
<MaterialSelect @selection="handleSelection" ref="materialSelectRef" v-if="materialOpen"></MaterialSelect> <MaterialSelect ref="materialSelectRef" v-if="materialOpen"></MaterialSelect>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="submitMaterialForm">确 定</el-button> <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
@ -593,7 +589,7 @@ import { getProcessInfoList } from '@/api/qms/baseProcessInfo';
import { getStationInfoList } from '@/api/qms/baseStationInfo'; import { getStationInfoList } from '@/api/qms/baseStationInfo';
import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue"; import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue";
import { useRouter } from 'vue-router'; import { useRouter, useRoute } from 'vue-router';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { qc_inspection_type, qc_result, qc_status, material_type, detect_type, control_type } = toRefs<any>(proxy?.useDict('qc_inspection_type', 'qc_result', 'qc_status', 'material_type', 'detect_type', 'control_type')); const { qc_inspection_type, qc_result, qc_status, material_type, detect_type, control_type } = toRefs<any>(proxy?.useDict('qc_inspection_type', 'qc_result', 'qc_status', 'material_type', 'detect_type', 'control_type'));
@ -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 route = useRoute();
inspectionType.value = router.currentRoute._rawValue.query && router.currentRoute._rawValue.query.inspectionType; inspectionType.value = route.query.inspectionType;
if (inspectionType.value == 2){ if (inspectionType.value == 2){
queryParams.value.inspectionType = '4'; queryParams.value.inspectionType = '2';
} else if (inspectionType.value == 3){ } else if (inspectionType.value == 3){
queryParams.value.inspectionType = '7'; queryParams.value.inspectionType = '3';
} else { } else {
queryParams.value.inspectionType = '6'; queryParams.value.inspectionType = '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 },
@ -991,6 +985,7 @@ const handleDeleteInspectionResult = async (row?: QcInspectionResultVO) => {
await delQcInspectionResult(_resultIds); await delQcInspectionResult(_resultIds);
proxy?.$modal.msgSuccess("删除成功"); proxy?.$modal.msgSuccess("删除成功");
await getInspectionResultList(); await getInspectionResultList();
await getList(); // 新增
} }
/** 提交按钮 */ /** 提交按钮 */
@ -1023,6 +1018,7 @@ const submitInspectionResultForm = () => {
proxy?.$modal.msgSuccess("操作成功"); proxy?.$modal.msgSuccess("操作成功");
inspectionResultDialog.visible = false; inspectionResultDialog.visible = false;
await getInspectionResultList(); await getInspectionResultList();
await getList(); // 新增
} }
}); });
} }

17
src/views/qms/qcInspectionItem/index.vue
Unescape Escape View File

@ -173,14 +173,14 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="检测方式" prop="detectType"> <el-form-item label="检测方式" prop="detectType">
<el-select v-model="form.detectType" placeholder="请选择检测方式" :disabled="!!form.itemId"> <el-select v-model="form.detectType" placeholder="请选择检测方式" :disabled="!!form.itemId">
<el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="控制类型" prop="controlType"> <el-form-item label="控制类型" prop="controlType">
<el-select v-model="form.controlType" placeholder="请选择控制类型"> <el-select v-model="form.controlType" placeholder="请选择控制类型">
<el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -204,7 +204,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="检测方法" prop="method"> <el-form-item label="检测方法" prop="method">
<el-select v-model="form.method" placeholder="请选择检测方法"> <el-select v-model="form.method" placeholder="请选择检测方法">
<el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -215,7 +215,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="form.detectType === 1"> <el-row v-if="form.detectType == 1">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="标准值" prop="standardValue"> <el-form-item label="标准值" prop="standardValue">
<el-input-number v-model="form.standardValue" placeholder="请输入标准值" /> <el-input-number v-model="form.standardValue" placeholder="请输入标准值" />
@ -233,15 +233,15 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="规格上限" prop="specUpper"> <el-form-item label="规格上限" prop="specUpper">
<el-input-number v-model="form.specUpper" placeholder="请输入规格上限" /> <el-input v-model="form.specUpper" placeholder="请输入规格上限" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="form.detectType === 1"> <el-row v-if="form.detectType == 1">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="规格下限" prop="specLower"> <el-form-item label="规格下限" prop="specLower">
<el-input-number v-model="form.specLower" placeholder="请输入规格下限" /> <el-input v-model="form.specLower" placeholder="请输入规格下限" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -465,6 +465,9 @@ const handleUpdate = async (row?: QcInspectionItemVO) => {
const _itemId = row?.itemId || ids.value[0] const _itemId = row?.itemId || ids.value[0]
const res = await getQcInspectionItem(_itemId); const res = await getQcInspectionItem(_itemId);
Object.assign(form.value, res.data); Object.assign(form.value, res.data);
form.value.method = Number(form.value.method);
form.value.detectType = Number(form.value.detectType);
form.value.controlType = Number(form.value.controlType);
dialog.visible = true; dialog.visible = true;
dialog.title = "修改检测项定义"; dialog.title = "修改检测项定义";
} }

8
src/views/qms/qcInspectionResult/index.vue
Unescape Escape View File

@ -152,7 +152,7 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card> </el-card>
<!-- 添加或修改质检结果子表对话框 --> <!-- 添加或修改质检结果子表对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> <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 ref="qcInspectionResultFormRef" :model="form" :rules="rules" label-width="120px">
@ -184,7 +184,7 @@
<el-radio <el-radio
v-for="dict in qc_result" v-for="dict in qc_result"
:key="dict.value" :key="dict.value"
:value="parseInt(dict.value)" :value="dict.value"
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -218,7 +218,7 @@
v-for="dict in detect_type" v-for="dict in detect_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -228,7 +228,7 @@
v-for="dict in control_type" v-for="dict in control_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

20
src/views/qms/qcInspectionTemplate/index.vue
Unescape Escape View File

@ -153,7 +153,7 @@
<pagination v-show="templateItemTotal > 0" :total="templateItemTotal" v-model:page="templateItemQueryParams.pageNum" v-model:limit="templateItemQueryParams.pageSize" @pagination="getTemplateItemList" /> <pagination v-show="templateItemTotal > 0" :total="templateItemTotal" v-model:page="templateItemQueryParams.pageNum" v-model:limit="templateItemQueryParams.pageSize" @pagination="getTemplateItemList" />
</el-card> </el-card>
<!-- 添加或修改检测模板主对话框 --> <!-- 添加或修改检测模板对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="qcInspectionTemplateFormRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="qcInspectionTemplateFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="模板编码" prop="templateCode"> <el-form-item label="模板编码" prop="templateCode">
@ -238,7 +238,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="关联检测项定义" prop="itemId"> <el-form-item label="关联检测项定义" prop="itemId">
<el-select v-model="templateItemForm.itemId" placeholder="请选择关联检测项定义" style="width: 100%;" @change="handleItemChange"> <el-select v-model="templateItemForm.itemId" placeholder="请选择关联检测项定义" style="width: 100%;" @change="handleItemChange">
<el-option v-for="item in qcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" /> <el-option v-for="item in filteredQcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -262,7 +262,7 @@
<el-form-item label="检测方式" prop="detectType"> <el-form-item label="检测方式" prop="detectType">
<el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top"> <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
<el-select v-model="templateItemForm.detectType" placeholder="请选择检测方式" style="width: 100%;" :disabled="true"> <el-select v-model="templateItemForm.detectType" placeholder="请选择检测方式" style="width: 100%;" :disabled="true">
<el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
@ -271,7 +271,7 @@
<el-form-item label="控制类型" prop="controlType"> <el-form-item label="控制类型" prop="controlType">
<el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top"> <el-tooltip content="此字段由关联检测项自动填充，不可编辑" placement="top">
<el-select v-model="templateItemForm.controlType" placeholder="请选择控制类型" style="width: 100%;" :disabled="true"> <el-select v-model="templateItemForm.controlType" placeholder="请选择控制类型" style="width: 100%;" :disabled="true">
<el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
@ -367,7 +367,7 @@
<!-- 添加物料信息对话框 --> <!-- 添加物料信息对话框 -->
<el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body> <el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
<MaterialSelect @selection='handleSelection' ref='materialSelectRef' v-if='materialOpen'></MaterialSelect> <MaterialSelect ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
<div slot='footer' class='dialog-footer'> <div slot='footer' class='dialog-footer'>
<el-button type='primary' @click='submitMaterialForm'>确 定</el-button> <el-button type='primary' @click='submitMaterialForm'>确 定</el-button>
<el-button @click='materialOpen = false'>取 消</el-button> <el-button @click='materialOpen = false'>取 消</el-button>
@ -393,6 +393,7 @@ import { getBaseSupplierInfoList } from '@/api/qms/baseSupplierInfo';
import { getQcInspectionItemCategoryList } from '@/api/qms/qcInspectionItemCategory'; import { getQcInspectionItemCategoryList } from '@/api/qms/qcInspectionItemCategory';
import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue"; import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue";
import { computed } from 'vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -423,6 +424,8 @@ const selectedMaterialId = ref(null);
const selectedProcessId = ref(null); const selectedProcessId = ref(null);
const selectedStaionId = ref(null); const selectedStaionId = ref(null);
const selectedSupplierId = ref(null); const selectedSupplierId = ref(null);
// 修改 selectedTypeId 的类型
const selectedTypeId = ref<string | number | null>(null);
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const qcInspectionTemplateFormRef = ref<ElFormInstance>(); const qcInspectionTemplateFormRef = ref<ElFormInstance>();
@ -669,6 +672,7 @@ const handleRowClick = (row: QcInspectionTemplateVO) => {
selectedTemplateId.value = row.templateId; selectedTemplateId.value = row.templateId;
selectedTemplateName.value = row.templateName || ''; selectedTemplateName.value = row.templateName || '';
selectedTemplateCode.value = row.templateCode || ''; selectedTemplateCode.value = row.templateCode || '';
selectedTypeId.value = row.typeId; // 新增
// 刷新子表数据 // 刷新子表数据
nextTick(() => { nextTick(() => {
getTemplateItemList(); getTemplateItemList();
@ -979,6 +983,12 @@ const submitMaterialForm = () => {
materialOpen.value = false; materialOpen.value = false;
}; };
// 添加 computed
const filteredQcInspectionItemList = computed(() => {
if (selectedTypeId.value === null) return [];
return qcInspectionItemList.value.filter(item => item.inspectionType === Number(selectedTypeId.value));
});
onMounted(() => { onMounted(() => {
getList(); getList();

6
src/views/qms/qcInspectionType/index.vue
Unescape Escape View File

@ -111,7 +111,7 @@
v-for="dict in qc_inspection_type" v-for="dict in qc_inspection_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -121,7 +121,7 @@
v-for="dict in create_method" v-for="dict in create_method"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -310,7 +310,7 @@ const handleExport = () => {
/** 导出模板按钮操作 */ /** 导出模板按钮操作 */
const handleExportTemplate = () => { const handleExportTemplate = () => {
proxy?.download('qms/qcInspectionType/exportTemplate', { proxy?.download('qms/qcInspectionType/exportTemplate', {
}, `qcInspectionType_template_${new Date().getTime()}.xlsx`) }, `qcInspectionType_template_${new Date().getTime()}.xlsx`)
} }

4
src/views/qms/qcTemplateItem/index.vue
Unescape Escape View File

@ -162,7 +162,7 @@
v-for="dict in qc_methond" v-for="dict in qc_methond"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -174,7 +174,7 @@
v-for="dict in control_type" v-for="dict in control_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

6
src/views/qms/qcUnqualifiedRecord/index.vue
Unescape Escape View File

@ -164,7 +164,7 @@
v-for="dict in qc_methond" v-for="dict in qc_methond"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -174,7 +174,7 @@
v-for="dict in detect_type" v-for="dict in detect_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -184,7 +184,7 @@
v-for="dict in qc_result" v-for="dict in qc_result"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

65
src/views/qms/qcUnqualifiedReview/index.vue
Unescape Escape View File

@ -134,7 +134,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="质检单号" align="center" prop="inspectionNo" v-if="columns[3].visible"/> <el-table-column label="质检单号" align="center" prop="inspectionNo" v-if="columns[3].visible"/>
<el-table-column label="检测类型" align="center" prop="inspectionType" v-if="columns[4].visible"/> <el-table-column label="检测类型" align="center" prop="typeName" v-if="columns[4].visible"/>
<el-table-column label="生产日期" align="center" prop="productionDate" width="180" v-if="columns[5].visible"> <el-table-column label="生产日期" align="center" prop="productionDate" width="180" v-if="columns[5].visible">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -251,7 +251,7 @@
v-for="dict in review_result" v-for="dict in review_result"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -382,14 +382,14 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检测方法" prop="inspectionMethod"> <el-form-item label="检测方法" prop="inspectionMethod">
<el-select v-model="qcUnqualifiedRecordForm.inspectionMethod" placeholder="请选择检测方法"> <el-select v-model="qcUnqualifiedRecordForm.inspectionMethod" placeholder="请选择检测方法">
<el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检测方式" prop="detectType"> <el-form-item label="检测方式" prop="detectType">
<el-select v-model="qcUnqualifiedRecordForm.detectType" placeholder="请选择检测方式"> <el-select v-model="qcUnqualifiedRecordForm.detectType" placeholder="请选择检测方式">
<el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -398,7 +398,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检测结果" prop="detectResult"> <el-form-item label="检测结果" prop="detectResult">
<el-select v-model="qcUnqualifiedRecordForm.detectResult" placeholder="请选择检测结果"> <el-select v-model="qcUnqualifiedRecordForm.detectResult" placeholder="请选择检测结果">
<el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -456,7 +456,14 @@
</template> </template>
<script setup name="QcUnqualifiedReview" lang="ts"> <script setup name="QcUnqualifiedReview" lang="ts">
import { listQcUnqualifiedReview, getQcUnqualifiedReview, delQcUnqualifiedReview, addQcUnqualifiedReview, updateQcUnqualifiedReview } from '@/api/qms/qcUnqualifiedReview'; import {
listQcUnqualifiedReview,
getQcUnqualifiedReview,
delQcUnqualifiedReview,
addQcUnqualifiedReview,
updateQcUnqualifiedReview,
handleUnqualified
} from '@/api/qms/qcUnqualifiedReview';
import { QcUnqualifiedReviewVO, QcUnqualifiedReviewQuery, QcUnqualifiedReviewForm } from '@/api/qms/qcUnqualifiedReview/types'; import { QcUnqualifiedReviewVO, QcUnqualifiedReviewQuery, QcUnqualifiedReviewForm } from '@/api/qms/qcUnqualifiedReview/types';
import { listQcUnqualifiedRecord, getQcUnqualifiedRecord, delQcUnqualifiedRecord, addQcUnqualifiedRecord, updateQcUnqualifiedRecord } from '@/api/qms/qcUnqualifiedRecord'; import { listQcUnqualifiedRecord, getQcUnqualifiedRecord, delQcUnqualifiedRecord, addQcUnqualifiedRecord, updateQcUnqualifiedRecord } from '@/api/qms/qcUnqualifiedRecord';
import { QcUnqualifiedRecordVO, QcUnqualifiedRecordQuery, QcUnqualifiedRecordForm } from '@/api/qms/qcUnqualifiedRecord/types'; import { QcUnqualifiedRecordVO, QcUnqualifiedRecordQuery, QcUnqualifiedRecordForm } from '@/api/qms/qcUnqualifiedRecord/types';
@ -469,6 +476,7 @@ const buttonLoading = ref(false);
const loading = ref(true); const loading = ref(true);
const showSearch = ref(true); const showSearch = ref(true);
const ids = ref<Array<string | number>>([]); const ids = ref<Array<string | number>>([]);
const inspectionNos = ref<Array<string | number>>([]);
const single = ref(true); const single = ref(true);
const multiple = ref(true); const multiple = ref(true);
const total = ref(0); const total = ref(0);
@ -483,17 +491,17 @@ const dialog = reactive<DialogOption>({
// 列显隐信息 // 列显隐信息
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
{ key: 0, label: `序号`, visible: true }, { key: 0, label: `序号`, visible: false },
{ key: 1, label: `不合格检测单号`, visible: true }, { key: 1, label: `不合格检测单号`, visible: true },
{ key: 2, label: `评审结果`, visible: true }, { key: 2, label: `评审结果`, visible: true },
{ key: 3, label: `质检单号`, visible: true }, { key: 3, label: `质检单号`, visible: true },
{ key: 4, label: `检测类型`, visible: true }, { key: 4, label: `检测类型`, visible: true },
{ key: 5, label: `生产日期`, visible: true }, { key: 5, label: `生产日期`, visible: false },
{ key: 6, label: `派工单号`, visible: true }, { key: 6, label: `派工单号`, visible: true },
{ key: 7, label: `工序名称`, visible: true }, { key: 7, label: `工序名称`, visible: true },
{ key: 8, label: `物料名称`, visible: true }, { key: 8, label: `物料名称`, visible: true },
{ key: 9, label: `物料编码`, visible: true }, { key: 9, label: `物料编码`, visible: true },
{ key: 10, label: `物料规格`, visible: true }, { key: 10, label: `物料规格`, visible: false },
{ 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 },
@ -618,6 +626,7 @@ const resetQuery = () => {
/** 多选框选中数据 */ /** 多选框选中数据 */
const handleSelectionChange = (selection: QcUnqualifiedReviewVO[]) => { const handleSelectionChange = (selection: QcUnqualifiedReviewVO[]) => {
ids.value = selection.map(item => item.reviewId); ids.value = selection.map(item => item.reviewId);
inspectionNos.value = selection.map(item => item.inspectionNo);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }
@ -674,7 +683,7 @@ const handleExport = () => {
/***** 子表 */ /***** 子表 */
const selectedReviewId = ref<string | number>(''); const selectedReviewId = ref<string | number>('');
const selectedUnqualifiedReviewNo = ref<string>(''); const selectedUnqualifiedReviewNo = ref();
const qcUnqualifiedRecordList = ref<QcUnqualifiedRecordVO[]>([]); const qcUnqualifiedRecordList = ref<QcUnqualifiedRecordVO[]>([]);
const qcUnqualifiedRecordLoading = ref(false); const qcUnqualifiedRecordLoading = ref(false);
const qcUnqualifiedRecordTotal = ref(0); const qcUnqualifiedRecordTotal = ref(0);
@ -808,33 +817,49 @@ onMounted(() => {
getList(); getList();
}); });
const getDispositionType = (reviewResult?: number) => {
switch(reviewResult) {
case 0: return '报废';
case 1: return '返工';
case 2: return '退货';
case 3: return '流转';
case 4: return '让步接收';
default: return '未知处置类型';
}
}
const handleReviewResult = async (reviewResult?: number) => {
const _reviewIds = ids.value;
const _inspectionNos = inspectionNos.value;
const dispositionType = getDispositionType(reviewResult);
await proxy?.$modal.confirm('是否确认' + dispositionType + '不合格品待评审编号为"' + _inspectionNos + '"的数据项？').finally(() => loading.value = false);
await handleUnqualified(reviewResult, _reviewIds);
proxy?.$modal.msgSuccess(dispositionType + '成功');
await getList();
}
/** 流转按钮操作 */ /** 流转按钮操作 */
const handleFlow = () => { const handleFlow = () => {
// TODO: 后续完善补充 handleReviewResult(3);
console.log('点击了流转按钮');
} }
/** 报废按钮操作 */ /** 报废按钮操作 */
const handleScrap = () => { const handleScrap = () => {
// TODO: 后续完善补充 handleReviewResult(0);
console.log('点击了报废按钮');
} }
/** 让步接收按钮操作 */ /** 让步接收按钮操作 */
const handleConcession = () => { const handleConcession = () => {
// TODO: 后续完善补充 handleReviewResult(4);
console.log('点击了让步接收按钮');
} }
/** 返工按钮操作 */ /** 返工按钮操作 */
const handleRework = () => { const handleRework = () => {
// TODO: 后续完善补充 handleReviewResult(1);
console.log('点击了返工按钮');
} }
/** 退货按钮操作 */ /** 退货按钮操作 */
const handleReturn = () => { const handleReturn = () => {
// TODO: 后续完善补充 handleReviewResult(2);
console.log('点击了退货按钮');
} }
</script> </script>

Write Preview
Loading…
Cancel
Save