Merge remote-tracking branch 'origin/master'

src/api/mes/technologyInfo/types.ts

@@ -45,7 +45,8 @@ export interface TechnologyInfoVO {
   remark: string;
 
   prodTechnologyStepInfoList?: [];
-
+  technologyName?: string;
+  materialName?: string;
 }
 
 export interface TechnologyInfoForm extends BaseEntity {
@@ -78,6 +79,8 @@ export interface TechnologyInfoForm extends BaseEntity {
    * 工艺版本
    */
   technologyVersion?: string;
+  technologyName?: string;
+  materialName?: string;
 
   /**
    * 硫化标准时间（秒）
@@ -147,6 +150,8 @@ export interface TechnologyInfoQuery extends PageQuery {
   params?: any;
 
   prodTechnologyStepInfoList?: [];
+  technologyName?: string;
+  materialName?: string;
 }
 
 

src/api/qms/QcInspectionMain/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QcInspectionMainVO, QcInspectionMainForm, QcInspectionMainQuery } from '@/api/qms/QcInspectionMain/types';
+
+/**
+ * 查询质检主表列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQcInspectionMain = (query?: QcInspectionMainQuery): AxiosPromise<QcInspectionMainVO[]> => {
+  return request({
+    url: '/qms/QcInspectionMain/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询质检主表详细
+ * @param inspectionId
+ */
+export const getQcInspectionMain = (inspectionId: string | number): AxiosPromise<QcInspectionMainVO> => {
+  return request({
+    url: '/qms/QcInspectionMain/' + inspectionId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增质检主表
+ * @param data
+ */
+export const addQcInspectionMain = (data: QcInspectionMainForm) => {
+  return request({
+    url: '/qms/QcInspectionMain',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改质检主表
+ * @param data
+ */
+export const updateQcInspectionMain = (data: QcInspectionMainForm) => {
+  return request({
+    url: '/qms/QcInspectionMain',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除质检主表
+ * @param inspectionId
+ */
+export const delQcInspectionMain = (inspectionId: string | number | Array<string | number>) => {
+  return request({
+    url: '/qms/QcInspectionMain/' + inspectionId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询质检主表列表
+ * @param query
+ * @returns {*}
+ */
+export function getQcInspectionMainList (query) {
+    return request({
+        url: '/qms/QcInspectionMain/getQcInspectionMainList',
+        method: 'get',
+        params: query
+    });
+};

src/api/qms/QcInspectionMain/types.ts

@@ -0,0 +1,413 @@
+export interface QcInspectionMainVO {
+  /**
+   * 质检主键
+   */
+  inspectionId: string | number;
+
+  /**
+   * 检测单号/卡号
+   */
+  inspectionNo: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 物料类型
+   */
+  materialType: string;
+
+  /**
+   * 物料名称
+   */
+  materialName: string;
+
+  /**
+   * 工序名称
+   */
+  processName: string;
+
+  /**
+   * 工位名称
+   */
+  stationName: string;
+
+  /**
+   * 质检数量
+   */
+  inspectionQty: number;
+
+  /**
+   * 合格数
+   */
+  qualifiedQty: number;
+
+  /**
+   * 不合格数
+   */
+  unqualifiedQty: number;
+
+  /**
+   * 质检结果（0合格/1不合格）
+   */
+  result: number;
+
+  /**
+   * 车间
+   */
+  workshop: string;
+
+  /**
+   * 检测类型主键
+   */
+  typeId: string | number;
+
+  /**
+   * 单据状态（0未处理/1完成）
+   */
+  status: number;
+
+  /**
+   * 检测人员
+   */
+  inspector: string;
+
+  /**
+   * 班次
+   */
+  shift: string;
+
+  /**
+   * 班组
+   */
+  team: string;
+
+  /**
+   * 检验时间
+   */
+  inspectionTime: string;
+
+  /**
+   * 生产订单号
+   */
+  productionOrder: string;
+
+  /**
+   * 批次号
+   */
+  batchNo: string;
+
+  /**
+   * 条码号
+   */
+  barcode: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+
+    /**
+   * 关联检测类型表
+   */
+    qcInspectionType: string;
+
+    /**
+     * 关联检测类型表名称
+     */
+    typeName: string;
+  
+    /**
+     * 关联检测类型表编码
+     */
+    typeCode: string;
+  
+
+}
+
+export interface QcInspectionMainForm extends BaseEntity {
+  /**
+   * 质检主键
+   */
+  inspectionId?: string | number;
+
+  /**
+   * 检测单号/卡号
+   */
+  inspectionNo?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 物料类型
+   */
+  materialType?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 工序名称
+   */
+  processName?: string;
+
+  /**
+   * 工位名称
+   */
+  stationName?: string;
+
+  /**
+   * 质检数量
+   */
+  inspectionQty?: number;
+
+  /**
+   * 合格数
+   */
+  qualifiedQty?: number;
+
+  /**
+   * 不合格数
+   */
+  unqualifiedQty?: number;
+
+  /**
+   * 质检结果（0合格/1不合格）
+   */
+  result?: number;
+
+  /**
+   * 车间
+   */
+  workshop?: string;
+
+  /**
+   * 检测类型主键
+   */
+  typeId?: string | number;
+
+  /**
+   * 单据状态（0未处理/1完成）
+   */
+  status?: number;
+
+  /**
+   * 检测人员
+   */
+  inspector?: string;
+
+  /**
+   * 班次
+   */
+  shift?: string;
+
+  /**
+   * 班组
+   */
+  team?: string;
+
+  /**
+   * 检验时间
+   */
+  inspectionTime?: string;
+
+  /**
+   * 生产订单号
+   */
+  productionOrder?: string;
+
+  /**
+   * 批次号
+   */
+  batchNo?: string;
+
+  /**
+   * 条码号
+   */
+  barcode?: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+
+
+
+  /**
+   * 关联检测类型表
+   */
+  qcInspectionType?: string;
+
+  /**
+   * 关联检测类型表名称
+   */
+  typeName?: string;
+
+  /**
+   * 关联检测类型表编码
+   */
+  typeCode?: string;
+
+
+
+}
+
+export interface QcInspectionMainQuery extends PageQuery {
+
+  /**
+   * 质检主键
+   */
+  inspectionId?: string | number;
+
+  /**
+   * 检测单号/卡号
+   */
+  inspectionNo?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 物料类型
+   */
+  materialType?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 工序名称
+   */
+  processName?: string;
+
+  /**
+   * 工位名称
+   */
+  stationName?: string;
+
+  /**
+   * 质检数量
+   */
+  inspectionQty?: number;
+
+  /**
+   * 合格数
+   */
+  qualifiedQty?: number;
+
+  /**
+   * 不合格数
+   */
+  unqualifiedQty?: number;
+
+  /**
+   * 质检结果（0合格/1不合格）
+   */
+  result?: number;
+
+  /**
+   * 车间
+   */
+  workshop?: string;
+
+  /**
+   * 检测类型主键
+   */
+  typeId?: string | number;
+
+  /**
+   * 单据状态（0未处理/1完成）
+   */
+  status?: number;
+
+  /**
+   * 检测人员
+   */
+  inspector?: string;
+
+  /**
+   * 班次
+   */
+  shift?: string;
+
+  /**
+   * 班组
+   */
+  team?: string;
+
+  /**
+   * 检验时间
+   */
+  inspectionTime?: string;
+
+  /**
+   * 生产订单号
+   */
+  productionOrder?: string;
+
+  /**
+   * 批次号
+   */
+  batchNo?: string;
+
+  /**
+   * 条码号
+   */
+  barcode?: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+
+
+
+  /**
+   * 关联检测类型表
+   */
+  qcInspectionType?: string;
+
+  /**
+   * 关联检测类型表名称
+   */
+  typeName?: string;
+
+  /**
+   * 关联检测类型表编码
+   */
+  typeCode?: string;
+  
+
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/qms/qcInspectionItem/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QcInspectionItemVO, QcInspectionItemForm, QcInspectionItemQuery } from '@/api/qms/qcInspectionItem/types';
+
+/**
+ * 查询检测项定义列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQcInspectionItem = (query?: QcInspectionItemQuery): AxiosPromise<QcInspectionItemVO[]> => {
+  return request({
+    url: '/qms/qcInspectionItem/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询检测项定义详细
+ * @param itemId
+ */
+export const getQcInspectionItem = (itemId: string | number): AxiosPromise<QcInspectionItemVO> => {
+  return request({
+    url: '/qms/qcInspectionItem/' + itemId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增检测项定义
+ * @param data
+ */
+export const addQcInspectionItem = (data: QcInspectionItemForm) => {
+  return request({
+    url: '/qms/qcInspectionItem',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改检测项定义
+ * @param data
+ */
+export const updateQcInspectionItem = (data: QcInspectionItemForm) => {
+  return request({
+    url: '/qms/qcInspectionItem',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除检测项定义
+ * @param itemId
+ */
+export const delQcInspectionItem = (itemId: string | number | Array<string | number>) => {
+  return request({
+    url: '/qms/qcInspectionItem/' + itemId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询检测项定义列表
+ * @param query
+ * @returns {*}
+ */
+export function getQcInspectionItemList (query) {
+    return request({
+        url: '/qms/qcInspectionItem/getQcInspectionItemList',
+        method: 'get',
+        params: query
+    });
+};

src/api/qms/qcInspectionItem/types.ts

@@ -0,0 +1,301 @@
+export interface QcInspectionItemVO {
+  /**
+   * 检测项主键
+   */
+  itemId: string | number;
+
+  /**
+   * 检测项编码
+   */
+  itemCode: string;
+
+  /**
+   * 检测项名称
+   */
+  itemName: string;
+
+  /**
+   * 检测位置
+   */
+  inspectionPosition: string;
+
+  /**
+   * 检测项类别（关联检测项类别表）
+   */
+  categoryId: string | number;
+
+  /**
+   * 检测单类型
+   */
+  inspectionType: number;
+
+  /**
+   * 检测方法（0目视,1千分尺）
+   */
+  method: number;
+
+  /**
+   * 检测方式（0定性,1定量）
+   */
+  detectType: number;
+
+  /**
+   * 控制类型（0手动输入，1自动输入）
+   */
+  controlType: number;
+
+  /**
+   * 标准值
+   */
+  standardValue: number;
+
+  /**
+   * 控制上限
+   */
+  upperLimit: number;
+
+  /**
+   * 控制下限
+   */
+  lowerLimit: number;
+
+  /**
+   * 规格名称
+   */
+  specName: string;
+
+  /**
+   * 规格上限
+   */
+  specUpper: number;
+
+  /**
+   * 规格下限
+   */
+  specLower: number;
+
+  /**
+   * 检测项说明
+   */
+  description: string;
+
+  /**
+   * 检测选项编码
+   */
+  optionCode: string;
+
+  /**
+   * 检测选项名称
+   */
+  optionName: string;
+
+  /**
+   * 是否默认选项（是/否）
+   */
+  isDefault: string;
+
+}
+
+export interface QcInspectionItemForm extends BaseEntity {
+  /**
+   * 检测项主键
+   */
+  itemId?: string | number;
+
+  /**
+   * 检测项编码
+   */
+  itemCode?: string;
+
+  /**
+   * 检测项名称
+   */
+  itemName?: string;
+
+  /**
+   * 检测位置
+   */
+  inspectionPosition?: string;
+
+  /**
+   * 检测项类别（关联检测项类别表）
+   */
+  categoryId?: string | number;
+
+  /**
+   * 检测单类型
+   */
+  inspectionType?: number;
+
+  /**
+   * 检测方法（0目视,1千分尺）
+   */
+  method?: number;
+
+  /**
+   * 检测方式（0定性,1定量）
+   */
+  detectType?: number;
+
+  /**
+   * 控制类型（0手动输入，1自动输入）
+   */
+  controlType?: number;
+
+  /**
+   * 标准值
+   */
+  standardValue?: number;
+
+  /**
+   * 控制上限
+   */
+  upperLimit?: number;
+
+  /**
+   * 控制下限
+   */
+  lowerLimit?: number;
+
+  /**
+   * 规格名称
+   */
+  specName?: string;
+
+  /**
+   * 规格上限
+   */
+  specUpper?: number;
+
+  /**
+   * 规格下限
+   */
+  specLower?: number;
+
+  /**
+   * 检测项说明
+   */
+  description?: string;
+
+  /**
+   * 检测选项编码
+   */
+  optionCode?: string;
+
+  /**
+   * 检测选项名称
+   */
+  optionName?: string;
+
+  /**
+   * 是否默认选项（是/否）
+   */
+  isDefault?: string;
+
+}
+
+export interface QcInspectionItemQuery extends PageQuery {
+
+  /**
+   * 检测项主键
+   */
+  itemId?: string | number;
+
+  /**
+   * 检测项编码
+   */
+  itemCode?: string;
+
+  /**
+   * 检测项名称
+   */
+  itemName?: string;
+
+  /**
+   * 检测位置
+   */
+  inspectionPosition?: string;
+
+  /**
+   * 检测项类别（关联检测项类别表）
+   */
+  categoryId?: string | number;
+
+  /**
+   * 检测单类型
+   */
+  inspectionType?: number;
+
+  /**
+   * 检测方法（0目视,1千分尺）
+   */
+  method?: number;
+
+  /**
+   * 检测方式（0定性,1定量）
+   */
+  detectType?: number;
+
+  /**
+   * 控制类型（0手动输入，1自动输入）
+   */
+  controlType?: number;
+
+  /**
+   * 标准值
+   */
+  standardValue?: number;
+
+  /**
+   * 控制上限
+   */
+  upperLimit?: number;
+
+  /**
+   * 控制下限
+   */
+  lowerLimit?: number;
+
+  /**
+   * 规格名称
+   */
+  specName?: string;
+
+  /**
+   * 规格上限
+   */
+  specUpper?: number;
+
+  /**
+   * 规格下限
+   */
+  specLower?: number;
+
+  /**
+   * 检测项说明
+   */
+  description?: string;
+
+  /**
+   * 检测选项编码
+   */
+  optionCode?: string;
+
+  /**
+   * 检测选项名称
+   */
+  optionName?: string;
+
+  /**
+   * 是否默认选项（是/否）
+   */
+  isDefault?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/qms/qcInspectionItemCategory/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QcInspectionItemCategoryVO, QcInspectionItemCategoryForm, QcInspectionItemCategoryQuery } from '@/api/qms/qcInspectionItemCategory/types';
+
+/**
+ * 查询检测项类别列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQcInspectionItemCategory = (query?: QcInspectionItemCategoryQuery): AxiosPromise<QcInspectionItemCategoryVO[]> => {
+  return request({
+    url: '/qms/qcInspectionItemCategory/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询检测项类别详细
+ * @param categoryId
+ */
+export const getQcInspectionItemCategory = (categoryId: string | number): AxiosPromise<QcInspectionItemCategoryVO> => {
+  return request({
+    url: '/qms/qcInspectionItemCategory/' + categoryId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增检测项类别
+ * @param data
+ */
+export const addQcInspectionItemCategory = (data: QcInspectionItemCategoryForm) => {
+  return request({
+    url: '/qms/qcInspectionItemCategory',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改检测项类别
+ * @param data
+ */
+export const updateQcInspectionItemCategory = (data: QcInspectionItemCategoryForm) => {
+  return request({
+    url: '/qms/qcInspectionItemCategory',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除检测项类别
+ * @param categoryId
+ */
+export const delQcInspectionItemCategory = (categoryId: string | number | Array<string | number>) => {
+  return request({
+    url: '/qms/qcInspectionItemCategory/' + categoryId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询检测项类别列表
+ * @param query
+ * @returns {*}
+ */
+export function getQcInspectionItemCategoryList (query) {
+    return request({
+        url: '/qms/qcInspectionItemCategory/getQcInspectionItemCategoryList',
+        method: 'get',
+        params: query
+    });
+};

src/api/qms/qcInspectionItemCategory/types.ts

@@ -0,0 +1,156 @@
+export interface QcInspectionItemCategoryVO {
+  /**
+   * 检测项类别主键
+   */
+  categoryId: string | number;
+
+  /**
+   * 父级ID
+   */
+  parentId: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 检测项类别编码
+   */
+  categoryCode: string;
+
+  /**
+   * 检测项类别名称
+   */
+  categoryName: string;
+
+  /**
+   * 检测单类型（关联检测类型表）
+   */
+  typeId: string | number;
+
+  /**
+   * 描述
+   */
+  description: string;
+
+  /**
+   * 检测类型名称
+   */
+  qcInspectionType?: string;
+
+  /**
+   * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
+   */
+  typeName?: string | number;
+
+    /**
+     * 子对象
+     */
+    children: QcInspectionItemCategoryVO[];
+}
+
+export interface QcInspectionItemCategoryForm extends BaseEntity {
+  /**
+   * 检测项类别主键
+   */
+  categoryId?: string | number;
+
+  /**
+   * 父级ID
+   */
+  parentId?: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 检测项类别编码
+   */
+  categoryCode?: string;
+
+  /**
+   * 检测项类别名称
+   */
+  categoryName?: string;
+
+  /**
+   * 检测单类型（关联检测类型表）
+   */
+  typeId?: string | number;
+
+  /**
+   * 描述
+   */
+  description?: string;
+
+  /**
+   * 检测类型名称
+   */
+  qcInspectionType?: string;
+
+  /**
+   * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
+   */
+  typeName?: string | number;
+
+}
+
+export interface QcInspectionItemCategoryQuery {
+
+  /**
+   * 检测项类别主键
+   */
+  categoryId?: string | number;
+
+  /**
+   * 父级ID
+   */
+  parentId?: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 检测项类别编码
+   */
+  categoryCode?: string;
+
+  /**
+   * 检测项类别名称
+   */
+  categoryName?: string;
+
+  /**
+   * 检测单类型（关联检测类型表）
+   */
+  typeId?: string | number;
+
+  /**
+   * 描述
+   */
+  description?: string;
+
+  /**
+   * 检测类型名称
+   */
+  qcInspectionType?: string;
+
+  /**
+   * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
+   */
+  typeName?: string | number;
+
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/qms/qcInspectionResult/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QcInspectionResultVO, QcInspectionResultForm, QcInspectionResultQuery } from '@/api/qms/qcInspectionResult/types';
+
+/**
+ * 查询质检结果子表列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQcInspectionResult = (query?: QcInspectionResultQuery): AxiosPromise<QcInspectionResultVO[]> => {
+  return request({
+    url: '/qms/qcInspectionResult/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询质检结果子表详细
+ * @param resultId
+ */
+export const getQcInspectionResult = (resultId: string | number): AxiosPromise<QcInspectionResultVO> => {
+  return request({
+    url: '/qms/qcInspectionResult/' + resultId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增质检结果子表
+ * @param data
+ */
+export const addQcInspectionResult = (data: QcInspectionResultForm) => {
+  return request({
+    url: '/qms/qcInspectionResult',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改质检结果子表
+ * @param data
+ */
+export const updateQcInspectionResult = (data: QcInspectionResultForm) => {
+  return request({
+    url: '/qms/qcInspectionResult',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除质检结果子表
+ * @param resultId
+ */
+export const delQcInspectionResult = (resultId: string | number | Array<string | number>) => {
+  return request({
+    url: '/qms/qcInspectionResult/' + resultId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询质检结果子表列表
+ * @param query
+ * @returns {*}
+ */
+export function getQcInspectionResultList (query) {
+    return request({
+        url: '/qms/qcInspectionResult/getQcInspectionResultList',
+        method: 'get',
+        params: query
+    });
+};

src/api/qms/qcInspectionResult/types.ts

@@ -0,0 +1,121 @@
+export interface QcInspectionResultVO {
+  /**
+   * 结果主键
+   */
+  resultId: string | number;
+
+  /**
+   * 关联质检主表ID
+   */
+  inspectionId: string | number;
+
+  /**
+   * 关联检测项ID
+   */
+  itemId: string | number;
+
+  /**
+   * 检测结果（0合格，1不合格）
+   */
+  detectResult: number;
+
+  /**
+   * 定量检测值
+   */
+  detectValue: number;
+
+  /**
+   * 规格质检值
+   */
+  specInspection: string;
+
+  /**
+   * 定性不合格明细
+   */
+  problemDetail: string;
+
+}
+
+export interface QcInspectionResultForm extends BaseEntity {
+  /**
+   * 结果主键
+   */
+  resultId?: string | number;
+
+  /**
+   * 关联质检主表ID
+   */
+  inspectionId?: string | number;
+
+  /**
+   * 关联检测项ID
+   */
+  itemId?: string | number;
+
+  /**
+   * 检测结果（0合格，1不合格）
+   */
+  detectResult?: number;
+
+  /**
+   * 定量检测值
+   */
+  detectValue?: number;
+
+  /**
+   * 规格质检值
+   */
+  specInspection?: string;
+
+  /**
+   * 定性不合格明细
+   */
+  problemDetail?: string;
+
+}
+
+export interface QcInspectionResultQuery extends PageQuery {
+
+  /**
+   * 结果主键
+   */
+  resultId?: string | number;
+
+  /**
+   * 关联质检主表ID
+   */
+  inspectionId?: string | number;
+
+  /**
+   * 关联检测项ID
+   */
+  itemId?: string | number;
+
+  /**
+   * 检测结果（0合格，1不合格）
+   */
+  detectResult?: number;
+
+  /**
+   * 定量检测值
+   */
+  detectValue?: number;
+
+  /**
+   * 规格质检值
+   */
+  specInspection?: string;
+
+  /**
+   * 定性不合格明细
+   */
+  problemDetail?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/qms/qcInspectionTemplate/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QcInspectionTemplateVO, QcInspectionTemplateForm, QcInspectionTemplateQuery } from '@/api/qms/qcInspectionTemplate/types';
+
+/**
+ * 查询检测模板主列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQcInspectionTemplate = (query?: QcInspectionTemplateQuery): AxiosPromise<QcInspectionTemplateVO[]> => {
+  return request({
+    url: '/qms/qcInspectionTemplate/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询检测模板主详细
+ * @param templateId
+ */
+export const getQcInspectionTemplate = (templateId: string | number): AxiosPromise<QcInspectionTemplateVO> => {
+  return request({
+    url: '/qms/qcInspectionTemplate/' + templateId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增检测模板主
+ * @param data
+ */
+export const addQcInspectionTemplate = (data: QcInspectionTemplateForm) => {
+  return request({
+    url: '/qms/qcInspectionTemplate',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改检测模板主
+ * @param data
+ */
+export const updateQcInspectionTemplate = (data: QcInspectionTemplateForm) => {
+  return request({
+    url: '/qms/qcInspectionTemplate',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除检测模板主
+ * @param templateId
+ */
+export const delQcInspectionTemplate = (templateId: string | number | Array<string | number>) => {
+  return request({
+    url: '/qms/qcInspectionTemplate/' + templateId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询检测模板主列表
+ * @param query
+ * @returns {*}
+ */
+export function getQcInspectionTemplateList (query) {
+    return request({
+        url: '/qms/qcInspectionTemplate/getQcInspectionTemplateList',
+        method: 'get',
+        params: query
+    });
+};

src/api/qms/qcInspectionTemplate/types.ts

@@ -0,0 +1,264 @@
+export interface QcInspectionTemplateVO {
+  /**
+   * 模板主键
+   */
+  templateId: string | number;
+
+  /**
+   * 模板编码
+   */
+  templateCode: string;
+
+  /**
+   * 模板名称
+   */
+  templateName: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 物料名称
+   */
+  materialName: string;
+
+  /**
+   * 关联检测类型表ID
+   */
+  typeId: string | number;
+
+  /**
+   * 工位编码
+   */
+  stationCode: string;
+
+  /**
+   * 工位名称
+   */
+  stationName: string;
+
+  /**
+   * 工序编码
+   */
+  processCode: string;
+
+  /**
+   * 工序名称
+   */
+  processName: string;
+
+  /**
+   * 供应商编码
+   */
+  supplierCode: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName: string;
+
+  /**
+   * 模板说明
+   */
+  description: string;
+
+
+  
+  /**
+   * 关联检测类型表
+   */
+  qcInspectionType: string;
+
+  /**
+   * 关联检测类型表名称
+   */
+  typeName: string;
+
+  /**
+   * 关联检测类型表编码
+   */
+  typeCode: string;
+
+
+}
+
+export interface QcInspectionTemplateForm extends BaseEntity {
+  /**
+   * 模板主键
+   */
+  templateId?: string | number;
+
+  /**
+   * 模板编码
+   */
+  templateCode?: string;
+
+  /**
+   * 模板名称
+   */
+  templateName?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 关联检测类型表ID
+   */
+  typeId?: string | number;
+
+  /**
+   * 工位编码
+   */
+  stationCode?: string;
+
+  /**
+   * 工位名称
+   */
+  stationName?: string;
+
+  /**
+   * 工序编码
+   */
+  processCode?: string;
+
+  /**
+   * 工序名称
+   */
+  processName?: string;
+
+  /**
+   * 供应商编码
+   */
+  supplierCode?: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * 模板说明
+   */
+  description?: string;
+
+
+  
+  /**
+   * 关联检测类型表
+   */
+  qcInspectionType?: string;
+
+  /**
+   * 关联检测类型表名称
+   */
+  typeName?: string;
+
+  /**
+   * 关联检测类型表编码
+   */
+  typeCode?: string;
+
+}
+
+export interface QcInspectionTemplateQuery extends PageQuery {
+
+  /**
+   * 模板主键
+   */
+  templateId?: string | number;
+
+  /**
+   * 模板编码
+   */
+  templateCode?: string;
+
+  /**
+   * 模板名称
+   */
+  templateName?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 关联检测类型表ID
+   */
+  typeId?: string | number;
+
+  /**
+   * 工位编码
+   */
+  stationCode?: string;
+
+  /**
+   * 工位名称
+   */
+  stationName?: string;
+
+  /**
+   * 工序编码
+   */
+  processCode?: string;
+
+  /**
+   * 工序名称
+   */
+  processName?: string;
+
+  /**
+   * 供应商编码
+   */
+  supplierCode?: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * 模板说明
+   */
+  description?: string;
+
+
+    /**
+   * 关联检测类型表
+   */
+    qcInspectionType?: string;
+
+    /**
+     * 关联检测类型表名称
+     */
+    typeName?: string;
+  
+    /**
+     * 关联检测类型表编码
+     */
+    typeCode?: string;
+
+
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/qms/qcInspectionType/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QcInspectionTypeVO, QcInspectionTypeForm, QcInspectionTypeQuery } from '@/api/qms/qcInspectionType/types';
+
+/**
+ * 查询检测类型列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQcInspectionType = (query?: QcInspectionTypeQuery): AxiosPromise<QcInspectionTypeVO[]> => {
+  return request({
+    url: '/qms/qcInspectionType/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询检测类型详细
+ * @param typeId
+ */
+export const getQcInspectionType = (typeId: string | number): AxiosPromise<QcInspectionTypeVO> => {
+  return request({
+    url: '/qms/qcInspectionType/' + typeId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增检测类型
+ * @param data
+ */
+export const addQcInspectionType = (data: QcInspectionTypeForm) => {
+  return request({
+    url: '/qms/qcInspectionType',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改检测类型
+ * @param data
+ */
+export const updateQcInspectionType = (data: QcInspectionTypeForm) => {
+  return request({
+    url: '/qms/qcInspectionType',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除检测类型
+ * @param typeId
+ */
+export const delQcInspectionType = (typeId: string | number | Array<string | number>) => {
+  return request({
+    url: '/qms/qcInspectionType/' + typeId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询检测类型列表
+ * @param query
+ * @returns {*}
+ */
+export function getQcInspectionTypeList (query) {
+    return request({
+        url: '/qms/qcInspectionType/getQcInspectionTypeList',
+        method: 'get',
+        params: query
+    });
+};

src/api/qms/qcInspectionType/types.ts

@@ -0,0 +1,91 @@
+export interface QcInspectionTypeVO {
+  /**
+   * 检测类型主键
+   */
+  typeId: string | number;
+
+  /**
+   * 检测类型编码
+   */
+  typeCode: string;
+
+  /**
+   * 检测类型名称
+   */
+  typeName: string;
+
+  /**
+   * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
+   */
+  qcInspectionType: number;
+
+  /**
+   * 创建方式（1人工创建 2自动创建）
+   */
+  createMethod: number;
+
+}
+
+export interface QcInspectionTypeForm extends BaseEntity {
+  /**
+   * 检测类型主键
+   */
+  typeId?: string | number;
+
+  /**
+   * 检测类型编码
+   */
+  typeCode?: string;
+
+  /**
+   * 检测类型名称
+   */
+  typeName?: string;
+
+  /**
+   * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
+   */
+  qcInspectionType?: number;
+
+  /**
+   * 创建方式（1人工创建 2自动创建）
+   */
+  createMethod?: number;
+
+}
+
+export interface QcInspectionTypeQuery extends PageQuery {
+
+  /**
+   * 检测类型主键
+   */
+  typeId?: string | number;
+
+  /**
+   * 检测类型编码
+   */
+  typeCode?: string;
+
+  /**
+   * 检测类型名称
+   */
+  typeName?: string;
+
+  /**
+   * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
+   */
+  qcInspectionType?: number;
+
+  /**
+   * 创建方式（1人工创建 2自动创建）
+   */
+  createMethod?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/qms/qcTemplateItem/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { QcTemplateItemVO, QcTemplateItemForm, QcTemplateItemQuery } from '@/api/qms/qcTemplateItem/types';
+
+/**
+ * 查询检测模板子表列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listQcTemplateItem = (query?: QcTemplateItemQuery): AxiosPromise<QcTemplateItemVO[]> => {
+  return request({
+    url: '/qms/qcTemplateItem/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询检测模板子表详细
+ * @param templateItemId
+ */
+export const getQcTemplateItem = (templateItemId: string | number): AxiosPromise<QcTemplateItemVO> => {
+  return request({
+    url: '/qms/qcTemplateItem/' + templateItemId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增检测模板子表
+ * @param data
+ */
+export const addQcTemplateItem = (data: QcTemplateItemForm) => {
+  return request({
+    url: '/qms/qcTemplateItem',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改检测模板子表
+ * @param data
+ */
+export const updateQcTemplateItem = (data: QcTemplateItemForm) => {
+  return request({
+    url: '/qms/qcTemplateItem',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除检测模板子表
+ * @param templateItemId
+ */
+export const delQcTemplateItem = (templateItemId: string | number | Array<string | number>) => {
+  return request({
+    url: '/qms/qcTemplateItem/' + templateItemId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询检测模板子表列表
+ * @param query
+ * @returns {*}
+ */
+export function getQcTemplateItemList (query) {
+    return request({
+        url: '/qms/qcTemplateItem/getQcTemplateItemList',
+        method: 'get',
+        params: query
+    });
+};

src/api/qms/qcTemplateItem/types.ts

@@ -0,0 +1,271 @@
+export interface QcTemplateItemVO {
+  /**
+   * 模板子表主键
+   */
+  templateItemId: string | number;
+
+  /**
+   * 关联模板主表ID
+   */
+  templateId: string | number;
+
+  /**
+   * 关联检测项定义ID
+   */
+  itemId: string | number;
+
+  /**
+   * 检测项编码
+   */
+  itemCode: string;
+
+  /**
+   * 检测项名称
+   */
+  itemName: string;
+
+  /**
+   * 检测位置
+   */
+  inspectionPosition: string;
+
+  /**
+   * 检测项目类别
+   */
+  categoryName: string;
+
+  /**
+   * 检测类型（根据主表关联的类型表主键查来的字典值自动存入）
+   */
+  inspectionType: number;
+
+  /**
+   * 检测方式（0定性,1定量）
+   */
+  detectType: number;
+
+  /**
+   * 控制类型
+   */
+  controlType: number;
+
+  /**
+   * 标准值
+   */
+  standardValue: number;
+
+  /**
+   * 控制上限
+   */
+  upperLimit: number;
+
+  /**
+   * 控制下限
+   */
+  lowerLimit: number;
+
+  /**
+   * 规格名称
+   */
+  specName: string;
+
+  /**
+   * 规格上限
+   */
+  specUpper: number;
+
+  /**
+   * 规格下限
+   */
+  specLower: number;
+
+  /**
+   * 检测项说明
+   */
+  description: string;
+
+}
+
+export interface QcTemplateItemForm extends BaseEntity {
+  /**
+   * 模板子表主键
+   */
+  templateItemId?: string | number;
+
+  /**
+   * 关联模板主表ID
+   */
+  templateId?: string | number;
+
+  /**
+   * 关联检测项定义ID
+   */
+  itemId?: string | number;
+
+  /**
+   * 检测项编码
+   */
+  itemCode?: string;
+
+  /**
+   * 检测项名称
+   */
+  itemName?: string;
+
+  /**
+   * 检测位置
+   */
+  inspectionPosition?: string;
+
+  /**
+   * 检测项目类别
+   */
+  categoryName?: string;
+
+  /**
+   * 检测类型（根据主表关联的类型表主键查来的字典值自动存入）
+   */
+  inspectionType?: number;
+
+  /**
+   * 检测方式（0定性,1定量）
+   */
+  detectType?: number;
+
+  /**
+   * 控制类型
+   */
+  controlType?: number;
+
+  /**
+   * 标准值
+   */
+  standardValue?: number;
+
+  /**
+   * 控制上限
+   */
+  upperLimit?: number;
+
+  /**
+   * 控制下限
+   */
+  lowerLimit?: number;
+
+  /**
+   * 规格名称
+   */
+  specName?: string;
+
+  /**
+   * 规格上限
+   */
+  specUpper?: number;
+
+  /**
+   * 规格下限
+   */
+  specLower?: number;
+
+  /**
+   * 检测项说明
+   */
+  description?: string;
+
+}
+
+export interface QcTemplateItemQuery extends PageQuery {
+
+  /**
+   * 模板子表主键
+   */
+  templateItemId?: string | number;
+
+  /**
+   * 关联模板主表ID
+   */
+  templateId?: string | number;
+
+  /**
+   * 关联检测项定义ID
+   */
+  itemId?: string | number;
+
+  /**
+   * 检测项编码
+   */
+  itemCode?: string;
+
+  /**
+   * 检测项名称
+   */
+  itemName?: string;
+
+  /**
+   * 检测位置
+   */
+  inspectionPosition?: string;
+
+  /**
+   * 检测项目类别
+   */
+  categoryName?: string;
+
+  /**
+   * 检测类型（根据主表关联的类型表主键查来的字典值自动存入）
+   */
+  inspectionType?: number;
+
+  /**
+   * 检测方式（0定性,1定量）
+   */
+  detectType?: number;
+
+  /**
+   * 控制类型
+   */
+  controlType?: number;
+
+  /**
+   * 标准值
+   */
+  standardValue?: number;
+
+  /**
+   * 控制上限
+   */
+  upperLimit?: number;
+
+  /**
+   * 控制下限
+   */
+  lowerLimit?: number;
+
+  /**
+   * 规格名称
+   */
+  specName?: string;
+
+  /**
+   * 规格上限
+   */
+  specUpper?: number;
+
+  /**
+   * 规格下限
+   */
+  specLower?: number;
+
+  /**
+   * 检测项说明
+   */
+  description?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/views/mes/prodInputScanInfo/index.vue

@@ -1,187 +1,217 @@
 <template>
-  <div class="p-2">
-    <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">
-<!--            <el-form-item label="主键标识" prop="prodInputScanInfoId">
-              <el-input v-model="queryParams.prodInputScanInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+  <div class='p-2'>
+    <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'>
+            <!--            <el-form-item label="主键标识" prop="prodInputScanInfoId">
+                          <el-input v-model="queryParams.prodInputScanInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>
+                              -->
+            <el-form-item label='工序' prop='processId'>
+              <el-select v-model='queryParams.processId' placeholder='请选择工序' clearable @keyup.enter='handleQuery'>
+                <el-option v-for='item in processOptions'
+                           :key='item.processId'
+                           :label='item.processName'
+                           :value='item.processId'
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
-            <el-form-item label="工序" prop="processId">
-              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label='机台' prop='machineId'>
+              <el-select v-model='queryParams.machineId' placeholder='请选择机台' clearable @keyup.enter='handleQuery'>
+                <el-option v-for='item in machineOptions'
+                           :key='item.machineId'
+                           :label='item.machineName'
+                           :value='item.machineId'></el-option>
+              </el-select>
             </el-form-item>
-            <el-form-item label="机台" prop="machineId">
-              <el-input v-model="queryParams.machineId" placeholder="请输入机台ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-            <el-form-item label="投入条码" prop="inputBarcode">
-              <el-input v-model="queryParams.inputBarcode" placeholder="请输入投入条码" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="生产条码" prop="productionBarcode">
-              <el-input v-model="queryParams.productionBarcode" placeholder="请输入生产条码" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-<!--            <el-form-item label="生产工具" prop="toolId">
-              <el-input v-model="queryParams.toolId" placeholder="请输入生产工具" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="物料" prop="materielId">
-              <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="投料工位" prop="stationId">
-              <el-input v-model="queryParams.stationId" placeholder="请输入投料工位ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="扫描结果" prop="scanResult">
-              <el-input v-model="queryParams.scanResult" placeholder="请输入扫描结果" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-            <el-form-item label="记录人名称" prop="userName" label-width="100px">
-              <el-input v-model="queryParams.userName" placeholder="请输入记录人名称" clearable @keyup.enter="handleQuery" />
+
+            <el-form-item label='投入条码' prop='inputBarcode'>
+              <el-input v-model='queryParams.inputBarcode' placeholder='请输入投入条码' clearable
+                        @keyup.enter='handleQuery' />
             </el-form-item>
+            <!--            <el-form-item label="生产条码" prop="productionBarcode">-->
+            <!--              <el-input v-model="queryParams.productionBarcode" placeholder="请输入生产条码" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="生产工具" prop="toolId">
+                          <el-input v-model="queryParams.toolId" placeholder="请输入生产工具" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="物料" prop="materielId">
+                          <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="投料工位" prop="stationId">
+                          <el-input v-model="queryParams.stationId" placeholder="请输入投料工位ID" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="扫描结果" prop="scanResult">
+                          <el-input v-model="queryParams.scanResult" placeholder="请输入扫描结果" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+<!--            <el-form-item label='记录人名称' prop='userName' label-width='100px'>-->
+<!--              <el-input v-model='queryParams.userName' placeholder='请输入记录人名称' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
+              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow='never'>
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:prodInputScanInfo:add']">新增</el-button>
+        <el-row :gutter='10' class='mb8'>
+          <!--          <el-col :span='1.5'>-->
+          <!--            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['mes:prodInputScanInfo:add']">-->
+          <!--              新增-->
+          <!--            </el-button>-->
+          <!--          </el-col>-->
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['mes:prodInputScanInfo:edit']"
+            >修改
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:prodInputScanInfo:edit']"
-              >修改</el-button
-            >
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['mes:prodInputScanInfo:remove']"
+            >删除
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:prodInputScanInfo:remove']"
-              >删除</el-button
-            >
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['mes:prodInputScanInfo:export']">导出
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:prodInputScanInfo:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="prodInputScanInfoList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键标识" align="center" prop="prodInputScanInfoId" v-if="columns[0].visible"/>
-        <el-table-column label="工序" align="center" prop="processName" v-if="columns[2].visible"/>
-        <el-table-column label="机台" align="center" prop="machineName" v-if="columns[3].visible"/>
-        <el-table-column label="投入条码" align="center" prop="inputBarcode" v-if="columns[4].visible"/>
-        <el-table-column label="生产条码" align="center" prop="productionBarcode" v-if="columns[5].visible"/>
-        <el-table-column label="生产工具" align="center" prop="toolId" v-if="columns[6].visible"/>
-        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
-        <el-table-column label="投料工位" align="center" prop="stationName" v-if="columns[8].visible"/>
-        <el-table-column label="扫描结果" align="center" prop="scanResult" v-if="columns[9].visible"/>
-        <el-table-column label="投料时间" align="center" prop="feedingTime" width='180' v-if="columns[17].visible">
+      <el-table v-loading='loading' :data='prodInputScanInfoList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='主键标识' align='center' prop='prodInputScanInfoId' v-if='columns[0].visible' />
+        <el-table-column label='工序' align='center' prop='processName' v-if='columns[2].visible' />
+        <el-table-column label='机台' align='center' prop='machineName' v-if='columns[3].visible' />
+        <el-table-column label='投入条码' align='center' prop='inputBarcode' v-if='columns[4].visible' />
+        <el-table-column label='生产条码' align='center' prop='productionBarcode' v-if='columns[5].visible' />
+        <el-table-column label='生产工具' align='center' prop='toolId' v-if='columns[6].visible' />
+        <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[7].visible' />
+        <el-table-column label='投料工位' align='center' prop='stationName' v-if='columns[8].visible' />
+        <el-table-column label='扫描结果' align='center' prop='scanResult' v-if='columns[9].visible' />
+        <el-table-column label='投料时间' align='center' prop='feedingTime' width='180' v-if='columns[17].visible'>
           <template #default='scope'>
             <span>{{ parseTime(scope.row.feedingTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="记录时间" align="center" prop="createTime" width='180' v-if="columns[14].visible">
-        <template #default='scope'>
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
+        <el-table-column label='记录时间' align='center' prop='createTime' width='180' v-if='columns[14].visible'>
+          <template #default='scope'>
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
         </el-table-column>
-        <el-table-column label="记录人名称" align="center" prop="userName" v-if="columns[10].visible"/>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[11].visible"/>
-<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--          <template #default="scope">-->
-<!--            <el-tooltip content="修改" placement="top">-->
-<!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:prodInputScanInfo:edit']"></el-button>-->
-<!--            </el-tooltip>-->
-<!--            <el-tooltip content="删除" placement="top">-->
-<!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:prodInputScanInfo:remove']"></el-button>-->
-<!--            </el-tooltip>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <el-table-column label='记录人名称' align='center' prop='userName' v-if='columns[10].visible' />
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[11].visible' />
+        <!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+        <!--          <template #default="scope">-->
+        <!--            <el-tooltip content="修改" placement="top">-->
+        <!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:prodInputScanInfo:edit']"></el-button>-->
+        <!--            </el-tooltip>-->
+        <!--            <el-tooltip content="删除" placement="top">-->
+        <!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:prodInputScanInfo:remove']"></el-button>-->
+        <!--            </el-tooltip>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
 
-      <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-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="prodInputScanInfoFormRef" :model="form" :rules="rules" label-width="80px">
-<!--        <el-form-item label="主键标识" prop="prodInputScanInfoId">
-          <el-input v-model="form.prodInputScanInfoId" placeholder="请输入主键标识" />
-        </el-form-item>-->
-        <el-form-item label="工序ID" prop="processId">
-<!--          <el-input v-model="form.processId" placeholder="请输入工序ID" />-->
-          <el-select v-model="form.processId" placeholder="请选择工序">
-            <el-option v-for="item in processOptions"
-                       :key="item.processId"
-                       :label="item.processName"
-                       :value="item.processId"></el-option>
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
+      <el-form ref='prodInputScanInfoFormRef' :model='form' :rules='rules' label-width='80px'>
+
+        <el-form-item label='工序ID' prop='processId'>
+          <el-select v-model='form.processId' placeholder='请选择工序'>
+            <el-option v-for='item in processOptions'
+                       :key='item.processId'
+                       :label='item.processName'
+                       :value='item.processId'>
+
+            </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="机台" prop="machineId">
-<!--          <el-input v-model="form.machineId" placeholder="请输入机台ID" />-->
-          <el-select v-model="form.machineId" placeholder="请选择机台">
-            <el-option v-for="item in machineOptions"
-                       :key="item.machineId"
-                       :label="item.machineName"
-                       :value="item.machineId"></el-option>
+        <el-form-item label='机台' prop='machineId'>
+          <!--          <el-input v-model="form.machineId" placeholder="请输入机台ID" />-->
+          <el-select v-model='form.machineId' placeholder='请选择机台'>
+            <el-option v-for='item in machineOptions'
+                       :key='item.machineId'
+                       :label='item.machineName'
+                       :value='item.machineId'></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="投入条码" prop="inputBarcode">
-          <el-input v-model="form.inputBarcode" placeholder="请输入投入条码" />
+        <el-form-item label='投入条码' prop='inputBarcode'>
+          <el-input v-model='form.inputBarcode' placeholder='请输入投入条码' />
         </el-form-item>
-        <el-form-item label="生产条码" prop="productionBarcode">
-          <el-input v-model="form.productionBarcode" placeholder="请输入生产条码" />
+        <el-form-item label='生产条码' prop='productionBarcode'>
+          <el-input v-model='form.productionBarcode' placeholder='请输入生产条码' />
         </el-form-item>
-        <el-form-item label="生产工具" prop="toolId">
-          <el-input v-model="form.toolId" placeholder="请输入生产工具" />
+        <el-form-item label='生产工具' prop='toolId'>
+          <el-input v-model='form.toolId' placeholder='请输入生产工具' />
         </el-form-item>
-        <el-form-item label="物料" prop="materielId">
-<!--          <el-input v-model="form.materielId" placeholder="请输入物料ID" />-->
-          <el-select v-model="form.materielId" placeholder="请选择物料">
-            <el-option v-for="item in materialOptions"
-                       :key="item.materialId"
-                       :label="item.materialName"
-                       :value="item.materialId"></el-option>
+        <el-form-item label='物料' prop='materielId'>
+          <!--          <el-input v-model="form.materielId" placeholder="请输入物料ID" />-->
+          <el-select v-model='form.materielId' placeholder='请选择物料'>
+            <el-option v-for='item in materialOptions'
+                       :key='item.materialId'
+                       :label='item.materialName'
+                       :value='item.materialId'></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="投料工位" prop="stationId">
-<!--          <el-input v-model="form.stationId" placeholder="请输入投料工位ID" />-->
-          <el-select v-model="form.stationId" placeholder="请选择投料工位">
-            <el-option v-for="item in stationOptions"
-                       :key="item.stationId"
-                       :label="item.stationName"
-                       :value="item.stationId"></el-option>
+        <el-form-item label='投料工位' prop='stationId'>
+          <!--          <el-input v-model="form.stationId" placeholder="请输入投料工位ID" />-->
+          <el-select v-model='form.stationId' placeholder='请选择投料工位'>
+            <el-option v-for='item in stationOptions'
+                       :key='item.stationId'
+                       :label='item.stationName'
+                       :value='item.stationId'></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="扫描结果" prop="scanResult">
-          <el-input v-model="form.scanResult" placeholder="请输入扫描结果" />
+        <el-form-item label='扫描结果' prop='scanResult'>
+          <el-input v-model='form.scanResult' placeholder='请输入扫描结果' />
         </el-form-item>
-        <el-form-item label="记录人名称" prop="userName">
-          <el-input v-model="form.userName" placeholder="请输入记录人名称" />
+        <el-form-item label='记录人名称' prop='userName'>
+          <el-input v-model='form.userName' placeholder='请输入记录人名称' />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' placeholder='请输入备注' />
         </el-form-item>
       </el-form>
       <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
         </div>
       </template>
     </el-dialog>
   </div>
 </template>
 
-<script setup name="ProdInputScanInfo" lang="ts">
-import { listProdInputScanInfo, getProdInputScanInfo, delProdInputScanInfo, addProdInputScanInfo, updateProdInputScanInfo } from '@/api/mes/prodInputScanInfo';
+<script setup name='ProdInputScanInfo' lang='ts'>
+import {
+  listProdInputScanInfo,
+  getProdInputScanInfo,
+  delProdInputScanInfo,
+  addProdInputScanInfo,
+  updateProdInputScanInfo
+} from '@/api/mes/prodInputScanInfo';
 import { ProdInputScanInfoVO, ProdInputScanInfoQuery, ProdInputScanInfoForm } from '@/api/mes/prodInputScanInfo/types';
-import { getProcessInfoList } from "@/api/mes/baseProcessInfo";
-import { getProdBaseMachineInfoList } from "@/api/mes/prodBaseMachineInfo";
-import { getBaseMaterialInfoList } from "@/api/mes/baseMaterialInfo";
-import {getStationInfoList} from "@/api/mes/baseStationInfo";
+import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
+import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
+import { getBaseMaterialInfoList } from '@/api/mes/baseMaterialInfo';
+import { getStationInfoList } from '@/api/mes/baseStationInfo';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -205,24 +235,24 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `主键标识`, visible: false },
-        { key: 1, label: `租户编号`, visible: false },
-        { 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: false },
-        { key: 13, label: `记录人`, visible: false },
-        { key: 14, label: `记录时间`, visible: true },
-        { key: 15, label: `更新人`, visible: false },
-        { key: 16, label: `更新时间`, visible: false },
-        { key: 17, label: `投料时间`, visible: true },
+  { key: 0, label: `主键标识`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `工序`, visible: true },
+  { key: 3, label: `机台`, visible: true },
+  { key: 4, label: `投入条码`, visible: true },
+  { key: 5, label: `生产条码`, visible: false },
+  { key: 6, label: `生产工具`, visible: false },
+  { key: 7, label: `物料`, visible: true },
+  { key: 8, label: `投料工位`, visible: true },
+  { key: 9, label: `扫描结果`, visible: true },
+  { key: 10, label: `记录人名称`, visible: true },
+  { key: 11, label: `备注`, visible: false },
+  { key: 12, label: `创建部门`, visible: false },
+  { key: 13, label: `记录人`, visible: false },
+  { key: 14, label: `记录时间`, visible: true },
+  { key: 15, label: `更新人`, visible: false },
+  { key: 16, label: `更新时间`, visible: false },
+  { key: 17, label: `投料时间`, visible: false }
 ]);
 
 const initFormData: ProdInputScanInfoForm = {
@@ -240,10 +270,10 @@ const initFormData: ProdInputScanInfoForm = {
   machineName: undefined,
   processName: undefined,
   materielName: undefined,
-  stationName: undefined,
-}
+  stationName: undefined
+};
 const data = reactive<PageData<ProdInputScanInfoForm, ProdInputScanInfoQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -261,11 +291,9 @@ const data = reactive<PageData<ProdInputScanInfoForm, ProdInputScanInfoQuery>>({
     processName: undefined,
     materielName: undefined,
     stationName: undefined,
-    params: {
-    }
+    params: {}
   },
-  rules: {
-  }
+  rules: {}
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -277,55 +305,55 @@ const getList = async () => {
   prodInputScanInfoList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   prodInputScanInfoFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: ProdInputScanInfoVO[]) => {
   ids.value = selection.map(item => item.prodInputScanInfoId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加生产投入扫描信息";
-}
+  dialog.title = '添加生产投入扫描信息';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: ProdInputScanInfoVO) => {
   reset();
-  const _prodInputScanInfoId = row?.prodInputScanInfoId || ids.value[0]
+  const _prodInputScanInfoId = row?.prodInputScanInfoId || ids.value[0];
   const res = await getProdInputScanInfo(_prodInputScanInfoId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改生产投入扫描信息";
-}
+  dialog.title = '修改生产投入扫描信息';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -333,67 +361,67 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.prodInputScanInfoId) {
-        await updateProdInputScanInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await updateProdInputScanInfo(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addProdInputScanInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await addProdInputScanInfo(form.value).finally(() => buttonLoading.value = false);
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: ProdInputScanInfoVO) => {
   const _prodInputScanInfoIds = row?.prodInputScanInfoId || ids.value;
   await proxy?.$modal.confirm('是否确认删除生产投入扫描信息编号为"' + _prodInputScanInfoIds + '"的数据项？').finally(() => loading.value = false);
   await delProdInputScanInfo(_prodInputScanInfoIds);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download('mes/prodInputScanInfo/export', {
     ...queryParams.value
-  }, `prodInputScanInfo_${new Date().getTime()}.xlsx`)
-}
+  }, `prodInputScanInfo_${new Date().getTime()}.xlsx`);
+};
 
 //获取工序选项
-let processOptions = ref([])
+let processOptions = ref([]);
 const getProcessSelect = async () => {
   let res = await getProcessInfoList(null);
   processOptions.value = res.data;
-}
+};
 
 //获取机台选项
-let machineOptions = ref([])
+let machineOptions = ref([]);
 const getMachineSelect = async () => {
   let res = await getProdBaseMachineInfoList(null);
   machineOptions.value = res.data;
-}
+};
 
 //获取物料选项
-let materialOptions = ref([])
+let materialOptions = ref([]);
 const getMaterialSelect = async () => {
   let res = await getBaseMaterialInfoList(null);
   materialOptions.value = res.data;
-}
+};
 
 //获取工位选项
-let stationOptions = ref([])
+let stationOptions = ref([]);
 const getStationSelect = async () => {
   let res = await getStationInfoList(null);
   stationOptions.value = res.data;
-}
+};
 
 
 onMounted(() => {
   getProcessSelect();
-    getMachineSelect();
-    getMaterialSelect();
-    getStationSelect();
+  getMachineSelect();
+  getMaterialSelect();
+  getStationSelect();
   getList();
 });
 </script>

src/views/mes/technologyInfo/formingIndex.vue

@@ -55,6 +55,7 @@
           <el-table-column type='selection' width='55' align='center' />
           <el-table-column label='主键标识' align='center' prop='technologyId' v-if='columns[0].visible' />
           <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
+          <el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[15].visible' />
           <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='180' />
           <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
             <template #default='scope'>
@@ -67,7 +68,7 @@
             </template>
           </el-table-column>
           <el-table-column label='工艺版本' align='center' prop='technologyVersion' v-if='columns[6].visible' />
-          <el-table-column label='硫化标准时间' align='center' prop='standardTime' v-if='columns[7].visible'>
+          <el-table-column label='成型标准时间' align='center' prop='standardTime' v-if='columns[7].visible'>
             <template v-slot='scope'>
               <span>{{ formatDayHourMinutes(scope.row.standardTime) }}</span>
             </template>
@@ -114,6 +115,9 @@
           <!--            />-->
           <!--          </el-select>-->
           <!--        </el-form-item>-->
+          <el-form-item label='工艺名称' prop='technologyName'>
+            <el-input v-model='form.technologyName' placeholder='请输入工艺名称' />
+          </el-form-item>
           <el-form-item label='物料名称' prop='materialId'>
             <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
               <template #append>
@@ -146,17 +150,17 @@
           <el-form-item label='工艺版本' prop='technologyVersion'>
             <el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' />
           </el-form-item>
-          <el-form-item label='硫化标准时间' prop='standardTime'>
-            <el-input-number v-model='form.productionTimeDays' placeholder='请输入天数' :min='0' :max='10000'
-                             :controls='false' :style="{ width: '50px' }" />
-            <span>&nbsp;天&nbsp;</span>
-            <el-input-number v-model='form.productionTimeHours' placeholder='请输入小时' :min='0' :max='23'
-                             :controls='false' :style="{ width: '50px' }" />
-            <span>&nbsp;小时&nbsp;</span>
-            <el-input-number v-model='form.productionTimeMinutes' placeholder='请输入分钟' :min='0' :max='59'
-                             :controls='false' :style="{ width: '50px' }" />
-            <span>&nbsp;分钟&nbsp;</span>
-          </el-form-item>
+          <!--          <el-form-item label='成型标准时间' prop='standardTime'>-->
+          <!--            <el-input-number v-model='form.productionTimeDays' placeholder='请输入天数' :min='0' :max='10000'-->
+          <!--                             :controls='false' :style="{ width: '50px' }" />-->
+          <!--            <span>&nbsp;天&nbsp;</span>-->
+          <!--            <el-input-number v-model='form.productionTimeHours' placeholder='请输入小时' :min='0' :max='23'-->
+          <!--                             :controls='false' :style="{ width: '50px' }" />-->
+          <!--            <span>&nbsp;小时&nbsp;</span>-->
+          <!--            <el-input-number v-model='form.productionTimeMinutes' placeholder='请输入分钟' :min='0' :max='59'-->
+          <!--                             :controls='false' :style="{ width: '50px' }" />-->
+          <!--            <span>&nbsp;分钟&nbsp;</span>-->
+          <!--          </el-form-item>-->
           <el-form-item label='激活标识' prop='activeFlag'>
             <el-radio-group v-model='form.activeFlag'>
               <el-radio
@@ -255,7 +259,6 @@
           <el-table-column label='序号' width='50' align='center' prop='index' />
           <el-table-column align='center' label='参数编号' prop='stepCode' width='130'>
             <template #default='scope'>
-              <!--            <el-input v-model='scope.row.stepCode' :disabled='true' placeholder='请输入参数编号' />-->
               <el-input v-model='scope.row.stepCode' placeholder='请输入参数编号' />
             </template>
           </el-table-column>
@@ -266,17 +269,17 @@
           </el-table-column>
           <el-table-column align='center' label='频率（毫秒）' prop='stepTime' width='130'>
             <template #default='scope'>
-              <el-input v-model='scope.row.stepTime'  />
+              <el-input v-model='scope.row.stepTime' />
             </template>
           </el-table-column>
           <el-table-column align='center' label='参数值' prop='stepParameter' width='100'>
             <template #default='scope'>
-              <el-input v-model='scope.row.stepParameter'  />
+              <el-input v-model='scope.row.stepParameter' />
             </template>
           </el-table-column>
           <el-table-column align='center' label='参数地址' prop='pointAddress' width='100'>
             <template #default='scope'>
-              <el-input v-model='scope.row.pointAddress'  />
+              <el-input v-model='scope.row.pointAddress' />
             </template>
           </el-table-column>
           <el-table-column align='center' label='数据类型' prop='dataType' width='100'>
@@ -400,14 +403,15 @@ const columns = ref<FieldOption[]>([
   { key: 4, label: `机台类型`, visible: true },
   { key: 5, label: `工艺类型`, visible: true },
   { key: 6, label: `工艺版本`, visible: true },
-  { key: 7, label: `硫化标准时间`, visible: true },
+  { key: 7, label: `成型标准时间`, visible: false },
   { key: 8, label: `激活标识`, visible: true },
   { key: 9, label: `备注`, visible: true },
   { key: 10, label: `创建部门`, visible: false },
   { key: 11, label: `创建人`, visible: false },
   { key: 12, label: `创建时间`, visible: false },
   { key: 13, label: `更新人`, visible: false },
-  { key: 14, label: `更新时间`, visible: false }
+  { key: 14, label: `更新时间`, visible: false },
+  { key: 15, label: `工艺名称`, visible: true }
 ]);
 
 const initFormData: TechnologyInfoForm = {

src/views/mes/technologyInfo/index.vue

@@ -79,6 +79,7 @@
         <el-table-column type='selection' width='55' align='center' />
         <el-table-column label='主键标识' align='center' prop='technologyId' v-if='columns[0].visible' />
         <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
+        <el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[15].visible' />
         <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='180' />
         <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
           <template #default='scope'>
@@ -138,6 +139,9 @@
 <!--            />-->
 <!--          </el-select>-->
 <!--        </el-form-item>-->
+        <el-form-item label='工艺名称' prop='technologyName'>
+          <el-input v-model='form.technologyName' placeholder='请输入工艺名称' />
+        </el-form-item>
         <el-form-item label='物料名称' prop='materialId'>
           <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
             <template #append>
@@ -170,6 +174,7 @@
         <el-form-item label='工艺版本' prop='technologyVersion'>
           <el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' />
         </el-form-item>
+
         <el-form-item label='硫化标准时间' prop='standardTime'>
           <el-input-number v-model='form.productionTimeDays' placeholder='请输入天数' :min='0' :max='10000'
                            :controls='false' :style="{ width: '50px' }" />
@@ -277,33 +282,39 @@
                 @selection-change='handleProdLineSelectionChange'>
         <el-table-column type='selection' width='50' align='center' />
         <el-table-column label='序号' width='50' align='center' prop='index' />
-        <el-table-column align='center' label='步序编号' prop='stepCode'>
+        <el-table-column align='center' label='步序编号' prop='stepCode' width='130'>
           <template #default='scope'>
-<!--            <el-input v-model='scope.row.stepCode' :disabled='true' placeholder='请输入步序编号' />-->
             <el-input v-model='scope.row.stepCode' placeholder='请输入步序编号' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='步序名称' prop='stepName'>
+        <el-table-column align='center' label='步序名称' prop='stepName' width='130'>
           <template #default='scope'>
             <el-input v-model='scope.row.stepName' placeholder='请输入步序名称' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='步序时间' prop='stepTime'>
+        <el-table-column align='center' label='步序时间' prop='stepTime' width='130'>
           <template #default='scope'>
             <el-input v-model='scope.row.stepTime' placeholder='请输入步序时间' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='步序参数' prop='stepParameter'>
+        <el-table-column align='center' label='步序参数' prop='stepParameter' width='130'>
           <template #default='scope'>
             <el-input v-model='scope.row.stepParameter' placeholder='请输入步序参数' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='阀门状态' prop='valueState'>
+        <el-table-column align='center' label='参数地址' prop='pointAddress' width='130'>
           <template #default='scope'>
-            <el-input v-model='scope.row.valueState' placeholder='请输入阀门状态' />
+            <el-input v-model='scope.row.pointAddress' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='激活标识' prop='activeFlag'>
+        <el-table-column align='center' label='阀门状态' prop='valueState' width='130'>
+          <template #default='scope'>
+            <el-select v-model='scope.row.valueState' placeholder='请选择阀门状态' >
+              <el-option v-for="dict in mes_value_state" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column align='center' label='激活标识' prop='activeFlag' width='130'>
           <template #default='scope'>
             <el-select v-model='scope.row.activeFlag' placeholder='请输入激活标识' >
               <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -342,8 +353,9 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {
   mes_machine_type,
   active_flag,
-  mes_technology_type
-} = toRefs<any>(proxy?.useDict('mes_machine_type', 'active_flag', 'mes_technology_type'));
+  mes_technology_type,
+  mes_value_state
+} = toRefs<any>(proxy?.useDict('mes_machine_type', 'active_flag', 'mes_technology_type', 'mes_value_state'));
 
 const technologyInfoList = ref<TechnologyInfoVO[]>([]);
 const buttonLoading = ref(false);
@@ -396,7 +408,8 @@ const columns = ref<FieldOption[]>([
   { key: 11, label: `创建人`, visible: false },
   { key: 12, label: `创建时间`, visible: false },
   { key: 13, label: `更新人`, visible: false },
-  { key: 14, label: `更新时间`, visible: false }
+  { key: 14, label: `更新时间`, visible: false },
+  { key: 15, label: `工艺名称`, visible: true },
 ]);
 
 const initFormData: TechnologyInfoForm = {
@@ -607,7 +620,7 @@ const handleCopy = (row: TechnologyInfoVO) => {
   Object.assign(form.value, JSON.parse(JSON.stringify(row)));
   // form.value.technologyId = undefined;
   dialog.visible = true;
-  dialog.title = '复制成型工艺信息';
+  dialog.title = '复制硫化工艺信息';
   isCopy.value = true;
 };
 const rowProdBaseProcessProdlineIndex = ({ row, rowIndex }: { row: any; rowIndex: number }): string => {

src/views/qms/QcInspectionMain/index.vue

@@ -0,0 +1,784 @@
+<template>
+  <div class="p-2">
+    <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='120px'>
+            <el-form-item label="检测单号/卡号" prop="inspectionNo">
+              <el-input v-model="queryParams.inspectionNo" placeholder="请输入检测单号/卡号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检验时间" prop="inspectionTime">
+              <el-date-picker clearable
+                v-model="queryParams.inspectionTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择检验时间"
+              />
+            </el-form-item>
+            <el-form-item label="生产订单号" prop="productionOrder">
+              <el-input v-model="queryParams.productionOrder" placeholder="请输入生产订单号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="批次号" prop="batchNo">
+              <el-input v-model="queryParams.batchNo" placeholder="请输入批次号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="条码号" prop="barcode">
+              <el-input v-model="queryParams.barcode" placeholder="请输入条码号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['qms:QcInspectionMain:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['qms:QcInspectionMain:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['qms:QcInspectionMain:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:QcInspectionMain:export']">导出</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExportTemplate" v-hasPermi="['qms:QcInspectionMain:export']">导出模板</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table
+        v-loading="loading"
+        :data="QcInspectionMainList"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+        highlight-current-row
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" prop="inspectionId" v-if="columns[0].visible"/>
+        <el-table-column label="检测单号/卡号" align="center" prop="inspectionNo" v-if="columns[1].visible"/>
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[2].visible"/>
+        <el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[3].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible"/>
+        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[5].visible"/>
+        <el-table-column label="工位名称" align="center" prop="stationName" v-if="columns[6].visible"/>
+        <el-table-column label="质检数量" align="center" prop="inspectionQty" v-if="columns[7].visible"/>
+        <el-table-column label="合格数" align="center" prop="qualifiedQty" v-if="columns[8].visible"/>
+        <el-table-column label="不合格数" align="center" prop="unqualifiedQty" v-if="columns[9].visible"/>
+        <el-table-column label="质检结果" align="center" prop="result" v-if="columns[11].visible">
+          <template #default="scope">
+            <dict-tag :options="qc_result" :value="scope.row.result"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="车间" align="center" prop="workshop" v-if="columns[11].visible"/>
+        <el-table-column label="关联检测类型表" align="center" prop="typeName" v-if="columns[12].visible"/>
+        <el-table-column label="单据状态" align="center" prop="status" v-if="columns[13].visible">
+          <template #default="scope">
+            <dict-tag :options="qc_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="检测人员" align="center" prop="inspector" v-if="columns[14].visible"/>
+        <el-table-column label="班次" align="center" prop="shift" v-if="columns[15].visible"/>
+        <el-table-column label="班组" align="center" prop="team" v-if="columns[16].visible"/>
+        <el-table-column label="检验时间" align="center" prop="inspectionTime" width="180" v-if="columns[17].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.inspectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="生产订单号" align="center" prop="productionOrder" v-if="columns[18].visible"/>
+        <el-table-column label="批次号" align="center" prop="batchNo" v-if="columns[19].visible"/>
+        <el-table-column label="条码号" align="center" prop="barcode" v-if="columns[20].visible"/>
+        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[21].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[22].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['qms:QcInspectionMain:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['qms:QcInspectionMain:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 子表显示区域 -->
+    <el-card v-if="selectedInspectionId" shadow="never" class="mt-4">
+      <template #header>
+        <div class="flex justify-between items-center">
+          <h3>质检结果子表 - {{ selectedInspectionNo }}</h3>
+          <el-button type="primary" size="small" icon="Plus" @click="handleAddInspectionResult" v-hasPermi="['qms:qcInspectionResult:add']">
+            新增检测结果
+          </el-button>
+        </div>
+      </template>
+
+      <!-- 子表搜索区域 -->
+      <div class="mb-4">
+        <el-form :model="inspectionResultQueryParams" :inline="true" label-width="100px">
+          <el-form-item label="检测结果" prop="detectResult">
+            <el-select v-model="inspectionResultQueryParams.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>
+            <el-button type="primary" icon="Search" @click="getInspectionResultList">搜索</el-button>
+            <el-button icon="Refresh" @click="resetInspectionResultQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- 子表数据表格 -->
+      <el-table v-loading="inspectionResultLoading" :data="inspectionResultList" @selection-change="handleInspectionResultSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" prop="resultId" />
+        <el-table-column label="关联检测项ID" align="center" prop="itemId" />
+        <el-table-column label="检测结果" align="center" prop="detectResult">
+          <template #default="scope">
+            <dict-tag :options="qc_result" :value="scope.row.detectResult"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="定量检测值" align="center" prop="detectValue" />
+        <el-table-column label="规格质检值" align="center" prop="specInspection" />
+        <el-table-column label="定性不合格明细" align="center" prop="problemDetail" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdateInspectionResult(scope.row)" v-hasPermi="['qms:qcInspectionResult:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDeleteInspectionResult(scope.row)" v-hasPermi="['qms:qcInspectionResult:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="inspectionResultTotal > 0" :total="inspectionResultTotal" v-model:page="inspectionResultQueryParams.pageNum" v-model:limit="inspectionResultQueryParams.pageSize" @pagination="getInspectionResultList" />
+    </el-card>
+
+    <!-- 添加或修改质检主表对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
+      <el-form ref="QcInspectionMainFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检测单号/卡号" prop="inspectionNo">
+              <el-input v-model="form.inspectionNo" placeholder="请输入检测单号/卡号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料编码" prop="materialCode">
+              <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="物料类型" prop="materialType">
+              <el-input v-model="form.materialType" placeholder="请输入物料类型" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="工序名称" prop="processName">
+              <el-input v-model="form.processName" placeholder="请输入工序名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工位名称" prop="stationName">
+              <el-input v-model="form.stationName" placeholder="请输入工位名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="质检数量" prop="inspectionQty">
+              <el-input-number v-model="form.inspectionQty" :precision="2" placeholder="请输入质检数量" style="width: 100%;" @change="calculateUnqualifiedQty" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合格数" prop="qualifiedQty">
+              <el-input-number v-model="form.qualifiedQty" :precision="2" placeholder="请输入合格数" style="width: 100%;" @change="calculateUnqualifiedQty" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不合格数" prop="unqualifiedQty">
+              <el-input-number v-model="form.unqualifiedQty" :precision="2" placeholder="不合格数" style="width: 100%;" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质检结果" prop="result">
+              <el-select v-model="form.result" placeholder="请选择质检结果" style="width: 100%;">
+                <el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="车间" prop="workshop">
+              <el-input v-model="form.workshop" placeholder="请输入车间" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检测类型" prop="typeId">
+              <!-- <el-input v-model="form.typeId" placeholder="请输入检测类型主键" /> -->
+               <el-select v-model="form.typeId" placeholder="请选择检测类型" style="width: 100%;">
+                <el-option v-for="item in qcInspectionTypeList" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
+               </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="单据状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio v-for="dict in qc_status" :key="dict.value" :value="parseInt(dict.value)">{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检测人员" prop="inspector">
+              <el-input v-model="form.inspector" placeholder="请输入检测人员" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="班次" prop="shift">
+              <el-input v-model="form.shift" placeholder="请输入班次" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="班组" prop="team">
+              <el-input v-model="form.team" placeholder="请输入班组" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检验时间" prop="inspectionTime">
+              <el-date-picker clearable v-model="form.inspectionTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择检验时间" style="width: 100%;">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产订单号" prop="productionOrder">
+              <el-input v-model="form.productionOrder" placeholder="请输入生产订单号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="批次号" prop="batchNo">
+              <el-input v-model="form.batchNo" placeholder="请输入批次号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="条码号" prop="barcode">
+              <el-input v-model="form.barcode" placeholder="请输入条码号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="供应商名称" prop="supplierName">
+              <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 添加或修改质检结果子表对话框 -->
+    <el-dialog :title="inspectionResultDialog.title" v-model="inspectionResultDialog.visible" width="800px" append-to-body>
+      <el-form ref="inspectionResultFormRef" :model="inspectionResultForm" :rules="inspectionResultRules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检测单号/卡号" prop="inspectionNo">
+              <el-input v-model="selectedInspectionNo" placeholder="检测单号/卡号" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="关联检测项" prop="itemId">
+              <el-select v-model="inspectionResultForm.itemId" placeholder="请选择关联检测项" style="width: 100%;">
+                <el-option v-for="item in qcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检测结果" prop="detectResult">
+              <el-radio-group v-model="inspectionResultForm.detectResult">
+                <el-radio v-for="dict in qc_result" :key="dict.value" :value="parseInt(dict.value)">{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="定量检测值" prop="detectValue" v-if="inspectionResultForm.detectResult === 1">
+              <el-input-number v-model="inspectionResultForm.detectValue" placeholder="请输入定量检测值" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="规格质检值" prop="specInspection" v-if="inspectionResultForm.detectResult === 1">
+              <el-input-number v-model="inspectionResultForm.specInspection" placeholder="请输入规格质检值" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="定性不合格明细" prop="problemDetail" v-if="inspectionResultForm.detectResult === 0">
+              <el-input v-model="inspectionResultForm.problemDetail" placeholder="请输入定性不合格明细" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="inspectionResultButtonLoading" type="primary" @click="submitInspectionResultForm">确 定</el-button>
+          <el-button @click="cancelInspectionResult">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="QcInspectionMain" lang="ts">
+import { listQcInspectionMain, getQcInspectionMain, delQcInspectionMain, addQcInspectionMain, updateQcInspectionMain } from '@/api/qms/QcInspectionMain';
+import { QcInspectionMainVO, QcInspectionMainQuery, QcInspectionMainForm } from '@/api/qms/QcInspectionMain/types';
+import { listQcInspectionResult, getQcInspectionResult, delQcInspectionResult, addQcInspectionResult, updateQcInspectionResult } from '@/api/qms/qcInspectionResult';
+import { QcInspectionResultVO, QcInspectionResultQuery, QcInspectionResultForm } from '@/api/qms/qcInspectionResult/types';
+import { listQcInspectionItem, getQcInspectionItem, delQcInspectionItem, addQcInspectionItem, updateQcInspectionItem, getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
+import { getQcInspectionTypeList } from '@/api/qms/qcInspectionType';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { qc_result, qc_status } = toRefs<any>(proxy?.useDict('qc_result', 'qc_status'));
+
+const QcInspectionMainList = ref<QcInspectionMainVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+// 子表相关状态
+const selectedInspectionId = ref<string | number | null>(null);
+const selectedInspectionNo = ref<string>('');
+const inspectionResultList = ref<QcInspectionResultVO[]>([]);
+const inspectionResultLoading = ref(false);
+const inspectionResultTotal = ref(0);
+const inspectionResultIds = ref<Array<string | number>>([]);
+const inspectionResultSingle = ref(true);
+const inspectionResultMultiple = ref(true);
+const inspectionResultButtonLoading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const QcInspectionMainFormRef = ref<ElFormInstance>();
+const inspectionResultFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const inspectionResultDialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, 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: `单据状态`, 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 },
+        { key: 21, label: `供应商名称`, visible: true },
+        { key: 22, label: `备注`, visible: true },
+]);
+
+const initFormData: QcInspectionMainForm = {
+  inspectionId: undefined,
+  inspectionNo: undefined,
+  materialCode: undefined,
+  materialType: undefined,
+  materialName: undefined,
+  processName: undefined,
+  stationName: undefined,
+  inspectionQty: undefined,
+  qualifiedQty: undefined,
+  unqualifiedQty: undefined,
+  result: undefined,
+  workshop: undefined,
+  typeId: undefined,
+  status: undefined,
+  inspector: undefined,
+  shift: undefined,
+  team: undefined,
+  inspectionTime: undefined,
+  productionOrder: undefined,
+  batchNo: undefined,
+  barcode: undefined,
+  supplierName: undefined,
+  remark: undefined,
+}
+
+const initInspectionResultFormData: QcInspectionResultForm = {
+  resultId: undefined,
+  inspectionId: undefined,
+  itemId: undefined,
+  detectResult: undefined,
+  detectValue: undefined,
+  specInspection: undefined,
+  problemDetail: undefined,
+}
+
+const data = reactive<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    inspectionId: undefined,
+    inspectionNo: undefined,
+    materialCode: undefined,
+    materialType: undefined,
+    materialName: undefined,
+    processName: undefined,
+    stationName: undefined,
+    inspectionQty: undefined,
+    qualifiedQty: undefined,
+    unqualifiedQty: undefined,
+    result: undefined,
+    workshop: undefined,
+    typeId: undefined,
+    status: undefined,
+    inspector: undefined,
+    shift: undefined,
+    team: undefined,
+    inspectionTime: undefined,
+    productionOrder: undefined,
+    batchNo: undefined,
+    barcode: undefined,
+    supplierName: undefined,
+    params: {
+    }
+  },
+  rules: {
+    // inspectionId: [
+    //   { required: true, message: "质检主键不能为空", trigger: "blur" }
+    // ],
+    inspectionQty: [
+      { required: true, message: "质检数量不能为空", trigger: "blur" }
+    ],
+    qualifiedQty: [
+      { required: true, message: "合格数不能为空", trigger: "blur" }
+    ],
+    result: [
+      { required: true, message: "质检结果不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+// 子表数据
+const inspectionResultForm = ref<QcInspectionResultForm>({...initInspectionResultFormData});
+const inspectionResultQueryParams = ref<QcInspectionResultQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  resultId: undefined,
+  inspectionId: undefined,
+  itemId: undefined,
+  detectResult: undefined,
+  detectValue: undefined,
+  specInspection: undefined,
+  problemDetail: undefined,
+  params: {}
+});
+
+const inspectionResultRules = ref({
+  // inspectionId: [
+  //   { required: true, message: "关联质检主表ID不能为空", trigger: "blur" }
+  // ],
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询质检主表列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQcInspectionMain(queryParams.value);
+  QcInspectionMainList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 查询质检结果子表列表 */
+const getInspectionResultList = async () => {
+  if (!selectedInspectionId.value) return;
+
+  inspectionResultLoading.value = true;
+  // 设置inspectionId过滤条件
+  inspectionResultQueryParams.value.inspectionId = selectedInspectionId.value;
+  const res = await listQcInspectionResult(inspectionResultQueryParams.value);
+  inspectionResultList.value = res.rows;
+  inspectionResultTotal.value = res.total;
+  inspectionResultLoading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  QcInspectionMainFormRef.value?.resetFields();
+}
+
+/** 子表取消按钮 */
+const cancelInspectionResult = () => {
+  resetInspectionResult();
+  inspectionResultDialog.visible = false;
+}
+
+/** 子表表单重置 */
+const resetInspectionResult = () => {
+  inspectionResultForm.value = {...initInspectionResultFormData};
+  inspectionResultFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 重置子表搜索 */
+const resetInspectionResultQuery = () => {
+  inspectionResultQueryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    resultId: undefined,
+    inspectionId: selectedInspectionId.value,
+    itemId: undefined,
+    detectResult: undefined,
+    detectValue: undefined,
+    specInspection: undefined,
+    problemDetail: undefined,
+    params: {}
+  };
+  getInspectionResultList();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: QcInspectionMainVO[]) => {
+  ids.value = selection.map(item => item.inspectionId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 子表多选框选中数据 */
+const handleInspectionResultSelectionChange = (selection: QcInspectionResultVO[]) => {
+  inspectionResultIds.value = selection.map(item => item.resultId);
+  inspectionResultSingle.value = selection.length != 1;
+  inspectionResultMultiple.value = !selection.length;
+}
+
+/** 行点击事件 */
+const handleRowClick = (row: QcInspectionMainVO) => {
+  selectedInspectionId.value = row.inspectionId;
+  selectedInspectionNo.value = row.inspectionNo || '';
+  // 刷新子表数据
+  nextTick(() => {
+    getInspectionResultList();
+  });
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加质检结果主表";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: QcInspectionMainVO) => {
+  reset();
+  const _inspectionId = row?.inspectionId || ids.value[0]
+  const res = await getQcInspectionMain(_inspectionId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改质检结果主表";
+}
+
+/** 新增检测结果 */
+const handleAddInspectionResult = () => {
+  resetInspectionResult();
+  inspectionResultForm.value.inspectionId = selectedInspectionId.value;
+  inspectionResultDialog.visible = true;
+  inspectionResultDialog.title = "添加检测结果";
+}
+
+/** 修改检测结果 */
+const handleUpdateInspectionResult = async (row?: QcInspectionResultVO) => {
+  resetInspectionResult();
+  const _resultId = row?.resultId || inspectionResultIds.value[0];
+  const res = await getQcInspectionResult(_resultId);
+  Object.assign(inspectionResultForm.value, res.data);
+  inspectionResultDialog.visible = true;
+  inspectionResultDialog.title = "修改检测结果";
+}
+
+/** 删除检测结果 */
+const handleDeleteInspectionResult = async (row?: QcInspectionResultVO) => {
+  const _resultIds = row?.resultId || inspectionResultIds.value;
+  await proxy?.$modal.confirm('是否确认删除检测结果编号为"' + _resultIds + '"的数据项？').finally(() => inspectionResultLoading.value = false);
+  await delQcInspectionResult(_resultIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getInspectionResultList();
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  QcInspectionMainFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.inspectionId) {
+        await updateQcInspectionMain(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addQcInspectionMain(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 子表提交按钮 */
+const submitInspectionResultForm = () => {
+  inspectionResultFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      inspectionResultButtonLoading.value = true;
+      if (inspectionResultForm.value.resultId) {
+        await updateQcInspectionResult(inspectionResultForm.value).finally(() => inspectionResultButtonLoading.value = false);
+      } else {
+        await addQcInspectionResult(inspectionResultForm.value).finally(() => inspectionResultButtonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      inspectionResultDialog.visible = false;
+      await getInspectionResultList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: QcInspectionMainVO) => {
+  const _inspectionIds = row?.inspectionId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除质检主表编号为"' + _inspectionIds + '"的数据项？').finally(() => loading.value = false);
+  await delQcInspectionMain(_inspectionIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('qms/QcInspectionMain/export', {
+    ...queryParams.value
+  }, `QcInspectionMain_${new Date().getTime()}.xlsx`)
+}
+
+/** 导出模板按钮操作 */
+const handleExportTemplate = () => {
+  proxy?.download('qms/QcInspectionMain/exportTemplate', {
+    
+  }, `QcInspectionMain_${new Date().getTime()}.xlsx`)
+}
+
+//获取检测项列表（不分页，获取全部）
+let qcInspectionItemList = ref([]);
+const getInspectionItemList = async () => {
+  const res = await getQcInspectionItemList(null);
+  qcInspectionItemList.value = res.data;
+}
+
+// 获取检测类型列表
+let qcInspectionTypeList = ref([]);
+const getInspectionTypeList = async () => {
+  const res = await getQcInspectionTypeList(null);
+  qcInspectionTypeList.value = res.data;
+}
+
+// 计算不合格数
+const calculateUnqualifiedQty = () => {
+  if (form.value.inspectionQty !== undefined && form.value.qualifiedQty !== undefined) {
+    form.value.unqualifiedQty = parseFloat((form.value.inspectionQty - form.value.qualifiedQty).toFixed(2));
+    if (form.value.unqualifiedQty < 0) {
+      form.value.unqualifiedQty = 0;
+    }
+  } else {
+    form.value.unqualifiedQty = 0;
+  }
+}
+
+onMounted(() => {
+  getInspectionItemList();
+  getInspectionTypeList();
+  getList();
+});
+</script>

src/views/qms/qcInspectionItem/index.vue

@@ -0,0 +1,516 @@
+<template>
+  <div class="p-2">
+    <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='120px'>
+            <!-- <el-form-item label="检测项主键" prop="itemId">
+              <el-input v-model="queryParams.itemId" 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="categoryId">
+              <el-input v-model="queryParams.categoryId" placeholder="请输入检测项类别" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测单类型" prop="inspectionType">
+              <el-input v-model="queryParams.inspectionType" placeholder="请输入检测单类型" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="检测方法" prop="method">
+              <el-select v-model="queryParams.method" placeholder="请选择检测方法" clearable >
+                <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </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="控制类型" prop="controlType">
+              <el-select v-model="queryParams.controlType" placeholder="请选择控制类型" 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 label="检测选项编码" prop="optionCode">
+              <el-input v-model="queryParams.optionCode" placeholder="请输入检测选项编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测选项名称" prop="optionName">
+              <el-input v-model="queryParams.optionName" placeholder="请输入检测选项名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="是否默认选项" prop="isDefault">
+              <el-select v-model="queryParams.isDefault" placeholder="请选择是否默认选项" clearable >
+                <el-option v-for="dict in is_default" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['qms:qcInspectionItem:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['qms:qcInspectionItem:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['qms:qcInspectionItem:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:qcInspectionItem:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="qcInspectionItemList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="检测项主键" align="center" prop="itemId" v-if="columns[0].visible"/> -->
+        <el-table-column label="序号" type="index" width="50" align="center"  v-if="columns[0].visible"/>
+        <el-table-column label="检测项编码" align="center" prop="itemCode" 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="inspectionPosition" 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="categoryId" v-if="columns[5].visible"/>
+        <el-table-column label="检测方法" align="center" prop="method" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="qc_methond" :value="scope.row.method"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="检测方式" align="center" prop="detectType" v-if="columns[7].visible">
+          <template #default="scope">
+            <dict-tag :options="detect_type" :value="scope.row.detectType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="控制类型" align="center" prop="controlType" v-if="columns[8].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[9].visible"/>
+        <el-table-column label="控制上限" align="center" prop="upperLimit" v-if="columns[10].visible"/>
+        <el-table-column label="控制下限" align="center" prop="lowerLimit" v-if="columns[11].visible"/>
+        <el-table-column label="规格名称" align="center" prop="specName" v-if="columns[12].visible"/>
+        <el-table-column label="规格上限" align="center" prop="specUpper" v-if="columns[13].visible"/>
+        <el-table-column label="规格下限" align="center" prop="specLower" v-if="columns[14].visible"/>
+        <el-table-column label="检测项说明" align="center" prop="description" v-if="columns[15].visible"/>
+        <el-table-column label="检测选项编码" align="center" prop="optionCode" v-if="columns[16].visible"/>
+        <el-table-column label="检测选项名称" align="center" prop="optionName" v-if="columns[17].visible"/>
+        <el-table-column label="是否默认选项" align="center" prop="isDefault" v-if="columns[18].visible">
+          <template #default="scope">
+            <dict-tag :options="is_default" :value="scope.row.isDefault"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['qms:qcInspectionItem:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['qms:qcInspectionItem:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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="1200px" append-to-body>
+      <el-form ref="qcInspectionItemFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="检测项编码" prop="itemCode">
+              <el-input v-model="form.itemCode" placeholder="请输入检测项编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项名称" prop="itemName">
+              <el-input v-model="form.itemName" placeholder="请输入检测项名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <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-col>
+          <el-col :span="6">
+            <el-form-item label="控制类型" prop="controlType">
+              <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-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="检测类型" prop="inspectionType">
+              <el-select v-model="form.inspectionType" placeholder="请选择检测类型">
+                <el-option v-for="item in qcInspectionTypeList" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项类别" prop="categoryId">
+              <el-select v-model="form.categoryId" placeholder="请选择检测项类别">
+                <el-option v-for="item in qcInspectionItemCategoryList" :key="item.categoryId" :label="item.categoryName" :value="item.categoryId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测方法" prop="method">
+              <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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格名称" prop="specName">
+              <el-input v-model="form.specName" placeholder="请输入规格名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row v-if="form.detectType === 1">
+          <el-col :span="6">
+            <el-form-item label="标准值" prop="standardValue">
+              <el-input-number v-model="form.standardValue" placeholder="请输入标准值" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制上限" prop="upperLimit">
+              <el-input-number v-model="form.upperLimit" placeholder="请输入控制上限" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制下限" prop="lowerLimit">
+              <el-input-number v-model="form.lowerLimit" placeholder="请输入控制下限" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格上限" prop="specUpper">
+              <el-input-number v-model="form.specUpper" placeholder="请输入规格上限" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row v-if="form.detectType === 1">
+          <el-col :span="6">
+            <el-form-item label="规格下限" prop="specLower">
+              <el-input-number v-model="form.specLower" placeholder="请输入规格下限" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测位置" prop="inspectionPosition">
+              <el-input v-model="form.inspectionPosition" placeholder="请输入检测位置" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-else>
+          <el-col :span="6">
+            <el-form-item label="检测位置" prop="inspectionPosition">
+              <el-input v-model="form.inspectionPosition" placeholder="请输入检测位置" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="检测项说明" prop="description">
+              <el-input type="textarea" v-model="form.description" placeholder="请输入检测项说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row span="24">
+          <el-col :span="6">
+            <el-form-item label="检测选项编码" prop="optionCode">
+              <el-input v-model="form.optionCode" placeholder="请输入检测选项编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测选项名称" prop="optionName">
+              <el-input v-model="form.optionName" placeholder="请输入检测选项名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否默认选项" prop="isDefault">
+              <el-select v-model="form.isDefault" placeholder="请选择是否默认选项">
+                <el-option v-for="dict in is_default" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="QcInspectionItem" lang="ts">
+import { listQcInspectionItem, getQcInspectionItem, delQcInspectionItem, addQcInspectionItem, updateQcInspectionItem, getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
+import { QcInspectionItemVO, QcInspectionItemQuery, QcInspectionItemForm } from '@/api/qms/qcInspectionItem/types';
+import { getQcInspectionItemCategoryList } from '@/api/qms/qcInspectionItemCategory';
+import { QcInspectionItemCategoryVO } from '@/api/qms/qcInspectionItemCategory/types';
+import { getQcInspectionTypeList } from '@/api/qms/qcInspectionType';
+import { QcInspectionTypeVO } from '@/api/qms/qcInspectionType/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { qc_methond, detect_type, control_type, is_default } = toRefs<any>(proxy?.useDict('qc_methond', 'detect_type', 'control_type', 'is_default'));
+
+const qcInspectionItemList = ref<QcInspectionItemVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+
+const queryFormRef = ref<ElFormInstance>();
+const qcInspectionItemFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        // { key: 0, label: `检测项主键`, visible: true },
+        { key: 0, 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: `规格上限`, 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: 20, label: `创建人`, visible: true },
+        // { key: 21, label: `创建部门`, visible: true },
+        // { key: 22, label: `创建时间`, visible: true },
+        // { key: 23, label: `修改人`, visible: true },
+        // { key: 24, label: `修改时间`, visible: true },
+]);
+
+const initFormData: QcInspectionItemForm = {
+  itemId: undefined,
+  itemCode: undefined,
+  itemName: undefined,
+  inspectionPosition: undefined,
+  categoryId: undefined,
+  inspectionType: undefined,
+  method: undefined,
+  detectType: undefined,
+  controlType: undefined,
+  standardValue: undefined,
+  upperLimit: undefined,
+  lowerLimit: undefined,
+  specName: undefined,
+  specUpper: undefined,
+  specLower: undefined,
+  description: undefined,
+  optionCode: undefined,
+  optionName: undefined,
+  isDefault: undefined,
+}
+const data = reactive<PageData<QcInspectionItemForm, QcInspectionItemQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    itemId: undefined,
+    itemCode: undefined,
+    itemName: undefined,
+    inspectionPosition: undefined,
+    categoryId: undefined,
+    inspectionType: undefined,
+    method: undefined,
+    detectType: undefined,
+    controlType: undefined,
+    standardValue: undefined,
+    upperLimit: undefined,
+    lowerLimit: undefined,
+    specName: undefined,
+    specUpper: undefined,
+    specLower: undefined,
+    description: undefined,
+    optionCode: undefined,
+    optionName: undefined,
+    isDefault: undefined,
+    params: {
+    }
+  },
+  rules: {
+    itemId: [
+      { required: true, message: "检测项主键不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询检测项定义列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQcInspectionItem(queryParams.value);
+  qcInspectionItemList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  qcInspectionItemFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: QcInspectionItemVO[]) => {
+  ids.value = selection.map(item => item.itemId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加检测项定义";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: QcInspectionItemVO) => {
+  reset();
+  const _itemId = row?.itemId || ids.value[0]
+  const res = await getQcInspectionItem(_itemId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改检测项定义";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  qcInspectionItemFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.itemId) {
+        await updateQcInspectionItem(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addQcInspectionItem(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: QcInspectionItemVO) => {
+  const _itemIds = row?.itemId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除检测项定义编号为"' + _itemIds + '"的数据项？').finally(() => loading.value = false);
+  await delQcInspectionItem(_itemIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('qms/qcInspectionItem/export', {
+    ...queryParams.value
+  }, `qcInspectionItem_${new Date().getTime()}.xlsx`)
+}
+
+/** 查询检测项类别列表 */
+let qcInspectionItemCategoryList = ref([]);
+const getCategoryList = async () => {
+  const res = await getQcInspectionItemCategoryList(null);
+  qcInspectionItemCategoryList.value = res.data;
+};
+
+/** 查询检测单类型列表 */
+let qcInspectionTypeList = ref([]);
+const getTypeList = async () => {
+  const res = await getQcInspectionTypeList(null);
+  qcInspectionTypeList.value = res.data;
+};
+
+onMounted(() => {
+  getList();
+  getCategoryList();
+  getTypeList();
+});
+</script>

src/views/qms/qcInspectionItemCategory/index.vue

@@ -0,0 +1,339 @@
+<template>
+  <div class="p-2">
+    <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">
+<!--            <el-form-item label="检测项类别主键" prop="categoryId">-->
+<!--              <el-input v-model="queryParams.categoryId" placeholder="请输入检测项类别主键" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="父级ID" prop="parentId">-->
+<!--              <el-input v-model="queryParams.parentId" placeholder="请输入父级ID" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="祖级列表" prop="ancestors">-->
+<!--              <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+            <el-form-item label="检测项类别编码" prop="categoryCode" label-width="120px">
+              <el-input v-model="queryParams.categoryCode" placeholder="请输入检测项类别编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测项类别名称" prop="categoryName" label-width="120px">
+              <el-input v-model="queryParams.categoryName" placeholder="请输入检测项类别名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测类型" prop="typeId" label-width="120px">
+<!--              <el-input v-model="queryParams.typeId" placeholder="请输入检测单类型" clearable @keyup.enter="handleQuery" />-->
+              <el-select v-model="queryParams.typeId" placeholder="请选择检测类型">
+                <el-option v-for="item in qcInspectionTypeList" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
+              </el-select>
+            </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>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['qms:qcInspectionItemCategory:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref="qcInspectionItemCategoryTableRef"
+        v-loading="loading"
+        :data="qcInspectionItemCategoryList"
+        row-key="categoryId"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+<!--        <el-table-column label="检测项类别主键" align="center" prop="categoryId" />-->
+<!--        <el-table-column label="父级ID" align="center" prop="parentId" />-->
+<!--        <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
+        <el-table-column label="检测项类别编码" align="center" prop="categoryCode" />
+        <el-table-column label="检测项类别名称" align="center" prop="categoryName" />
+        <el-table-column label="检测类型" align="center" prop="typeName" />
+        <el-table-column label="描述" align="center" prop="description" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['qms:qcInspectionItemCategory:edit']" />
+            </el-tooltip>
+            <el-tooltip content="新增" placement="top">
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['qms:qcInspectionItemCategory:add']" />
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['qms:qcInspectionItemCategory:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改检测项类别对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="qcInspectionItemCategoryFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="检测项类别主键" prop="categoryId">-->
+<!--          <el-input v-model="form.categoryId" placeholder="请输入检测项类别主键" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="父级" prop="parentId">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="qcInspectionItemCategoryOptions"
+            :props="{ value: 'categoryId', label: 'categoryName', children: 'children' }"
+            value-key="categoryId"
+            placeholder="请选择父级"
+            check-strictly
+          />
+        </el-form-item>
+<!--        <el-form-item label="祖级列表" prop="ancestors">-->
+<!--          <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="检测项类别编码" prop="categoryCode">
+          <el-input v-model="form.categoryCode" 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-select v-model="form.typeId" placeholder="请选择检测类型">
+            <el-option v-for="item in qcInspectionTypeList" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
+          </el-select>
+        </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">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="QcInspectionItemCategory" lang="ts">
+import { listQcInspectionItemCategory, getQcInspectionItemCategory, delQcInspectionItemCategory, addQcInspectionItemCategory, updateQcInspectionItemCategory } from '@/api/qms/qcInspectionItemCategory';
+import { QcInspectionItemCategoryVO, QcInspectionItemCategoryQuery, QcInspectionItemCategoryForm } from '@/api/qms/qcInspectionItemCategory/types';
+import {getQcInspectionTypeList} from "@/api/qms/qcInspectionType";
+import { QcInspectionTypeVO } from '@/api/qms/qcInspectionType/types';
+import type { TreeInstance } from 'element-plus';
+import { watch } from "vue";
+
+type QcInspectionItemCategoryOption = {
+  categoryId: number;
+  categoryName: string;
+  children?: QcInspectionItemCategoryOption[];
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
+
+
+const qcInspectionItemCategoryList = ref<QcInspectionItemCategoryVO[]>([]);
+const qcInspectionItemCategoryOptions = ref<QcInspectionItemCategoryOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const qcInspectionItemCategoryFormRef = ref<ElFormInstance>();
+// const qcInspectionItemCategoryTableRef = ref<ElTableInstance>();
+const inspectionTypeTreeRef = ref<TreeInstance>();
+const inspectionTypeName = ref('');
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+
+const initFormData: QcInspectionItemCategoryForm = {
+    categoryId: undefined,
+    parentId: undefined,
+    ancestors: undefined,
+    categoryCode: undefined,
+    categoryName: undefined,
+    typeId: undefined,
+    description: undefined,
+}
+
+const data = reactive<PageData<QcInspectionItemCategoryForm, QcInspectionItemCategoryQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    categoryId: undefined,
+    parentId: undefined,
+    ancestors: undefined,
+    categoryCode: undefined,
+    categoryName: undefined,
+    typeId: undefined,
+    description: undefined,
+    params: {
+    }
+  },
+  rules: {
+    // categoryId: [
+    //   { required: true, message: "检测项类别主键不能为空", trigger: "blur" }
+    // ],
+    parentId: [
+      { required: true, message: "父级不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询检测项类别列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQcInspectionItemCategory(queryParams.value);
+  const data = proxy?.handleTree<QcInspectionItemCategoryVO>(res.data, "categoryId", "parentId");
+  if (data) {
+    qcInspectionItemCategoryList.value = data;
+    loading.value = false;
+  }
+}
+
+/** 查询检测项类别下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listQcInspectionItemCategory();
+  qcInspectionItemCategoryOptions.value = [];
+  const data: QcInspectionItemCategoryOption = { categoryId: 0, categoryName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<QcInspectionItemCategoryOption>(res.data, "categoryId", "parentId");
+  qcInspectionItemCategoryOptions.value.push(data);
+}
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {...initFormData}
+  qcInspectionItemCategoryFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+const handleAdd = (row?: QcInspectionItemCategoryVO) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.categoryId) {
+    form.value.parentId = row.categoryId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = "添加检测项类别";
+}
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(qcInspectionItemCategoryList.value, isExpandAll.value)
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: QcInspectionItemCategoryVO[], status: boolean) => {
+  data.forEach((item) => {
+    qcInspectionItemCategoryTableRef.value?.toggleRowExpansion(item, status)
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+  })
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: QcInspectionItemCategoryVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getQcInspectionItemCategory(row.categoryId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改检测项类别";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  qcInspectionItemCategoryFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.categoryId) {
+        await updateQcInspectionItemCategory(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addQcInspectionItemCategory(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row: QcInspectionItemCategoryVO) => {
+  await proxy?.$modal.confirm('是否确认删除检测项类别编号为"' + row.categoryId + '"的数据项？');
+  loading.value = true;
+  await delQcInspectionItemCategory(row.categoryId).finally(() => loading.value = false);
+  await getList();
+  proxy?.$modal.msgSuccess("删除成功");
+}
+
+//获取检测类型列表（不分页，获取全部）
+let qcInspectionTypeList = ref([]);
+const getInspectionTypeList = async () => {
+  const res = await getQcInspectionTypeList(null);
+  qcInspectionTypeList.value = proxy?.handleTree(res.data, "typeId", "parentId") || [];
+}
+
+/** 节点筛选 */
+const filterNode = (value: string, data: QcInspectionTypeVO) => {
+  if (!value) return true;
+  return data.typeName.includes(value);
+};
+
+/** 节点单击事件 */
+const handleNodeClick = (data: QcInspectionTypeVO) => {
+  queryParams.value.typeId = data.typeId;
+  handleQuery();
+};
+
+watch(inspectionTypeName, val => {
+  inspectionTypeTreeRef.value?.filter(val);
+});
+
+
+onMounted(() => {
+  getList();
+  getInspectionTypeList();
+});
+</script>

src/views/qms/qcInspectionResult/index.vue

@@ -0,0 +1,294 @@
+<template>
+  <div class="p-2">
+    <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-item label="结果主键" prop="resultId">
+              <el-input v-model="queryParams.resultId" placeholder="请输入结果主键" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="关联质检主表ID" prop="inspectionId">
+              <el-input v-model="queryParams.inspectionId" placeholder="请输入关联质检主表ID" clearable @keyup.enter="handleQuery" />
+            </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 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-input v-model="queryParams.detectValue" placeholder="请输入定量检测值" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="规格质检值" prop="specInspection">
+              <el-input v-model="queryParams.specInspection" placeholder="请输入规格质检值" clearable @keyup.enter="handleQuery" />
+            </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>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['qms:qcInspectionResult:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['qms:qcInspectionResult:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['qms:qcInspectionResult:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:qcInspectionResult:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <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="detectResult" v-if="columns[3].visible">
+          <template #default="scope">
+            <dict-tag :options="qc_result" :value="scope.row.detectResult"/>
+          </template>
+        </el-table-column>
+        <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" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['qms:qcInspectionResult:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['qms:qcInspectionResult:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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>
+        <el-form-item label="关联检测项ID" prop="itemId">
+          <el-input v-model="form.itemId" placeholder="请输入关联检测项ID" />
+        </el-form-item>
+        <el-form-item label="检测结果" prop="detectResult">
+          <el-radio-group v-model="form.detectResult">
+            <el-radio
+              v-for="dict in qc_result"
+              :key="dict.value"
+              :value="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="定量检测值" prop="detectValue">
+          <el-input v-model="form.detectValue" placeholder="请输入定量检测值" />
+        </el-form-item>
+        <el-form-item label="规格质检值" prop="specInspection">
+          <el-input v-model="form.specInspection" placeholder="请输入规格质检值" />
+        </el-form-item>
+        <el-form-item label="定性不合格明细" prop="problemDetail">
+          <el-input v-model="form.problemDetail" placeholder="请输入定性不合格明细" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<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';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { qc_result } = toRefs<any>(proxy?.useDict('qc_result'));
+
+const qcInspectionResultList = ref<QcInspectionResultVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const qcInspectionResultFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+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 },
+]);
+
+const initFormData: QcInspectionResultForm = {
+  resultId: undefined,
+  inspectionId: undefined,
+  itemId: undefined,
+  detectResult: undefined,
+  detectValue: undefined,
+  specInspection: undefined,
+  problemDetail: undefined,
+}
+const data = reactive<PageData<QcInspectionResultForm, QcInspectionResultQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    resultId: undefined,
+    inspectionId: undefined,
+    itemId: undefined,
+    detectResult: undefined,
+    detectValue: undefined,
+    specInspection: undefined,
+    problemDetail: undefined,
+    params: {
+    }
+  },
+  rules: {
+    resultId: [
+      { required: true, message: "结果主键不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询质检结果子表列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQcInspectionResult(queryParams.value);
+  qcInspectionResultList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  qcInspectionResultFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: QcInspectionResultVO[]) => {
+  ids.value = selection.map(item => item.resultId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加质检结果子表";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: QcInspectionResultVO) => {
+  reset();
+  const _resultId = row?.resultId || ids.value[0]
+  const res = await getQcInspectionResult(_resultId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改质检结果子表";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  qcInspectionResultFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.resultId) {
+        await updateQcInspectionResult(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addQcInspectionResult(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: QcInspectionResultVO) => {
+  const _resultIds = row?.resultId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除质检结果子表编号为"' + _resultIds + '"的数据项？').finally(() => loading.value = false);
+  await delQcInspectionResult(_resultIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('qms/qcInspectionResult/export', {
+    ...queryParams.value
+  }, `qcInspectionResult_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/qms/qcInspectionTemplate/index.vue

@@ -0,0 +1,713 @@
+<template>
+  <div class="p-2">
+    <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='120px'>
+            <el-form-item label="模板编码" prop="templateCode">
+              <el-input v-model="queryParams.templateCode" placeholder="请输入模板编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="模板名称" prop="templateName">
+              <el-input v-model="queryParams.templateName" placeholder="请输入模板名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['qms:qcInspectionTemplate:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['qms:qcInspectionTemplate:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['qms:qcInspectionTemplate:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:qcInspectionTemplate:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table
+        v-loading="loading"
+        :data="qcInspectionTemplateList"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+        highlight-current-row
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- 序号前端自动排序 -->
+        <el-table-column label="序号" type="index" width="50" align="center" v-if="columns[0].visible"/>
+        <el-table-column label="模板编码" align="center" prop="templateCode" v-if="columns[1].visible"/>
+        <el-table-column label="模板名称" align="center" prop="templateName" v-if="columns[2].visible"/>
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[3].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible"/>
+        <el-table-column label="关联检测类型表" align="center" prop="typeName" v-if="columns[5].visible"/>
+        <el-table-column label="工位编码" align="center" prop="stationCode" v-if="columns[6].visible"/>
+        <el-table-column label="工位名称" align="center" prop="stationName" v-if="columns[7].visible"/>
+        <el-table-column label="工序编码" align="center" prop="processCode" v-if="columns[8].visible"/>
+        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[9].visible"/>
+        <el-table-column label="供应商编码" align="center" prop="supplierCode" v-if="columns[10].visible"/>
+        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[11].visible"/>
+        <el-table-column label="模板说明" align="center" prop="description" v-if="columns[12].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['qms:qcInspectionTemplate:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['qms:qcInspectionTemplate:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 子表显示区域 -->
+    <el-card v-if="selectedTemplateId" shadow="never" class="mt-4">
+      <template #header>
+        <div class="flex justify-between items-center">
+          <h3>检测模板子表 - {{ selectedTemplateName }}</h3>
+          <el-button type="primary" size="small" icon="Plus" @click="handleAddTemplateItem" v-hasPermi="['qms:qcTemplateItem:add']">
+            新增检测项
+          </el-button>
+        </div>
+      </template>
+
+      <!-- 子表搜索区域 -->
+      <div class="mb-4">
+        <el-form :model="templateItemQueryParams" :inline="true" label-width="100px">
+          <el-form-item label="检测方式" prop="detectType">
+            <el-select v-model="templateItemQueryParams.detectType" placeholder="请选择检测方式" clearable>
+              <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="控制类型" prop="controlType">
+            <el-select v-model="templateItemQueryParams.controlType" placeholder="请选择控制类型" 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>
+            <el-button type="primary" icon="Search" @click="getTemplateItemList">搜索</el-button>
+            <el-button icon="Refresh" @click="resetTemplateItemQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- 子表数据表格 -->
+      <el-table v-loading="templateItemLoading" :data="templateItemList" @selection-change="handleTemplateItemSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" type="index" width="50" align="center" />
+        <el-table-column label="检测项编码" align="center" prop="itemCode" />
+        <el-table-column label="检测项名称" align="center" prop="itemName" />
+        <el-table-column label="检测位置" align="center" prop="inspectionPosition" />
+        <el-table-column label="检测项目类别" align="center" prop="categoryName" />
+        <el-table-column label="检测类型" align="center" prop="inspectionType" />
+        <el-table-column label="检测方式" align="center" prop="detectType">
+          <template #default="scope">
+            <dict-tag :options="qc_methond" :value="scope.row.detectType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="控制类型" align="center" prop="controlType">
+          <template #default="scope">
+            <dict-tag :options="control_type" :value="scope.row.controlType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="标准值" align="center" prop="standardValue" />
+        <el-table-column label="控制上限" align="center" prop="upperLimit" />
+        <el-table-column label="控制下限" align="center" prop="lowerLimit" />
+        <el-table-column label="规格名称" align="center" prop="specName" />
+        <el-table-column label="规格上限" align="center" prop="specUpper" />
+        <el-table-column label="规格下限" align="center" prop="specLower" />
+        <el-table-column label="检测项说明" align="center" prop="description" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdateTemplateItem(scope.row)" v-hasPermi="['qms:qcTemplateItem:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDeleteTemplateItem(scope.row)" v-hasPermi="['qms:qcTemplateItem:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="templateItemTotal > 0" :total="templateItemTotal" v-model:page="templateItemQueryParams.pageNum" v-model:limit="templateItemQueryParams.pageSize" @pagination="getTemplateItemList" />
+    </el-card>
+
+    <!-- 添加或修改检测模板主对话框 -->
+    <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-item label="模板编码" prop="templateCode">
+          <el-input v-model="form.templateCode" placeholder="请输入模板编码" />
+        </el-form-item>
+        <el-form-item label="模板名称" prop="templateName">
+          <el-input v-model="form.templateName" placeholder="请输入模板名称" />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="关联检测类型表" prop="typeId">
+          <el-select v-model="form.typeId" placeholder="请选择关联检测类型表">
+            <el-option v-for="item in qcInspectionTypeList" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工位编码" prop="stationCode">
+          <el-input v-model="form.stationCode" placeholder="请输入工位编码" />
+        </el-form-item>
+        <el-form-item label="工位名称" prop="stationName">
+          <el-input v-model="form.stationName" placeholder="请输入工位名称" />
+        </el-form-item>
+        <el-form-item label="工序编码" prop="processCode">
+          <el-input v-model="form.processCode" placeholder="请输入工序编码" />
+        </el-form-item>
+        <el-form-item label="工序名称" prop="processName">
+          <el-input v-model="form.processName" placeholder="请输入工序名称" />
+        </el-form-item>
+        <el-form-item label="供应商编码" prop="supplierCode">
+          <el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
+        </el-form-item>
+        <el-form-item label="供应商名称" prop="supplierName">
+          <el-input v-model="form.supplierName" 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">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 添加或修改检测模板子表对话框 -->
+    <el-dialog :title="templateItemDialog.title" v-model="templateItemDialog.visible" width="1200px" append-to-body>
+      <el-form ref="templateItemFormRef" :model="templateItemForm" :rules="templateItemRules" label-width="120px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="模板编码" prop="templateCode">
+              <el-input v-model="selectedTemplateCode" placeholder="模板编码" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="模板名称" prop="templateName">
+              <el-input v-model="selectedTemplateName" placeholder="模板名称" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="关联检测项定义" prop="itemId">
+              <el-select v-model="templateItemForm.itemId" placeholder="请选择关联检测项定义" style="width: 100%;">
+                <el-option v-for="item in qcInspectionItemList" :key="item.itemId" :label="item.itemName" :value="item.itemId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项编码" prop="itemCode">
+              <el-input v-model="templateItemForm.itemCode" placeholder="请输入检测项编码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="检测项名称" prop="itemName">
+              <el-input v-model="templateItemForm.itemName" placeholder="请输入检测项名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测方式" prop="detectType">
+              <el-select v-model="templateItemForm.detectType" placeholder="请选择检测方式" style="width: 100%;">
+                <el-option v-for="dict in qc_methond" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制类型" prop="controlType">
+              <el-select v-model="templateItemForm.controlType" placeholder="请选择控制类型" style="width: 100%;">
+                <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-col>
+          <el-col :span="6">
+            <el-form-item label="检测项目类别" prop="categoryName">
+              <el-input v-model="templateItemForm.categoryName" placeholder="请输入检测项目类别" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="检测类型" prop="inspectionType">
+              <el-input v-model="templateItemForm.inspectionType" placeholder="请输入检测类型" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测位置" prop="inspectionPosition">
+              <el-input v-model="templateItemForm.inspectionPosition" placeholder="请输入检测位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准值" prop="standardValue" v-if="templateItemForm.detectType === 1">
+              <el-input-number v-model="templateItemForm.standardValue" placeholder="请输入标准值" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制上限" prop="upperLimit" v-if="templateItemForm.detectType === 1">
+              <el-input-number v-model="templateItemForm.upperLimit" placeholder="请输入控制上限" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="templateItemForm.detectType === 1">
+          <el-col :span="6">
+            <el-form-item label="控制下限" prop="lowerLimit">
+              <el-input-number v-model="templateItemForm.lowerLimit" placeholder="请输入控制下限" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格名称" prop="specName">
+              <el-input v-model="templateItemForm.specName" placeholder="请输入规格名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格上限" prop="specUpper">
+              <el-input-number v-model="templateItemForm.specUpper" placeholder="请输入规格上限" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格下限" prop="specLower">
+              <el-input-number v-model="templateItemForm.specLower" placeholder="请输入规格下限" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="检测项说明" prop="description">
+              <el-input type="textarea" v-model="templateItemForm.description" placeholder="请输入检测项说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="templateItemButtonLoading" type="primary" @click="submitTemplateItemForm">确 定</el-button>
+          <el-button @click="cancelTemplateItem">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="QcInspectionTemplate" lang="ts">
+import { listQcInspectionTemplate, getQcInspectionTemplate, delQcInspectionTemplate, addQcInspectionTemplate, updateQcInspectionTemplate, getQcTemplateItemList } from '@/api/qms/qcInspectionTemplate';
+import { QcInspectionTemplateVO, QcInspectionTemplateQuery, QcInspectionTemplateForm } from '@/api/qms/qcInspectionTemplate/types';
+import { listQcTemplateItem, getQcTemplateItem, delQcTemplateItem, addQcTemplateItem, updateQcTemplateItem } from '@/api/qms/qcTemplateItem';
+import { QcTemplateItemVO, QcTemplateItemQuery, QcTemplateItemForm } from '@/api/qms/qcTemplateItem/types';
+import { getQcInspectionTypeList } from '@/api/qms/qcInspectionType';
+import { QcInspectionTypeVO } from '@/api/qms/qcInspectionType/types';
+import { listQcInspectionItem, getQcInspectionItem, delQcInspectionItem, addQcInspectionItem, updateQcInspectionItem, getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { qc_methond, control_type } = toRefs<any>(proxy?.useDict('qc_methond', 'control_type'));
+
+const qcInspectionTemplateList = ref<QcInspectionTemplateVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+// 子表相关状态
+const selectedTemplateId = ref<string | number | null>(null);
+const selectedTemplateName = ref<string>('');
+const selectedTemplateCode = ref<string>('');
+const templateItemList = ref<QcTemplateItemVO[]>([]);
+const templateItemLoading = ref(false);
+const templateItemTotal = ref(0);
+const templateItemIds = ref<Array<string | number>>([]);
+const templateItemSingle = ref(true);
+const templateItemMultiple = ref(true);
+const templateItemButtonLoading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const qcInspectionTemplateFormRef = ref<ElFormInstance>();
+const templateItemFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const templateItemDialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, 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: `关联检测类型表ID`, 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 },
+]);
+
+const initFormData: QcInspectionTemplateForm = {
+  templateId: undefined,
+  templateCode: undefined,
+  templateName: undefined,
+  materialCode: undefined,
+  materialName: undefined,
+  typeId: undefined,
+  stationCode: undefined,
+  stationName: undefined,
+  processCode: undefined,
+  processName: undefined,
+  supplierCode: undefined,
+  supplierName: undefined,
+  description: undefined,
+}
+
+const initTemplateItemFormData: QcTemplateItemForm = {
+  templateItemId: undefined,
+  templateId: undefined,
+  itemId: undefined,
+  itemCode: undefined,
+  itemName: undefined,
+  inspectionPosition: undefined,
+  categoryName: undefined,
+  inspectionType: undefined,
+  detectType: undefined,
+  controlType: undefined,
+  standardValue: undefined,
+  upperLimit: undefined,
+  lowerLimit: undefined,
+  specName: undefined,
+  specUpper: undefined,
+  specLower: undefined,
+  description: undefined,
+}
+
+const data = reactive<PageData<QcInspectionTemplateForm, QcInspectionTemplateQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    templateId: undefined,
+    templateCode: undefined,
+    templateName: undefined,
+    materialCode: undefined,
+    materialName: undefined,
+    typeId: undefined,
+    stationCode: undefined,
+    stationName: undefined,
+    processCode: undefined,
+    processName: undefined,
+    supplierCode: undefined,
+    supplierName: undefined,
+    description: undefined,
+    params: {
+    }
+  },
+  rules: {
+    // templateId: [
+    //   { required: true, message: "模板主键不能为空", trigger: "blur" }
+    // ],
+    templateCode: [
+      { required: true, message: "模板编码不能为空", trigger: "blur" }
+    ],
+    templateName: [
+      { required: true, message: "模板名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+// 子表数据
+const templateItemForm = ref<QcTemplateItemForm>({...initTemplateItemFormData});
+const templateItemQueryParams = ref<QcTemplateItemQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  templateItemId: undefined,
+  templateId: undefined,
+  itemId: undefined,
+  itemCode: undefined,
+  itemName: undefined,
+  inspectionPosition: undefined,
+  categoryName: undefined,
+  inspectionType: undefined,
+  detectType: undefined,
+  controlType: undefined,
+  standardValue: undefined,
+  upperLimit: undefined,
+  lowerLimit: undefined,
+  specName: undefined,
+  specUpper: undefined,
+  specLower: undefined,
+  description: undefined,
+  params: {}
+});
+
+const templateItemRules = ref({
+  // templateId: [
+  //   { required: true, message: "关联模板主表ID不能为空", trigger: "blur" }
+  // ],
+  itemCode: [
+    { required: true, message: "检测项编码不能为空", trigger: "blur" }
+  ],
+  itemName: [
+    { required: true, message: "检测项名称不能为空", trigger: "blur" }
+  ],
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询检测模板主列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQcInspectionTemplate(queryParams.value);
+  qcInspectionTemplateList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 查询检测模板子表列表 */
+const getTemplateItemList = async () => {
+  if (!selectedTemplateId.value) return;
+
+  templateItemLoading.value = true;
+  // 设置templateId过滤条件
+  templateItemQueryParams.value.templateId = selectedTemplateId.value;
+  const res = await listQcTemplateItem(templateItemQueryParams.value);
+  templateItemList.value = res.rows;
+  templateItemTotal.value = res.total;
+  templateItemLoading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  qcInspectionTemplateFormRef.value?.resetFields();
+}
+
+/** 子表取消按钮 */
+const cancelTemplateItem = () => {
+  resetTemplateItem();
+  templateItemDialog.visible = false;
+}
+
+/** 子表表单重置 */
+const resetTemplateItem = () => {
+  templateItemForm.value = {...initTemplateItemFormData};
+  templateItemFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 重置子表搜索 */
+const resetTemplateItemQuery = () => {
+  templateItemQueryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    templateItemId: undefined,
+    templateId: selectedTemplateId.value,
+    itemId: undefined,
+    itemCode: undefined,
+    itemName: undefined,
+    inspectionPosition: undefined,
+    categoryName: undefined,
+    inspectionType: undefined,
+    detectType: undefined,
+    controlType: undefined,
+    standardValue: undefined,
+    upperLimit: undefined,
+    lowerLimit: undefined,
+    specName: undefined,
+    specUpper: undefined,
+    specLower: undefined,
+    description: undefined,
+    params: {}
+  };
+  getTemplateItemList();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: QcInspectionTemplateVO[]) => {
+  ids.value = selection.map(item => item.templateId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 子表多选框选中数据 */
+const handleTemplateItemSelectionChange = (selection: QcTemplateItemVO[]) => {
+  templateItemIds.value = selection.map(item => item.templateItemId);
+  templateItemSingle.value = selection.length != 1;
+  templateItemMultiple.value = !selection.length;
+}
+
+/** 行点击事件 */
+const handleRowClick = (row: QcInspectionTemplateVO) => {
+  selectedTemplateId.value = row.templateId;
+  selectedTemplateName.value = row.templateName || '';
+  selectedTemplateCode.value = row.templateCode || '';
+  // 刷新子表数据
+  nextTick(() => {
+    getTemplateItemList();
+  });
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加检测模板主";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: QcInspectionTemplateVO) => {
+  reset();
+  const _templateId = row?.templateId || ids.value[0]
+  const res = await getQcInspectionTemplate(_templateId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改检测模板主";
+}
+
+/** 新增检测项 */
+const handleAddTemplateItem = () => {
+  resetTemplateItem();
+  templateItemForm.value.templateId = selectedTemplateId.value;
+  templateItemDialog.visible = true;
+  templateItemDialog.title = "添加检测项";
+}
+
+/** 修改检测项 */
+const handleUpdateTemplateItem = async (row?: QcTemplateItemVO) => {
+  resetTemplateItem();
+  const _templateItemId = row?.templateItemId || templateItemIds.value[0];
+  const res = await getQcTemplateItem(_templateItemId);
+  Object.assign(templateItemForm.value, res.data);
+  templateItemDialog.visible = true;
+  templateItemDialog.title = "修改检测项";
+}
+
+/** 删除检测项 */
+const handleDeleteTemplateItem = async (row?: QcTemplateItemVO) => {
+  const _templateItemIds = row?.templateItemId || templateItemIds.value;
+  await proxy?.$modal.confirm('是否确认删除检测项编号为"' + _templateItemIds + '"的数据项？').finally(() => templateItemLoading.value = false);
+  await delQcTemplateItem(_templateItemIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getTemplateItemList();
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  qcInspectionTemplateFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.templateId) {
+        await updateQcInspectionTemplate(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addQcInspectionTemplate(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 子表提交按钮 */
+const submitTemplateItemForm = () => {
+  templateItemFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      templateItemButtonLoading.value = true;
+      if (templateItemForm.value.templateItemId) {
+        await updateQcTemplateItem(templateItemForm.value).finally(() => templateItemButtonLoading.value = false);
+      } else {
+        await addQcTemplateItem(templateItemForm.value).finally(() => templateItemButtonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      templateItemDialog.visible = false;
+      await getTemplateItemList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: QcInspectionTemplateVO) => {
+  const _templateIds = row?.templateId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除检测模板主编号为"' + _templateIds + '"的数据项？').finally(() => loading.value = false);
+  await delQcInspectionTemplate(_templateIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('qms/qcInspectionTemplate/export', {
+    ...queryParams.value
+  }, `qcInspectionTemplate_${new Date().getTime()}.xlsx`)
+}
+
+
+//获取检测类型列表（不分页，获取全部）
+let qcInspectionTypeList = ref([]);
+const getInspectionTypeList = async () => {
+  const res = await getQcInspectionTypeList(null);
+  qcInspectionTypeList.value = res.data;
+}
+
+//获取检测项列表（不分页，获取全部）
+let qcInspectionItemList = ref([]);
+const getInspectionItemList = async () => {
+  const res = await getQcInspectionItemList(null);
+  qcInspectionItemList.value = res.data;
+}
+
+
+onMounted(() => {
+  getList();
+  getInspectionTypeList();
+  getInspectionItemList();
+});
+</script>

src/views/qms/qcInspectionType/index.vue

@@ -0,0 +1,307 @@
+<template>
+  <div class="p-2">
+    <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='120px'>
+            <!-- <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="typeCode">
+              <el-input v-model="queryParams.typeCode" placeholder="请输入检测类型编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测类型名称" prop="typeName">
+              <el-input v-model="queryParams.typeName" placeholder="请输入检测类型名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检测类型" prop="qcInspectionType">
+              <el-select v-model="queryParams.qcInspectionType" placeholder="请选择检测类型" clearable >
+                <el-option v-for="dict in qc_inspection_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建方式" prop="createMethod">
+              <el-select v-model="queryParams.createMethod" placeholder="请选择创建方式" clearable >
+                <el-option v-for="dict in create_method" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['qms:qcInspectionType:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['qms:qcInspectionType:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['qms:qcInspectionType:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:qcInspectionType:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="qcInspectionTypeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- 页面自动序号 -->
+        <el-table-column label="序号" align="center" prop="typeId" v-if="columns[0].visible">
+          <template #default="scope">
+            {{ scope.$index + 1 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="检测类型主键" align="center" prop="typeId" v-if="columns[1].visible"/>
+        <el-table-column label="检测类型编码" align="center" prop="typeCode" v-if="columns[2].visible"/>
+        <el-table-column label="检测类型名称" align="center" prop="typeName" v-if="columns[3].visible"/>
+        <el-table-column label="检测类型" align="center" prop="qcInspectionType" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="qc_inspection_type" :value="scope.row.qcInspectionType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建方式" align="center" prop="createMethod" v-if="columns[5].visible">
+          <template #default="scope">
+            <dict-tag :options="create_method" :value="scope.row.createMethod"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['qms:qcInspectionType:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['qms:qcInspectionType:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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="qcInspectionTypeFormRef" :model="form" :rules="rules" label-width="120px">
+        <!-- <el-form-item label="检测类型主键" prop="typeId">
+          <el-input v-model="form.typeId" placeholder="请输入检测类型主键" />
+        </el-form-item> -->
+        <el-form-item label="检测类型编码" prop="typeCode">
+          <el-input v-model="form.typeCode" placeholder="请输入检测类型编码" />
+        </el-form-item>
+        <el-form-item label="检测类型名称" prop="typeName">
+          <el-input v-model="form.typeName" placeholder="请输入检测类型名称" />
+        </el-form-item>
+        <el-form-item label="检测类型" prop="qcInspectionType">
+          <el-select v-model="form.qcInspectionType" placeholder="请选择检测类型">
+            <el-option
+                v-for="dict in qc_inspection_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建方式" prop="createMethod">
+          <el-select v-model="form.createMethod" placeholder="请选择创建方式">
+            <el-option
+                v-for="dict in create_method"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="QcInspectionType" lang="ts">
+import { listQcInspectionType, getQcInspectionType, delQcInspectionType, addQcInspectionType, updateQcInspectionType } from '@/api/qms/qcInspectionType';
+import { QcInspectionTypeVO, QcInspectionTypeQuery, QcInspectionTypeForm } from '@/api/qms/qcInspectionType/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { qc_inspection_type, create_method } = toRefs<any>(proxy?.useDict('qc_inspection_type', 'create_method'));
+
+const qcInspectionTypeList = ref<QcInspectionTypeVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const qcInspectionTypeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `序号`, visible: true },
+        { key: 1, label: `检测类型主键`, visible: false },
+        { key: 2, label: `检测类型编码`, visible: true },
+        { key: 3, label: `检测类型名称`, visible: true },
+        { key: 4, label: `检测类型`, visible: true },
+        { key: 5, label: `创建方式`, visible: true },
+        // { key: 5, label: `创建人`, visible: true },
+        // { key: 7, label: `创建部门`, visible: true },
+        // { key: 8, label: `创建时间`, visible: true },
+        // { key: 9, label: `修改人`, visible: true },
+        // { key: 10, label: `修改时间`, visible: true },
+]);
+
+const initFormData: QcInspectionTypeForm = {
+  typeId: undefined,
+  typeCode: undefined,
+  typeName: undefined,
+  qcInspectionType: undefined,
+  createMethod: undefined,
+}
+const data = reactive<PageData<QcInspectionTypeForm, QcInspectionTypeQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    typeId: undefined,
+    typeCode: undefined,
+    typeName: undefined,
+    qcInspectionType: undefined,
+    createMethod: undefined,
+    params: {
+    }
+  },
+  rules: {
+    typeId: [
+      { required: true, message: "检测类型主键不能为空", trigger: "blur" }
+    ],
+    typeCode: [
+      { required: true, message: "检测类型编码不能为空", trigger: "blur" }
+    ],
+    typeName: [
+      { required: true, message: "检测类型名称不能为空", trigger: "blur" }
+    ],
+    qcInspectionType: [
+      { required: true, message: "检测类型不能为空", trigger: "change" }
+    ],
+    // createMethod: [
+    //   { required: true, message: "创建方式不能为空", trigger: "change" }
+    // ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询检测类型列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQcInspectionType(queryParams.value);
+  qcInspectionTypeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  qcInspectionTypeFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: QcInspectionTypeVO[]) => {
+  ids.value = selection.map(item => item.typeId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加检测类型";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: QcInspectionTypeVO) => {
+  reset();
+  const _typeId = row?.typeId || ids.value[0]
+  const res = await getQcInspectionType(_typeId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改检测类型";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  qcInspectionTypeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.typeId) {
+        await updateQcInspectionType(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addQcInspectionType(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: QcInspectionTypeVO) => {
+  const _typeIds = row?.typeId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除检测类型编号为"' + _typeIds + '"的数据项？').finally(() => loading.value = false);
+  await delQcInspectionType(_typeIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('qms/qcInspectionType/export', {
+    ...queryParams.value
+  }, `qcInspectionType_${new Date().getTime()}.xlsx`)
+}
+
+
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/qms/qcTemplateItem/index.vue

@@ -0,0 +1,441 @@
+<template>
+  <div class="p-2">
+    <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-item label="模板子表主键" prop="templateItemId">
+              <el-input v-model="queryParams.templateItemId" placeholder="请输入模板子表主键" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="关联模板主表ID" prop="templateId">
+              <el-input v-model="queryParams.templateId" placeholder="请输入关联模板主表ID" clearable @keyup.enter="handleQuery" />
+            </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 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="inspectionType">
+              <el-input v-model="queryParams.inspectionType" 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 qc_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="控制类型" prop="controlType">
+              <el-select v-model="queryParams.controlType" placeholder="请选择控制类型" 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>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['qms:qcTemplateItem:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['qms:qcTemplateItem:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['qms:qcTemplateItem:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['qms:qcTemplateItem:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="qcTemplateItemList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="模板子表主键" align="center" prop="templateItemId" v-if="columns[0].visible"/> -->
+        <el-table-column label="序号" align="center" prop="templateItemId" v-if="columns[0].visible"/>
+        <el-table-column label="关联模板主表ID" align="center" prop="templateId" 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="itemCode" v-if="columns[3].visible"/>
+        <el-table-column label="检测项名称" align="center" prop="itemName" v-if="columns[4].visible"/>
+        <el-table-column label="检测位置" align="center" prop="inspectionPosition" v-if="columns[5].visible"/>
+        <el-table-column label="检测项目类别" align="center" prop="categoryName" v-if="columns[6].visible"/>
+        <el-table-column label="检测类型" align="center" prop="inspectionType" v-if="columns[7].visible"/>
+        <el-table-column label="检测方式" align="center" prop="detectType" v-if="columns[8].visible">
+          <template #default="scope">
+            <dict-tag :options="qc_methond" :value="scope.row.detectType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="控制类型" align="center" prop="controlType" v-if="columns[9].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[10].visible"/>
+        <el-table-column label="控制上限" align="center" prop="upperLimit" v-if="columns[11].visible"/>
+        <el-table-column label="控制下限" align="center" prop="lowerLimit" v-if="columns[12].visible"/>
+        <el-table-column label="规格名称" align="center" prop="specName" v-if="columns[13].visible"/>
+        <el-table-column label="规格上限" align="center" prop="specUpper" v-if="columns[14].visible"/>
+        <el-table-column label="规格下限" align="center" prop="specLower" v-if="columns[15].visible"/>
+        <el-table-column label="检测项说明" align="center" prop="description" v-if="columns[16].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['qms:qcTemplateItem:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['qms:qcTemplateItem:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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="1200px" append-to-body>
+      <el-form ref="qcTemplateItemFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="关联模板主表ID" prop="templateId">
+              <el-input v-model="form.templateId" placeholder="请输入关联模板主表ID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="关联检测项定义ID" prop="itemId">
+              <el-input v-model="form.itemId" placeholder="请输入关联检测项定义ID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项编码" prop="itemCode">
+              <el-input v-model="form.itemCode" placeholder="请输入检测项编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项名称" prop="itemName">
+              <el-input v-model="form.itemName" placeholder="请输入检测项名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="检测方式" prop="detectType">
+              <el-select v-model="form.detectType" placeholder="请选择检测方式">
+                <el-option
+                    v-for="dict in qc_methond"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制类型" prop="controlType">
+              <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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测项目类别" prop="categoryName">
+              <el-input v-model="form.categoryName" placeholder="请输入检测项目类别" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检测类型" prop="inspectionType">
+              <el-input v-model="form.inspectionType" placeholder="请输入检测类型" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+           <el-col :span="6">
+            <el-form-item label="标准值" prop="standardValue">
+              <el-input-number v-model="form.standardValue" placeholder="请输入标准值" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制上限" prop="upperLimit">
+              <el-input-number v-model="form.upperLimit" placeholder="请输入控制上限" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="控制下限" prop="lowerLimit">
+              <el-input-number v-model="form.lowerLimit" placeholder="请输入控制下限" />
+            </el-form-item>
+          </el-col>
+           <el-col :span="6">
+            <el-form-item label="检测位置" prop="inspectionPosition">
+              <el-input v-model="form.inspectionPosition" placeholder="请输入检测位置" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="规格名称" prop="specName">
+              <el-input v-model="form.specName" placeholder="请输入规格名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格上限" prop="specUpper">
+              <el-input-number v-model="form.specUpper" placeholder="请输入规格上限" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格下限" prop="specLower">
+              <el-input-number v-model="form.specLower" placeholder="请输入规格下限" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="检测项说明" prop="description">
+              <el-input type="textarea" v-model="form.description" placeholder="请输入检测项说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="QcTemplateItem" lang="ts">
+import { listQcTemplateItem, getQcTemplateItem, delQcTemplateItem, addQcTemplateItem, updateQcTemplateItem } from '@/api/qms/qcTemplateItem';
+import { QcTemplateItemVO, QcTemplateItemQuery, QcTemplateItemForm } from '@/api/qms/qcTemplateItem/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { qc_methond, control_type } = toRefs<any>(proxy?.useDict('qc_methond', 'control_type'));
+
+const qcTemplateItemList = ref<QcTemplateItemVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const qcTemplateItemFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `序号`, visible: true },
+        { key: 1, label: `关联模板主表ID`, visible: true },
+        { key: 2, label: `关联检测项定义ID`, 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: `规格名称`, visible: true },
+        { key: 14, label: `规格上限`, visible: true },
+        { key: 15, label: `规格下限`, visible: true },
+        { key: 16, label: `检测项说明`, visible: true },
+]);
+
+const initFormData: QcTemplateItemForm = {
+  templateItemId: undefined,
+  templateId: undefined,
+  itemId: undefined,
+  itemCode: undefined,
+  itemName: undefined,
+  inspectionPosition: undefined,
+  categoryName: undefined,
+  inspectionType: undefined,
+  detectType: undefined,
+  controlType: undefined,
+  standardValue: undefined,
+  upperLimit: undefined,
+  lowerLimit: undefined,
+  specName: undefined,
+  specUpper: undefined,
+  specLower: undefined,
+  description: undefined,
+}
+const data = reactive<PageData<QcTemplateItemForm, QcTemplateItemQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    templateItemId: undefined,
+    templateId: undefined,
+    itemId: undefined,
+    itemCode: undefined,
+    itemName: undefined,
+    inspectionPosition: undefined,
+    categoryName: undefined,
+    inspectionType: undefined,
+    detectType: undefined,
+    controlType: undefined,
+    standardValue: undefined,
+    upperLimit: undefined,
+    lowerLimit: undefined,
+    specName: undefined,
+    specUpper: undefined,
+    specLower: undefined,
+    description: undefined,
+    params: {
+    }
+  },
+  rules: {
+    templateItemId: [
+      { required: true, message: "模板子表主键不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询检测模板子表列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listQcTemplateItem(queryParams.value);
+  qcTemplateItemList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  qcTemplateItemFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: QcTemplateItemVO[]) => {
+  ids.value = selection.map(item => item.templateItemId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加检测模板子表";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: QcTemplateItemVO) => {
+  reset();
+  const _templateItemId = row?.templateItemId || ids.value[0]
+  const res = await getQcTemplateItem(_templateItemId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改检测模板子表";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  qcTemplateItemFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.templateItemId) {
+        await updateQcTemplateItem(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addQcTemplateItem(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: QcTemplateItemVO) => {
+  const _templateItemIds = row?.templateItemId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除检测模板子表编号为"' + _templateItemIds + '"的数据项？').finally(() => loading.value = false);
+  await delQcTemplateItem(_templateItemIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('qms/qcTemplateItem/export', {
+    ...queryParams.value
+  }, `qcTemplateItem_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>