diff --git a/src/api/search/equipment.js b/src/api/search/equipment.js index 8886def8..b600c0a2 100644 --- a/src/api/search/equipment.js +++ b/src/api/search/equipment.js @@ -37,6 +37,15 @@ export function getLeaseDevListApi(query) { } +export function getCategoryListApi(query) { + return request({ + url: '/material-mall/comprehensive/getCategoryList', + method: 'get', + params: query + }) +} + + diff --git a/src/views/EquipmentTypeConfig/index.vue b/src/views/EquipmentTypeConfig/index.vue index c339f146..f24b91dc 100644 --- a/src/views/EquipmentTypeConfig/index.vue +++ b/src/views/EquipmentTypeConfig/index.vue @@ -1076,10 +1076,10 @@ export default { this.tableData = listRes.rows this.total = listRes.total || 0 } else { - this.$message.error(listRes.msg || '获取装备列表失败') + // this.$message.error(listRes.msg || '获取装备列表失败') } } catch (error) { - this.$message.error('获取装备列表失败:' + (error.message || '未知错误')) + console.log('🚀 ~ error:', error) } finally { this.tableLoading = false } diff --git a/src/views/business/warehouse/details.vue b/src/views/business/warehouse/details.vue index c3f7a94a..e78cc697 100644 --- a/src/views/business/warehouse/details.vue +++ b/src/views/business/warehouse/details.vue @@ -131,7 +131,7 @@ {{ scope.row.num }} @@ -642,7 +642,6 @@ export default { this.$message.error(res.msg || '操作失败') } } catch (error) { - this.$message.error('提交申请时发生错误') console.log('🚀 ~ error:', error) } finally { this.isLoading = false diff --git a/src/views/equipmentRepair/repairApply/addRepair.vue b/src/views/equipmentRepair/repairApply/addRepair.vue index a0715222..669b8c7f 100644 --- a/src/views/equipmentRepair/repairApply/addRepair.vue +++ b/src/views/equipmentRepair/repairApply/addRepair.vue @@ -329,7 +329,7 @@ export default { // 通过行ID找到对应的行 if (this.currentRowId !== null) { // 在表格数据中查找对应的行 - const targetRow = this.tableList.find(item => item.keyId === this.currentRowId) + const targetRow = this.tableList.find(item => item.id === this.currentRowId) if (targetRow) { // 如果当前行还没有 bmFileInfos 数组,先创建 if (!targetRow.bmFileInfos) { @@ -358,8 +358,8 @@ export default { // 上传前记录行ID beforeFileUpload(row) { - this.currentRowId = row.keyId - console.log('记录当前行ID:', row.keyId) + this.currentRowId = row.id + console.log('记录当前行ID:', row.id) }, // 图片预览方法 diff --git a/src/views/search/category/index.vue b/src/views/search/category/index.vue new file mode 100644 index 00000000..3ab6dc37 --- /dev/null +++ b/src/views/search/category/index.vue @@ -0,0 +1,209 @@ + + + + + diff --git a/src/views/system/project/index.vue b/src/views/system/project/index.vue index 19857da3..aef7177c 100644 --- a/src/views/system/project/index.vue +++ b/src/views/system/project/index.vue @@ -71,7 +71,7 @@ - + - + @@ -1006,7 +1006,12 @@ export default { } } +.app-container{ + overflow-y:unset; +} .app-container-content { + height: calc(100vh - 120px); + ::v-deep .el-dialog { display: flex !important; flex-direction: column !important; @@ -1015,11 +1020,11 @@ export default { top: 50% !important; left: 50% !important; transform: translate(-50%, -50%) !important; - max-height: 100vh !important; + height: calc(100vh - 120px); .el-dialog__body { flex: 1; - overflow-y: scroll !important; + padding: 20px 40px; }