From bea2bb2048059eef082c42f949ac91756c1af76c Mon Sep 17 00:00:00 2001 From: bb_pan Date: Thu, 26 Jun 2025 10:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/materialsStation/index.js | 8 ++++---- src/views/business/businessHandling/directApply.vue | 11 +++-------- src/views/business/businessHandling/index.vue | 9 ++------- src/views/material/back/component/addReturn.vue | 13 ++++--------- .../lease/apply/component/addToolsApply.vue | 4 ---- .../purchase/goodsArrived/component/addTools.vue | 4 ---- .../inventoryScrap/component/addToolsApply.vue | 9 ++------- .../toolsBack/back/component/addReturn.vue | 7 +------ .../toolsLease/apply/component/addToolsApply.vue | 9 ++------- .../toolsLease/outBound/component/addToolsApply.vue | 7 +------ 10 files changed, 19 insertions(+), 62 deletions(-) diff --git a/src/api/materialsStation/index.js b/src/api/materialsStation/index.js index acce680b..3e217813 100644 --- a/src/api/materialsStation/index.js +++ b/src/api/materialsStation/index.js @@ -274,11 +274,11 @@ export function applyRemove(ids) { } // 获取机具类型树 -export function equipmentTypeTree(query) { +export function equipmentTypeTree(data) { return request({ - url: '/material/ma_type/equipmentType', - method: 'get', - params: query + url: '/material/material_lease_apply_info/equipmentType', + method: 'post', + data }) } diff --git a/src/views/business/businessHandling/directApply.vue b/src/views/business/businessHandling/directApply.vue index f1e392a3..1f7fd01c 100644 --- a/src/views/business/businessHandling/directApply.vue +++ b/src/views/business/businessHandling/directApply.vue @@ -1013,9 +1013,9 @@ export default { // overflow-y: auto; // } -.highlight-text { - background-color: #ffd04b; - color: #000; +::v-deep .highlight-text { + background-color: #ffd04b; + color: #000; } ::v-deep .el-input-group__append { @@ -1046,11 +1046,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} - .el-input-group__append { padding: 0; .el-button { diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue index 548cc45c..64c3e8d6 100644 --- a/src/views/business/businessHandling/index.vue +++ b/src/views/business/businessHandling/index.vue @@ -1276,7 +1276,7 @@ export default { if (this.currentMatchIndex === -1 || !this.matchedOptions.length) return const option = this.matchedOptions[this.currentMatchIndex] - const selectDom = this.$el.querySelector('.el-select-dropdown__wrap') + const selectDom = this.$el.querySelector('.type-select-dropdown') const optionDom = selectDom?.querySelector(`[data-key="${option.typeId}"]`) if (optionDom) { @@ -1358,7 +1358,7 @@ export default { // overflow-y: auto; // } -.highlight-text { +::v-deep .highlight-text { background-color: #ffd04b; color: #000; } @@ -1391,11 +1391,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} - .el-input-group__append { padding: 0; .el-button { diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue index 0041d48b..237b61bd 100644 --- a/src/views/material/back/component/addReturn.vue +++ b/src/views/material/back/component/addReturn.vue @@ -1351,7 +1351,7 @@ export default { if (this.currentMatchIndex === -1 || !this.matchedOptions.length) return const option = this.matchedOptions[this.currentMatchIndex] - const selectDom = this.$el.querySelector('.el-select-dropdown__wrap') + const selectDom = this.$el.querySelector('.type-select-dropdown') const optionDom = selectDom?.querySelector(`[data-key="${option.typeId}"]`) if (optionDom) { @@ -1422,9 +1422,9 @@ export default { overflow-y: auto; } -.highlight-text { - background-color: #ffd04b; - color: #000; +::v-deep .highlight-text { + background-color: #ffd04b; + color: #000; } ::v-deep .el-input-group__append { @@ -1455,11 +1455,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} - .el-input-group__append { padding: 0; .el-button { diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue index beea92cd..729906db 100644 --- a/src/views/material/lease/apply/component/addToolsApply.vue +++ b/src/views/material/lease/apply/component/addToolsApply.vue @@ -1257,10 +1257,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} .el-input-group__append { padding: 0; diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue index 121a90e5..a9493e32 100644 --- a/src/views/material/purchase/goodsArrived/component/addTools.vue +++ b/src/views/material/purchase/goodsArrived/component/addTools.vue @@ -1433,10 +1433,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} .el-input-group__append { padding: 0; diff --git a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue index 0e7509bd..4f5d8929 100644 --- a/src/views/material/repair/inventoryScrap/component/addToolsApply.vue +++ b/src/views/material/repair/inventoryScrap/component/addToolsApply.vue @@ -996,7 +996,7 @@ export default { if (this.currentMatchIndex === -1 || !this.matchedOptions.length) return const option = this.matchedOptions[this.currentMatchIndex] - const selectDom = this.$el.querySelector('.el-select-dropdown__wrap') + const selectDom = this.$el.querySelector('.type-select-dropdown') const optionDom = selectDom?.querySelector(`[data-key="${option.typeId}"]`) if (optionDom) { @@ -1054,7 +1054,7 @@ export default { // overflow-y: auto; // } -.highlight-text { +::v-deep .highlight-text { background-color: #ffd04b; color: #000; } @@ -1087,11 +1087,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} - .el-input-group__append { padding: 0; .el-button { diff --git a/src/views/materialsStation/toolsBack/back/component/addReturn.vue b/src/views/materialsStation/toolsBack/back/component/addReturn.vue index 4d67b814..c61c15a6 100644 --- a/src/views/materialsStation/toolsBack/back/component/addReturn.vue +++ b/src/views/materialsStation/toolsBack/back/component/addReturn.vue @@ -943,7 +943,7 @@ export default { overflow-y: auto; } -.highlight-text { +::v-deep .highlight-text { background-color: #ffd04b; color: #000; } @@ -976,11 +976,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} - .el-input-group__append { padding: 0; .el-button { diff --git a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue index e694fecf..7bfc1cc2 100644 --- a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue +++ b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue @@ -412,7 +412,7 @@ export default { }, /** 机具类型 */ equipmentType() { - equipmentTypeTree().then(response => { + equipmentTypeTree({ agreementId: this.agreementId }).then(response => { this.equipmentTypeList = response.data // 处理并扁平化所有类型数据 this.flattenTypeOptions = this.processTypeData(response.data) @@ -782,7 +782,7 @@ export default { // overflow-y: auto; // } -.highlight-text { +::v-deep .highlight-text { background-color: #ffd04b; color: #000; } @@ -815,11 +815,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} - .el-input-group__append { padding: 0; .el-button { diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue index 21f508af..2ae62102 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue @@ -858,7 +858,7 @@ export default { // overflow-y: auto; // } -.highlight-text { +::v-deep .highlight-text { background-color: #ffd04b; color: #000; } @@ -891,11 +891,6 @@ export default { } } -.highlight-text { - background-color: #ffd04b; - color: #000; -} - .el-input-group__append { padding: 0; .el-button {