aql

src/api/qms/aql/index.ts

@@ -6,36 +6,36 @@ export interface AqlVO {
   inspectionQualification: string
   sampleCharacterCode: string
   sampleSize: number
-  a0010: number
-  r0010: number
-  a0015: number
-  r0015: number
-  a0025: number
-  r0025: number
-  a0040: number
-  r0040: number
-  a0065: number
-  r0065: number
-  a010: number
-  r010: number
-  a015: number
-  r015: number
-  a025: number
-  r025: number
-  a040: number
-  r040: number
-  a065: number
-  r065: number
-  a10: number
-  r10: number
-  a15: number
-  r15: number
-  a25: number
-  r25: number
-  a40: number
-  r40: number
-  a65: number
-  r65: number
+  a0Separator010: number
+  r0Separator010: number
+  a0Separator015: number
+  r0Separator015: number
+  a0Separator025: number
+  r0Separator025: number
+  a0Separator040: number
+  r0Separator040: number
+  a0Separator065: number
+  r0Separator065: number
+  a0Separator10: number
+  r0Separator10: number
+  a0Separator15: number
+  r0Separator15: number
+  a0Separator25: number
+  r0Separator25: number
+  a0Separator40: number
+  r0Separator40: number
+  a0Separator65: number
+  r0Separator65: number
+  a1Separator0: number
+  r1Separator0: number
+  a1Separator5: number
+  r1Separator5: number
+  a2Separator5: number
+  r2Separator5: number
+  a4Separator0: number
+  r4Separator0: number
+  a6Separator5: number
+  r6Separator5: number
   a10: number
   r10: number
   a15: number
@@ -100,4 +100,4 @@ export const exportAql = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/aql/get-import-template' })
-}
+}

src/api/qms/inspectionMethod/index.ts

@@ -5,7 +5,6 @@ export interface InspectionMethodVO {
   code: string
   describe: string
   version: string
-  status: string
   operationGuidance: string
   videoAddress: string
   available: string
@@ -50,4 +49,4 @@ export const exportInspectionMethod = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/inspection-method/get-import-template' })
-}
+}

src/views/qms/aql/aql.data.ts

@@ -48,154 +48,152 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: 'A0_010',
-    field: 'a0010',
+    field: 'a0Separator010',
     sort: 'custom',
   },
   {
     label: 'R0_010',
-    field: 'r0010',
+    field: 'r0Separator010',
     sort: 'custom',
   },
   {
     label: 'A0_015',
-    field: 'a0015',
+    field: 'a0Separator015',
     sort: 'custom',
   },
   {
     label: 'R0_015',
-    field: 'r0015',
+    field: 'r0Separator015',
     sort: 'custom',
   },
   {
     label: 'A0_025',
-    field: 'a0025',
+    field: 'a0Separator025',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: 'R0_025',
-    field: 'r0025',
+    field: 'r0Separator025',
     sort: 'custom',
   },
   {
     label: 'A0_040',
-    field: 'a0040',
+    field: 'a0Separator040',
     sort: 'custom',
   },
   {
     label: 'R0_040',
-    field: 'r0040',
+    field: 'r0Separator040',
     sort: 'custom',
   },
   {
     label: 'A0_065',
-    field: 'a0065',
+    field: 'a0Separator065',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: 'R0_065',
-    field: 'r0065',
+    field: 'r0Separator065',
     sort: 'custom',
   },
   {
     label: 'A0_10',
-    field: 'a010',
+    field: 'a0Separator10',
     sort: 'custom',
   },
   {
     label: 'R0_10',
-    field: 'r010',
+    field: 'r0Separator10',
     sort: 'custom',
   },
   {
     label: 'A0_15',
-    field: 'a015',
+    field: 'a0Separator15',
     sort: 'custom',
   },
   {
     label: 'R0_15',
-    field: 'r015',
+    field: 'r0Separator15',
     sort: 'custom',
   },
   {
     label: 'A0_25',
-    field: 'a025',
+    field: 'a0Separator25',
     sort: 'custom',
   },
   {
     label: 'R0_25',
-    field: 'r025',
+    field: 'r0Separator25',
     sort: 'custom',
   },
   {
     label: 'A0_40',
-    field: 'a040',
+    field: 'a0Separator40',
     sort: 'custom',
   },
   {
     label: 'R0_40',
-    field: 'r040',
+    field: 'r0Separator40',
     sort: 'custom',
   },
   {
     label: 'A0_65',
-    field: 'a065',
+    field: 'a0Separator65',
     sort: 'custom',
   },
   {
     label: 'R0_65',
-    field: 'r065',
+    field: 'r0Separator65',
     sort: 'custom',
   },
   {
     label: 'A1_0',
-    field: 'a10',
+    field: 'a1Separator0',
     sort: 'custom',
   },
   {
     label: 'R1_0',
-    field: 'r10',
+    field: 'r1Separator0',
     sort: 'custom',
   },
   {
     label: 'A1_5',
-    field: 'a15',
+    field: 'a1Separator5',
     sort: 'custom',
   },
   {
     label: 'R1_5',
-    field: 'r15',
+    field: 'r1Separator5',
     sort: 'custom',
   },
   {
     label: 'A2_5',
-    field: 'a25',
+    field: 'a2Separator5',
     sort: 'custom',
   },
   {
     label: 'R2_5',
-    field: 'r25',
+    field: 'r2Separator5',
     sort: 'custom',
   },
   {
     label: 'A4_0',
-    field: 'a40',
+    field: 'a4Separator0',
     sort: 'custom',
   },
   {
     label: 'R4_0',
-    field: 'r40',
+    field: 'r4Separator0',
     sort: 'custom',
   },
   {
     label: 'A6_5',
-    field: 'a65',
+    field: 'a6Separator5',
     sort: 'custom',
   },
   {
     label: 'R6_5',
-    field: 'r65',
+    field: 'r6Separator5',
     sort: 'custom',
   },
   {
@@ -312,6 +310,11 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',

src/views/qms/aql/index.vue

@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:aql:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:aql:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:aql:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:aql:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:aql:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:aql:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:aql:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:aql:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:aql:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:aql:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/qms/inspectionMethod/index.vue

@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:inspectionMethod:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:inspectionMethod:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:inspectionMethod:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:inspectionMethod:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:inspectionMethod:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:inspectionMethod:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:inspectionMethod:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:inspectionMethod:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:inspectionMethod:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspectionMethod:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/qms/inspectionMethod/inspectionMethod.data.ts

@@ -4,7 +4,6 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const InspectionMethodRules = reactive({
   code: [required],
-  status: [required],
   available: [required],
 })
 
@@ -32,15 +31,6 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'version',
     sort: 'custom',
   },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Radio'
-    },
-  },
   {
     label: '操作指导',
     field: 'operationGuidance',
@@ -55,6 +45,11 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',