diff --git a/src/api/qms/qcInspectionItemCategory/types.ts b/src/api/qms/qcInspectionItemCategory/types.ts
index 501fd68..345843d 100644
--- a/src/api/qms/qcInspectionItemCategory/types.ts
+++ b/src/api/qms/qcInspectionItemCategory/types.ts
@@ -34,20 +34,6 @@ export interface QcInspectionItemCategoryVO {
*/
description: string;
- /**
- * 检测类型名称
- */
- qcInspectionType?: string;
-
- /**
- * 检测类型(字典:首检 专检 自检 互检 原材料检 抽检 成品检)
- */
- typeName?: string | number;
-
- /**
- * 子对象
- */
- children: QcInspectionItemCategoryVO[];
}
export interface QcInspectionItemCategoryForm extends BaseEntity {
@@ -86,19 +72,9 @@ export interface QcInspectionItemCategoryForm extends BaseEntity {
*/
description?: string;
- /**
- * 检测类型名称
- */
- qcInspectionType?: string;
-
- /**
- * 检测类型(字典:首检 专检 自检 互检 原材料检 抽检 成品检)
- */
- typeName?: string | number;
-
}
-export interface QcInspectionItemCategoryQuery {
+export interface QcInspectionItemCategoryQuery extends PageQuery {
/**
* 检测项类别主键
@@ -136,20 +112,9 @@ export interface QcInspectionItemCategoryQuery {
description?: string;
/**
- * 检测类型名称
+ * 日期范围参数
*/
- qcInspectionType?: string;
-
- /**
- * 检测类型(字典:首检 专检 自检 互检 原材料检 抽检 成品检)
- */
- typeName?: string | number;
-
-
- /**
- * 日期范围参数
- */
- params?: any;
+ params?: any;
}
diff --git a/src/views/qms/qcInspectionItemCategory/index.vue b/src/views/qms/qcInspectionItemCategory/index.vue
index f8e29a8..8abd8a0 100644
--- a/src/views/qms/qcInspectionItemCategory/index.vue
+++ b/src/views/qms/qcInspectionItemCategory/index.vue
@@ -32,9 +32,9 @@
-
-
-
+
+
+
@@ -62,9 +62,9 @@
新增
-
- 展开/折叠
-
+
+
+
导入
@@ -75,10 +75,10 @@
ref="qcInspectionItemCategoryTableRef"
v-loading="loading"
:data="qcInspectionItemCategoryList"
- row-key="categoryId"
- :default-expand-all="isExpandAll"
- :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
+
@@ -91,9 +91,9 @@
-
-
-
+
+
+
@@ -108,16 +108,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -204,6 +204,8 @@ const initFormData: QcInspectionItemCategoryForm = {
const data = reactive>({
form: {...initFormData},
queryParams: {
+ pageNum: 1,
+ pageSize: 10,
categoryId: undefined,
parentId: undefined,
ancestors: undefined,
@@ -218,8 +220,8 @@ const data = reactive {
loading.value = true;
const res = await listQcInspectionItemCategory(queryParams.value);
- const data = proxy?.handleTree(res.data, "categoryId", "parentId");
- if (data) {
- qcInspectionItemCategoryList.value = data;
- loading.value = false;
- }
+ // const data = proxy?.handleTree(res.data, "categoryId", "parentId");
+ // if (data) {
+ // qcInspectionItemCategoryList.value = data;
+ // loading.value = false;
+ // }
+ qcInspectionItemCategoryList.value = res.rows;
+ loading.value = false;
}
/** 查询检测项类别下拉树结构 */
@@ -278,7 +282,7 @@ const resetQuery = () => {
/** 新增按钮操作 */
const handleAdd = (row?: QcInspectionItemCategoryVO) => {
reset();
- getTreeselect();
+ // getTreeselect();
if (row != null && row.categoryId) {
form.value.parentId = row.categoryId;
} else {
@@ -305,7 +309,7 @@ const toggleExpandAll = (data: QcInspectionItemCategoryVO[], status: boolean) =>
/** 修改按钮操作 */
const handleUpdate = async (row: QcInspectionItemCategoryVO) => {
reset();
- await getTreeselect();
+ // await getTreeselect();
if (row != null) {
form.value.parentId = row.parentId;
}