From d8b0c68bd7f4024814dc230bfae84fbe3adeea71 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 20 Nov 2025 14:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=EF=BC=8C=E5=88=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business-examine/receive-apply/index.vue | 3 +- .../business/businessHandlingRecord/index.vue | 1 + .../material/cost/component/applyHome.vue | 1 + .../material/cost/component/examHome.vue | 1 + .../component/leaseCostRangeReportHome.vue | 1 + .../cost/component/lostReportHome.vue | 1 + .../cost/component/repairReportHome.vue | 1 + .../material/cost/component/reportHome.vue | 1 + .../cost/component/scrapReportHome.vue | 1 + .../material/cost/component/unreportHome.vue | 25 +++++++++++++++- .../costPush/expendableExpensePush/index.vue | 1 + .../costPush/leaseExpensePush/index.vue | 1 + .../material/costPush/protocolMatch/index.vue | 1 + .../material/costPush/pushReview/index.vue | 1 + src/views/material/repair/partUsing/index.vue | 27 +++++++++++++++++ .../repair/projectRepairing/index.vue | 29 ++++++++++++++++++- .../material/repair/testRecord/index.vue | 28 ++++++++++++++++++ .../stquery/deviceComparisonStatistical.vue | 23 ++------------- 18 files changed, 124 insertions(+), 23 deletions(-) diff --git a/src/views/business-examine/receive-apply/index.vue b/src/views/business-examine/receive-apply/index.vue index 36bcb2d0..bbabe88e 100644 --- a/src/views/business-examine/receive-apply/index.vue +++ b/src/views/business-examine/receive-apply/index.vue @@ -136,10 +136,11 @@ export default { { label: '已完成', value: '2' }, { label: '已驳回', value: '3' } ], - // 表头 + // 表头 tableColumns: [ { label: '申请时间', prop: 'createTime', width: '100', showTooltip: false }, { label: '申请人', prop: 'createBy' }, + { label: '分公司', prop: 'impUnitName', showTooltip: false }, { label: '领用单位', prop: 'leaseUnit', showTooltip: false }, { label: '领用工程', prop: 'leaseProject', showTooltip: false }, { label: '领料物资类型', prop: 'maTypeNames' }, diff --git a/src/views/business/businessHandlingRecord/index.vue b/src/views/business/businessHandlingRecord/index.vue index 7f1739fe..3b6607d4 100644 --- a/src/views/business/businessHandlingRecord/index.vue +++ b/src/views/business/businessHandlingRecord/index.vue @@ -324,6 +324,7 @@ export default { tableColumns: [ { label: '申请时间', prop: 'createTime', width: '100' }, { label: '申请人', prop: 'createBy', width: '80' }, + { label: '分公司', prop: 'impUnitName', showTooltip: false }, { label: '领用单位', prop: 'leaseUnit', width: '180' }, { label: '领用工程', prop: 'leaseProject', width: '180' }, { label: '领料物资类型', prop: 'maTypeNames', showTooltip: true }, diff --git a/src/views/material/cost/component/applyHome.vue b/src/views/material/cost/component/applyHome.vue index 65f306b3..e7c7292a 100644 --- a/src/views/material/cost/component/applyHome.vue +++ b/src/views/material/cost/component/applyHome.vue @@ -72,6 +72,7 @@ + diff --git a/src/views/material/cost/component/examHome.vue b/src/views/material/cost/component/examHome.vue index af790ab9..6001d417 100644 --- a/src/views/material/cost/component/examHome.vue +++ b/src/views/material/cost/component/examHome.vue @@ -53,6 +53,7 @@ + diff --git a/src/views/material/cost/component/leaseCostRangeReportHome.vue b/src/views/material/cost/component/leaseCostRangeReportHome.vue index b1eabd5d..edf4b83c 100644 --- a/src/views/material/cost/component/leaseCostRangeReportHome.vue +++ b/src/views/material/cost/component/leaseCostRangeReportHome.vue @@ -43,6 +43,7 @@ + diff --git a/src/views/material/cost/component/lostReportHome.vue b/src/views/material/cost/component/lostReportHome.vue index 8009100f..2c2d2550 100644 --- a/src/views/material/cost/component/lostReportHome.vue +++ b/src/views/material/cost/component/lostReportHome.vue @@ -57,6 +57,7 @@ + diff --git a/src/views/material/cost/component/repairReportHome.vue b/src/views/material/cost/component/repairReportHome.vue index f81358fd..8d84bf83 100644 --- a/src/views/material/cost/component/repairReportHome.vue +++ b/src/views/material/cost/component/repairReportHome.vue @@ -57,6 +57,7 @@ + diff --git a/src/views/material/cost/component/reportHome.vue b/src/views/material/cost/component/reportHome.vue index ea2c1a20..48b78798 100644 --- a/src/views/material/cost/component/reportHome.vue +++ b/src/views/material/cost/component/reportHome.vue @@ -57,6 +57,7 @@ + diff --git a/src/views/material/cost/component/scrapReportHome.vue b/src/views/material/cost/component/scrapReportHome.vue index 0088568c..567de3ba 100644 --- a/src/views/material/cost/component/scrapReportHome.vue +++ b/src/views/material/cost/component/scrapReportHome.vue @@ -57,6 +57,7 @@ + diff --git a/src/views/material/cost/component/unreportHome.vue b/src/views/material/cost/component/unreportHome.vue index 010ddd38..c67bf32a 100644 --- a/src/views/material/cost/component/unreportHome.vue +++ b/src/views/material/cost/component/unreportHome.vue @@ -22,6 +22,17 @@ + + + + + + 查询 重置 @@ -44,6 +55,7 @@ + @@ -126,7 +138,12 @@ - + + + + diff --git a/src/views/material/costPush/pushReview/index.vue b/src/views/material/costPush/pushReview/index.vue index 92954e3b..a6af6ab5 100644 --- a/src/views/material/costPush/pushReview/index.vue +++ b/src/views/material/costPush/pushReview/index.vue @@ -111,6 +111,7 @@ + diff --git a/src/views/material/repair/partUsing/index.vue b/src/views/material/repair/partUsing/index.vue index 499ab8d0..7be658e9 100644 --- a/src/views/material/repair/partUsing/index.vue +++ b/src/views/material/repair/partUsing/index.vue @@ -46,6 +46,16 @@ style="width: 240px" /> + + + + + {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }} + @@ -126,6 +137,7 @@ import { import { getProjectList, getUnitList, + getImpUnitNameListApi, } from '@/api/back/index.js' import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; @@ -174,7 +186,9 @@ export default { statusName: null, //状态 startTime: null, endTime: null, + impUnitName: null, //分公司 }, + impUnitNameList: [], } }, computed: { @@ -198,6 +212,7 @@ export default { this.queryParams.startTime = this.format(start) this.queryParams.endTime = this.format(end) this.initSelectData() + this.getImpUnitNameList() this.getList() }, methods: { @@ -233,6 +248,17 @@ export default { children: node.children, }; }, + + // 分公司下拉 + async getImpUnitNameList () { + try { + const res = await getImpUnitNameListApi() + this.impUnitNameList = res.data + } catch (error) { + console.log('🚀 ~ error:', error) + } + }, + // 获取 来往单位 列表数据 async GetUnitData() { const params = { @@ -269,6 +295,7 @@ export default { keyWord: this.queryParams.keyWord, typeName: this.queryParams.typeName, statusName: this.queryParams.statusName, + impUnitName: this.queryParams.impUnitName, startTime: this.queryParams.startTime, endTime: this.queryParams.endTime, pageSize: this.queryParams.pageSize, diff --git a/src/views/material/repair/projectRepairing/index.vue b/src/views/material/repair/projectRepairing/index.vue index 4c58585b..73e267a4 100644 --- a/src/views/material/repair/projectRepairing/index.vue +++ b/src/views/material/repair/projectRepairing/index.vue @@ -28,6 +28,16 @@ style="width: 240px" /> + + + + + + @@ -85,7 +96,9 @@ import { getRepairProjectListApi, } from '@/api/repair/repair'; - +import { + getImpUnitNameListApi, +} from '@/api/back/index.js' export default { name: 'ProjectRepairing', @@ -115,7 +128,9 @@ export default { keyWord: null, startTime: null, endTime: null, + impUnitName: null, }, + impUnitNameList: [], } }, computed: { @@ -138,6 +153,7 @@ export default { start.setMonth(start.getMonth() - 1) this.queryParams.startTime = this.format(start) this.queryParams.endTime = this.format(end) + this.getImpUnitNameList() this.getList() }, methods: { @@ -158,12 +174,23 @@ export default { return `${year}-${month}-${day}`; }, + // 分公司下拉 + async getImpUnitNameList () { + try { + const res = await getImpUnitNameListApi() + this.impUnitNameList = res.data + } catch (error) { + console.log('🚀 ~ error:', error) + } + }, + // 获取列表 async getList() { try { this.loading = true const params = { keyWord: this.queryParams.keyWord, + impUnitName: this.queryParams.impUnitName, startTime: this.queryParams.startTime, endTime: this.queryParams.endTime, pageSize: this.queryParams.pageSize, diff --git a/src/views/material/repair/testRecord/index.vue b/src/views/material/repair/testRecord/index.vue index e74f5306..febd4539 100644 --- a/src/views/material/repair/testRecord/index.vue +++ b/src/views/material/repair/testRecord/index.vue @@ -54,6 +54,18 @@ style="width: 240px" /> + + + + + + + {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }} + @@ -263,6 +276,7 @@ import { import { getProjectList, getUnitList, + getImpUnitNameListApi, } from '@/api/back/index.js' import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; @@ -312,6 +326,7 @@ export default { statusName: null, //状态 startTime: null, endTime: null, + impUnitName: null, //分公司 }, dialogVisible: false, // 弹框显示 printTableData: [], @@ -322,6 +337,7 @@ export default { testResult2: '', testResult3: '', testConclusion: '合格', + impUnitNameList: [], } }, computed: { @@ -346,6 +362,7 @@ export default { this.queryParams.startTime = this.format(start) this.queryParams.endTime = this.format(end) this.initSelectData() + this.getImpUnitNameList() this.getList() }, methods: { @@ -381,6 +398,16 @@ export default { children: node.children, }; }, + + // 分公司下拉 + async getImpUnitNameList () { + try { + const res = await getImpUnitNameListApi() + this.impUnitNameList = res.data + } catch (error) { + console.log('🚀 ~ error:', error) + } + }, // 获取 来往单位 列表数据 async GetUnitData() { const params = { @@ -429,6 +456,7 @@ export default { keyWord: this.queryParams.keyWord, typeName: this.queryParams.typeName, statusName: this.queryParams.statusName, + impUnitName: this.queryParams.impUnitName, startTime: this.queryParams.startTime, endTime: this.queryParams.endTime, pageSize: this.queryParams.pageSize, diff --git a/src/views/material/stquery/deviceComparisonStatistical.vue b/src/views/material/stquery/deviceComparisonStatistical.vue index 2a88fb68..46b88c84 100644 --- a/src/views/material/stquery/deviceComparisonStatistical.vue +++ b/src/views/material/stquery/deviceComparisonStatistical.vue @@ -72,29 +72,12 @@ type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" /> + - - - + - - - - - - - - - +