From d86160697125b82782173c1d1cfc36d999abfd57 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Tue, 14 Oct 2025 17:44:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9C=81=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/EquipmentLedger/equ-out.js | 8 ++++++++ src/views/EquipmentLedger/index.vue | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/api/EquipmentLedger/equ-out.js b/src/api/EquipmentLedger/equ-out.js index ec6d9577..b36115ea 100644 --- a/src/api/EquipmentLedger/equ-out.js +++ b/src/api/EquipmentLedger/equ-out.js @@ -43,3 +43,11 @@ export const addProjectOutAPI = (data) => { data: data, }) } + +// 获取省份 +export const getProvinceListAPI = () => { + return request({ + url: '/material-mall/cnarea/provinces', + method: 'GET', + }) +} \ No newline at end of file diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue index 3d5ec81c..d5956f61 100644 --- a/src/views/EquipmentLedger/index.vue +++ b/src/views/EquipmentLedger/index.vue @@ -752,7 +752,7 @@ import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js' import { firstLevel, secondAndThirdLevel } from '@/api/EquipmentEntryApply' -import { getMaxFeatureAPI } from '@/api/EquipmentLedger/equ-out.js' +import { getMaxFeatureAPI, getProvinceListAPI } from '@/api/EquipmentLedger/equ-out.js' export default { name: 'EquipmentLedger', @@ -901,6 +901,12 @@ export default { } }, methods: { + // 获取省份 + getProvinceList() { + getProvinceListAPI().then((res) => { + this.provinceList = res.data + }) + }, // 获取厂家 getManufacturerSelectList() { getManufacturerSelectApi().then((res) => { @@ -1340,6 +1346,7 @@ export default { }, async created() { + this.getProvinceList() this.getFirstLevel() this.getManufacturerSelectList() // 并行加载初始数据 From 360874805a29575f37b604077c3c06c38f1fe443 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Tue, 14 Oct 2025 18:04:31 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentLedger/index.vue | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue index d5956f61..f0aae7b1 100644 --- a/src/views/EquipmentLedger/index.vue +++ b/src/views/EquipmentLedger/index.vue @@ -84,9 +84,9 @@ - + @@ -753,6 +753,7 @@ import { } from '@/api/EquipmentLedger/index.js' import { firstLevel, secondAndThirdLevel } from '@/api/EquipmentEntryApply' import { getMaxFeatureAPI, getProvinceListAPI } from '@/api/EquipmentLedger/equ-out.js' +import { deptTreeSelect } from '@/api/system/user' export default { name: 'EquipmentLedger', @@ -765,7 +766,7 @@ export default { // 查询参数 queryParams: { province: undefined, // 省份 - propertyUnit: undefined, // 产权单位 + propertyUnitId: undefined, // 产权单位 name: undefined, // 装备名称 specificationModel: undefined, // 规格型号 major: undefined, // 专业 @@ -907,6 +908,23 @@ export default { this.provinceList = res.data }) }, + // 获取产权单位 + getDeptTreeSelect() { + deptTreeSelect().then((res) => { + this.propertyUnitList = this.filterTree(res.data) + console.log('🚀 ~ getDeptTreeSelect ~ this.propertyUnitList:', this.propertyUnitList) + }) + }, + filterTree(nodes) { + return nodes + .map(node => { + if (node.children) { + node.children = this.filterTree(node.children) + } + return node + }) + .filter(node => node.status !== '1') + }, // 获取厂家 getManufacturerSelectList() { getManufacturerSelectApi().then((res) => { @@ -1349,6 +1367,7 @@ export default { this.getProvinceList() this.getFirstLevel() this.getManufacturerSelectList() + this.getDeptTreeSelect() // 并行加载初始数据 await Promise.all([this.getDeviceTree(), this.getDeviceStatusCount()]) // 最后加载列表数据 From d72f62f9888a4ad92a573403ec07b0efb6c6613e Mon Sep 17 00:00:00 2001 From: bb_pan Date: Tue, 14 Oct 2025 18:09:30 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentEntryApply/equipmentInput/add.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/EquipmentEntryApply/equipmentInput/add.vue b/src/views/EquipmentEntryApply/equipmentInput/add.vue index 455852d7..0783c37f 100644 --- a/src/views/EquipmentEntryApply/equipmentInput/add.vue +++ b/src/views/EquipmentEntryApply/equipmentInput/add.vue @@ -198,10 +198,10 @@ - + Date: Tue, 14 Oct 2025 18:10:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentEntryApply/equipmentInput/add.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/EquipmentEntryApply/equipmentInput/add.vue b/src/views/EquipmentEntryApply/equipmentInput/add.vue index 0783c37f..f5754b72 100644 --- a/src/views/EquipmentEntryApply/equipmentInput/add.vue +++ b/src/views/EquipmentEntryApply/equipmentInput/add.vue @@ -401,6 +401,9 @@ export default { unit: [ { required: true, message: '请输入计数单位', trigger: 'blur' } ], + purchaseDate: [ + { required: true, message: '请选择采购日期', trigger: 'change' } + ], // deviceTypeList: [ // { required: true, message: '请选择装备类型', trigger: 'change' } // ], From 43256ea107102f4fd3c70900466f54007e62b8ae Mon Sep 17 00:00:00 2001 From: bb_pan Date: Tue, 14 Oct 2025 18:18:53 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentEntryApply/EquipmentDetailList.vue | 4 ++-- src/views/EquipmentEntryApply/equipmentInput/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/EquipmentEntryApply/EquipmentDetailList.vue b/src/views/EquipmentEntryApply/EquipmentDetailList.vue index be3467ae..c8a8b2e7 100644 --- a/src/views/EquipmentEntryApply/EquipmentDetailList.vue +++ b/src/views/EquipmentEntryApply/EquipmentDetailList.vue @@ -248,14 +248,14 @@ 编辑 删除 diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue index 970a9de7..64e642f8 100644 --- a/src/views/EquipmentEntryApply/equipmentInput/index.vue +++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue @@ -257,14 +257,14 @@ 编辑 删除 From 163923fcc695f332d56ab65dc58883d95fba9d5d Mon Sep 17 00:00:00 2001 From: bb_pan Date: Tue, 14 Oct 2025 18:21:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentLedger/details.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/EquipmentLedger/details.vue b/src/views/EquipmentLedger/details.vue index 82b5fa4c..f642544c 100644 --- a/src/views/EquipmentLedger/details.vue +++ b/src/views/EquipmentLedger/details.vue @@ -59,7 +59,7 @@ - + @@ -101,6 +101,11 @@ + + + + +
From baf7cafdbb5df793049a3ccf189551d94b4fb284 Mon Sep 17 00:00:00 2001 From: jiang Date: Tue, 14 Oct 2025 20:43:52 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentRetire/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/EquipmentRetire/index.vue b/src/views/EquipmentRetire/index.vue index d86d42f2..18256299 100644 --- a/src/views/EquipmentRetire/index.vue +++ b/src/views/EquipmentRetire/index.vue @@ -80,11 +80,11 @@ - - - + + + - +