diff --git a/src/api/lab/hardness/hardnessFour/index.ts b/src/api/lab/hardness/hardnessFour/index.ts new file mode 100644 index 0000000..76ff160 --- /dev/null +++ b/src/api/lab/hardness/hardnessFour/index.ts @@ -0,0 +1,53 @@ +import request from '@/config/axios' + +export interface HardnessFourVO { + sydw: string + standard: string + cz: string + guig: string + testUser: string + testDate: string + testYd: string + auditStatus: string +} + +// 查询实验室-洛氏硬度列表 +export const getHardnessFourPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/lab/hardness-four/senior', data }) + } else { + return await request.get({ url: `/lab/hardness-four/page`, params }) + } +} + +// 查询实验室-洛氏硬度详情 +export const getHardnessFour = async (id: number) => { + return await request.get({ url: `/lab/hardness-four/get?id=` + id }) +} + +// 新增实验室-洛氏硬度 +export const createHardnessFour = async (data: HardnessFourVO) => { + return await request.post({ url: `/lab/hardness-four/create`, data }) +} + +// 修改实验室-洛氏硬度 +export const updateHardnessFour = async (data: HardnessFourVO) => { + return await request.put({ url: `/lab/hardness-four/update`, data }) +} + +// 删除实验室-洛氏硬度 +export const deleteHardnessFour = async (id: number) => { + return await request.delete({ url: `/lab/hardness-four/delete?id=` + id }) +} + +// 导出实验室-洛氏硬度 Excel +export const exportHardnessFour = async (params) => { + return await request.download({ url: `/lab/hardness-four/export-excel`, params }) +} + +// 下载导入模板 +export const importTemplate = () => { + return request.download({ url: '/lab/hardness-four/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/lab/hardness/hardnessFour/hardnessFour.data.ts b/src/views/lab/hardness/hardnessFour/hardnessFour.data.ts new file mode 100644 index 0000000..0c9156b --- /dev/null +++ b/src/views/lab/hardness/hardnessFour/hardnessFour.data.ts @@ -0,0 +1,120 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const HardnessFourRules = reactive({ +}) + +export const HardnessFour = useCrudSchemas(reactive([ + // { + // label: '主键、自增', + // field: 'id', + // sort: 'custom', + // isForm: false, + // }, + { + label: '批次号', + field: 'batchNo', + sort: 'custom', + isSearch: true, + }, + { + label: '送样单位', + field: 'sydw', + sort: 'custom', + isSearch: false, + isTable:true, + + }, + { + label: '标准', + field: 'standard', + sort: 'false', + isSearch: false, + }, + { + label: '材质', + field: 'cz', + sort: 'custom', + isSearch: false, + }, + { + label: '规格', + field: 'guig', + sort: 'custom', + isSearch: false, + }, + { + label: '实验人', + field: 'testUser', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.LAB_USER_TEST_TYPE, + dictClass: 'number' + }, + { + label: '硬度', + field: 'testYd', + sort: 'custom', + isSearch: false, + }, + { + label: '实验日期', + field: 'testDate', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'date', + valueFormat: 'YYYY-MM-DD' + } + }, + }, + + { + label: '审核状态', + field: 'auditStatus', + sort: 'custom', + isSearch: true, + table: { + fixed: 'right' + }, + isForm:false, + dictType: DICT_TYPE.LAB_AUDIT_STATUS, + dictClass: 'number' + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + fixed: 'right' + } + } +])) \ No newline at end of file diff --git a/src/views/lab/hardness/hardnessFour/index.vue b/src/views/lab/hardness/hardnessFour/index.vue new file mode 100644 index 0000000..15b90a7 --- /dev/null +++ b/src/views/lab/hardness/hardnessFour/index.vue @@ -0,0 +1,225 @@ + + + diff --git a/src/views/lab/hardness/three/hardnessThree.data.ts b/src/views/lab/hardness/three/hardnessThree.data.ts index 2781220..0018259 100644 --- a/src/views/lab/hardness/three/hardnessThree.data.ts +++ b/src/views/lab/hardness/three/hardnessThree.data.ts @@ -138,6 +138,7 @@ export const HardnessThree = useCrudSchemas(reactive([ width: 120, fixed: 'right' }, + isForm:false, dictType: DICT_TYPE.LAB_AUDIT_STATUS, dictClass: 'number' }, diff --git a/src/views/lab/hardness/three/index.vue b/src/views/lab/hardness/three/index.vue index deee3cd..3906b74 100644 --- a/src/views/lab/hardness/three/index.vue +++ b/src/views/lab/hardness/three/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/lab/hardness/two/hardnessTwo.data.ts b/src/views/lab/hardness/two/hardnessTwo.data.ts index b2a3eb1..b0895a4 100644 --- a/src/views/lab/hardness/two/hardnessTwo.data.ts +++ b/src/views/lab/hardness/two/hardnessTwo.data.ts @@ -147,6 +147,7 @@ export const HardnessTwo = useCrudSchemas(reactive([ width: 120, fixed: 'right' }, + isForm:false, dictType: DICT_TYPE.LAB_AUDIT_STATUS, dictClass: 'number' }, diff --git a/src/views/lab/hardness/two/index.vue b/src/views/lab/hardness/two/index.vue index 7a595d1..1185e39 100644 --- a/src/views/lab/hardness/two/index.vue +++ b/src/views/lab/hardness/two/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/lab/platscale/platscale.data.ts b/src/views/lab/platscale/platscale.data.ts index 7297556..16fbaa8 100644 --- a/src/views/lab/platscale/platscale.data.ts +++ b/src/views/lab/platscale/platscale.data.ts @@ -90,25 +90,25 @@ export const Platscale = useCrudSchemas(reactive([ label: '品种', field: 'pz', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } }, { - label: '供货单位', + label: '使用单位', field: 'ghdw', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } }, { - label: '运输单位', + label: '发货单位', field: 'ysdw', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } diff --git a/src/views/lab/platscaledata/platscale.data.ts b/src/views/lab/platscaledata/platscale.data.ts index 5739ac6..e525374 100644 --- a/src/views/lab/platscaledata/platscale.data.ts +++ b/src/views/lab/platscaledata/platscale.data.ts @@ -90,25 +90,25 @@ export const Platscale = useCrudSchemas(reactive([ label: '品种', field: 'pz', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } }, { - label: '供货单位', + label: '使用单位', field: 'ghdw', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } }, { - label: '运输单位', + label: '发货单位', field: 'ysdw', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } diff --git a/src/views/lab/stretch/stretchthousandnew/stretchThousandnew.data.ts b/src/views/lab/stretch/stretchthousandnew/stretchThousandnew.data.ts index 7d37838..f85d17f 100644 --- a/src/views/lab/stretch/stretchthousandnew/stretchThousandnew.data.ts +++ b/src/views/lab/stretch/stretchthousandnew/stretchThousandnew.data.ts @@ -34,7 +34,7 @@ export const StretchThousandnew = useCrudSchemas(reactive([ label: '编号', field: 'bhNo', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } @@ -124,7 +124,7 @@ export const StretchThousandnew = useCrudSchemas(reactive([ label: '尺寸', field: 'deviceCc', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } diff --git a/src/views/lab/stretch/stretchthreehundred/stretchthreehundred.data.ts b/src/views/lab/stretch/stretchthreehundred/stretchthreehundred.data.ts index 3f60543..4793525 100644 --- a/src/views/lab/stretch/stretchthreehundred/stretchthreehundred.data.ts +++ b/src/views/lab/stretch/stretchthreehundred/stretchthreehundred.data.ts @@ -52,7 +52,7 @@ export const Stretch300 = useCrudSchemas(reactive([ label: '材质', field: 'cz', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } @@ -61,7 +61,7 @@ export const Stretch300 = useCrudSchemas(reactive([ label: '规格', field: 'guig', sort: 'custom', - isSearch: false, + isSearch: true, table: { width: 150 } diff --git a/src/views/tjanalysis/platscale/index.vue b/src/views/tjanalysis/platscale/index.vue index 2bf28f9..a2344b4 100644 --- a/src/views/tjanalysis/platscale/index.vue +++ b/src/views/tjanalysis/platscale/index.vue @@ -9,6 +9,20 @@ clearable /> + + + + + + - - + + @@ -66,7 +80,9 @@ const queryParams = reactive({ pageNo: 1, pageSize: 10, dateRange: [], - ghdw: '' + ghdw:'', + ysdw:'', + pz:'' }) const handleQuery = async () => { @@ -75,7 +91,9 @@ const handleQuery = async () => { const resetQuery = async () => { queryParams.dateRange = [] - queryParams.ghdw = '' + queryParams.ghdw ='' + queryParams.ysdw ='' + queryParams.pz ='' getList() } @@ -89,7 +107,6 @@ const getList = async (page) => { dataList.dList = res.list dataList.total = res.total } - console.log('23',dataList.total); loading.value = false }