From 1d070e8054da25b7c914bfb3d341199bfd2e214e Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 22 Jan 2026 20:33:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/EquipmentEntryApply/index.js | 8 + src/views/EquipmentLedger/details.vue | 10 +- .../entryApply/components/AddEquip.vue | 2282 +++++++++-------- .../entryApply/components/EquipmentAdd.vue | 75 + 4 files changed, 1350 insertions(+), 1025 deletions(-) diff --git a/src/api/EquipmentEntryApply/index.js b/src/api/EquipmentEntryApply/index.js index 67f75b60..5900f1e7 100644 --- a/src/api/EquipmentEntryApply/index.js +++ b/src/api/EquipmentEntryApply/index.js @@ -360,3 +360,11 @@ export const getDevDetailsApi = (data) => { params: data }) } + +// 获取特征值 +export const getConfigApi = (data) => { + return request({ + url: `/material-mall/equipment/field/getConfig`, + method: 'GET', + }) +} diff --git a/src/views/EquipmentLedger/details.vue b/src/views/EquipmentLedger/details.vue index 9b187839..95a6b7ba 100644 --- a/src/views/EquipmentLedger/details.vue +++ b/src/views/EquipmentLedger/details.vue @@ -118,6 +118,14 @@ + + + + + + + +
@@ -303,7 +311,7 @@ /> - +
- - -
- - - -
-
- 基础信息 + + - + - + ::v-deep.el-tag.el-tag--success { + background-color: rgba(52, 226, 199, 0.1); + border-color: #34E2C7; + color: #34E2C7; + } + diff --git a/src/views/stockManagement/entryApply/components/EquipmentAdd.vue b/src/views/stockManagement/entryApply/components/EquipmentAdd.vue index a81750c6..d3830b2a 100644 --- a/src/views/stockManagement/entryApply/components/EquipmentAdd.vue +++ b/src/views/stockManagement/entryApply/components/EquipmentAdd.vue @@ -346,6 +346,64 @@ + + + + + + + import EquipmentEntryEditDialog from '@/views/EquipmentEntryApply/equipmentInput/edit.vue' import AddEquip from './AddEquip' +import { + getConfigApi +} from '@/api/EquipmentEntryApply' // 使用defineComponent规范组件定义 import { @@ -760,6 +821,8 @@ export default { { key: 42, label: `特征项9`, prop: 'featureItem9', visible: true }, { key: 43, label: `特征值9`, prop: 'featureValue9', visible: true } ], + fieldVoList:[], + dialogVisible: false, dialogTitle: '', dialogList: [], @@ -776,6 +839,7 @@ export default { watch: { isVisible(val) { if (val) { + this.getConfig() this.getList() } } @@ -783,6 +847,7 @@ export default { mounted() { this.getManufacturerSelectList() + this.getConfig() }, methods: { handleNumberInput(key) { @@ -985,6 +1050,14 @@ export default { } }) }, + + + getConfig() { + getConfigApi().then(res => { + this.fieldVoList = res.data.config || [] + }) + }, + // 获取列表数据 async getList() { try { @@ -1003,6 +1076,8 @@ export default { const res = await getDeviceByOrderIdApi(params) this.tableData = res.data.rows this.total = res.data.total + + } catch (error) { console.error('获取列表失败:', error) }