From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001 From: cuikaidong <ckd2942379034@163.com> Date: 星期二, 29 七月 2025 14:18:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue | 50 +++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue index 085b567..12d9b4c 100644 --- a/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue +++ b/src/views/dnc/base/modules/ProductStructure/Document/UseNcDocumentEquipmentTableList.vue @@ -1,18 +1,28 @@ <template> - <a-table :columns="columns" :data-source="dataSource" bordered :pagination="false"> + <a-table :columns="columns" :data-source="dataSource" bordered :pagination="false" :size="size" rowKey="deviceId"> </a-table> </template> <script> + import { getAction } from '@/api/manage' import { JeecgListMixin } from '@/mixins/JeecgListMixin' export default { name: 'UseNcDocumentEquipmentTableList', components: {}, mixins: [JeecgListMixin], + props: { + currentDocumentInfo: { + type: Object + }, + size: { + type: String + } + }, data() { return { + disableMixinCreated: true, columns: [ { title: '搴忓彿', @@ -24,19 +34,41 @@ return parseInt(index) + 1 } }, - { title: '璁惧鍚嶇О', dataIndex: 'deviceName', align: 'center' }, - { title: '璁惧缂栧彿', dataIndex: 'deviceNo', align: 'center' }, - { title: '璁惧鍨嬪彿', dataIndex: 'deviceModel', align: 'center' }, - { title: '鎵�灞為儴闂�', dataIndex: 'departName', align: 'center' }, - { title: '璁惧鍒嗙粍', dataIndex: 'groupName', align: 'center' }, - { title: '鎺у埗绯荤粺', dataIndex: 'controlSystem', align: 'center' } + { title: '璁惧鍚嶇О', dataIndex: 'equipmentName', align: 'center' }, + { title: '璁惧缂栧彿', dataIndex: 'equipmentId', align: 'center' }, + { title: '璁惧绫诲瀷', dataIndex: 'equipmentType', align: 'center' }, + { title: '璁惧鍨嬪彿', dataIndex: 'equipmentModel', align: 'center' }, + { title: '鎵�灞炶溅闂�', dataIndex: 'productionName', align: 'center' }, + { title: '鏁版帶绯荤粺', dataIndex: 'controlSystem', align: 'center' } ], url: { - list: '' + list: '/doc/relative/get/device' } } }, - methods: {} + methods: { + loadData() { + this.dataSource = [] + if (!this.url.list) { + this.$message.error('璇疯缃畊rl.list灞炴��!') + return + } + var params = this.getQueryParams()//鏌ヨ鏉′欢 + if (!params) { + return false + } + this.loading = true + getAction(this.url.list + `/${this.currentDocumentInfo.docId}`, params).then((res) => { + if (res.success) { + this.dataSource = res.list + } else { + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) + } + } } </script> -- Gitblit v1.9.3