diff --git a/src/views/inventory/addDeviceMAOrder.vue b/src/views/inventory/addDeviceMAOrder.vue
index a019123..4e22ecb 100644
--- a/src/views/inventory/addDeviceMAOrder.vue
+++ b/src/views/inventory/addDeviceMAOrder.vue
@@ -32,7 +32,7 @@
                     </div>
                 </el-col>
                 <el-col :span="7">
-                    <el-form-item prop="billDate">
+                    <el-form-item prop="createTime">
                         <el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
                     </el-form-item>
                 </el-col>
@@ -46,7 +46,7 @@
                 </el-col>
 
                 <el-col :span="7">
-                    <el-form-item prop="billDate">
+                    <el-form-item prop="collOrderId">
                         <el-input v-model="formData.collOrderId" auto-complete="off" :disabled="true"></el-input>
                     </el-form-item>
                 </el-col>
@@ -64,7 +64,6 @@
                 ></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="count"></el-table-column>
                 <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
                     <template slot-scope="scope">
                         <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus"
@@ -133,10 +132,19 @@
             <el-form :inline="true" :model="filterQuery" size="mini">
                 <el-row>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.nameCode" placeholder="领用记录号" clearable></el-input>
+                        <el-input v-model="filterQuery.orderId" placeholder="领用记录号" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.deptCode" placeholder="领用部门" clearable></el-input>
+                        <el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in deptList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item>
                         <el-button-group>
@@ -145,7 +153,6 @@
                             >查询
                             </el-button
                             >
-                            <el-button type="primary" icon="search" @click="combine">确定</el-button>
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -153,8 +160,7 @@
 
             <el-table v-loading="collOrderLoading" :data="collectOrderList" style="width: 100%"
                       highlight-current-row="false"
-                      @current-change="combine"
-                      ref="multipleTable">
+                      @current-change="combine">
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column label="领用记录号" prop="orderId"></el-table-column>
                 <el-table-column label="领用部门" prop="deptName"></el-table-column>
@@ -196,21 +202,12 @@
                       @current-change="combine"
                       ref="multipleTable">
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="领用记录号" prop="orderId"></el-table-column>
-                <el-table-column label="领用部门" prop="deptName"></el-table-column>
-                <el-table-column label="领用人" prop="createUser"></el-table-column>
-                <el-table-column label="操作" fixed="right" width="150">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.stop="true"
-                            @click.native="showCollectOrderDetail(scope.row)"
-                        >详情
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
+                <el-table-column label="产品名称" prop="productName"></el-table-column>
+                <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                <el-table-column label="条码" prop="code" show-overflow-tooltip></el-table-column>
             </el-table>
 
             <el-pagination
@@ -234,6 +231,7 @@ import {
 } from "@/api/inventory/deviceMAOrder";
 import {getCollectOrderList, getCollectOrderDetailList} from "@/api/inventory/deviceCollectOrder";
 import {isBlank} from "@/utils/strUtil";
+import {filterDepts} from "@/api/auth/authDept";
 
 export default {
     props: {
@@ -258,17 +256,16 @@ export default {
             collectOrderList: [],
             collectOrderTotal: 0,
             formData: {
+                id: null,
                 orderId: null,
                 collOrderId: null,
                 createTime: null,
                 status: 0,
-                code: null,
             },
             detailList: [],
             loading: false,
             currentIndex: -1,
             selectCollectOrderVisible: false,
-            multiProduct: [],
             collOrderDetailVisible: false,
             collOrderDetailList: [],
             collOrderDetailLoading: false,
@@ -278,7 +275,8 @@ export default {
                 page: 1,
                 limit: 10
             },
-            collOrderDetailTotal: 0
+            collOrderDetailTotal: 0,
+            deptList: []
         }
     },
     methods: {
@@ -288,13 +286,20 @@ export default {
             this.selectCollectOrderVisible = true;
         },
         saveMAOrder() {
-            this.saveOrder();
-            this.closeDialog();
+            if (!isBlank(this.formData.orderId)) {
+                this.saveOrder();
+                this.closeDialog();
+            } else {
+                this.$message.error("请选择养护设备！");
+
+            }
         },
         saveOrder() {
             if (isBlank(this.formData.orderId)) {
                 addDeviceMAOrder(this.formData).then((res) => {
                     if (res.code === 20000) {
+                        this.formData.id = res.data.id;
+                        this.formData.orderId = res.data.orderId;
                         this.formData.createTime = res.data.createTime;
                         this.getList();
                     } else {
@@ -359,14 +364,7 @@ export default {
             });
         },
         combine(row) {
-            if (this.multiProduct.length === 0) {
-                this.$message.error("请选择养护产品！");
-                return;
-            }
-            let invProductIds = [];
-            this.multiProduct.forEach(item => {
-                invProductIds.push(item.id);
-            });
+            this.selectCollectOrderVisible = false;
             this.formData.collOrderId = row.orderId;
             this.saveOrder();
         },
@@ -375,6 +373,7 @@ export default {
             this.getCollOrderDetailList();
         },
         showCollectOrderDetail(row) {
+            this.collOrderDetailVisible = true;
             this.collOrderDetailList = [];
             this.collOrderDetailTotal = 0;
             this.collDetailQuery.orderId = row.orderId;
@@ -384,6 +383,7 @@ export default {
         getCollOrderDetailList() {
             this.collOrderDetailLoading = true;
             getCollectOrderDetailList(this.collDetailQuery).then((res) => {
+                this.collOrderDetailLoading = false;
                 if (res.code === 20000) {
                     this.collOrderDetailList = res.data.list || [];
                     this.collOrderDetailTotal = res.data.total || 0;
@@ -392,16 +392,24 @@ export default {
                     this.collOrderDetailTotal = 0;
                 }
             }).catch(() => {
+                this.collOrderDetailLoading = false;
                 this.collOrderDetailList = [];
                 this.collOrderDetailTotal = 0;
             });
-        }
+        },
+        getDepts() {
+            filterDepts().then((res) => {
+                this.deptList = res.data.list || [];
+            })
+        },
     },
     created() {
+        this.getDepts();
         if (null !== this.deviceMAOrder) {
+            this.formData.id = this.deviceMAOrder.id;
             this.formData.orderId = this.deviceMAOrder.orderId;
+            this.formData.collOrderId = this.deviceMAOrder.collOrderId;
             this.formData.createTime = this.deviceMAOrder.createTime;
-            this.formData.invWarehouseCode = this.deviceMAOrder.invWarehouseCode;
             this.getList();
         }
     },
diff --git a/src/views/inventory/deviceCollectOrderNew.vue b/src/views/inventory/deviceCollectOrderNew.vue
index 989e441..63afe13 100644
--- a/src/views/inventory/deviceCollectOrderNew.vue
+++ b/src/views/inventory/deviceCollectOrderNew.vue
@@ -9,7 +9,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true"
-                                   @change="invWarehouseChange" size="mini">
+                                   size="mini">
                             <el-option
                                 v-for="item in deptList"
                                 :key="item.name"
@@ -188,23 +188,6 @@ 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 || [];
-            })
-        },
         closeDialog() {
             this.formVisible = false;
             this.getList();
diff --git a/src/views/inventory/deviceMAOrderCompleted.vue b/src/views/inventory/deviceMAOrderCompleted.vue
index 96c9466..4a3991a 100644
--- a/src/views/inventory/deviceMAOrderCompleted.vue
+++ b/src/views/inventory/deviceMAOrderCompleted.vue
@@ -8,30 +8,8 @@
                                   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-input placeholder="请输入领用记录号" v-model="filterQuery.collOrderId"
+                                  clearable="true"></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button-group>
@@ -44,132 +22,117 @@
                             >查询
                             </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%"
+                      highlight-current-row="true"
+                      @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="collOrderId" 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">
+            </el-table>
+
+            <el-pagination
+                :page-size="filterQuery.limit"
+                :current-page="filterQuery.page"
+                @current-change="handleCurrentChange" kan1
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
+
+        <el-card>
+            <el-table v-loading="loading" :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"></el-table-column>
+                <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
+                <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
                     <template slot-scope="scope">
-                        <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
+                        <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
+                                  :label="0">未养护
+                        </el-radio>
+                        <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
+                                  :label="1">已养护
+                        </el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="180" fixed="right">
+                <el-table-column width="150" label="设备状态" prop="deviceStatus">
                     <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
-                        >
+                        <el-radio v-model="scope.row.deviceStatus" :label="1" disabled="true">
+                            正常
+                        </el-radio>
+                        <el-radio v-model="scope.row.deviceStatus" :label="0" disabled="true">
+                            异常
+                        </el-radio>
                     </template>
                 </el-table-column>
+                <el-table-column width="200" label="养护备注" prop="remark" show-overflow-tooltip></el-table-column>
+                <el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
+                <el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate"></el-table-column>
+                <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                                 show-overflow-tooltip></el-table-column>
+                <el-table-column width="180" label="生产厂家" prop="ylqxzcrbarmc"></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>
+            <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 {getDeviceMAOrderList, getDeviceMAOrderDetailList} from "@/api/inventory/deviceMAOrder";
 
 export default {
     data() {
         return {
             filterQuery: {
-                invWarehouseCode: null,
-                invSpaceCode: null,
-                status: 0,
+                status: 1,
                 orderId: null,
+                collOrderId: 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: "编辑养护记录"
+            detailList: [],
+            detailQuery: {
+                orderIdFk: null,
+                page: 1,
+                limit: 10
             },
-            maOrder: null
+            detailTotal: 0,
+
         };
     },
-    components: {
-        addInvMAOrder
-    },
     methods: {
         onReset() {
             this.$router.push({
                 path: "",
             });
             this.filterQuery = {
-                invWarehouseCode: null,
-                invSpaceCode: null,
-                status: 0,
+                status: 1,
                 orderId: null,
+                collOrderId: null,
                 page: 1,
                 limit: 20,
             };
@@ -188,7 +151,9 @@ export default {
         },
         getList() {
             this.loading = true
-            getMAOrderList(this.filterQuery).then((res) => {
+            this.detailList = [];
+            this.detailTotal = 0;
+            getDeviceMAOrderList(this.filterQuery).then((res) => {
                 this.loading = false;
                 if (res.code === 20000) {
                     this.list = res.data.list || [];
@@ -203,83 +168,35 @@ 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 || [];
-            })
-        },
-        closeDialog() {
-            this.formVisible = false;
-            this.getList();
-        },
-        addMAOrder() {
-            this.maOrder = null;
-            this.formName = 'add';
-            this.formVisible = true;
+        handleChange(row) {
+            this.detailQuery.orderIdFk = row.orderId;
+            this.detailQuery.page = 1;
+            this.getDeviceCollOrderDetailList();
         },
-        editOrder(row) {
-            this.maOrder = row;
-            this.formName = 'edit';
-            this.formVisible = true;
+        handleCurrentDetailChange(val) {
+            this.detailQuery.page = val;
+            this.getDeviceCollOrderDetailList();
         },
-        submitAudit(row) {
-            let params = {id: row.id};
-            submitAudit(params).then((res) => {
+        getDeviceCollOrderDetailList() {
+            this.loading = true;
+            getDeviceMAOrderDetailList(this.detailQuery).then((res) => {
+                this.loading = 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);
-            });
+                this.loading = false;
+                this.detailList = [];
+                this.detailTotal = 0;
+            })
         },
     },
     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.getList();
     },
 };
 </script>
diff --git a/src/views/inventory/deviceMAOrderNew.vue b/src/views/inventory/deviceMAOrderNew.vue
index 77f39e2..ec61c77 100644
--- a/src/views/inventory/deviceMAOrderNew.vue
+++ b/src/views/inventory/deviceMAOrderNew.vue
@@ -7,6 +7,10 @@
                         <el-input placeholder="请输入养护记录号" v-model="filterQuery.orderId"
                                   clearable="true"></el-input>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input placeholder="请输入领用记录号" v-model="filterQuery.collOrderId"
+                                  clearable="true"></el-input>
+                    </el-form-item>
                     <el-form-item>
                         <el-button-group>
                             <el-button
@@ -30,7 +34,7 @@
             <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="orderId" width="180"></el-table-column>
+                <el-table-column label="领用记录号" prop="collOrderId" 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="操作" width="180" fixed="right">
@@ -64,7 +68,7 @@
         <el-pagination
             :page-size="filterQuery.limit"
             :current-page="filterQuery.page"
-            @current-change="handleCurrentChange" kan1
+            @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"
         ></el-pagination>
@@ -96,6 +100,7 @@ export default {
             filterQuery: {
                 status: 0,
                 orderId: null,
+                collOrderId: null,
                 page: 1,
                 limit: 20
             },
@@ -199,11 +204,13 @@ export default {
                 } else {
                     this.$message.error(res.message);
                 }
+            }).catch((error) => {
+                this.$message.error(error.message);
             })
         }
     },
     created() {
-
+        this.getList();
     },
 };
 </script>