diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js
index b746322..c596c4a 100644
--- a/src/api/wms/equipment.js
+++ b/src/api/wms/equipment.js
@@ -114,3 +114,21 @@ export function getAuxiliaryEquipmentList(query) {
     params: query
   });
 }
+
+// 查询维修记录
+export function getWXRecordsList(query) {
+  return request({
+    url: '/wms/equipment/getWXRecordsList',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询保养记录
+export function getBYRecordsList(query) {
+  return request({
+    url: '/wms/equipment/getBYRecordsList',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index d5a72cb..9469bb6 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -907,6 +907,18 @@
               :equipmentCode="form.equipmentCode"
             ></ItemEquipment>
           </el-tab-pane>
+          <el-tab-pane label="维修记录" >
+            <ItemWXRecords
+              :optType="optType"
+              :equipmentCode="form.equipmentCode"
+            ></ItemWXRecords>
+          </el-tab-pane>
+          <el-tab-pane label="保养记录" >
+            <ItemBYRecords
+              :optType="optType"
+              :equipmentCode="form.equipmentCode"
+            ></ItemBYRecords>
+          </el-tab-pane>
           <el-tab-pane label="设备相关图片">
             <el-descriptions
               :column="1"
@@ -1037,6 +1049,8 @@ import { Message } from "element-ui";
 import { getToken } from "@/utils/auth";
 import ItemSelectPerson from "./itemPerson.vue";
 import ItemEquipment from "./itemEquipment.vue";
+import ItemWXRecords from "./itemWXRecords.vue";
+import ItemBYRecords from "./itemBYRecords.vue";
 
 export default {
   name: "Equipment",
@@ -1046,7 +1060,7 @@ export default {
     "equipment_status",
     "equipment_category",
   ],
-  components: { ItemSelectPerson, ItemEquipment },
+  components: { ItemSelectPerson, ItemEquipment , ItemWXRecords , ItemBYRecords},
   data() {
     return {
       CS: {
diff --git a/src/views/wms/equipment/itemBYRecords.vue b/src/views/wms/equipment/itemBYRecords.vue
new file mode 100644
index 0000000..f8724f7
--- /dev/null
+++ b/src/views/wms/equipment/itemBYRecords.vue
@@ -0,0 +1,167 @@
+<template>
+  <div class="app-container">
+    <el-table
+      :data="itemList"
+    >
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
+      <el-table-column
+        label="单号"
+        align="center"
+        width="200"
+        prop="orderCode"
+        fixed
+      />
+      <el-table-column
+        label="循环周期"
+        align="center"
+        prop="planLoop"
+        width="80"
+      />
+      <el-table-column
+        label="实际开始时间"
+        align="center"
+        prop="orderStart"
+        width="200"
+      />
+      <el-table-column
+        label="实际结束时间"
+        align="center"
+        prop="orderEnd"
+        width="200"
+      />
+      <el-table-column
+        label="工单状态"
+        align="center"
+        prop="orderStatus"
+        width="100"
+      >
+        <template slot-scope="scope">
+          {{
+            scope.row.orderStatus == 0
+            ? "待处理"
+            : scope.row.orderStatus == 1
+            ? "已完成"
+            : scope.row.orderStatus == 2
+            ? "已逾期"
+            : scope.row.orderStatus == 3
+            ? "进行中"
+            : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="工单费用"
+        align="center"
+        prop="orderCost"
+        width="100"
+      />
+      <el-table-column
+        label="责任人"
+        align="center"
+        prop="planPerson"
+        width="100"
+      />
+      <el-table-column
+        label="工单用时"
+        align="center"
+        prop="orderCostTime"
+        width="100"
+      />
+      <el-table-column
+        label="签字"
+        align="center"
+        prop="orderSignPerson"
+        width="100"
+      />
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { getBYRecordsList } from "@/api/wms/equipment";
+import { Message } from "element-ui";
+
+export default {
+  name: "MdItemSingle",
+  dicts: ["equipment_status"],
+  data() {
+    return {
+      showFlag: false,
+      // 选中数组
+      selectedItemId: undefined,
+      selectedRows: undefined,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        equipmentCode: this.equipmentCode,
+      },
+    };
+  },
+
+  props: {
+    equipmentCode: undefined,
+    optType: undefined,
+  },
+
+  created() {
+    this.getList();
+  },
+
+  methods: {
+    // 取消按钮
+    cancel() {
+      this.showFlag = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        itemId: null,
+        itemCode: this.processId,
+        itemType: null,
+      };
+      this.resetForm("form");
+    },
+
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+
+    /** 查询设备编码列表*/
+    getList() {
+      getBYRecordsList(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+      });
+    },
+
+  },
+};
+</script>
diff --git a/src/views/wms/equipment/itemWXRecords.vue b/src/views/wms/equipment/itemWXRecords.vue
new file mode 100644
index 0000000..70a9449
--- /dev/null
+++ b/src/views/wms/equipment/itemWXRecords.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class="app-container">
+    <el-table
+      :data="itemList"
+    >
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
+      <el-table-column
+        label="维修单号"
+        align="center"
+        prop="workCode"
+        fixed
+        width="200"
+      />
+      <el-table-column
+        label="维修人员"
+        align="center"
+        prop="workPerson"
+        width="100"
+      />
+      <el-table-column
+        label="维修班组"
+        align="center"
+        prop="workTeam"
+        width="100"
+      />
+      <el-table-column
+        label="故障描述"
+        align="center"
+        prop="workFaultDesc"
+        width="150"
+      />
+      <el-table-column
+        label="原因分析"
+        align="center"
+        prop="workReason"
+        width="150"
+      />
+      <el-table-column
+        label="维修措施"
+        align="center"
+        prop="repairMeasures"
+        width="150"
+      />
+      <el-table-column
+        label="维修开始时间"
+        align="center"
+        prop="workStartTime"
+        width="150"
+      />
+      <el-table-column
+        label="维修结束时间"
+        align="center"
+        prop="workEndTime"
+        width="150"
+      />
+      <el-table-column
+        label="维修状态"
+        align="center"
+        prop="workStatus"
+        width="100"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_repair_status"
+            :value="scope.row.workStatus"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { getWXRecordsList } from "@/api/wms/equipment";
+import { Message } from "element-ui";
+
+export default {
+  name: "MdItemSingle",
+  dicts: ["device_repair_status"],
+  data() {
+    return {
+      showFlag: false,
+      // 选中数组
+      selectedItemId: undefined,
+      selectedRows: undefined,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        equipmentCode: this.equipmentCode,
+      },
+    };
+  },
+
+  props: {
+    equipmentCode: undefined,
+    optType: undefined,
+  },
+
+  created() {
+    this.getList();
+  },
+
+  methods: {
+    // 取消按钮
+    cancel() {
+      this.showFlag = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        itemId: null,
+        itemCode: this.processId,
+        itemType: null,
+      };
+      this.resetForm("form");
+    },
+
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+
+    /** 查询设备编码列表*/
+    getList() {
+      getWXRecordsList(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+      });
+    },
+
+  },
+};
+</script>