From 28dceae839bdc4516992de945bba4bc407b9499c Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 20 Nov 2025 15:50:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/material/lease/protocol/index.vue | 1 +
.../stquery/deviceComparisonStatistical.vue | 132 ++++++++++++++++--
2 files changed, 119 insertions(+), 14 deletions(-)
diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index 4ec895fd..e49cfc00 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -869,6 +869,7 @@ export default {
console.log('🚀 ~ val:', val)
this.form.projectUnitId = null
this.form.unitId = null
+ this.form.projectId = val.id
this.departList = []
this.uniteList = []
this.getUnitList()
diff --git a/src/views/material/stquery/deviceComparisonStatistical.vue b/src/views/material/stquery/deviceComparisonStatistical.vue
index 46b88c84..a8f86649 100644
--- a/src/views/material/stquery/deviceComparisonStatistical.vue
+++ b/src/views/material/stquery/deviceComparisonStatistical.vue
@@ -38,15 +38,6 @@
style="width: 240px"
/>
-
-
-
查询
@@ -74,7 +65,12 @@
/>
-
+
+
+ 施工机具
+ 安全工器具
+
+
@@ -88,6 +84,66 @@
@pagination="getList"
/>
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.allUsNum }}
+
+
+
+ {{ scope.row.allUsNum }}
+
+
+ >
+
+
+
+
+
@@ -117,7 +173,13 @@
type="index"
:index="indexContinuation(dialogUseQuery.pageNum, dialogUseQuery.pageSize)"
>
-
+
+
+
+ {{ scope.row.proName }}
+
+
+
@@ -164,7 +226,6 @@ export default {
pageNum: 1,
pageSize: 10,
keyWord: null,
- typeName: null, //物资名称
proName: null,
startTime: null,
endTime: null
@@ -178,7 +239,20 @@ export default {
typeId: undefined
},
useRecordList: [], //在用设备列表
- dialogUserTotal: 0
+ dialogUserTotal: 0,
+
+ // 二级弹窗参数
+ openDeviceRecord: false, // 二级弹窗
+ dialogDeviceQuery: { // 二级查询参数
+ pageNum: 1,
+ pageSize: 10,
+ keyWord: undefined,
+ typeId: undefined
+ },
+ deviceRecordList: [], // 二级列表数据
+ dialogDeviceTotal: 0, // 二级总条数
+ titleDevice: '查看', // 二级标题
+
}
},
created() {
@@ -202,7 +276,6 @@ export default {
this.loading = true
const params = {
keyWord: this.queryParams.keyWord,
- typeName: this.queryParams.typeName,
proName: this.queryParams.proName,
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
@@ -270,6 +343,36 @@ export default {
)
},
// ------------------
+ //查看二级列表
+ openDeviceRecords(row) {
+ this.openUseRecord = true
+ this.dialogUseQuery.typeId = row.typeId
+ this.dialogUseQuery.keyWord = ''
+ this.dialogUseQuery.pageNum = 1
+ this.dialogUseQuery.pageSize = 10
+ this.useRecordList = []
+ this.getDevicerRecords()
+ },
+
+ /** 查询二级弹窗设备列表 */
+ getDevicerRecords() {
+ this.loadingDevice = true
+ getAllUsDetailsApi(this.dialogDeviceQuery)
+ .then(response => {
+ this.deviceRecordList = response.data.rows
+ this.dialogDeviceTotal = response.data.total
+ })
+ .catch(() => {
+ this.deviceRecordList = []
+ this.dialogDeviceTotal = 0
+ })
+ .finally(() => {
+ this.loadingDevice = false
+ })
+ },
+
+
+
//查看在用设备
openUserRecords(row) {
this.openUseRecord = true
@@ -280,6 +383,7 @@ export default {
this.useRecordList = []
this.getUserRecords()
},
+
/** 查询在用设备列表 */
getUserRecords() {
this.loading2 = true