历史租赁总数设备查看

2024-11-21 15:02:26 +08:00 · 2024-11-21 15:02:26 +08:00 · 5ab0b7d3eb
parent 34e8b050cc
commit 5ab0b7d3eb
7 changed files with 196 additions and 2 deletions
--- 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
@ -56,4 +56,15 @@ public class ProjUsingRecordController extends BaseController {
        util.exportExcel(response, list, "综合查询--工程机具使用");
    }

+    /**
+     * 历史租赁总数编码设备详情
+     */
+    @ApiOperation(value = "综合查询--工程机具使用列表")
+    @GetMapping("/getHisCodeRecord")
+    public AjaxResult getHisCodeRecord(ProjUsingRecord bean) {
+        startPage();
+        List<ProjUsingRecord> list = projUsingRecordService.getHisCodeRecord(bean);
+        return AjaxResult.success(getDataTable(list));
+    }
+
 }
--- 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
@ -20,4 +20,6 @@ public interface ProjUsingRecordMapper {
     * @return List<ProjUsingRecord>
     */
    List<ProjUsingRecord> getProjUsingRecordList(ProjUsingRecord bean);
+
+    List<ProjUsingRecord> getHisCodeRecord(ProjUsingRecord bean);
 }
--- 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
@ -18,4 +18,6 @@ public interface ProjUsingRecordService {
    * @return List<ProjUsingRecord>
    */
    List<ProjUsingRecord> getProjUsingRecordList(ProjUsingRecord bean);
+
+    List<ProjUsingRecord> getHisCodeRecord(ProjUsingRecord bean);
 }
--- 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
@ -26,4 +26,9 @@ public class ProjUsingRecordServiceImpl implements ProjUsingRecordService {
    public List<ProjUsingRecord> getProjUsingRecordList(ProjUsingRecord bean) {
        return projUsingRecordMapper.getProjUsingRecordList(bean);
    }
+
+    @Override
+    public List<ProjUsingRecord> getHisCodeRecord(ProjUsingRecord bean) {
+        return projUsingRecordMapper.getHisCodeRecord(bean);
+    }
 }
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ProjUsingRecordMapper.xml
@ -8,10 +8,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        SELECT subquery1.agreementCode,
        subquery1.unitName,
        subquery1.proName,
+        subquery1.unitId,
+        subquery1.type_id as typeId,
+        subquery1.proId,
        subquery1.typeName,
        subquery1.typeModelName,
        subquery1.unit,
        subquery3.typeKeepName,
+        CASE WHEN subquery1.manage_type = '0' then '编码' else '数量' end as manageTypeName,
        IFNULL(subquery1.outNum, 0) as outNum,
        IFNULL(subquery2.backNum, 0) as backNum,
        CASE
@ -31,9 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        FROM (SELECT bai.agreement_id,
        mt.type_id,
        mt.rent_price,
+        mt.manage_type,
        bai.agreement_code AS agreementCode,
        bui.unit_name AS unitName,
+        bui.unit_id AS unitId,
        bpl.lot_name AS proName,
+        bpl.lot_id AS proId,
        mt2.type_name AS typeName,
        mt.type_name AS typeModelName,
        mt.unit_name AS unit,
@ -138,4 +145,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            WHERE LOCATE(#{userId}, subquery3.userIds) > 0
        </if>
    </select>
+    <select id="getHisCodeRecord" resultType="com.bonus.sgzb.material.domain.ProjUsingRecord">
+        SELECT bai.agreement_id,
+               mt.type_id,
+               mt.rent_price,
+               mt.manage_type,
+               bai.agreement_code AS agreementCode,
+               bui.unit_name AS unitName,
+               bpl.lot_name AS proName,
+               mt2.type_name AS typeName,
+               mt.type_name AS typeModelName,
+               mt.unit_name AS unit,
+               mm.ma_code
+        FROM lease_out_details lod
+                 LEFT JOIN lease_apply_info lai ON lai.id = lod.parent_id
+                 LEFT JOIN tm_task_agreement tta ON tta.task_id = lai.task_id
+                 LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
+                 LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
+                 LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
+                 LEFT JOIN ma_type mt ON mt.type_id = lod.type_id
+                 LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+                 LEFT JOIN ma_machine mm ON mm.ma_id = lod.ma_id
+                 LEFT JOIN sys_user su ON su.user_id = lai.lease_person
+        where
+          bui.unit_id = #{unitId}
+          and bpl.lot_id = #{proId}
+          and mt.type_id = #{typeId}
+          <if test="maCode != null and maCode != ''">
+              and mm.ma_code like concat('%',#{maCode},'%')
+          </if>
+    </select>
 </mapper>
--- a/sgzb-ui/src/api/stquery/deviceStatusRecord.js
+++ b/sgzb-ui/src/api/stquery/deviceStatusRecord.js
@ -70,6 +70,14 @@ export function getAllRecords(query) {
    params: query
  })
 }
+// 获取 总保有量编码设备
+export function getHisCodeRecords(query) {
+  return request({
+    url: '/material/projUsingRecord/getHisCodeRecord',
+    method: 'get',
+    params: query
+  })
+}



--- a/sgzb-ui/src/views/stquery/projUsingRecord.vue
+++ b/sgzb-ui/src/views/stquery/projUsingRecord.vue
@ -188,6 +188,12 @@
                prop="unit"
                :show-overflow-tooltip="true"
            />
+            <el-table-column
+                label="管理模式"
+                align="center"
+                prop="manageTypeName"
+                :show-overflow-tooltip="true"
+            />
            <el-table-column
              label="库管员"
              align="center"
@ -199,7 +205,22 @@
                align="center"
                prop="outNum"
                :show-overflow-tooltip="true"
-            />
+            >
+            <template slot-scope="scope">
+              <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
+              <span
+                v-if="scope.row.manageTypeName === '编码'"
+                class="clickText"
+                @click="openHisCodeRecords(scope.row)"
+              >
+                  {{ scope.row.outNum }}
+                  </span>
+              <!-- 否则，直接显示数字 -->
+              <span v-else>
+                  {{ scope.row.outNum }}
+                  </span>
+            </template>
+            </el-table-column>
            <el-table-column
                label="在用数量"
                align="center"
@ -224,6 +245,79 @@
            :page-sizes="[5, 10, 15, 20, 30]"
            @pagination="getList"
        />
+      <!-- 总保有量编码设备弹窗-->
+      <el-dialog
+        :title="title"
+        :visible.sync="openHisCodeRecord"
+        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="30"
+              style="width: 240px"
+              @keyup.enter.native="handleGetHisCodeRecord"
+            />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleGetHisCodeRecord"
+            >查询</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="loading" :data="HisCodeRecords">
+          <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="getHisCodeRecords"
+        />
+      </el-dialog>
    </div>
 </template>

@ -233,7 +327,7 @@ import {
    getProData,
    usingRecord,
 } from '@/api/stquery/projUsingRecord'
-import {getTypeKeeper} from "@/api/stquery/deviceStatusRecord";
+import {getAllRecords, getHisCodeRecords, getTypeKeeper} from "@/api/stquery/deviceStatusRecord";

 export default {
    name: 'backRecord',
@ -252,10 +346,19 @@ export default {
            showSearch: true,
            // 总条数
            total: 0,
+            openHisCodeRecord: false,
            // 字典表格数据
            leaseAuditList: [],
            // 日期范围
            dateRange: [],
+            dialogQuery: {
+              pageNum: 1,
+              pageSize: 10,
+              typeId: undefined,
+              maCode: undefined,
+              unitId: undefined,
+              proId: undefined,
+            },
            // 查询参数
            queryParams: {
                pageNum: 1,
@ -272,6 +375,7 @@ export default {
            },
            unitList: [], //来往单位集合
            keepIdList: [], //库管员id集合
+            HisCodeRecords: [], //历史租赁设备列表
            proList: [], //工程集合
        }
    },
@ -348,6 +452,11 @@ export default {
            this.queryParams.pageNum = 1
            this.getList()
        },
+        /** 搜索历史租赁设备按钮*/
+        handleGetHisCodeRecord() {
+            this.queryParams.pageNum = 1
+            this.getHisCodeRecords()
+        },
        /** 重置按钮操作 */
        resetQuery() {
            this.getProList()
@ -375,6 +484,22 @@ export default {
        keepUserChange(val) {
            this.getTypeKeeper(val)
        },
+      //查看历史租赁编码设备
+        openHisCodeRecords(row) {
+        this.openHisCodeRecord = true
+        this.dialogQuery.maCode = ""
+        this.dialogQuery.typeId= row.typeId
+        this.dialogQuery.unitId= row.unitId
+        this.dialogQuery.proId= row.proId
+        this.getHisCodeRecords()
+      },
+      /** 查看历史租赁编码设备 */
+      getHisCodeRecords() {
+        getHisCodeRecords(this.dialogQuery).then((response) => {
+          this.HisCodeRecords = response.data.rows
+          this.dialogTotal = response.data.total
+        })
+      },
        // 获取 库管员
        async getTypeKeeper() {
          const params = {
@ -393,4 +518,8 @@ export default {
    width: 60px !important;
    margin-bottom: 10px;
 }
+.clickText {
+  color: #02a7f0;
+  cursor: pointer;
+}
 </style>