采样过程、方案

src/api/qms/samplingProcess/index.ts

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 export interface SamplingProcessVO {
   id: number
   code: string
-  describe: string
+  description: string
   sampleType: string
   evaluationMode: string
   sampleSize: number
@@ -50,4 +50,4 @@ export const exportSamplingProcess = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/sampling-process/get-import-template' })
-}
+}

src/api/qms/samplingScheme/index.ts

@@ -4,7 +4,6 @@ export interface SamplingSchemeVO {
   id: number
   code: string
   describe: string
-  status: string
   available: string
 }
 

src/views/qms/samplingProcess/index.vue

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

src/views/qms/samplingProcess/samplingProcess.data.ts

@@ -64,6 +64,11 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',

src/views/qms/samplingScheme/index.vue

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

src/views/qms/samplingScheme/samplingScheme.data.ts

@@ -4,7 +4,7 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const SamplingSchemeRules = reactive({
   code: [required],
-  status: [required],
+  // status: [required],
   available: [required],
 })
 
@@ -28,19 +28,16 @@ export const SamplingScheme = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Radio'
-    },
-  },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',