diff --git a/src/api/qms/QcInspectionMain/types.ts b/src/api/qms/QcInspectionMain/types.ts
index 58d815a..a6d1424 100644
--- a/src/api/qms/QcInspectionMain/types.ts
+++ b/src/api/qms/QcInspectionMain/types.ts
@@ -335,7 +335,7 @@ export interface QcInspectionMainQuery extends PageQuery {
/**
* 检验类别(首检/过程检等等)
*/
- inspectionType?: number;
+ inspectionType?: number | string;
/**
* 单据状态(0未处理/1完成)
diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue
index 7449f28..8e3bad0 100644
--- a/src/views/qms/QcInspectionMain/index.vue
+++ b/src/views/qms/QcInspectionMain/index.vue
@@ -21,8 +21,8 @@
-
-
+
+
@@ -593,6 +593,7 @@ import { getProcessInfoList } from '@/api/qms/baseProcessInfo';
import { getStationInfoList } from '@/api/qms/baseStationInfo';
import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue";
+import { useRouter } from 'vue-router';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { qc_inspection_type, qc_result, qc_status, material_type, detect_type, control_type } = toRefs(proxy?.useDict('qc_inspection_type', 'qc_result', 'qc_status', 'material_type', 'detect_type', 'control_type'));
@@ -637,6 +638,23 @@ const inspectionResultDialog = reactive({
title: ''
});
+//0首检 1专检 2自检 3互检 4原材料检 5抽检 6成品检 7入库检
+//路由:inspectionType = 1产品检 2原材料检 3入库检
+const inspectionType = ref();
+const inspectionTypeVisible = ref(false);
+const getInspectionType = async () => {
+ const router = useRouter();
+ inspectionType.value = router.currentRoute._rawValue.query && router.currentRoute._rawValue.query.inspectionType;
+ if (inspectionType.value == 2){
+ queryParams.value.inspectionType = '4';
+ } else if (inspectionType.value == 3){
+ queryParams.value.inspectionType = '7';
+ } else {
+ queryParams.value.inspectionType = '6';
+ inspectionTypeVisible.value = true;
+ }
+};
+
// 列显隐信息
const columns = ref([
{ key: 0, label: `序号`, visible: true },
@@ -1113,8 +1131,9 @@ const submitMaterialForm = () => {
};
onMounted(() => {
- getList();
+ getInspectionType();
getInspectionTemplateList();
getInspectionItemList();
+ getList();
});