From b727742da6b743c8386d92ecdb166f4d4d1fa110 Mon Sep 17 00:00:00 2001 From: jiang Date: Fri, 19 Dec 2025 18:20:33 +0800 Subject: [PATCH] =?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 --- .env.production | 4 +- .../equipmentInput/index.vue | 133 ++- .../order/sharedOutList.vue | 1 + src/views/EquipmentTypeConfig/index.vue | 506 ++++------- src/views/address-manage/index.vue | 819 +++++++++--------- src/views/business/apply/addApply.vue | 39 +- src/views/business/outbound/details.vue | 6 +- src/views/business/warehouse/details.vue | 4 +- src/views/business/warehouse/index.vue | 4 +- src/views/material/ma/type/index.vue | 1 + src/views/toolsManage/toolsLedger/index.vue | 15 +- 11 files changed, 791 insertions(+), 741 deletions(-) diff --git a/.env.production b/.env.production index f4bf5b8c..b032d264 100644 --- a/.env.production +++ b/.env.production @@ -5,6 +5,6 @@ VUE_APP_TITLE = 机械化施工装备管理（共享）平台 ENV = 'production' # 机械化施工装备管理（共享）平台/生产环境 -# VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = '/prod-api' # 宏源 -VUE_APP_BASE_API = '/iws/jxhzb-api' \ No newline at end of file +#VUE_APP_BASE_API = '/iws/jxhzb-api' diff --git a/src/views/EquipmentEntryApproval/equipmentInput/index.vue b/src/views/EquipmentEntryApproval/equipmentInput/index.vue index 98ed1c9d..11db73cb 100644 --- a/src/views/EquipmentEntryApproval/equipmentInput/index.vue +++ b/src/views/EquipmentEntryApproval/equipmentInput/index.vue @@ -110,23 +110,24 @@ --> - + + - + @@ -327,6 +328,9 @@ export default { specificationModel: '', originalCode: '', manufacturer: '', + + minOriginalValue: '', + maxOriginalValue: '', manufacturerId: '', minBuyPrice: '', maxBuyPrice: '', @@ -335,6 +339,11 @@ export default { pageNum: 1, pageSize: 10 }, + // 用于存储上一次的有效值，避免循环验证 + lastValidValues: { + minOriginalValue: '', + maxOriginalValue: '' + }, manufacturerList: [], tableData: [], columns2: [], @@ -374,6 +383,117 @@ export default { this.getManufacturerSelectList() }, methods: { + handleNumberInput(key) { + let value = this.queryParams[key] || '' + // 1. 清理输入 + const cleanedValue = this.cleanNumberInput(value) + + // 2. 存储为上次有效值（清理后） + this.lastValidValues[key] = cleanedValue + + // 3. 根据输入类型进行验证 + if (key === 'minOriginalValue') { + this.queryParams[key] = this.validateMinValue(cleanedValue) + } else if (key === 'maxOriginalValue') { + this.queryParams[key] = this.validateMaxValue(cleanedValue) + } else { + this.queryParams[key] = cleanedValue + } + + // 4. 确保响应式更新 + this.$forceUpdate() + }, + + // 清理数字输入 + cleanNumberInput(input) { + if (!input) return '' + + // 过滤非数字和小数点 + let cleaned = input.replace(/[^\d.]/g, '') + + // 处理多个小数点 + const dotIndex = cleaned.indexOf('.') + if (dotIndex !== -1) { + const before = cleaned.substring(0, dotIndex + 1) + const after = cleaned.substring(dotIndex + 1).replace(/\./g, '') + cleaned = before + after + } + + // 限制小数位数 + const parts = cleaned.split('.') + if (parts.length > 1) { + cleaned = parts[0] + '.' + parts[1].slice(0, 2) + } + + return cleaned + }, + + // 验证最小值（不能大于最大值） + validateMinValue(value) { + // 如果是空值或纯小数点，直接返回 + if (!value || value === '.') return value + + const maxValue = this.queryParams.maxOriginalValue + const minNum = this.safeParseNumber(value) + const maxNum = this.safeParseNumber(maxValue) + + // 如果最大值无效，直接返回清理后的值 + if (maxNum === null) return value + + // 如果最小值大于最大值，则使用最大值 + if (minNum !== null && minNum > maxNum) { + return maxValue + } + + return value + }, + + // 验证最大值（不能小于最小值） + validateMaxValue(value) { + // 如果是空值或纯小数点，直接返回 + if (!value || value === '.') return value + + const minValue = this.queryParams.minOriginalValue + const maxNum = this.safeParseNumber(value) + const minNum = this.safeParseNumber(minValue) + + // 如果最小值无效，直接返回清理后的值 + if (minNum === null) return value + + // 如果最大值小于最小值，则使用最小值 + if (maxNum !== null && maxNum < minNum) { + return minValue + } + + return value + }, + + // 安全解析数字 + safeParseNumber(str) { + if (!str || str === '.' || isNaN(Number(str))) { + return null + } + return Number(str) + }, + + // 同时验证两个值（在表单提交前调用） + validateNumberRange() { + const minNum = this.safeParseNumber(this.queryParams.minOriginalValue) + const maxNum = this.safeParseNumber(this.queryParams.maxOriginalValue) + + if (minNum !== null && maxNum !== null && minNum > maxNum) { + // 交换值，使最小值 <= 最大值 + const temp = this.queryParams.minOriginalValue + this.queryParams.minOriginalValue = this.queryParams.maxOriginalValue + this.queryParams.maxOriginalValue = temp + + // 提示用户 + this.$message.warning('已自动调整数值范围，确保最小值 ≤ 最大值') + return false + } + + return true + }, goBack() { // this.$router.go(-1) this.$router.push({ path: '/equipment/equipment-entry-approval' }) @@ -401,6 +521,7 @@ export default { * 获取装备申请列表 */ getEquipmentApplyList() { + this.validateNumberRange() this.queryParams.startOrderCreateTime = this.orderCreateTime ? this.orderCreateTime[0] : '' this.queryParams.endOrderCreateTime = this.orderCreateTime ? this.orderCreateTime[1] : '' this.queryParams.startProductionDate = this.productionDate ? this.productionDate[0] : '' diff --git a/src/views/EquipmentSharedLease/order/sharedOutList.vue b/src/views/EquipmentSharedLease/order/sharedOutList.vue index 7b0d31d9..1c4fc4e6 100644 --- a/src/views/EquipmentSharedLease/order/sharedOutList.vue +++ b/src/views/EquipmentSharedLease/order/sharedOutList.vue @@ -404,6 +404,7 @@ export default { //通过 handleOut(row) { row.category = '' + row.proCode = this.queryParams.proCode this.$confirm('是否确定出库?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/EquipmentTypeConfig/index.vue b/src/views/EquipmentTypeConfig/index.vue index 59cc3008..629e6c9d 100644 --- a/src/views/EquipmentTypeConfig/index.vue +++ b/src/views/EquipmentTypeConfig/index.vue @@ -15,9 +15,9 @@ style="margin-bottom: 20px" /> -
+
{{ node.label }} - + 新增 + 导出 + -
+
- - - + @@ -282,7 +254,7 @@ @@ -294,41 +266,23 @@ size="small" class="detail-form" > - - - - - -
- - 点击修改 -
- - - - - - - - - - + + + + + + +
取消 @@ -340,7 +294,7 @@ @@ -352,28 +306,22 @@ size="small" class="detail-form" > - - - - - - - - - - - - + + + + + +
取消 @@ -452,38 +400,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -644,17 +560,12 @@ export default { isEditing: false, editingFeature: null, tempSelectedFeatures: [], - editingPredefinedIndex: -1, - isEditingPredefined: false, predefinedInputTemp: '', // 用于新增预定义值 - queryParams: { - deptName: undefined, - status: undefined, - typeId: undefined, - keyWord: undefined, + typeId: '', + keyWord: '', pageNum: 1, pageSize: 10 }, @@ -665,7 +576,7 @@ export default { label: 'name' }, // 树搜索相关 - equipmentTypeName: undefined, + equipmentTypeName: '', defaultExpandedKeys: [], isMousemoveId: null, cascaderProps: { @@ -681,13 +592,11 @@ export default { total: 0, tableLoading: false, previewDialogVisible: false, - formData: { id: '', categoryPath: [], // 存储分类ID数组（用于提交修改） deviceName: '' }, - // 核心修改2：恢复分类ID校验，确保修改后能提交 editFormRules: { categoryPath: [{ required: true, message: '请选择装备分类', trigger: 'change' }], @@ -707,10 +616,8 @@ export default { }, selectedParentNode: null, levelMapping: new Map(), - // 核心修改4：存储装备分类路径文本（用于展示） categoryPathText: '', - // 配置特征项相关数据 configDialogVisible: false, currentEquipmentId: '', @@ -747,7 +654,6 @@ export default { inputType: [{ required: true, message: '请选择输入类型', trigger: 'change' }], mustHave: [{ required: true, message: '请选择是否必填', trigger: 'change' }] }, - // 存储当前装备的 typeId，用于新建特征项 currentEquipmentTypeIdForFeature: '' } @@ -778,19 +684,6 @@ export default { }, methods: { - // 新增：进入编辑模式 - enterEditMode() { - this.isEditing = true - this.tempSelectedFeatures = [...this.selectedFeatureValues] - }, - // 新增：退出编辑模式 - exitEditMode() { - this.isEditing = false - this.selectedFeatureValues = [...this.tempSelectedFeatures] - this.tempSelectedFeatures = [] - this.$message.success('编辑完成') - }, - // 新增：判断预定义值是否被选中 isPredefinedValueSelected(value) { if (this.currentFeature.inputType === 3) { @@ -808,7 +701,7 @@ export default { } // 多选（inputType=3）：数组添加/删除值（避免重复） else if (this.currentFeature.inputType === 3) { - // 初始化数组（防止undefined） + // 初始化数组（防止''） if (!Array.isArray(this.addValueForm.propertyValue)) { this.addValueForm.propertyValue = [] } @@ -946,7 +839,7 @@ export default { }, processChildrenData(data, currentLevel = 1) { - if (currentLevel > 6) { + if (currentLevel > 5) { return [] } return data.map((item) => { @@ -958,7 +851,7 @@ export default { parentId: item.parentId ? Number(item.parentId) : null, ...item } - if (item.children && item.children.length > 0 && currentLevel < 6) { + if (item.children && item.children.length > 0 && currentLevel < 5) { processedItem.children = this.processChildrenData(item.children, currentLevel + 1) } else { delete processedItem.children @@ -968,14 +861,7 @@ export default { }, handleNodeClick(data, node) { - if (data.id === 'all') { - this.queryParams.typeId = undefined - this.queryParams.parentId = undefined - } else { - this.queryParams.typeId = data.id - this.queryParams.parentId = data.parentId - } - this.queryParams.pageNum = 1 + this.queryParams.typeId = data.id this.getDeviceList() }, @@ -994,6 +880,7 @@ export default { // 核心修改5：编辑时选择分类后，同步更新路径文本 handleEditCategoryChange(value, selectedOptions) { + console.log(value) if (value && value.length > 6) { this.$message.warning('最多只能选择6级分类') this.formData.categoryPath = value.slice(0, 6) @@ -1007,19 +894,6 @@ export default { this.categoryPathText = '无分类路径' } }, - - getFullCategoryPath() { - if (!this.formData.currentCategoryInfo || !this.formData.currentCategoryInfo.fullPath) { - return '无分类信息' - } - const path = this.formData.currentCategoryInfo.fullPath - const nonEmptyPath = path.filter((item) => item && item.trim() !== '') - if (nonEmptyPath.length === 0) { - return '根分类' - } - return nonEmptyPath.join(' > ') - }, - // 筛选节点 - 左侧树 filterNode(value, data) { if (!value) return true @@ -1037,21 +911,91 @@ export default { }, // 树节点新增 - appendTreeNode(data) { - console.log('🚀 ~ data--->add:', data) - this.$message.info('新增功能开发中...') + async appendTreeNode(data) { + this.resetAddFormData() + console.log(data) + const targetId = data.id + if (!targetId) { + this.$message.warning('无法获取装备ID，编辑失败') + return + } + const levelInfo = this.levelMapping.get(targetId) + console.log(levelInfo) + if (!levelInfo) { + this.$message.warning('未找到该装备的分类信息，无法编辑') + return + } + // 1. 初始化分类路径文本（如“专业1 > 工序1 > 装备1”） + const fullPath = levelInfo.fullPath || [] + this.categoryPathText = fullPath.filter((item) => item.trim()).join(' > ') || '无分类路径' + + // 2. 初始化分类ID数组（用于提交修改） + const categoryPath = this.getCategoryPathById(targetId) + // 安全截取指定长度（处理数组为空/长度不足的情况） + this.addFormData = { + categoryPath: categoryPath.map((item) => item) + } + + console.log(this.formData) + + await this.$nextTick() + this.addDialogVisible = true }, // 树节点编辑 - editTreeNode(data) { - console.log('🚀 ~ data:', data) - this.$message.info('编辑功能开发中...') + async editTreeNode(data) { + console.log(data) + const targetId = data.id + if (!targetId) { + this.$message.warning('无法获取装备ID，编辑失败') + return + } + const levelInfo = this.levelMapping.get(targetId) + console.log(levelInfo) + if (!levelInfo) { + this.$message.warning('未找到该装备的分类信息，无法编辑') + return + } + // 1. 初始化分类路径文本（如“专业1 > 工序1 > 装备1”） + const fullPath = levelInfo.fullPath || [] + this.categoryPathText = fullPath.filter((item) => item.trim()).join(' > ') || '无分类路径' + + // 2. 初始化分类ID数组（用于提交修改） + const categoryPath = this.getCategoryPathById(targetId) + // 安全截取指定长度（处理数组为空/长度不足的情况） + const limitedCategoryPath = Array.isArray(categoryPath) + ? categoryPath.slice(0, levelInfo.level - 1) // 从第0位开始，截取指定长度 + : [] + this.formData = { + id: targetId, + categoryPath: limitedCategoryPath.map((item) => item), + deviceName: levelInfo.name || '' + } + await this.$nextTick() + this.editDialogVisible = true }, // 树节点删除 removeTreeNode(data) { - console.log(data, '删除时的数据源--') - this.$message.info('删除功能开发中...') + this.$confirm('确定要删除该类别吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async() => { + try { + const id = data.id + const res = await deleteEquipmentTypeAPI(id) + if (res.code === 200) { + this.$message.success('删除成功') + this.getDeviceList() + this.getDeviceTree() + } else { + this.$message.error(res.msg || '删除失败') + } + } catch (error) { + console.log(error) + } + }) }, toggleCollapse() { @@ -1064,7 +1008,7 @@ export default { const res = await getEquipmentTreeAPI() if (res.code === 200) { this.treeData = this.processTreeData(res.data) - this.processedTreeData = this.processTreeData(res.data) + this.processedTreeData = this.processChildrenData(res.data) this.buildLevelMapping(res.data) // 初始化默认展开的节点（前两级） this.defaultExpandedKeys = this.getSecondLevelKeys(this.treeData) @@ -1128,37 +1072,8 @@ export default { this.tableLoading = true const listRes = await getEquipmentListAPI(this.queryParams) if (listRes.code === 200) { - let rawData = [] - let totalCount = 0 - if (listRes.data && typeof listRes.data === 'object') { - if (listRes.data.rows) { - rawData = listRes.data.rows - totalCount = listRes.data.total || 0 - } else if (Array.isArray(listRes.data)) { - rawData = listRes.data - totalCount = rawData.length - } else if (listRes.data.list) { - rawData = listRes.data.list - totalCount = listRes.data.total || rawData.length - } else { - rawData = [listRes.data] - totalCount = 1 - } - } else if (Array.isArray(listRes.data)) { - rawData = listRes.data - totalCount = rawData.length - } else { - rawData = [] - totalCount = 0 - } - if (rawData.length > 0) { - this.tableData = this.transformDataToTable(rawData) - this.total = totalCount - } else { - this.tableData = [] - this.total = 0 - this.$message.info('该分类下暂无数据') - } + this.tableData = listRes.rows + this.total = listRes.total || 0 } else { this.$message.error(listRes.msg || '获取装备列表失败') } @@ -1168,78 +1083,6 @@ export default { this.tableLoading = false } }, - - transformDataToTable(data) { - if (!data || !Array.isArray(data)) return [] - const tableData = [] - data.forEach((item) => { - const itemId = item.typeId || item.id - const levelInfo = this.levelMapping.get(itemId) - let level1 = '', - level2 = '', - level3 = '', - level4 = '', - level5 = '', - level6 = '' - if (levelInfo && levelInfo.fullPath) { - const path = levelInfo.fullPath - level1 = path[0] || '' - level2 = path[1] || '' - level3 = path[2] || '' - level4 = path[3] || '' - level5 = path[4] || '' - level6 = path[5] || '' - } - tableData.push({ - id: itemId, - level1, - level2, - level3, - level4, - level5, - level6, - createBy: item.createBy || '', - createTime: item.createTime || '', - updateBy: item.updateBy || '', - updateTime: item.updateTime || '', - rawData: item - }) - }) - return tableData - }, - - async onHandlePreview(row) { - try { - const targetId = row.rawData.typeId || row.rawData.id || row.id - if (!targetId) { - this.$message.warning('无法获取装备ID，查看失败') - return - } - const res = await getEquipmentTypeDetailAPI(targetId) - if (res.code === 200) { - const detailData = res.data - const levelInfo = this.levelMapping.get(targetId) || {} - const fullPath = levelInfo.fullPath || ['', '', '', '', '', ''] - this.formData = { - id: detailData.typeId || detailData.id || targetId, - level1: fullPath[0], - level2: fullPath[1], - level3: fullPath[2], - level4: fullPath[3], - level5: fullPath[4], - level6: detailData.typeName || fullPath[5], - categoryPath: [], - deviceName: '' - } - this.previewDialogVisible = true - } else { - this.$message.error(res.msg || '获取装备详情失败') - } - } catch (error) { - this.$message.error('获取装备详情失败：' + (error.message || '未知错误')) - } - }, - handlePreviewClose() { this.previewDialogVisible = false }, @@ -1280,12 +1123,13 @@ export default { // 核心修改6：打开编辑弹窗时，初始化路径文本和分类ID async onHandleEdit(row) { - const targetId = row.rawData.typeId || row.rawData.id || row.id + const targetId = row.typeId if (!targetId) { this.$message.warning('无法获取装备ID，编辑失败') return } const levelInfo = this.levelMapping.get(targetId) + console.log(levelInfo) if (!levelInfo) { this.$message.warning('未找到该装备的分类信息，无法编辑') return @@ -1296,14 +1140,18 @@ export default { // 2. 初始化分类ID数组（用于提交修改） const categoryPath = this.getCategoryPathById(targetId) + // 安全截取指定长度（处理数组为空/长度不足的情况） + const limitedCategoryPath = Array.isArray(categoryPath) + ? categoryPath.slice(0, levelInfo.level - 1) // 从第0位开始，截取指定长度 + : [] this.formData = { id: targetId, - categoryPath: categoryPath.map((id) => String(id)), + categoryPath: limitedCategoryPath.map((item) => item), deviceName: levelInfo.name || '' } - // 3. 默认隐藏分类修改器 - this.showCategoryEditor = false + console.log(this.formData) + await this.$nextTick() this.editDialogVisible = true }, @@ -1389,7 +1237,7 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm('queryForm') - this.queryParams.keyWord = undefined + this.queryParams.keyWord = '' this.queryParams.pageNum = 1 this.queryParams.pageSize = 10 this.getDeviceList() @@ -1399,6 +1247,15 @@ export default { this.resetAddFormData() this.addDialogVisible = true }, + handleExport() { + this.download( + '/material-mall/equipment/type/export', + { + ...this.queryParams + }, + `装备类型管理_${new Date().getTime()}.xlsx` + ) + }, handleAddClose() { this.addDialogVisible = false @@ -1449,42 +1306,43 @@ export default { }, onHandleDelete(row) { - this.$confirm('确定要删除该装备吗？', '提示', { + this.$confirm('确定要删除该类别吗？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(async() => { try { - const id = row.rawData.id || row.rawData.typeId + const id = row.typeId const res = await deleteEquipmentTypeAPI(id) if (res.code === 200) { this.$message.success('删除成功') + await this.getDeviceTree() this.getDeviceList() } else { this.$message.error(res.msg || '删除失败') } } catch (error) { - this.$message.error('删除失败：' + (error.message || '未知错误')) + console.log(error) } }) }, // ========== 特征值配置相关方法 ========== async onHandleConfig(row) { - const targetId = row.rawData.typeId + const targetId = row.typeId if (!targetId) { this.$message.warning('无法获取装备ID，配置失败') return } - this.resetConfigData() this.currentEquipmentId = targetId this.currentEquipmentTypeIdForFeature = targetId - - this.currentEquipmentName = row.level6 || row.rawData.typeName || row.rawData.name || '当前装备' - + if (row.actualLevel == '5') { + this.currentEquipmentName = row.subCategory + } else { + this.currentEquipmentName = row.branch + } this.featureLoading = true - try { const featureListRes = await getPropertiesByTypeId(this.currentEquipmentId) const equipmentFeatureRes = await getPropertiesByTypeId(targetId) @@ -1748,7 +1606,6 @@ export default { } } catch (error) { console.error('删除特征项失败:', error) - this.$message.error('删除失败：' + (error.message || '网络错误')) } }) .catch(() => { @@ -2019,6 +1876,7 @@ export default { .tree-column .el-card { width: 100%; + height: 100% !important; } .card-container { @@ -2423,7 +2281,7 @@ export default { .content-box { border-radius: 8px; - height: calc(100vh - 120px); + height: calc(100vh - 220px); display: flex; flex-direction: column; overflow: hidden; @@ -2610,4 +2468,6 @@ export default { justify-content: space-between; width: 100%; } + + diff --git a/src/views/address-manage/index.vue b/src/views/address-manage/index.vue index 7bc47349..3994a8a3 100644 --- a/src/views/address-manage/index.vue +++ b/src/views/address-manage/index.vue @@ -1,170 +1,195 @@