From 443ca29d3fdcd33d0ca5feea2f435f5de573683c Mon Sep 17 00:00:00 2001 From: lb Date: Mon, 31 Jul 2023 17:04:07 +0800 Subject: [PATCH 01/16] =?UTF-8?q?update=20=E8=B4=A8=E9=87=8F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/qualityInspectionType/index.vue | 541 +++++++++++------- 1 file changed, 339 insertions(+), 202 deletions(-) diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue index 4629e7e4..05e0d3bf 100644 --- a/src/views/quality/base/qualityInspectionType/index.vue +++ b/src/views/quality/base/qualityInspectionType/index.vue @@ -1,214 +1,351 @@ From 6fdc9b2826ce98df73e5378f7dfe9163d87b5137 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 1 Aug 2023 11:20:37 +0800 Subject: [PATCH 02/16] =?UTF-8?q?update=20=E8=B4=A8=E9=87=8F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- .../base/qualityInspectionType/index.vue | 95 ++++++------------- 2 files changed, 28 insertions(+), 69 deletions(-) diff --git a/.env.dev b/.env.dev index 6ce9baa5..8ef6dd7c 100644 --- a/.env.dev +++ b/.env.dev @@ -5,7 +5,7 @@ ENV = 'development' VUE_APP_TITLE = 芋道管理系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.1.8:48080' +VUE_APP_BASE_API = 'http://192.168.0.33:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue index 05e0d3bf..3c2328dd 100644 --- a/src/views/quality/base/qualityInspectionType/index.vue +++ b/src/views/quality/base/qualityInspectionType/index.vue @@ -1,67 +1,14 @@ diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue index 1a37636e..2b4f04d4 100644 --- a/src/views/quality/base/qualityInspectionType/index.vue +++ b/src/views/quality/base/qualityInspectionType/index.vue @@ -1,62 +1,26 @@ @@ -108,6 +68,16 @@ export default { components: {}, data() { return { + tableBtn: [ + { + type: 'edit', + btnName: '修改', + }, + { + type: 'delete', + btnName: '删除', + }, + ], tableData: [], tableProps: [ { @@ -120,42 +90,38 @@ export default { { prop: 'name', label: '检测类型名称', align: 'center' }, { prop: 'code', label: '检测类型编码', align: 'center' }, { prop: 'remark', label: '备注', align: 'center' }, - { - label: '操作', - alignt: 'center', - subcomponent: { - render: function (h) { - return h( - 'div', - null, - [ - h( - 'el-button', - { - props: { - icon: 'el-icon-edit', - size: 'mini', - type: 'text', - }, - }, - ' 修改' - ), - h( - 'el-button', - { - props: { - icon: 'el-icon-edit', - size: 'mini', - type: 'text', - }, - }, - ' 修改' - ), - ] - ); - }, - }, - }, + // { + // label: '操作', + // alignt: 'center', + // subcomponent: { + // render: function (h) { + // return h('div', null, [ + // h( + // 'el-button', + // { + // props: { + // icon: 'el-icon-edit', + // size: 'mini', + // type: 'text', + // }, + // }, + // ' 修改' + // ), + // h( + // 'el-button', + // { + // props: { + // icon: 'el-icon-edit', + // size: 'mini', + // type: 'text', + // }, + // }, + // ' 修改' + // ), + // ]); + // }, + // }, + // }, ], // 遮罩层 loading: true, @@ -201,11 +167,11 @@ export default { name: 'search', color: 'primary', }, - { - type: 'button', - btnName: '重置', - name: 'reset', - }, + // { + // type: 'button', + // btnName: '重置', + // name: 'reset', + // }, { type: this.$auth.hasPermi('base:quality-inspection-type:create') ? 'button' @@ -215,14 +181,14 @@ export default { plain: true, color: 'primary', }, - { - type: this.$auth.hasPermi('base:quality-inspection-type:export') - ? 'button' - : '', - btnName: '导出', - name: 'export', - color: 'warning', - }, + // { + // type: this.$auth.hasPermi('base:quality-inspection-type:export') + // ? 'button' + // : '', + // btnName: '导出', + // name: 'export', + // color: 'warning', + // }, ], }; }, @@ -230,10 +196,20 @@ export default { this.getList(); }, methods: { + /** base table related */ + handleTableBtnClick({ data, type }) { + switch (type) { + case 'edit': + this.handleUpdate(data); + break; + case 'delete': + this.handleDelete(data); + break; + } + }, /** search bar related */ handleSearchBarBtnClick(btn) { const keys = ['name']; - console.log('btn', btn); switch (btn.btnName) { case 'search': keys.forEach((key) => { From 6d4f44fd68e95488eb9ac9559bffe289b525f9b4 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 1 Aug 2023 17:01:59 +0800 Subject: [PATCH 05/16] =?UTF-8?q?update=20=E8=B4=A8=E9=87=8F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/base/mixin.js | 5 +++++ src/views/quality/base/qualityInspectionType/index.vue | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/views/quality/base/mixin.js diff --git a/src/views/quality/base/mixin.js b/src/views/quality/base/mixin.js new file mode 100644 index 00000000..91b329b7 --- /dev/null +++ b/src/views/quality/base/mixin.js @@ -0,0 +1,5 @@ +export default { + data() { + + } +} \ No newline at end of file diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue index 2b4f04d4..164a9c72 100644 --- a/src/views/quality/base/qualityInspectionType/index.vue +++ b/src/views/quality/base/qualityInspectionType/index.vue @@ -172,6 +172,9 @@ export default { // btnName: '重置', // name: 'reset', // }, + { + type: 'separate' + }, { type: this.$auth.hasPermi('base:quality-inspection-type:create') ? 'button' @@ -179,7 +182,7 @@ export default { btnName: '新增', name: 'add', plain: true, - color: 'primary', + color: 'success', }, // { // type: this.$auth.hasPermi('base:quality-inspection-type:export') From 77688fed7774a5040ef120030c04b460d2682de7 Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 2 Aug 2023 09:49:14 +0800 Subject: [PATCH 06/16] =?UTF-8?q?update=20=E8=B4=A8=E9=87=8F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/qualityInspectionDet/index.vue | 254 ++++++++++-------- .../base/qualityInspectionType/index.vue | 10 +- 2 files changed, 147 insertions(+), 117 deletions(-) diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue index d6aa3a15..6ec4534b 100644 --- a/src/views/quality/base/qualityInspectionDet/index.vue +++ b/src/views/quality/base/qualityInspectionDet/index.vue @@ -1,109 +1,26 @@ @@ -158,6 +71,82 @@ export default { components: {}, data() { return { + searchBarFormConfig: [ + { + type: 'input', + label: '检测内容', + placeholder: '请输入检测内容', + param: 'content', + }, + { + type: 'datePicker', + label: '创建时间', + dateType: 'daterange', // datetimerange + format: 'yyyy-MM-dd HH:mm:ss', + valueFormat: 'yyyy-MM-ddTHH:mm:ss', + rangeSeparator: '-', + startPlaceholder: '开始日期', + endPlaceholder: '结束日期', + defaultTime: ['00:00:00', '23:59:59'], + param: 'createTime', + width: 350, + }, + { + type: 'button', + btnName: '查询', + name: 'search', + color: 'primary', + }, + // { + // type: 'button', + // btnName: '重置', + // name: 'reset', + // }, + { + type: 'separate', + }, + { + type: this.$auth.hasPermi('base:quality-inspection-det:create') + ? 'button' + : '', + btnName: '新增', + name: 'add', + plain: true, + color: 'success', + }, + // { + // type: this.$auth.hasPermi('base:quality-inspection-type:export') + // ? 'button' + // : '', + // btnName: '导出', + // name: 'export', + // color: 'warning', + // }, + ], + tableBtn: [ + this.$auth.hasPermi('base:quality-inspection-det:update') ? { + type: 'edit', + btnName: '修改', + } : undefined, + this.$auth.hasPermi('base:quality-inspection-det:delete') ? { + type: 'delete', + btnName: '删除', + } : undefined, + ].filter(v=>v), + tableData: [], + tableProps: [ + { + prop: 'createTime', + label: '添加时间', + fixed: true, + width: 180, + filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), + }, + { prop: 'typeId', label: '检测类型ID', align: 'center' }, + { prop: 'content', label: '检测类型内容', align: 'center' }, + { prop: 'code', label: '检测编码', align: 'center' }, + { prop: 'remark', label: '备注', align: 'center' }, + ], // 遮罩层 loading: true, // 导出遮罩层 @@ -196,6 +185,47 @@ export default { this.getList(); }, methods: { + /** base table related */ + handleTableBtnClick({ data, type }) { + switch (type) { + case 'edit': + this.handleUpdate(data); + break; + case 'delete': + this.handleDelete(data); + break; + } + }, + /** search bar related */ + handleSearchBarBtnClick(btn) { + const keys = ['name', 'createTime']; // timeVal + switch (btn.btnName) { + case 'search': + keys.forEach((key) => { + if (key == 'timeVal') { + this.queryParams['startTime'] = btn.timeVal[0]; + this.queryParams['endTime'] = btn.timeVal[1]; + return; + } + this.queryParams[key] = btn[key] || null; + }); + this.handleQuery(); + break; + case 'add': + this.handleAdd(); + break; + case 'export': + this.handleExport(); + break; + case 'reset': + this.$refs['search-bar'].resetForm(); + this.resetQuery(); + break; + } + }, + handleEmitFun(val) { + console.log('emit unf', val); + }, /** 查询列表 */ getList() { this.loading = true; diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue index 164a9c72..18eefe7d 100644 --- a/src/views/quality/base/qualityInspectionType/index.vue +++ b/src/views/quality/base/qualityInspectionType/index.vue @@ -69,15 +69,15 @@ export default { data() { return { tableBtn: [ - { + this.$auth.hasPermi('base:quality-inspection-type:update') ? { type: 'edit', btnName: '修改', - }, - { + } : undefined, + this.$auth.hasPermi('base:quality-inspection-type:delete') ? { type: 'delete', btnName: '删除', - }, - ], + } : undefined, + ].filter(v=>v), tableData: [], tableProps: [ { From b6e47673460528a10647f939704f2764f7ae4733 Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 2 Aug 2023 11:27:33 +0800 Subject: [PATCH 07/16] add mixin & dialog --- src/views/quality/base/mixin.js | 5 - .../base/qualityInspectionDet/index.vue | 58 ++++++-- src/views/quality/components/dialogForm.vue | 137 ++++++++++++++++++ src/views/quality/mixin/basicPageMixin.js | 87 +++++++++++ 4 files changed, 268 insertions(+), 19 deletions(-) delete mode 100644 src/views/quality/base/mixin.js create mode 100644 src/views/quality/components/dialogForm.vue create mode 100644 src/views/quality/mixin/basicPageMixin.js diff --git a/src/views/quality/base/mixin.js b/src/views/quality/base/mixin.js deleted file mode 100644 index 91b329b7..00000000 --- a/src/views/quality/base/mixin.js +++ /dev/null @@ -1,5 +0,0 @@ -export default { - data() { - - } -} \ No newline at end of file diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue index 6ec4534b..9bca5dc5 100644 --- a/src/views/quality/base/qualityInspectionDet/index.vue +++ b/src/views/quality/base/qualityInspectionDet/index.vue @@ -37,8 +37,12 @@ @confirm="submitForm"> - - + + @@ -52,7 +56,6 @@ - @@ -66,11 +69,14 @@ import { exportQualityInspectionDetExcel, } from '@/api/base/qualityInspectionDet'; +import moment from 'moment'; + export default { name: 'QualityInspectionDet', components: {}, data() { return { + typeList: [], // 检测类型列表 searchBarFormConfig: [ { type: 'input', @@ -124,15 +130,19 @@ export default { // }, ], tableBtn: [ - this.$auth.hasPermi('base:quality-inspection-det:update') ? { - type: 'edit', - btnName: '修改', - } : undefined, - this.$auth.hasPermi('base:quality-inspection-det:delete') ? { - type: 'delete', - btnName: '删除', - } : undefined, - ].filter(v=>v), + this.$auth.hasPermi('base:quality-inspection-det:update') + ? { + type: 'edit', + btnName: '修改', + } + : undefined, + this.$auth.hasPermi('base:quality-inspection-det:delete') + ? { + type: 'delete', + btnName: '删除', + } + : undefined, + ].filter((v) => v), tableData: [], tableProps: [ { @@ -183,6 +193,7 @@ export default { }, created() { this.getList(); + this.getTypeList(); }, methods: { /** base table related */ @@ -226,6 +237,19 @@ export default { handleEmitFun(val) { console.log('emit unf', val); }, + /** 获取检测类型id */ + getTypeList() { + this.$axios('/base/quality-inspection-type/listAll').then( + (response) => { + this.typeList = response.data.map((item) => { + return { + label: item.name, + value: item.id, + }; + }); + } + ); + }, /** 查询列表 */ getList() { this.loading = true; @@ -266,7 +290,7 @@ export default { handleAdd() { this.reset(); this.open = true; - this.title = '添加质量检测信息基础'; + this.title = '添加质量检测信息'; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -275,7 +299,7 @@ export default { getQualityInspectionDet(id).then((response) => { this.form = response.data; this.open = true; - this.title = '修改质量检测信息基础'; + this.title = '修改质量检测信息'; }); }, /** 提交按钮 */ @@ -336,3 +360,9 @@ export default { }, }; + + diff --git a/src/views/quality/components/dialogForm.vue b/src/views/quality/components/dialogForm.vue new file mode 100644 index 00000000..aac1d33d --- /dev/null +++ b/src/views/quality/components/dialogForm.vue @@ -0,0 +1,137 @@ + + + + + + + diff --git a/src/views/quality/mixin/basicPageMixin.js b/src/views/quality/mixin/basicPageMixin.js new file mode 100644 index 00000000..b4005a91 --- /dev/null +++ b/src/views/quality/mixin/basicPageMixin.js @@ -0,0 +1,87 @@ +export default { + data() { + return { + // 遮罩层 + loading: true, + // 导出遮罩层 + exportLoading: false, + // 显示搜索条件 + showSearch: true, + // 总条数 + total: 0, + // 质量检测信息基础列表 + list: [], + // 弹出层标题 + title: '', + // 是否显示弹出层 + open: false, + // 查询参数 + queryParams: { + pageNo: 1, + pageSize: 10, + }, + + // 列表数据 + tableData: [], + tableProps: [], // 占位 + tableBtn: [], // 占位 + searchBarFormConfig: [], // 占位 + // 弹窗表单配置 + dialogFormConfig: [], // 占位 + }; + }, + mounted() { + if (this.prepareSelectOptions) { + // 准备列表的options + // TODO: 也许需要挪到 dialogForm.vue 里 + this.prepareSelectOptions(); + } + }, + methods: { + // 处理搜索条件 + handleSearchBarBtnClick() {}, + // 处理表格按钮 + handleTableBtnClick({ data, type }) { + switch (type) { + case 'edit': + this.handleUpdate(data); + break; + case 'delete': + this.handleDelete(data); + break; + } + }, + // 处理搜索栏按钮 + handleSearchBarBtnClick(btn) { + const keys = ['name', 'createTime']; // timeVal + switch (btn.btnName) { + case 'search': + keys.forEach((key) => { + if (key == 'timeVal') { + this.queryParams['startTime'] = btn.timeVal[0]; + this.queryParams['endTime'] = btn.timeVal[1]; + return; + } + this.queryParams[key] = btn[key] || null; + }); + this.handleQuery(); + break; + case 'add': + this.handleAdd(); + break; + case 'export': + this.handleExport(); + break; + case 'reset': + this.$refs['search-bar'].resetForm(); + this.resetQuery(); + break; + } + }, + handleEmitFun(val) { + console.log('emit unf', val); + }, + // 获取列表数据 + getList() {}, + }, +}; From 006e94a865a55ba030bbdd4150d5913fb892a51e Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 2 Aug 2023 15:16:40 +0800 Subject: [PATCH 08/16] apply DialogForm & debug --- .../base/qualityInspectionType/index.vue | 61 ++++++++++--- src/views/quality/components/dialogForm.vue | 89 +++++++++++-------- 2 files changed, 98 insertions(+), 52 deletions(-) diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue index 18eefe7d..6e7bc5d8 100644 --- a/src/views/quality/base/qualityInspectionType/index.vue +++ b/src/views/quality/base/qualityInspectionType/index.vue @@ -33,9 +33,27 @@ - + + + - diff --git a/src/views/quality/components/dialogForm.vue b/src/views/quality/components/dialogForm.vue index 0a306bea..408c108c 100644 --- a/src/views/quality/components/dialogForm.vue +++ b/src/views/quality/components/dialogForm.vue @@ -20,6 +20,13 @@ @change="$emit('update', form)" :placeholder="`请输入${col.label}`" v-bind="col.bind" /> + - + From 7c665484a7b0f2949d6d269a827da71c1f8c3d43 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 3 Aug 2023 15:03:59 +0800 Subject: [PATCH 15/16] =?UTF-8?q?update=20getCode=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/qualityInspectionType/index.vue | 9 +++- src/views/quality/components/dialogForm.vue | 50 +++++++++++++------ 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue index c4097ee2..9bafb076 100644 --- a/src/views/quality/base/qualityInspectionType/index.vue +++ b/src/views/quality/base/qualityInspectionType/index.vue @@ -52,7 +52,14 @@ // } }, ], - [{ input: true, label: '检测类型编码', prop: 'code' }], + [ + { + input: true, + label: '检测类型编码', + prop: 'code', + url: '/base/quality-inspection-type/getCode', + }, + ], [{ input: true, label: '备注', prop: 'remark' }], ]" /> diff --git a/src/views/quality/components/dialogForm.vue b/src/views/quality/components/dialogForm.vue index 408c108c..000e1cf9 100644 --- a/src/views/quality/components/dialogForm.vue +++ b/src/views/quality/components/dialogForm.vue @@ -97,6 +97,9 @@ export default { get() { return this.dataForm; }, + set(val) { + console.log('set form', val); + }, }, }, mounted() { @@ -111,7 +114,11 @@ export default { resetFields(args) { return this.$refs.form.resetFields(args); }, - + // getCode + async getCode(url) { + const response = await this.$axios(url); + return response.data; + }, handleOptions() { // console.log("[dialogForm:handleOptions]") const promiseList = []; @@ -120,22 +127,33 @@ export default { if (opt.options) { this.optionListOf[opt.prop] = opt.options; } else if (opt.url) { - promiseList.push(async () => { - const response = await this.$axios(opt.url, { - method: opt.method ?? 'get', + // 如果是下拉框，或者新增模式下的输入框，才去请求 + if (opt.select || (opt.input && !this.form?.id)) { + promiseList.push(async () => { + const response = await this.$axios(opt.url, { + method: opt.method ?? 'get', + }); + console.log('[dialogForm:handleOptions:response]', response); + if (opt.select) { + // 处理下拉框选项 + const list = + 'list' in response.data + ? response.data.list + : response.data; + this.$set( + this.optionListOf, + opt.prop, + list.map((item) => ({ + label: item[opt.labelKey ?? 'name'], + value: item[opt.valueKey ?? 'id'], + })) + ); + } else if (opt.input) { + // 处理输入框数据 + this.form[opt.prop] = response.data; + } }); - console.log('[dialogForm:handleOptions:response]', response); - const list = - 'list' in response.data ? response.data.list : response.data; - this.$set( - this.optionListOf, - opt.prop, - list.map((item) => ({ - label: item[opt.labelKey ?? 'name'], - value: item[opt.valueKey ?? 'id'], - })) - ); - }); + } try { // this.formLoading = true; // console.log("[dialogForm:handleOptions:promiseList]", promiseList) From 4d0c0ae91adb2210cc085cb65d6fb9980ce4ec1f Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 3 Aug 2023 15:09:15 +0800 Subject: [PATCH 16/16] =?UTF-8?q?update=20=E5=9F=BA=E6=9C=AC=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E8=B4=A8=E9=87=8F=E5=9F=BA=E7=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/qualityInspectionDet/index.vue | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue index da2a30d7..939568c5 100644 --- a/src/views/quality/base/qualityInspectionDet/index.vue +++ b/src/views/quality/base/qualityInspectionDet/index.vue @@ -17,6 +17,7 @@ v-if="tableBtn.length" slot="handleBtn" label="操作" + fixed="right" :method-list="tableBtn" @clickBtn="handleTableBtnClick" /> @@ -49,6 +50,9 @@ prop: 'typeId', url: '/base/quality-inspection-type/listAll', rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + bind: { + filterable: true, + }, }, ], [ @@ -59,7 +63,14 @@ rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], - [{ input: true, label: '检测编码', prop: 'code' }], + [ + { + input: true, + label: '内容编码', + prop: 'code', + url: '/base/quality-inspection-det/getCode', + }, + ], [{ input: true, label: '备注', prop: 'remark' }], ]" /> @@ -93,20 +104,20 @@ export default { placeholder: '请输入检测内容', param: 'content', }, - { - type: 'datePicker', - label: '创建时间', - dateType: 'daterange', // datetimerange - // format: 'yyyy-MM-dd HH:mm:ss', - format: 'yyyy-MM-dd', - valueFormat: 'yyyy-MM-dd HH:mm:ss', - rangeSeparator: '-', - startPlaceholder: '开始日期', - endPlaceholder: '结束日期', - defaultTime: ['00:00:00', '23:59:59'], - param: 'createTime', - width: 350, - }, + // { + // type: 'datePicker', + // label: '创建时间', + // dateType: 'daterange', // datetimerange + // // format: 'yyyy-MM-dd HH:mm:ss', + // format: 'yyyy-MM-dd', + // valueFormat: 'yyyy-MM-dd HH:mm:ss', + // rangeSeparator: '-', + // startPlaceholder: '开始日期', + // endPlaceholder: '结束日期', + // defaultTime: ['00:00:00', '23:59:59'], + // param: 'createTime', + // width: 350, + // }, { type: 'button', btnName: '查询', @@ -161,8 +172,8 @@ export default { width: 180, filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, - { prop: 'typeId', label: '检测类型ID', align: 'center' }, - { prop: 'content', label: '检测类型内容', align: 'center' }, + { prop: 'typeName', label: '类型名称', align: 'center' }, + { prop: 'content', label: '检测内容', align: 'center' }, { prop: 'code', label: '检测编码', align: 'center' }, { prop: 'remark', label: '备注', align: 'center' }, ],