diff --git a/sgzb-ui/prettier.config.js b/sgzb-ui/prettier.config.js
index df4d29ed..c4bf424e 100644
--- a/sgzb-ui/prettier.config.js
+++ b/sgzb-ui/prettier.config.js
@@ -1,7 +1,7 @@
 module.exports = {
     tabWidth: 4,
     semi: false,
-    vueIndentScriptAndStyle: true,
+    vueIndentScriptAndStyle: false,
     singleQuote: true,
     trailingComma: 'all',
     proseWrap: 'never',
diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
index 12d5cd29..cf2ee32f 100644
--- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
+++ b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
@@ -265,6 +265,7 @@ export default {
         endTime:this.queryParams.time && this.queryParams.time[1], */
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum,
+                maType: '1'
             }
 
             const res = await statusList(params)
diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue b/sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue
new file mode 100644
index 00000000..6dea716d
--- /dev/null
+++ b/sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue
@@ -0,0 +1,348 @@
+<template>
+    <div class="app-container" id="backRecord">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <!-- <el-form-item label="退料日期">
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="往来单位">
+        <el-select  v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择">
+          <el-option
+            v-for="item in unitList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工程名称">
+        <el-select  v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
+          <el-option
+            v-for="item in proList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="协议号" prop="agreementCode">
+        <el-input
+          v-model="queryParams.agreementCode"
+          placeholder="请输入协议号"
+          clearable
+          :maxlength="20"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+            <el-form-item label="机具名称" prop="typeName">
+                <el-input
+                    v-model="queryParams.typeName"
+                    placeholder="请输入机具名称"
+                    clearable
+                    :maxlength="20"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="规格型号" prop="typeModelName">
+                <el-input
+                    v-model="queryParams.typeModelName"
+                    placeholder="请输入规格型号"
+                    clearable
+                    :maxlength="20"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <!-- <el-form-item label="关键字" prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          :maxlength="20"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >查询</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+                <span style="margin-left: 20px; color: red"
+                    >保有量=在库+在用+在修+修试后待入库</span
+                >
+            </el-form-item>
+        </el-form>
+
+        <!-- <el-col :span="1.5">
+        
+      </el-col> -->
+
+        <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+
+        <el-table v-loading="loading" :data="leaseAuditList">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+                :index="
+                    indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                "
+            />
+            <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="unit"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="在库数量"
+                align="center"
+                prop="num"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="在用数量"
+                align="center"
+                prop="usNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="在修数量"
+                align="center"
+                prop="repairNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="修试后待入库"
+                align="center"
+                prop="repairInputNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="新购待入库"
+                align="center"
+                prop="inputNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="总保有量"
+                align="center"
+                prop="allNum"
+                :show-overflow-tooltip="true"
+            />
+            <!-- <el-table-column label="总保有量资产（万元）" align="center" prop="proName" :show-overflow-tooltip="true" /> -->
+            <el-table-column
+                label="是否计数"
+                align="center"
+                prop="manageType"
+                :show-overflow-tooltip="true"
+            />
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            :page-sizes="[5, 10, 15, 20, 30]"
+            @pagination="getList"
+        />
+    </div>
+</template>
+
+<script>
+import {
+    statusList,
+    exportList,
+    getUnitData,
+    getProData,
+} from '@/api/stquery/deviceStatusRecord'
+
+export default {
+    name: 'backRecord',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 字典表格数据
+            leaseAuditList: [],
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                dictName: undefined,
+                dictType: undefined,
+                status: undefined,
+
+                time: null, //申请时间
+                unitId: null, //来往单位id
+                proId: null, //工程id
+
+                types: 1, // 1申请列表 2审核列表
+            },
+            unitList: [], //来往单位集合
+            proList: [], //工程集合
+        }
+    },
+    created() {
+        this.getList()
+        /* this.getUnitList();
+    this.getProList(); */
+    },
+    methods: {
+        // 获取 申请列表
+        async getList() {
+            this.loading = true
+
+            const params = {
+                /* unitId:this.queryParams.unitId,
+        proId:this.queryParams.proId,
+        keyWord:this.queryParams.keyWord,
+        agreementCode:this.queryParams.agreementCode, */
+                typeName: this.queryParams.typeName,
+                typeModelName: this.queryParams.typeModelName,
+                /* startTime:this.queryParams.time && this.queryParams.time[0],
+        endTime:this.queryParams.time && this.queryParams.time[1], */
+                pageSize: this.queryParams.pageSize,
+                pageNum: this.queryParams.pageNum,
+                maType: '2',
+            }
+
+            const res = await statusList(params)
+            console.log('机具状态', res)
+            this.loading = false
+            this.leaseAuditList = res.data.rows
+            this.total = res.data.total
+        },
+
+        // 获取 来往单位 列表数据
+        async getUnitList() {
+            const params = {
+                id: this.queryParams.proId,
+            }
+            const res = await getUnitData(params)
+            this.unitList = res.data
+            console.log('GetUnitData ======================', res)
+        },
+        // 获取 工程名称 列表数据
+        async getProList() {
+            const params = {
+                id: this.queryParams.unitId,
+            }
+            const res = await getProData(params)
+            this.proList = res.data
+            console.log('GetProData ======================', res)
+        },
+
+        // 表单重置
+        reset() {
+            this.form = {
+                dictId: undefined,
+                dictName: undefined,
+                dictType: undefined,
+                status: '0',
+                remark: undefined,
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.time = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'material/backRecord/export',
+                {
+                    ...this.queryParams,
+                },
+                `综合查询_退料记录_${new Date().getTime()}.xlsx`,
+            )
+        },
+
+        // 表单合并行
+        /* mergeRow ({ row, column, rowIndex, columnIndex}) {
+      if (rowIndex == 0) {
+        return {
+          rowspan: 3,
+          colspan: 1
+        }
+      }
+    } */
+    },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+    width: 60px !important;
+    margin-bottom: 10px;
+}
+</style>