综合查询工程机具历史归还设备详情功能开发

2024-11-21 17:28:15 +08:00 · 2024-11-21 17:28:15 +08:00 · 118600bf0e
parent c9764487a0
commit 118600bf0e
8 changed files with 178 additions and 5 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
@ -76,5 +76,15 @@ public class ProjUsingRecordController extends BaseController {
        List<ProjUsingRecord> list = projUsingRecordService.getUserGjjRecords(bean);
        return AjaxResult.success(getDataTable(list));
    }
+    /**
+     * 历史租赁总数编码设备详情
+     */
+    @ApiOperation(value = "综合查询--在用数量列表")
+    @GetMapping("/getHisReturnCodeRecord")
+    public AjaxResult getHisReturnCodeRecord(ProjUsingRecord bean) {
+        startPage();
+        List<ProjUsingRecord> list = projUsingRecordService.getHisReturnCodeRecord(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
@ -24,4 +24,6 @@ public interface ProjUsingRecordMapper {
    List<ProjUsingRecord> getHisCodeRecord(ProjUsingRecord bean);

    List<ProjUsingRecord> getUserGjjRecords(ProjUsingRecord bean);
+
+    List<ProjUsingRecord> getHisReturnCodeRecord(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
@ -22,4 +22,6 @@ public interface ProjUsingRecordService {
    List<ProjUsingRecord> getHisCodeRecord(ProjUsingRecord bean);

    List<ProjUsingRecord> getUserGjjRecords(ProjUsingRecord bean);
+
+    List<ProjUsingRecord> getHisReturnCodeRecord(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
@ -36,4 +36,9 @@ public class ProjUsingRecordServiceImpl implements ProjUsingRecordService {
    public List<ProjUsingRecord> getUserGjjRecords(ProjUsingRecord bean) {
        return projUsingRecordMapper.getUserGjjRecords(bean);
    }
+
+    @Override
+    public List<ProjUsingRecord> getHisReturnCodeRecord(ProjUsingRecord bean) {
+        return projUsingRecordMapper.getHisReturnCodeRecord(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
@ -188,8 +188,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                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
+            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>
+    <select id="getHisReturnCodeRecord" resultType="com.bonus.sgzb.material.domain.ProjUsingRecord">
+        SELECT
+        bai.agreement_id,
+        mt.type_id,
+        mt.rent_price,
+        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
+        back_check_details bcd
+        LEFT JOIN back_apply_info baif ON baif.id = bcd.parent_id
+        LEFT JOIN tm_task_agreement tta ON tta.task_id = baif.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 = bcd.type_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+        LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
+        LEFT JOIN sys_user su ON su.user_id = baif.back_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>
--- a/sgzb-ui/src/api/stquery/deviceStatusRecord.js
+++ b/sgzb-ui/src/api/stquery/deviceStatusRecord.js
@ -86,6 +86,14 @@ export function getHisCodeRecords(query) {
    params: query
  })
 }
+// 获取 历史归还编码设备
+export function getHisReturnCodeRecords(query) {
+  return request({
+    url: '/material/projUsingRecord/getHisReturnCodeRecord',
+    method: 'get',
+    params: query
+  })
+}



--- a/sgzb-ui/src/views/stquery/projUsingRecord.vue
+++ b/sgzb-ui/src/views/stquery/projUsingRecord.vue
@ -247,7 +247,22 @@
              align="center"
              prop="backNum"
              :show-overflow-tooltip="true"
-            />
+              >
+              <template slot-scope="scope">
+                <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
+                <span
+                  v-if="scope.row.manageTypeName === '编码'"
+                  class="clickText"
+                  @click="openHisReturnCodeRecords(scope.row)"
+                >
+                  {{ scope.row.backNum }}
+                  </span>
+                <!-- 否则，直接显示数字 -->
+                <span v-else>
+                  {{ scope.row.backNum }}
+                  </span>
+              </template>
+            </el-table-column>
            <!-- <el-table-column label="在用总价值（元）" align="center" prop="xxx" :show-overflow-tooltip="true" />
      <el-table-column label="投入总价值（元）" align="center" prop="sss" :show-overflow-tooltip="true" /> -->
        </el-table>
@ -407,6 +422,80 @@
        />
      </el-dialog>

+      <!-- 历史归还编码设备弹窗-->
+      <el-dialog
+        :title="title"
+        :visible.sync="openHisReturnCodeRecord"
+        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="handleGetHisReturnCodeRecord"
+            />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleGetHisReturnCodeRecord"
+            >查询</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="loading" :data="HisReturnCodeRecords">
+          <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="getHisReturnCodeRecords"
+        />
+      </el-dialog>
+
    </div>
 </template>

@ -416,7 +505,7 @@ import {
    getProData,
    usingRecord,
 } from '@/api/stquery/projUsingRecord'
-import {getAllRecords, getHisCodeRecords, getTypeKeeper,getUserGjjRecords, getUserRecords} from "@/api/stquery/deviceStatusRecord";
+import {getAllRecords, getHisCodeRecords, getTypeKeeper,getUserGjjRecords, getHisReturnCodeRecords,getUserRecords} from "@/api/stquery/deviceStatusRecord";

 export default {
    name: 'backRecord',
@ -427,8 +516,11 @@ export default {
            loading: true,
            // 选中数组
            ids: [],
+            // 弹出层标题
+            title: '',
            // 非单个禁用
            single: true,
+            dialogTotal: 0,
            // 非多个禁用
            multiple: true,
            // 显示搜索条件
@ -436,6 +528,7 @@ export default {
            // 总条数
            total: 0,
            openHisCodeRecord: false,
+            openHisReturnCodeRecord: false,
            openUseRecord: false,
            // 字典表格数据
            leaseAuditList: [],
@ -468,6 +561,7 @@ export default {
            keepIdList: [], //库管员id集合
            HisCodeRecords: [], //历史租赁设备列表
            UserRecords: [], //在用数量设备列表
+            HisReturnCodeRecords: [], //历史归还设备列表
            proList: [], //工程集合
        }
    },
@ -553,6 +647,11 @@ export default {
            this.queryParams.pageNum = 1
            this.getHisCodeRecords()
        },
+        /** 搜索历史归还设备按钮*/
+        handleGetHisReturnCodeRecord() {
+            this.queryParams.pageNum = 1
+            this.getHisReturnCodeRecords()
+        },
      //查看在用设备
      openUserRecords(row) {
        this.openUseRecord = true
@ -604,12 +703,28 @@ export default {
        this.dialogQuery.proId= row.proId
        this.getHisCodeRecords()
      },
+      //查看历史租赁编码设备
+        openHisReturnCodeRecords(row) {
+        this.openHisReturnCodeRecord = true
+        this.dialogQuery.maCode = ""
+        this.dialogQuery.typeId= row.typeId
+        this.dialogQuery.unitId= row.unitId
+        this.dialogQuery.proId= row.proId
+        this.getHisReturnCodeRecords()
+      },
      /** 查看历史租赁编码设备 */
      getHisCodeRecords() {
        getHisCodeRecords(this.dialogQuery).then((response) => {
          this.HisCodeRecords = response.data.rows
          this.dialogTotal = response.data.total
        })
+      },
+      /** 查看历史归还编码设备 */
+      getHisReturnCodeRecords() {
+        getHisReturnCodeRecords(this.dialogQuery).then((response) => {
+          this.HisReturnCodeRecords = response.data.rows
+          this.dialogTotal = response.data.total
+        })
      },
        // 获取 库管员
        async getTypeKeeper() {
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
@ -9,7 +9,7 @@
            v-show="showSearch"
            label-width="68px"
        >
-            <el-form-item label="关键字999" prop="keyWord">
+            <el-form-item label="关键字" prop="keyWord">
                <el-input
                    v-model="queryParams.keyWord"
                    placeholder="请输入关键字"