diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java
index 5dd14d45..e27ceef0 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java
@@ -59,12 +59,22 @@ public class ProjUsingRecordController extends BaseController {
     /**
      * 历史租赁总数编码设备详情
      */
-    @ApiOperation(value = "综合查询--工程机具使用列表")
+    @ApiOperation(value = "综合查询--历史租赁总数编码设备详情")
     @GetMapping("/getHisCodeRecord")
     public AjaxResult getHisCodeRecord(ProjUsingRecord bean) {
         startPage();
         List<ProjUsingRecord> list = projUsingRecordService.getHisCodeRecord(bean);
         return AjaxResult.success(getDataTable(list));
     }
+    /**
+     * 历史租赁总数编码设备详情
+     */
+    @ApiOperation(value = "综合查询--在用数量列表")
+    @GetMapping("/getUserGjjRecords")
+    public AjaxResult getUserGjjRecords(ProjUsingRecord bean) {
+        startPage();
+        List<ProjUsingRecord> list = projUsingRecordService.getUserGjjRecords(bean);
+        return AjaxResult.success(getDataTable(list));
+    }
 
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java
index 40082a38..a572aa99 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java
@@ -23,6 +23,11 @@ public class ProjUsingRecord {
     @ApiModelProperty(value = "")
     private Integer id;
 
+    /**
+     * 协议号
+     */
+    @ApiModelProperty(value = "协议号")
+    private String agreementId;
     /**
      * 协议号
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ProjUsingRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ProjUsingRecordMapper.java
index bc69fb0a..657d5f3f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ProjUsingRecordMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ProjUsingRecordMapper.java
@@ -22,4 +22,6 @@ public interface ProjUsingRecordMapper {
     List<ProjUsingRecord> getProjUsingRecordList(ProjUsingRecord bean);
 
     List<ProjUsingRecord> getHisCodeRecord(ProjUsingRecord bean);
+
+    List<ProjUsingRecord> getUserGjjRecords(ProjUsingRecord bean);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ProjUsingRecordService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ProjUsingRecordService.java
index 255b79d4..2087bbf0 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ProjUsingRecordService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ProjUsingRecordService.java
@@ -20,4 +20,6 @@ public interface ProjUsingRecordService {
     List<ProjUsingRecord> getProjUsingRecordList(ProjUsingRecord bean);
 
     List<ProjUsingRecord> getHisCodeRecord(ProjUsingRecord bean);
+
+    List<ProjUsingRecord> getUserGjjRecords(ProjUsingRecord bean);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ProjUsingRecordServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ProjUsingRecordServiceImpl.java
index 2877afeb..d06ca11f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ProjUsingRecordServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ProjUsingRecordServiceImpl.java
@@ -31,4 +31,9 @@ public class ProjUsingRecordServiceImpl implements ProjUsingRecordService {
     public List<ProjUsingRecord> getHisCodeRecord(ProjUsingRecord bean) {
         return projUsingRecordMapper.getHisCodeRecord(bean);
     }
+
+    @Override
+    public List<ProjUsingRecord> getUserGjjRecords(ProjUsingRecord bean) {
+        return projUsingRecordMapper.getUserGjjRecords(bean);
+    }
 }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml
index 8b998d39..2ccaa3a1 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml
@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getProjUsingRecordList" resultType="com.bonus.sgzb.material.domain.ProjUsingRecord">
         SELECT subquery1.agreementCode,
+        subquery1.agreement_id,
         subquery1.unitName,
         subquery1.proName,
         subquery1.unitId,
@@ -175,4 +176,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               and mm.ma_code like concat('%',#{maCode},'%')
           </if>
     </select>
+    <select id="getUserGjjRecords" resultType="com.bonus.sgzb.material.domain.ProjUsingRecord">
+        SELECT
+            mt.type_name typeModelName,
+            mt2.type_name typeName,
+            mm.ma_code
+        FROM
+            slt_agreement_info sai
+                LEFT JOIN ma_type mt ON sai.type_id = mt.type_id
+                LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
+                LEFT JOIN ma_machine mm ON mm.ma_id = sai.ma_id
+        WHERE
+            sai.agreement_id = #{agreementId}
+        and sai.type_id = #{typeId}
+        and sai.end_time is null and sai.back_id is null
+        <if test="maCode != null and maCode != ''">
+            and mm.ma_code like concat('%',#{maCode},'%')
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/sgzb-ui/src/api/stquery/deviceStatusRecord.js b/sgzb-ui/src/api/stquery/deviceStatusRecord.js
index 331a731d..0bb03adf 100644
--- a/sgzb-ui/src/api/stquery/deviceStatusRecord.js
+++ b/sgzb-ui/src/api/stquery/deviceStatusRecord.js
@@ -62,6 +62,14 @@ export function getUserRecords(query) {
     params: query
   })
 }
+// 获取 工机具在用机具设备
+export function getUserGjjRecords(query) {
+  return request({
+    url: '/material/projUsingRecord/getUserGjjRecords',
+    method: 'get',
+    params: query
+  })
+}
 // 获取 总保有量编码设备
 export function getAllRecords(query) {
   return request({
diff --git a/sgzb-ui/src/views/stquery/projUsingRecord.vue b/sgzb-ui/src/views/stquery/projUsingRecord.vue
index a51bdba4..4c12a695 100644
--- a/sgzb-ui/src/views/stquery/projUsingRecord.vue
+++ b/sgzb-ui/src/views/stquery/projUsingRecord.vue
@@ -226,7 +226,22 @@
                 align="center"
                 prop="usNum"
                 :show-overflow-tooltip="true"
-            />
+                >
+              <template slot-scope="scope">
+                <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
+                <span
+                  v-if="scope.row.manageTypeName === '编码'"
+                  class="clickText"
+                  @click="openUserRecords(scope.row)"
+                >
+                  {{ scope.row.usNum }}
+                  </span>
+                <!-- 否则，直接显示数字 -->
+                <span v-else>
+                  {{ scope.row.usNum }}
+                  </span>
+              </template>
+            </el-table-column>
             <el-table-column
               label="历史归还总数"
               align="center"
@@ -318,6 +333,80 @@
           @pagination="getHisCodeRecords"
         />
       </el-dialog>
+      <!-- 在用编码设备弹窗-->
+      <el-dialog
+        :title="title"
+        :visible.sync="openUseRecord"
+        width="1200px"
+        append-to-body
+      >
+          <el-form
+           :model="dialogQuery"
+           ref="dialogQuery"
+           size="small"
+           :inline="true"
+           label-width="80px"
+         >
+
+          <el-form-item label="机具编码" prop="maCode">
+             <el-input
+               v-model="dialogQuery.maCode"
+               placeholder="请输入机具编码"
+               clearable
+               :maxlength="20"
+               style="width: 240px"
+               @keyup.enter.native="handleUseRecord"
+             />
+           </el-form-item>
+
+           <el-form-item>
+             <el-button
+               type="primary"
+               icon="el-icon-search"
+               size="mini"
+               @click="handleUseRecord"
+             >查询</el-button>
+           </el-form-item>
+         </el-form>
+
+        <el-table v-loading="loading" :data="UserRecords">
+          <el-table-column
+            label="序号"
+            align="center"
+            width="80"
+            type="index"
+            :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
+          >
+          </el-table-column>
+          <el-table-column
+            label="类型名称"
+            align="center"
+            prop="typeName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="规格型号"
+            align="center"
+            prop="typeModelName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="编码"
+            align="center"
+            prop="maCode"
+            :show-overflow-tooltip="true"
+          />
+        </el-table>
+
+        <pagination
+          v-show="dialogTotal > 0"
+          :total="dialogTotal"
+          :page.sync="dialogQuery.pageNum"
+          :limit.sync="dialogQuery.pageSize"
+          @pagination="getUserRecords"
+        />
+      </el-dialog>
+
     </div>
 </template>
 
@@ -327,7 +416,7 @@ import {
     getProData,
     usingRecord,
 } from '@/api/stquery/projUsingRecord'
-import {getAllRecords, getHisCodeRecords, getTypeKeeper} from "@/api/stquery/deviceStatusRecord";
+import {getAllRecords, getHisCodeRecords, getTypeKeeper,getUserGjjRecords, getUserRecords} from "@/api/stquery/deviceStatusRecord";
 
 export default {
     name: 'backRecord',
@@ -347,6 +436,7 @@ export default {
             // 总条数
             total: 0,
             openHisCodeRecord: false,
+            openUseRecord: false,
             // 字典表格数据
             leaseAuditList: [],
             // 日期范围
@@ -358,6 +448,7 @@ export default {
               maCode: undefined,
               unitId: undefined,
               proId: undefined,
+              agreementId: undefined,
             },
             // 查询参数
             queryParams: {
@@ -376,6 +467,7 @@ export default {
             unitList: [], //来往单位集合
             keepIdList: [], //库管员id集合
             HisCodeRecords: [], //历史租赁设备列表
+            UserRecords: [], //在用数量设备列表
             proList: [], //工程集合
         }
     },
@@ -452,11 +544,30 @@ export default {
             this.queryParams.pageNum = 1
             this.getList()
         },
+        handleUseRecord() {
+          this.queryParams.pageNum = 1
+          this.getUserRecords()
+        },
         /** 搜索历史租赁设备按钮*/
         handleGetHisCodeRecord() {
             this.queryParams.pageNum = 1
             this.getHisCodeRecords()
         },
+      //查看在用设备
+      openUserRecords(row) {
+        this.openUseRecord = true
+        this.dialogQuery.maCode = ""
+        this.dialogQuery.typeId= row.typeId
+        this.dialogQuery.agreementId= row.agreementId
+        this.getUserRecords()
+      },
+      /** 查询在用设备列表 */
+      getUserRecords() {
+        getUserGjjRecords(this.dialogQuery).then((response) => {
+          this.UserRecords = response.data.rows
+          this.dialogTotal = response.data.total
+        })
+      },
         /** 重置按钮操作 */
         resetQuery() {
             this.getProList()