From 4ba2f1bea75864deec679039850ade04f167e0de Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 2 Dec 2022 18:07:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E9=A2=86?=
 =?UTF-8?q?=E7=94=A8=E5=85=BB=E6=8A=A4=E9=A1=B5=E9=9D=A2=E5=92=8Cjs?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inventory/deviceCollectOrder.js       |   3 +
 src/api/inventory/deviceMAOrder.js            |   1 +
 src/router/index.js                           |  63 ++++
 .../inventory/deviceCollectOrderAudit.vue     | 288 ++++++++++++++++++
 .../inventory/deviceCollectOrderCompleted.vue | 288 ++++++++++++++++++
 src/views/inventory/deviceCollectOrderNew.vue | 275 +++++++++++++++++
 src/views/inventory/deviceMAOrder.vue         | 288 ++++++++++++++++++
 7 files changed, 1206 insertions(+)
 create mode 100644 src/api/inventory/deviceCollectOrder.js
 create mode 100644 src/api/inventory/deviceMAOrder.js
 create mode 100644 src/views/inventory/deviceCollectOrderAudit.vue
 create mode 100644 src/views/inventory/deviceCollectOrderCompleted.vue
 create mode 100644 src/views/inventory/deviceCollectOrderNew.vue
 create mode 100644 src/views/inventory/deviceMAOrder.vue

diff --git a/src/api/inventory/deviceCollectOrder.js b/src/api/inventory/deviceCollectOrder.js
new file mode 100644
index 0000000..b85714d
--- /dev/null
+++ b/src/api/inventory/deviceCollectOrder.js
@@ -0,0 +1,3 @@
+import axios from "../../utils/axios";
+
+
diff --git a/src/api/inventory/deviceMAOrder.js b/src/api/inventory/deviceMAOrder.js
new file mode 100644
index 0000000..cdf157e
--- /dev/null
+++ b/src/api/inventory/deviceMAOrder.js
@@ -0,0 +1 @@
+import axios from "../../utils/axios";
diff --git a/src/router/index.js b/src/router/index.js
index bdbfa5d..15b1905 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -118,6 +118,11 @@ import invMAOrderNew from "@/views/inventory/invMAOrderNew";
 import invMAOrderAudit from "@/views/inventory/invMAOrderAudit";
 import invMAOrderCompleted from "@/views/inventory/invMAOrderCompleted";
 
+//设备管理
+import deviceCollectOrderNew from "@/views/inventory/deviceCollectOrderNew.vue";
+import deviceCollectOrderAudit from "@/views/inventory/deviceCollectOrderAudit.vue";
+import deviceCollectOrderCompleted from "@/views/inventory/deviceCollectOrderCompleted.vue";
+import deviceMAOrder from "@/views/inventory/deviceMAOrder.vue";
 
 //库存
 import invProducts from "../views/inventory/InvProducts.vue";
@@ -1500,6 +1505,64 @@ export const asyncRouterMap = [
                             }
                         ]
                     },
+                    {
+                        path: "/deviceManage",
+                        component: Empty,
+                        name: "设备管理",
+                        icon: "",
+                        meta: {
+                            authRule: ["invManage/deviceManage"]
+                        },
+                        children: [
+                            {
+                                path: "/deviceCollectOrder",
+                                component: Empty,
+                                name: "设备领用",
+                                icon: "",
+                                meta: {
+                                    authRule: ["deviceCollectOrder/order"]
+                                },
+                                children: [
+                                    {
+                                        path: "deviceCollectOrderNew",
+                                        component: deviceCollectOrderNew,
+                                        name: "新增领用记录",
+                                        icon: "",
+                                        meta: {
+                                            authRule: ["deviceCollectOrder/orderNew"]
+                                        }
+                                    },
+                                    {
+                                        path: "deviceCollectOrderAudit",
+                                        component: deviceCollectOrderAudit,
+                                        name: "审核领用记录",
+                                        icon: "",
+                                        meta: {
+                                            authRule: ["deviceCollectOrder/orderAudit"]
+                                        }
+                                    },
+                                    {
+                                        path: "deviceCollectOrderCompleted",
+                                        component: deviceCollectOrderCompleted,
+                                        name: "领用记录查询",
+                                        icon: "",
+                                        meta: {
+                                            authRule: ["deviceCollectOrder/orderCompleted"]
+                                        }
+                                    },
+                                ]
+                            },
+                            {
+                                path: "deviceMAOrder",
+                                component: deviceMAOrder,
+                                name: "设备养护记录",
+                                icon: "",
+                                meta: {
+                                    authRule: ["deviceManage/deviceMAOrder"]
+                                }
+                            }
+                        ]
+                    }
                 ]
             },
             {
diff --git a/src/views/inventory/deviceCollectOrderAudit.vue b/src/views/inventory/deviceCollectOrderAudit.vue
new file mode 100644
index 0000000..96c9466
--- /dev/null
+++ b/src/views/inventory/deviceCollectOrderAudit.vue
@@ -0,0 +1,288 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="filterQuery" size="mini">
+                <el-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-input placeholder="请输入养护记录号" v-model="filterQuery.orderId"
+                                  clearable="true"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
+                                   @change="invWarehouseChange" size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in spaceCodeList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                            <el-button type="primary" icon="search" @click="addMAOrder"
+                            >新增养护记录
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index" fixed></el-table-column>
+                <el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
+                <el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column>
+                <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
+                <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
+                <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
+                    <template slot-scope="scope">
+                        <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="180" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="editOrder(scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="submitAudit(scope.row)"
+                        >提交审核
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            :current-page="filterQuery.page"
+            @current-change="handleCurrentChange" kan1
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+
+        <el-dialog
+            :title="formMap[formName]"
+            :visible.sync="formVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="formVisible"
+        >
+            <addInvMAOrder
+                :maOrder="maOrder"
+                :closeDialog="closeDialog"
+            ></addInvMAOrder>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import {isBlank} from "@/utils/strUtil";
+import {userInfo} from "@/api/auth/login";
+import {getMAOrderList, deleteOrder, submitAudit} from "@/api/inventory/invMAOrder";
+import {filterSubAll} from "@/api/basic/invSubWarehouse";
+import {getSpaceCodeList} from "@/api/inventory/invSpace";
+import addInvMAOrder from "@/views/inventory/addInvMAOrder";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                invWarehouseCode: null,
+                invSpaceCode: null,
+                status: 0,
+                orderId: null,
+                page: 1,
+                limit: 20
+            },
+            list: [],
+            total: 0,
+            loading: false,
+            idQuery: null,
+            subInvList: [],
+            spaceCodeList: [],
+            statusMap: {
+                0: "草稿",
+                1: "未审核",
+                2: "已完成"
+            },
+            formVisible: false,
+            formName: null,
+            formMap: {
+                add: "新增养护记录",
+                edit: "编辑养护记录"
+            },
+            maOrder: null
+        };
+    },
+    components: {
+        addInvMAOrder
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                invWarehouseCode: null,
+                invSpaceCode: null,
+                status: 0,
+                orderId: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        getList() {
+            this.loading = true
+            getMAOrderList(this.filterQuery).then((res) => {
+                this.loading = false;
+                if (res.code === 20000) {
+                    this.list = res.data.list || [];
+                    this.total = res.data.total || 0;
+                } else {
+                    this.list = [];
+                    this.total = 0;
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.list = [];
+                this.total = 0;
+            });
+        },
+        getAllWarehouse() {
+            filterSubAll().then((res) => {
+                this.subInvList = res.data || [];
+            });
+        },
+        invWarehouseChange() {
+            this.filterQuery.invSpaceCode = null;
+            this.spaceCodeList = [];
+            let params = {
+                invStorageCode: this.filterQuery.invStorageCode,
+                invWarehouseCode: this.filterQuery.invWarehouseCode,
+                status: true
+            };
+            getSpaceCodeList(params).then((res) => {
+                this.spaceCodeList = res.data || [];
+            })
+        },
+        closeDialog() {
+            this.formVisible = false;
+            this.getList();
+        },
+        addMAOrder() {
+            this.maOrder = null;
+            this.formName = 'add';
+            this.formVisible = true;
+        },
+        editOrder(row) {
+            this.maOrder = row;
+            this.formName = 'edit';
+            this.formVisible = true;
+        },
+        submitAudit(row) {
+            let params = {id: row.id};
+            submitAudit(params).then((res) => {
+                if (res.code === 20000) {
+                    this.$message.success("提交成功！");
+                    this.getList();
+                } else {
+                    this.$message.error(res.message);
+                }
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
+        deleteDialog(id) {
+            this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let params = {id: id};
+                deleteOrder(params).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message.success("删除成功！");
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                })
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
+    },
+    created() {
+        this.getAllWarehouse();
+        //获取用户默认仓库信息
+        userInfo().then((res) => {
+            if (res.code === 20000) {
+                if (!isBlank(res.data.locInvCode)) {
+                    this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
+                    this.invWarehouseChange();
+                }
+                this.getList();
+            }
+        }).catch((error) => {
+        });
+    },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/inventory/deviceCollectOrderCompleted.vue b/src/views/inventory/deviceCollectOrderCompleted.vue
new file mode 100644
index 0000000..96c9466
--- /dev/null
+++ b/src/views/inventory/deviceCollectOrderCompleted.vue
@@ -0,0 +1,288 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="filterQuery" size="mini">
+                <el-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-input placeholder="请输入养护记录号" v-model="filterQuery.orderId"
+                                  clearable="true"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
+                                   @change="invWarehouseChange" size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in spaceCodeList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                            <el-button type="primary" icon="search" @click="addMAOrder"
+                            >新增养护记录
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index" fixed></el-table-column>
+                <el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
+                <el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column>
+                <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
+                <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
+                <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
+                    <template slot-scope="scope">
+                        <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="180" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="editOrder(scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="submitAudit(scope.row)"
+                        >提交审核
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            :current-page="filterQuery.page"
+            @current-change="handleCurrentChange" kan1
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+
+        <el-dialog
+            :title="formMap[formName]"
+            :visible.sync="formVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="formVisible"
+        >
+            <addInvMAOrder
+                :maOrder="maOrder"
+                :closeDialog="closeDialog"
+            ></addInvMAOrder>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import {isBlank} from "@/utils/strUtil";
+import {userInfo} from "@/api/auth/login";
+import {getMAOrderList, deleteOrder, submitAudit} from "@/api/inventory/invMAOrder";
+import {filterSubAll} from "@/api/basic/invSubWarehouse";
+import {getSpaceCodeList} from "@/api/inventory/invSpace";
+import addInvMAOrder from "@/views/inventory/addInvMAOrder";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                invWarehouseCode: null,
+                invSpaceCode: null,
+                status: 0,
+                orderId: null,
+                page: 1,
+                limit: 20
+            },
+            list: [],
+            total: 0,
+            loading: false,
+            idQuery: null,
+            subInvList: [],
+            spaceCodeList: [],
+            statusMap: {
+                0: "草稿",
+                1: "未审核",
+                2: "已完成"
+            },
+            formVisible: false,
+            formName: null,
+            formMap: {
+                add: "新增养护记录",
+                edit: "编辑养护记录"
+            },
+            maOrder: null
+        };
+    },
+    components: {
+        addInvMAOrder
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                invWarehouseCode: null,
+                invSpaceCode: null,
+                status: 0,
+                orderId: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        getList() {
+            this.loading = true
+            getMAOrderList(this.filterQuery).then((res) => {
+                this.loading = false;
+                if (res.code === 20000) {
+                    this.list = res.data.list || [];
+                    this.total = res.data.total || 0;
+                } else {
+                    this.list = [];
+                    this.total = 0;
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.list = [];
+                this.total = 0;
+            });
+        },
+        getAllWarehouse() {
+            filterSubAll().then((res) => {
+                this.subInvList = res.data || [];
+            });
+        },
+        invWarehouseChange() {
+            this.filterQuery.invSpaceCode = null;
+            this.spaceCodeList = [];
+            let params = {
+                invStorageCode: this.filterQuery.invStorageCode,
+                invWarehouseCode: this.filterQuery.invWarehouseCode,
+                status: true
+            };
+            getSpaceCodeList(params).then((res) => {
+                this.spaceCodeList = res.data || [];
+            })
+        },
+        closeDialog() {
+            this.formVisible = false;
+            this.getList();
+        },
+        addMAOrder() {
+            this.maOrder = null;
+            this.formName = 'add';
+            this.formVisible = true;
+        },
+        editOrder(row) {
+            this.maOrder = row;
+            this.formName = 'edit';
+            this.formVisible = true;
+        },
+        submitAudit(row) {
+            let params = {id: row.id};
+            submitAudit(params).then((res) => {
+                if (res.code === 20000) {
+                    this.$message.success("提交成功！");
+                    this.getList();
+                } else {
+                    this.$message.error(res.message);
+                }
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
+        deleteDialog(id) {
+            this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let params = {id: id};
+                deleteOrder(params).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message.success("删除成功！");
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                })
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
+    },
+    created() {
+        this.getAllWarehouse();
+        //获取用户默认仓库信息
+        userInfo().then((res) => {
+            if (res.code === 20000) {
+                if (!isBlank(res.data.locInvCode)) {
+                    this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
+                    this.invWarehouseChange();
+                }
+                this.getList();
+            }
+        }).catch((error) => {
+        });
+    },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/inventory/deviceCollectOrderNew.vue b/src/views/inventory/deviceCollectOrderNew.vue
new file mode 100644
index 0000000..70f1e7a
--- /dev/null
+++ b/src/views/inventory/deviceCollectOrderNew.vue
@@ -0,0 +1,275 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="filterQuery" size="mini">
+                <el-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-input placeholder="请输入领用记录号" v-model="filterQuery.orderId"
+                                  clearable="true"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择领用部门" clearable="true"
+                                   @change="invWarehouseChange" size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                            <el-button type="primary" icon="search" @click="addMAOrder"
+                            >新增领用记录
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index" fixed></el-table-column>
+                <el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
+                <el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column>
+                <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
+                <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
+                <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
+                    <template slot-scope="scope">
+                        <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="180" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="editOrder(scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="submitAudit(scope.row)"
+                        >提交审核
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            :current-page="filterQuery.page"
+            @current-change="handleCurrentChange" kan1
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+
+        <el-dialog
+            :title="formMap[formName]"
+            :visible.sync="formVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="formVisible"
+        >
+            <addInvMAOrder
+                :maOrder="maOrder"
+                :closeDialog="closeDialog"
+            ></addInvMAOrder>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import {isBlank} from "@/utils/strUtil";
+import {userInfo} from "@/api/auth/login";
+import {getMAOrderList, deleteOrder, submitAudit} from "@/api/inventory/invMAOrder";
+import {filterSubAll} from "@/api/basic/invSubWarehouse";
+import {getSpaceCodeList} from "@/api/inventory/invSpace";
+import addInvMAOrder from "@/views/inventory/addInvMAOrder";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                invWarehouseCode: null,
+                invSpaceCode: null,
+                status: 0,
+                orderId: null,
+                page: 1,
+                limit: 20
+            },
+            list: [],
+            total: 0,
+            loading: false,
+            idQuery: null,
+            subInvList: [],
+            spaceCodeList: [],
+            statusMap: {
+                0: "草稿",
+                1: "未审核",
+                2: "已完成"
+            },
+            formVisible: false,
+            formName: null,
+            formMap: {
+                add: "新增养护记录",
+                edit: "编辑养护记录"
+            },
+            maOrder: null
+        };
+    },
+    components: {
+        addInvMAOrder
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                invWarehouseCode: null,
+                invSpaceCode: null,
+                status: 0,
+                orderId: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        getList() {
+            this.loading = true
+            getMAOrderList(this.filterQuery).then((res) => {
+                this.loading = false;
+                if (res.code === 20000) {
+                    this.list = res.data.list || [];
+                    this.total = res.data.total || 0;
+                } else {
+                    this.list = [];
+                    this.total = 0;
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.list = [];
+                this.total = 0;
+            });
+        },
+        getAllWarehouse() {
+            filterSubAll().then((res) => {
+                this.subInvList = res.data || [];
+            });
+        },
+        invWarehouseChange() {
+            this.filterQuery.invSpaceCode = null;
+            this.spaceCodeList = [];
+            let params = {
+                invStorageCode: this.filterQuery.invStorageCode,
+                invWarehouseCode: this.filterQuery.invWarehouseCode,
+                status: true
+            };
+            getSpaceCodeList(params).then((res) => {
+                this.spaceCodeList = res.data || [];
+            })
+        },
+        closeDialog() {
+            this.formVisible = false;
+            this.getList();
+        },
+        addMAOrder() {
+            this.maOrder = null;
+            this.formName = 'add';
+            this.formVisible = true;
+        },
+        editOrder(row) {
+            this.maOrder = row;
+            this.formName = 'edit';
+            this.formVisible = true;
+        },
+        submitAudit(row) {
+            let params = {id: row.id};
+            submitAudit(params).then((res) => {
+                if (res.code === 20000) {
+                    this.$message.success("提交成功！");
+                    this.getList();
+                } else {
+                    this.$message.error(res.message);
+                }
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
+        deleteDialog(id) {
+            this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let params = {id: id};
+                deleteOrder(params).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message.success("删除成功！");
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                })
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
+    },
+    created() {
+        this.getAllWarehouse();
+        //获取用户默认仓库信息
+        userInfo().then((res) => {
+            if (res.code === 20000) {
+                if (!isBlank(res.data.locInvCode)) {
+                    this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
+                    this.invWarehouseChange();
+                }
+                this.getList();
+            }
+        }).catch((error) => {
+        });
+    },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/inventory/deviceMAOrder.vue b/src/views/inventory/deviceMAOrder.vue
new file mode 100644
index 0000000..96c9466
--- /dev/null
+++ b/src/views/inventory/deviceMAOrder.vue
@@ -0,0 +1,288 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="filterQuery" size="mini">
+                <el-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-input placeholder="请输入养护记录号" v-model="filterQuery.orderId"
+                                  clearable="true"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
+                                   @change="invWarehouseChange" size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择当前货位" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in spaceCodeList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                            <el-button type="primary" icon="search" @click="addMAOrder"
+                            >新增养护记录
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index" fixed></el-table-column>
+                <el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
+                <el-table-column label="仓库" prop="invWarehouseName" width="180"></el-table-column>
+                <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
+                <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
+                <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
+                    <template slot-scope="scope">
+                        <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="180" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="editOrder(scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="submitAudit(scope.row)"
+                        >提交审核
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            :current-page="filterQuery.page"
+            @current-change="handleCurrentChange" kan1
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+
+        <el-dialog
+            :title="formMap[formName]"
+            :visible.sync="formVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="formVisible"
+        >
+            <addInvMAOrder
+                :maOrder="maOrder"
+                :closeDialog="closeDialog"
+            ></addInvMAOrder>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import {isBlank} from "@/utils/strUtil";
+import {userInfo} from "@/api/auth/login";
+import {getMAOrderList, deleteOrder, submitAudit} from "@/api/inventory/invMAOrder";
+import {filterSubAll} from "@/api/basic/invSubWarehouse";
+import {getSpaceCodeList} from "@/api/inventory/invSpace";
+import addInvMAOrder from "@/views/inventory/addInvMAOrder";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                invWarehouseCode: null,
+                invSpaceCode: null,
+                status: 0,
+                orderId: null,
+                page: 1,
+                limit: 20
+            },
+            list: [],
+            total: 0,
+            loading: false,
+            idQuery: null,
+            subInvList: [],
+            spaceCodeList: [],
+            statusMap: {
+                0: "草稿",
+                1: "未审核",
+                2: "已完成"
+            },
+            formVisible: false,
+            formName: null,
+            formMap: {
+                add: "新增养护记录",
+                edit: "编辑养护记录"
+            },
+            maOrder: null
+        };
+    },
+    components: {
+        addInvMAOrder
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                invWarehouseCode: null,
+                invSpaceCode: null,
+                status: 0,
+                orderId: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        getList() {
+            this.loading = true
+            getMAOrderList(this.filterQuery).then((res) => {
+                this.loading = false;
+                if (res.code === 20000) {
+                    this.list = res.data.list || [];
+                    this.total = res.data.total || 0;
+                } else {
+                    this.list = [];
+                    this.total = 0;
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.list = [];
+                this.total = 0;
+            });
+        },
+        getAllWarehouse() {
+            filterSubAll().then((res) => {
+                this.subInvList = res.data || [];
+            });
+        },
+        invWarehouseChange() {
+            this.filterQuery.invSpaceCode = null;
+            this.spaceCodeList = [];
+            let params = {
+                invStorageCode: this.filterQuery.invStorageCode,
+                invWarehouseCode: this.filterQuery.invWarehouseCode,
+                status: true
+            };
+            getSpaceCodeList(params).then((res) => {
+                this.spaceCodeList = res.data || [];
+            })
+        },
+        closeDialog() {
+            this.formVisible = false;
+            this.getList();
+        },
+        addMAOrder() {
+            this.maOrder = null;
+            this.formName = 'add';
+            this.formVisible = true;
+        },
+        editOrder(row) {
+            this.maOrder = row;
+            this.formName = 'edit';
+            this.formVisible = true;
+        },
+        submitAudit(row) {
+            let params = {id: row.id};
+            submitAudit(params).then((res) => {
+                if (res.code === 20000) {
+                    this.$message.success("提交成功！");
+                    this.getList();
+                } else {
+                    this.$message.error(res.message);
+                }
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
+        deleteDialog(id) {
+            this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let params = {id: id};
+                deleteOrder(params).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message.success("删除成功！");
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                })
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
+    },
+    created() {
+        this.getAllWarehouse();
+        //获取用户默认仓库信息
+        userInfo().then((res) => {
+            if (res.code === 20000) {
+                if (!isBlank(res.data.locInvCode)) {
+                    this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
+                    this.invWarehouseChange();
+                }
+                this.getList();
+            }
+        }).catch((error) => {
+        });
+    },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>