diff --git a/src/views/inventory/deviceCollectOrderAudit.vue b/src/views/inventory/deviceCollectOrderAudit.vue
index 1e74819..37ff194 100644
--- a/src/views/inventory/deviceCollectOrderAudit.vue
+++ b/src/views/inventory/deviceCollectOrderAudit.vue
@@ -85,6 +85,7 @@
                 ></el-table-column>
                 <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
                 <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column width="150" label="序列号" prop="serialNo"></el-table-column>
                 <el-table-column width="150" label="领用日期" prop="createTime"></el-table-column>
                 <el-table-column width="150" label="领用仓库" prop="invWarehouseName"></el-table-column>
                 <el-table-column width="150" label="领用货位" prop="invSpaceName"></el-table-column>
diff --git a/src/views/inventory/deviceCollectOrderCompleted.vue b/src/views/inventory/deviceCollectOrderCompleted.vue
index 96c9466..04e9bf2 100644
--- a/src/views/inventory/deviceCollectOrderCompleted.vue
+++ b/src/views/inventory/deviceCollectOrderCompleted.vue
@@ -4,32 +4,18 @@
             <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"
+                        <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"
+                        <el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true"
                                    size="mini">
                             <el-option
-                                v-for="item in spaceCodeList"
+                                v-for="item in deptList"
                                 :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>
@@ -44,52 +30,23 @@
                             >查询
                             </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 v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange">
                 <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="orderId" width="180"></el-table-column>
+                <el-table-column label="领用部门" prop="deptName" 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="auditUser" 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>
 
@@ -101,64 +58,81 @@
             :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>
+        <el-card>
+            <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
+                <el-table-column label="序号" type="index" width="50"></el-table-column>
+                <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
+                <el-table-column width="200"
+                                 label="产品通用名"
+                                 prop="productName"
+                ></el-table-column>
+                <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+                <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column width="150" label="序列号" prop="serialNo"></el-table-column>
+                <el-table-column width="150" label="领用日期" prop="createTime"></el-table-column>
+                <el-table-column width="150" label="领用仓库" prop="invWarehouseName"></el-table-column>
+                <el-table-column width="150" label="领用货位" prop="invSpaceName"></el-table-column>
+                <el-table-column width="150" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
+                <el-table-column width="160" label="失效日期(yyMMdd)" prop="expireDate"
+                                 show-overflow-tooltip></el-table-column>
+                <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                                 show-overflow-tooltip></el-table-column>
+                <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
+                                 show-overflow-tooltip></el-table-column>
+            </el-table>
+
+            <el-pagination
+                :page-size="detailQuery.limit"
+                :current-page="detailQuery.page"
+                @current-change="handleCurrentDetailChange"
+                layout="prev, pager, next"
+                :total="detailTotal"
+            ></el-pagination>
+        </el-card>
 
     </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";
+import {
+    getCollectOrderList,
+    getCollectOrderDetailList
+} from "@/api/inventory/deviceCollectOrder";
+import addDeviceCollectOrder from "@/views/inventory/addDeviceCollectOrder.vue";
+import {filterDepts} from "@/api/auth/authDept";
 
 export default {
     data() {
         return {
             filterQuery: {
-                invWarehouseCode: null,
-                invSpaceCode: null,
-                status: 0,
+                status: 2,
                 orderId: null,
+                deptCode: 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: "编辑养护记录"
+            deviceCollectOrder: null,
+            deptList: [],
+            detailLoading: false,
+            detailList: [],
+            detailQuery: {
+                orderIdFk: null,
+                page: 1,
+                limit: 20
             },
-            maOrder: null
+            detailTotal: 0
         };
     },
     components: {
-        addInvMAOrder
+        addDeviceCollectOrder
     },
     methods: {
         onReset() {
@@ -166,10 +140,9 @@ export default {
                 path: "",
             });
             this.filterQuery = {
-                invWarehouseCode: null,
-                invSpaceCode: null,
-                status: 0,
+                status: 2,
                 orderId: null,
+                deptCode: null,
                 page: 1,
                 limit: 20,
             };
@@ -188,7 +161,9 @@ export default {
         },
         getList() {
             this.loading = true
-            getMAOrderList(this.filterQuery).then((res) => {
+            this.detailList = [];
+            this.detailTotal = 0;
+            getCollectOrderList(this.filterQuery).then((res) => {
                 this.loading = false;
                 if (res.code === 20000) {
                     this.list = res.data.list || [];
@@ -203,83 +178,44 @@ export default {
                 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 || [];
+        getDepts() {
+            filterDepts().then((res) => {
+                this.deptList = res.data.list || [];
             })
         },
-        closeDialog() {
-            this.formVisible = false;
-            this.getList();
-        },
-        addMAOrder() {
-            this.maOrder = null;
-            this.formName = 'add';
-            this.formVisible = true;
+        handleCurrentDetailChange(val) {
+            this.detailQuery.page = val;
+            this.getOrderDetailList();
         },
-        editOrder(row) {
-            this.maOrder = row;
-            this.formName = 'edit';
-            this.formVisible = true;
-        },
-        submitAudit(row) {
-            let params = {id: row.id};
-            submitAudit(params).then((res) => {
+        getOrderDetailList() {
+            this.detailLoading = true;
+            getCollectOrderDetailList(this.detailQuery).then((res) => {
+                this.detailLoading = false;
                 if (res.code === 20000) {
-                    this.$message.success("提交成功！");
-                    this.getList();
+                    this.detailList = res.data.list || [];
+                    this.detailTotal = res.data.total || 0;
                 } else {
-                    this.$message.error(res.message);
+                    this.detailList = [];
+                    this.detailTotal = 0;
                 }
-            }).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);
-            });
+            }).catch(() => {
+                this.detailLoading = false;
+                this.detailList = [];
+                this.detailTotal = 0;
+            })
         },
+        handleChange(row) {
+            this.detailList = {
+                orderIdFk: row.orderId,
+                page: 1,
+                limit: 20
+            };
+            this.getOrderDetailList();
+        }
     },
     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) => {
-        });
+        this.getDepts();
+        this.getList();
     },
 };
 </script>