diff --git a/src/views/EquipmentRoamRecord/retirementRecord/index.vue b/src/views/EquipmentRoamRecord/retirementRecord/index.vue index 9238b39e..e2d3995c 100644 --- a/src/views/EquipmentRoamRecord/retirementRecord/index.vue +++ b/src/views/EquipmentRoamRecord/retirementRecord/index.vue @@ -147,7 +147,7 @@ {{ index + 1 }} - {{ item.type === '1' ? '工具' : (item.type === '2' ? '装备' : '未知类型') }} + {{ item.type === '2' ? '工具' : (item.type === '1' ? '装备' : '未知类型') }} {{ item.devName }} {{ item.devModel }} {{ item.devCode }} @@ -322,7 +322,7 @@ export default { display: flex; flex-direction: column; overflow: hidden; - + ::v-deep .el-card__body { display: flex !important; flex-direction: column !important; diff --git a/src/views/EquipmentSharedLease/order/index.vue b/src/views/EquipmentSharedLease/order/index.vue index 3fc1765a..40f9ef79 100644 --- a/src/views/EquipmentSharedLease/order/index.vue +++ b/src/views/EquipmentSharedLease/order/index.vue @@ -338,7 +338,7 @@
.el-tree-node__expand-icon { + color: #1890ff !important; +} + +::v-deep .el-tree-node__expand-icon.is-leaf { + color: transparent !important; +} + +::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content { + background-color: #8decf1; +} diff --git a/src/views/EquipmentUpOrDown/equipment/index.vue b/src/views/EquipmentUpOrDown/equipment/index.vue index f46072bd..774c0151 100644 --- a/src/views/EquipmentUpOrDown/equipment/index.vue +++ b/src/views/EquipmentUpOrDown/equipment/index.vue @@ -563,7 +563,7 @@ export default { /* 内容区域布局优化 */ .content-box { - height: calc(100vh - 220px); + height: calc(100vh - 270px); border-radius: 8px; display: flex; flex-direction: column; diff --git a/src/views/InterfaceConfig/index.vue b/src/views/InterfaceConfig/index.vue index 271f3999..db067135 100644 --- a/src/views/InterfaceConfig/index.vue +++ b/src/views/InterfaceConfig/index.vue @@ -67,7 +67,7 @@ - + diff --git a/src/views/business/apply/addApply.vue b/src/views/business/apply/addApply.vue index 66e6545f..63158cf8 100644 --- a/src/views/business/apply/addApply.vue +++ b/src/views/business/apply/addApply.vue @@ -10,21 +10,29 @@ /> - + + > + + {{ item.proName }} + + @@ -853,21 +861,23 @@ export default { return } - // const itemsToAdd = this.addList.filter(item => this.ids.includes(item.id)) const invalidItem = this.selectedRow.find(item => item.manageType === '1' && (item.num == 0 || !item.num)) if (invalidItem) { this.$message.error('请为数量管理的设备填写申请数量。') return } - // 关键修改:新增设备时,初始化 useTimeRange 为 Date 对象数组 + // 关键修改:读取主表单的日期范围,深拷贝避免引用联动 + const mainTimeRange = this.queryParams.useTimeRange + const defaultTimeRange = mainTimeRange && mainTimeRange.length === 2 + ? [new Date(mainTimeRange[0]), new Date(mainTimeRange[1])] // 复制日期对象,避免引用 + : [] + + // 新增行时自动填充主表单的日期范围 this.selectedRow.forEach(item => { this.tableList.push({ ...item, - // 逻辑:主表单有日期则用主表单日期,无则为空数组 - useTimeRange: this.queryParams.useTime - ? [new Date(this.queryParams.useTime), new Date(this.queryParams.useTime)] - : [] + useTimeRange: [...defaultTimeRange] // 自动填充日期 }) }) diff --git a/src/views/business/apply/applyList.vue b/src/views/business/apply/applyList.vue index 118471c1..843c39a1 100644 --- a/src/views/business/apply/applyList.vue +++ b/src/views/business/apply/applyList.vue @@ -122,7 +122,7 @@ - + + + > + + @@ -142,7 +145,7 @@ - + - + @@ -51,7 +51,7 @@ - 合同新建 + 协议新建 - + - + - +