diff --git a/src/views/inventory/addDeviceMAOrder.vue b/src/views/inventory/addDeviceMAOrder.vue
index 490e4be..a019123 100644
--- a/src/views/inventory/addDeviceMAOrder.vue
+++ b/src/views/inventory/addDeviceMAOrder.vue
@@ -151,23 +151,26 @@
                 </el-row>
             </el-form>
 
-            <el-table v-loading="loading" :data="collectOrderList" style="width: 100%"
+            <el-table v-loading="collOrderLoading" :data="collectOrderList" style="width: 100%"
                       highlight-current-row="false"
-                      :row-key="getRowKeys"
-                      @selection-change="handleSelectionChange"
+                      @current-change="combine"
                       ref="multipleTable">
-                <el-table-column
-                    type="selection"
-                    :reserve-selection="true"
-                    width="55">
-                </el-table-column>
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="产品标识" prop="nameCode"></el-table-column>
-                <el-table-column label="产品名称" prop="cpmctymc"></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="productionDate" width="120"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate" width="120"></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>
 
             <el-pagination
@@ -178,11 +181,57 @@
                 :total="collectOrderTotal"
             ></el-pagination>
         </el-dialog>
+
+        <el-dialog
+            title="领用设备列表"
+            :visible.sync="collOrderDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="85%"
+            v-if="collOrderDetailVisible"
+            :append-to-body='true'
+        >
+            <el-table v-loading="collOrderDetailLoading" :data="collOrderDetailList" style="width: 100%"
+                      highlight-current-row="false"
+                      @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>
+
+            <el-pagination
+                :page-size="collDetailQuery.limit"
+                :current-page="collDetailQuery.page"
+                @current-change="handleCollOrderDetailChange"
+                layout="prev, pager, next"
+                :total="collOrderDetailTotal"
+            ></el-pagination>
+        </el-dialog>
     </div>
+
 </template>
 
 <script>
-import {updateDeviceMAOrderDetail, addDeviceMAOrder, updateDeviceMAOrder, getDeviceMAOrderDetailList} from "@/api/inventory/deviceMAOrder";
+import {
+    updateDeviceMAOrderDetail,
+    addDeviceMAOrder,
+    updateDeviceMAOrder,
+    getDeviceMAOrderDetailList
+} from "@/api/inventory/deviceMAOrder";
 import {getCollectOrderList, getCollectOrderDetailList} from "@/api/inventory/deviceCollectOrder";
 import {isBlank} from "@/utils/strUtil";
 
@@ -219,7 +268,17 @@ export default {
             loading: false,
             currentIndex: -1,
             selectCollectOrderVisible: false,
-            multiProduct: []
+            multiProduct: [],
+            collOrderDetailVisible: false,
+            collOrderDetailList: [],
+            collOrderDetailLoading: false,
+            collOrderLoading: false,
+            collDetailQuery: {
+                orderId: null,
+                page: 1,
+                limit: 10
+            },
+            collOrderDetailTotal: 0
         }
     },
     methods: {
@@ -242,8 +301,19 @@ export default {
                         this.$message.error(res.message);
                     }
                 }).catch((error) => {
-
-                })
+                    this.$message.error(error.message);
+                });
+            } else {
+                updateDeviceMAOrder(this.formData).then((res) => {
+                    if (res.code === 20000) {
+                        this.formData.createTime = res.data.createTime;
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                }).catch((error) => {
+                    this.$message.error(error.message);
+                });
             }
         },
         getList() {
@@ -288,7 +358,7 @@ export default {
                 this.collectOrderTotal = 0;
             });
         },
-        combine() {
+        combine(row) {
             if (this.multiProduct.length === 0) {
                 this.$message.error("请选择养护产品！");
                 return;
@@ -297,18 +367,35 @@ export default {
             this.multiProduct.forEach(item => {
                 invProductIds.push(item.id);
             });
-            this.formData.collOrderId = '';
+            this.formData.collOrderId = row.orderId;
             this.saveOrder();
         },
-        getRowKeys(row) {
-            return row.id;
+        handleCollOrderDetailChange(val) {
+            this.collDetailQuery.page = val;
+            this.getCollOrderDetailList();
         },
-        handleSelectionChange(selectedRows) {
-            this.multiProduct = [];
-            selectedRows.forEach(item => {
-                this.multiProduct.push(item);
-            });
+        showCollectOrderDetail(row) {
+            this.collOrderDetailList = [];
+            this.collOrderDetailTotal = 0;
+            this.collDetailQuery.orderId = row.orderId;
+            this.collDetailQuery.page = 1;
+            this.getCollOrderDetailList();
         },
+        getCollOrderDetailList() {
+            this.collOrderDetailLoading = true;
+            getCollectOrderDetailList(this.collDetailQuery).then((res) => {
+                if (res.code === 20000) {
+                    this.collOrderDetailList = res.data.list || [];
+                    this.collOrderDetailTotal = res.data.total || 0;
+                } else {
+                    this.collOrderDetailList = [];
+                    this.collOrderDetailTotal = 0;
+                }
+            }).catch(() => {
+                this.collOrderDetailList = [];
+                this.collOrderDetailTotal = 0;
+            });
+        }
     },
     created() {
         if (null !== this.deviceMAOrder) {