diff --git a/src/api/auth/authDept.js b/src/api/auth/authDept.js
index b4c2bf22..3ceab3b9 100644
--- a/src/api/auth/authDept.js
+++ b/src/api/auth/authDept.js
@@ -31,3 +31,11 @@ export function deleteDept(data) {
     data: data
   });
 }
+
+export function getDeptListByUser(params) {
+  return axios({
+    url: "/spms/inv/warehouse/filterByUser",
+    method: "get",
+    params: params
+  });
+}
diff --git a/src/api/inventory/deviceMAOrder.js b/src/api/inventory/deviceMAOrder.js
index 4a47ccac..1f70683d 100644
--- a/src/api/inventory/deviceMAOrder.js
+++ b/src/api/inventory/deviceMAOrder.js
@@ -1,4 +1,4 @@
-import axios from "../../utils/axios";
+import axios from "../../utils/request";
 
 export function getDeviceMAOrderList(params) {
     return axios({
@@ -8,7 +8,7 @@ export function getDeviceMAOrderList(params) {
     });
 }
 
-export function addMAOrder(data) {
+export function addDeviceMAOrder(data) {
     return axios({
         url: "/device/MA/order/addMAOrder",
         method: "post",
@@ -64,15 +64,6 @@ export function deleteDeviceMAOrderDetail(data) {
     });
 }
 
-export function addDeviceMAOrder(data) {
-    return axios({
-        url: "/device/MA/order/addDeviceMAOrder",
-        method: "post",
-        data: data
-    });
-}
-
-
 export function verifyTemplateFile(data) {
     return axios({
         url: "/device/MA/order/verifyTemplateFile",
diff --git a/src/api/inventory/deviceReceiveOrder.js b/src/api/inventory/deviceReceiveOrder.js
index e11870df..4d06aed4 100644
--- a/src/api/inventory/deviceReceiveOrder.js
+++ b/src/api/inventory/deviceReceiveOrder.js
@@ -1,6 +1,6 @@
-import axios from "../../utils/axios";
+import axios from "../../utils/request";
 
-export function getReceiveOrderList(params) {
+export function getDeviceReceiveOrderList(params) {
     return axios({
         url: "/device/receive/order/filterList",
         method: "get",
@@ -8,7 +8,7 @@ export function getReceiveOrderList(params) {
     });
 }
 
-export function addReceiveOrder(data) {
+export function addDeviceReceiveOrder(data) {
     return axios({
         url: "/device/receive/order/addOrder",
         method: "post",
@@ -16,7 +16,7 @@ export function addReceiveOrder(data) {
     });
 }
 
-export function updateReceiveOrder(data) {
+export function updateDeviceReceiveOrder(data) {
     return axios({
         url: "/device/receive/order/update",
         method: "post",
@@ -32,7 +32,7 @@ export function submitAudit(data) {
     });
 }
 
-export function updateReceiveOrderStatus(data) {
+export function updateDeviceReceiveOrderStatus(data) {
     return axios({
         url: "/device/receive/order/updateStatus",
         method: "post",
@@ -40,7 +40,7 @@ export function updateReceiveOrderStatus(data) {
     });
 }
 
-export function deleteReceiveOrder(data) {
+export function deleteDeviceReceiveOrder(data) {
     return axios({
         url: "/device/receive/order/delete",
         method: "post",
@@ -48,7 +48,7 @@ export function deleteReceiveOrder(data) {
     });
 }
 
-export function getReceiveOrderDetailList(params) {
+export function getDeviceReceiveOrderDetailList(params) {
     return axios({
         url: "/device/receive/order/detail/filterList",
         method: "get",
@@ -64,7 +64,7 @@ export function checkCode(params) {
     });
 }
 
-export function addReceiveOrderDetail(data) {
+export function addDeviceReceiveOrderDetail(data) {
     return axios({
         url: "/device/receive/order/detail/addOrderDetail",
         method: "post",
@@ -72,7 +72,7 @@ export function addReceiveOrderDetail(data) {
     });
 }
 
-export function updateReceiveOrderDetail(data) {
+export function updateDeviceReceiveOrderDetail(data) {
     return axios({
         url: "/device/receive/order/detail/updateOrderDetail",
         method: "post",
@@ -80,7 +80,7 @@ export function updateReceiveOrderDetail(data) {
     })
 }
 
-export function deleteReceiveOrderDetail(data) {
+export function deleteDeviceReceiveOrderDetail(data) {
     return axios({
         url: "/device/receive/order/detail/deleteOrderDetail",
         method: "post",
diff --git a/src/views/inventory/AssetManage.vue b/src/views/inventory/AssetManage.vue
index df13458c..ef1e26a0 100644
--- a/src/views/inventory/AssetManage.vue
+++ b/src/views/inventory/AssetManage.vue
@@ -2,40 +2,18 @@
   <div>
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
-        <el-form-item class="query-form-item" label="养护记录号:">
-          <el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号"
+        <el-form-item class="query-form-item" label="设备编号:">
+          <el-input v-model="filterQuery.orderId" placeholder="请输入设备编号"
                     clearable="true"></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="仓库:">
-          <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
-                     @change="invChange"
-          >
-            <el-option
-              v-for="item in invList"
-              :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 class="query-form-item" label="货位:">
-          <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
-          >
-            <el-option
-              v-for="item in spaceList"
-              :key="item.name"
-              :label="item.name"
-              :value="item.code">
-              <span style="float: left">{{ item.name }}</span>
-            </el-option>
-          </el-select>
+        <el-form-item class="query-form-item" label="产品DI:">
+          <el-input v-model="filterQuery.nameCode" placeholder="请输入产品DI"
+                    clearable="true"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
           </el-button-group>
         </el-form-item>
       </el-form>
@@ -43,37 +21,27 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="养护记录号" prop="orderId" ></el-table-column>
-        <el-table-column label="仓库" prop="invName" ></el-table-column>
-        <el-table-column label="货位" prop="invSpaceName" ></el-table-column>
-        <el-table-column label="养护日期" prop="createTime" ></el-table-column>
-        <el-table-column label="养护人" prop="createUserName"></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="设备名称" prop="productName" width="180"></el-table-column>
+        <el-table-column label="设备编号" prop="code" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品DI" prop="nameCode" width="180"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate" width="180"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
+        <el-table-column label="医疗器械注册/备案人名称" prop="ylqxzcrbarmc" width="180"></el-table-column>
+        <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
+        <el-table-column label="领用部门" prop="fromDeptName" ></el-table-column>
+        <el-table-column label="领用仓库" prop="fromInvName" ></el-table-column>
+        <el-table-column label="领用货位" prop="fromInvSpaceName" ></el-table-column>
+        <el-table-column label="领用日期" prop="createTime" ></el-table-column>
+        <el-table-column label="领用人" prop="createUserName"></el-table-column>
         <el-table-column label="操作" >
           <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)"
-            >删除
+              @click.native.stop="addMAOrder(scope.row)"
+            >养护
             </el-button
             >
           </template>
@@ -89,58 +57,50 @@
     </el-card>
 
     <el-dialog
-      :title="formMap[formName]"
+      title="新增设备养护记录"
       :visible.sync="formVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       width="85%"
       v-if="formVisible"
     >
-      <addInvMAOrder
-        :maOrder="maOrder"
+      <deviceMAOrderModify
+        :deviceMAOrder="deviceMAOrder"
         :closeDialog="closeDialog"
-      ></addInvMAOrder>
+      >
+      </deviceMAOrderModify>
     </el-dialog>
 
   </div>
 </template>
 
 <script>
-import {getInvListByUser} from "@/api/system/invWarehouse";
-import {getInvSpaceList} from "@/api/inventory/invSpace";
-import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
-import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
+import {getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder";
+import deviceMAOrderModify from "@/views/inventory/DeviceMAOrderModify.vue";
 
 export default {
-  name: "InvMAOrderNew",
+  name: "AssetManage",
   data() {
     return {
       filterQuery: {
-        orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
+        code: null,
+        nameCode: null,
+        status: 2,
         page: 1,
-        limit: 20,
+        limit: 20
       },
       list: [],
       total: 0,
-      invList: [],
-      spaceList: [],
       loading: false,
+      idQuery: null,
       formVisible: false,
-      codeTableLoading: false,
-      statusMap: {
-        0: "草稿",
-        1: "未审核",
-        2: "已完成"
-      },
-      formName: null,
-      formMap: {
-        add: "新增养护记录",
-        edit: "编辑养护记录"
-      },
-      maOrder: {},
+      deviceMAOrder: {
+        code: null,
+        deptName: null,
+        createUser: null,
+        createTime: null,
+        collOrderId: null
+      }
     };
   },
   methods: {
@@ -149,14 +109,12 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
+        code: null,
+        nameCode: null,
+        status: 2,
         page: 1,
-        limit: 20,
+        limit: 20
       };
-      this.spaceList = [];
       this.getList();
     },
     onSubmit() {
@@ -165,7 +123,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      getInvMAOrderList(this.filterQuery).then((res) => {
+      getDeviceReceiveOrderList(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.list = res.data.list || [];
@@ -182,78 +140,28 @@ export default {
         this.total = 0;
       })
     },
-    invChange() {
-      this.spaceList = [];
-      this.getSpaceList();
-      this.getList();
-    },
-    getInvList() {
-      getInvListByUser()
-        .then((response) => {
-          this.invList = response.data || [];
-          this.getSpaceList();
-          this.getList();
-        })
-        .catch(() => {
-        });
-    },
-    getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
-      getInvSpaceList(params).then((res) => {
-        this.spaceList = res.data.list || [];
-      })
-    },
-    addMAOrder() {
-      this.formVisible = true;
-      this.formName = 'add';
-      this.maOrder = {};
-    },
-    editOrder(row) {
-      this.formVisible = true;
-      this.formName = 'edit';
-      this.maOrder = row;
-    },
-    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(rowId) {
-      this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let params = {id: rowId};
-        this.loading = true;
-        deleteInvMAOrder(params).then((res) => {
-          this.loading = false;
-          if (res.code === 20000) {
-            this.$message.success("删除成功！");
-            this.getList();
-          } else {
-            this.$message.error(res.message);
-          }
-        }).catch(() => {
-          this.loading = false;
-        });
-      });
-    },
     closeDialog() {
       this.formVisible = false;
       this.getList();
     },
+    addMAOrder(row) {
+      this.deviceMAOrder = {
+        code: row.code,
+        createUser: this.$store.getters.adminId,
+        deptName: row.fromDeptName,
+        deptCode: row.fromDeptName,
+        invCode: row.fromInvCode,
+        invName: row.fromInvName,
+        invSpaceCode:row.fromInvSpaceCode,
+        invSpaceName: row.fromInvSpaceName,
+        createTime: new Date().toLocaleString(),
+        collOrderId: row.orderIdFk
+      }
+      this.formVisible = true;
+    },
   },
   components: {
-    addInvMAOrder
+    deviceMAOrderModify
   },
   mounted() {
     document.body.ondrop = function (event) {
@@ -262,7 +170,7 @@ export default {
     };
   },
   created() {
-    this.getInvList();
+    this.getList();
   },
 };
 </script>
diff --git a/src/views/inventory/DeviceMAOrderCompleted.vue b/src/views/inventory/DeviceMAOrderCompleted.vue
index df13458c..19117c66 100644
--- a/src/views/inventory/DeviceMAOrderCompleted.vue
+++ b/src/views/inventory/DeviceMAOrderCompleted.vue
@@ -6,74 +6,38 @@
           <el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号"
                     clearable="true"></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="仓库:">
-          <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
-                     @change="invChange"
-          >
-            <el-option
-              v-for="item in invList"
-              :key="item.name"
-              :label="item.name"
-              :value="item.code">
-              <span style="float: left">{{ item.name }}</span>
-            </el-option>
-          </el-select>
+        <el-form-item class="query-form-item" label="设备编号:">
+          <el-input v-model="filterQuery.code" placeholder="请输入设备编号"
+                    clearable="true"></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="货位:">
-          <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
-          >
-            <el-option
-              v-for="item in spaceList"
-              :key="item.name"
-              :label="item.name"
-              :value="item.code">
-              <span style="float: left">{{ item.name }}</span>
-            </el-option>
-          </el-select>
+        <el-form-item class="query-form-item" label="领用记录号:">
+          <el-input v-model="filterQuery.receiveOrderId" placeholder="请输入领用记录号"
+                    clearable="true"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
           </el-button-group>
         </el-form-item>
       </el-form>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                @current-change="handleChange"
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="养护记录号" prop="orderId" ></el-table-column>
-        <el-table-column label="仓库" prop="invName" ></el-table-column>
-        <el-table-column label="货位" prop="invSpaceName" ></el-table-column>
-        <el-table-column label="养护日期" prop="createTime" ></el-table-column>
+        <el-table-column label="养护记录号" prop="orderId"></el-table-column>
+        <el-table-column label="领用记录号" prop="receiveOrderId"></el-table-column>
+        <el-table-column label="养护日期" prop="createTime"></el-table-column>
         <el-table-column label="养护人" prop="createUserName"></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="操作" >
+        <el-table-column label="养护备注" prop="remark" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作">
           <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)"
-            >删除
+              @click.native.stop="print(scope.row)"
+            >打印
             </el-button
             >
           </template>
@@ -88,59 +52,66 @@
       ></pagination>
     </el-card>
 
-    <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="formVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="85%"
-      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="200" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
+        <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
+        <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
+        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+                         show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="detailTotal>0"
+        :total="detailTotal"
+        :limit.sync="detailQuery.limit"
+        :page.sync="detailQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
 
   </div>
 </template>
 
 <script>
-import {getInvListByUser} from "@/api/system/invWarehouse";
-import {getInvSpaceList} from "@/api/inventory/invSpace";
-import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
-import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
+import {
+  getDeviceMAOrderList,
+  getDeviceMAOrderDetailList,
+  verifyTemplateFile,
+  printOrder
+} from "@/api/inventory/deviceMAOrder";
 
 export default {
-  name: "InvMAOrderNew",
+  name: "DeviceMAOrderCompleted",
   data() {
     return {
       filterQuery: {
         orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
+        code: null,
+        receiveOrderId: null,
+        status: 1,
         page: 1,
         limit: 20,
       },
       list: [],
       total: 0,
-      invList: [],
-      spaceList: [],
       loading: false,
-      formVisible: false,
-      codeTableLoading: false,
-      statusMap: {
-        0: "草稿",
-        1: "未审核",
-        2: "已完成"
-      },
-      formName: null,
-      formMap: {
-        add: "新增养护记录",
-        edit: "编辑养护记录"
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20,
       },
-      maOrder: {},
+      detailList: [],
+      detailLoading: false,
+      detailTotal: 0
     };
   },
   methods: {
@@ -150,9 +121,9 @@ export default {
       });
       this.filterQuery = {
         orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
+        code: null,
+        receiveOrderId: null,
+        status: 1,
         page: 1,
         limit: 20,
       };
@@ -165,7 +136,9 @@ export default {
     },
     getList() {
       this.loading = true;
-      getInvMAOrderList(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 || [];
@@ -182,79 +155,55 @@ export default {
         this.total = 0;
       })
     },
-    invChange() {
-      this.spaceList = [];
-      this.getSpaceList();
-      this.getList();
-    },
-    getInvList() {
-      getInvListByUser()
-        .then((response) => {
-          this.invList = response.data || [];
-          this.getSpaceList();
-          this.getList();
-        })
-        .catch(() => {
-        });
-    },
-    getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
-      getInvSpaceList(params).then((res) => {
-        this.spaceList = res.data.list || [];
-      })
-    },
-    addMAOrder() {
-      this.formVisible = true;
-      this.formName = 'add';
-      this.maOrder = {};
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getDetailList();
     },
-    editOrder(row) {
-      this.formVisible = true;
-      this.formName = 'edit';
-      this.maOrder = row;
+    getDetailList() {
+      getDeviceMAOrderDetailList(this.detailQuery).then((res) => {
+        if (res.code === 20000) {
+          this.detailList = res.data.list || [];
+          this.detailTotal = res.data.total || 0;
+        } else {
+          this.detailList = [];
+          this.detailTotal = 0;
+        }
+      }).catch(() => {
+        this.detailList = [];
+        this.detailTotal = 0;
+      });
     },
-    submitAudit(row) {
-      let params = {id: row.id};
-      submitAudit(params).then((res) => {
+    print(row) {
+      let query = {moduleId: 7};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
-          this.$message.success("提交成功！");
-          this.getList();
+          let printParams = {
+            templateId: res.data,
+            orderId: row.orderId
+          };
+          printOrder(printParams).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          })
         } else {
+          this.loading = false;
           this.$message.error(res.message);
         }
       }).catch((error) => {
+        this.loading = false;
         this.$message.error(error.message);
-      });
-    },
-    deleteDialog(rowId) {
-      this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let params = {id: rowId};
-        this.loading = true;
-        deleteInvMAOrder(params).then((res) => {
-          this.loading = false;
-          if (res.code === 20000) {
-            this.$message.success("删除成功！");
-            this.getList();
-          } else {
-            this.$message.error(res.message);
-          }
-        }).catch(() => {
-          this.loading = false;
-        });
-      });
-    },
-    closeDialog() {
-      this.formVisible = false;
-      this.getList();
+      })
     },
   },
-  components: {
-    addInvMAOrder
-  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
@@ -262,7 +211,7 @@ export default {
     };
   },
   created() {
-    this.getInvList();
+    this.getList();
   },
 };
 </script>
diff --git a/src/views/inventory/DeviceMAOrderModify.vue b/src/views/inventory/DeviceMAOrderModify.vue
index df13458c..f650ea77 100644
--- a/src/views/inventory/DeviceMAOrderModify.vue
+++ b/src/views/inventory/DeviceMAOrderModify.vue
@@ -1,224 +1,161 @@
 <template>
   <div>
-    <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
-        <el-form-item class="query-form-item" label="养护记录号:">
-          <el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号"
-                    clearable="true"></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item" label="仓库:">
-          <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
-                     @change="invChange"
-          >
-            <el-option
-              v-for="item in invList"
-              :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 class="query-form-item" label="货位:">
-          <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
-          >
-            <el-option
-              v-for="item in spaceList"
-              :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 style="margin-left: 10px;display:flex;">
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
-          </el-button-group>
-        </el-form-item>
-      </el-form>
+    <el-card style="margin: 5px;margin-top: -20px">
+      <el-form :model="formData" ref="dataForm" label-width="100px" style="margin-bottom: -15px">
+        <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
+          <el-button
+            type="primary"
+            @click.native="saveOrder()"
+          >保存
+          </el-button>
+        </el-button-group>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
-                border>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="养护记录号" prop="orderId" ></el-table-column>
-        <el-table-column label="仓库" prop="invName" ></el-table-column>
-        <el-table-column label="货位" prop="invSpaceName" ></el-table-column>
-        <el-table-column label="养护日期" prop="createTime" ></el-table-column>
-        <el-table-column label="养护人" prop="createUserName"></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="操作" >
-          <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>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="getList"
-      ></pagination>
-    </el-card>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="设备号:">
+              <el-input v-model="formData.code"
+                        auto-complete="off"
+                        :disabled="true"
+                        style="width: 90%"
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="养护日期:">
+              <el-input v-model="formData.createTime"
+                        auto-complete="off"
+                        :disabled="true"
+                        style="width: 90%"
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="领用部门:">
+              <el-input v-model="formData.fromDeptName"
+                        auto-complete="off"
+                        :disabled="true"
+                        style="width: 90%"
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
-    <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="formVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="85%"
-      v-if="formVisible"
-    >
-      <addInvMAOrder
-        :maOrder="maOrder"
-        :closeDialog="closeDialog"
-      ></addInvMAOrder>
-    </el-dialog>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="养护人:">
+              <el-input v-model="formData.createUserName"
+                        auto-complete="off"
+                        :disabled="true"
+                        style="width: 90%"
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-table :data="detailList" style="width: 100%;margin-top: 20px;"
+                  highlight-current-row
+                  border max-height="300" height="300">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
+          <el-table-column width="150" label="产品通用名" prop="productName" show-overflow-tooltip></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="maStatus">
+            <template slot-scope="scope">
+              <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maStatus"
+                        :label="0">未养护
+              </el-radio>
+              <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maStatus"
+                        :label="1">已养护
+              </el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="设备状态" prop="deviceStatus">
+            <template slot-scope="scope">
+              <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="1">
+                正常
+              </el-radio>
+              <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="0">
+                异常
+              </el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column width="200" label="养护备注" prop="remark">
+            <template slot-scope="scope">
+              <el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
+          <el-table-column label="失效日期(yyMMdd)" prop="expireDate"
+                           show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                           show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+                           show-overflow-tooltip></el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
 
   </div>
 </template>
 
 <script>
-import {getInvListByUser} from "@/api/system/invWarehouse";
-import {getInvSpaceList} from "@/api/inventory/invSpace";
-import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
-import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
+import {addDeviceMAOrder, filterDetail} from "@/api/inventory/deviceMAOrder";
 
 export default {
-  name: "InvMAOrderNew",
+  props: {
+    deleteInvMAOrder: {
+      type: Object,
+      required: true
+    },
+    closeDialog: {
+      type: Function,
+      required: true
+    }
+  },
+  name: "DeviceMAOrderModify",
   data() {
     return {
-      filterQuery: {
-        orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
-        page: 1,
-        limit: 20,
+      collectOrderList: [],
+      collectOrderTotal: 0,
+      formData: {
+        code: null,
+        createUser: null,
+        createTime: null,
+        fromDeptCode: null,
+        fromDeptName: null,
+        fromInvCode: null,
+        fromInvName: null,
+        fromInvSpaceCode: null,
+        fromInvSpaceName: null,
+        remark: null,
+        maStatus: null,
+        deviceStatus: null,
+        receiveOrderId: null,
+        createUserName: null,
       },
-      list: [],
-      total: 0,
-      invList: [],
-      spaceList: [],
-      loading: false,
-      formVisible: false,
-      codeTableLoading: false,
-      statusMap: {
-        0: "草稿",
-        1: "未审核",
-        2: "已完成"
-      },
-      formName: null,
-      formMap: {
-        add: "新增养护记录",
-        edit: "编辑养护记录"
-      },
-      maOrder: {},
+      detailList: []
     };
   },
   methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
-        page: 1,
-        limit: 20,
-      };
-      this.spaceList = [];
-      this.getList();
-    },
-    onSubmit() {
-      this.filterQuery.page = 1;
-      this.getList();
-    },
-    getList() {
-      this.loading = true;
-      getInvMAOrderList(this.filterQuery).then((res) => {
-        this.loading = false;
-        if (res.code === 20000) {
-          this.list = res.data.list || [];
-          this.total = res.data.total || 0;
-        } else {
-          this.$message.error(res.message);
-          this.list = [];
-          this.total = 0;
-        }
-      }).catch((error) => {
-        this.loading = false;
-        this.$message.error(error.message);
-        this.list = [];
-        this.total = 0;
-      })
-    },
-    invChange() {
-      this.spaceList = [];
-      this.getSpaceList();
-      this.getList();
-    },
-    getInvList() {
-      getInvListByUser()
-        .then((response) => {
-          this.invList = response.data || [];
-          this.getSpaceList();
-          this.getList();
-        })
-        .catch(() => {
-        });
-    },
-    getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
-      getInvSpaceList(params).then((res) => {
-        this.spaceList = res.data.list || [];
-      })
-    },
-    addMAOrder() {
-      this.formVisible = true;
-      this.formName = 'add';
-      this.maOrder = {};
-    },
-    editOrder(row) {
-      this.formVisible = true;
-      this.formName = 'edit';
-      this.maOrder = row;
-    },
-    submitAudit(row) {
-      let params = {id: row.id};
-      submitAudit(params).then((res) => {
+    saveOrder() {
+      if (this.detailList[0].maStatus === 0) {
+        this.$message.error("请完成当前设备养护！");
+        return;
+      }
+      this.formData.remark = this.detailList[0].remark;
+      this.formData.maStatus = this.detailList[0].maStatus;
+      this.formData.deviceStatus = this.detailList[0].deviceStatus;
+      addDeviceMAOrder(this.formData).then((res) => {
         if (res.code === 20000) {
-          this.$message.success("提交成功！");
-          this.getList();
+          this.closeDialog();
         } else {
           this.$message.error(res.message);
         }
@@ -226,34 +163,12 @@ export default {
         this.$message.error(error.message);
       });
     },
-    deleteDialog(rowId) {
-      this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let params = {id: rowId};
-        this.loading = true;
-        deleteInvMAOrder(params).then((res) => {
-          this.loading = false;
-          if (res.code === 20000) {
-            this.$message.success("删除成功！");
-            this.getList();
-          } else {
-            this.$message.error(res.message);
-          }
-        }).catch(() => {
-          this.loading = false;
-        });
-      });
-    },
-    closeDialog() {
-      this.formVisible = false;
-      this.getList();
-    },
-  },
-  components: {
-    addInvMAOrder
+    getMAOrderDetailList(code) {
+      let params = {code: code};
+      filterDetail(params).then((res) => {
+        this.detailList.push(res.data);
+      })
+    }
   },
   mounted() {
     document.body.ondrop = function (event) {
@@ -262,7 +177,16 @@ export default {
     };
   },
   created() {
-    this.getInvList();
+    this.formData = {
+      code: this.deviceMAOrder.code,
+      createUser: this.$store.getters.adminId,
+      createUserName: this.$store.getters.name,
+      deptName: this.deviceMAOrder.deptName,
+      createTime: this.deviceMAOrder.createTime,
+      deptCode: this.deviceMAOrder.deptCode,
+      collOrderId: this.deviceMAOrder.collOrderId
+    };
+    this.getMAOrderDetailList(this.deviceMAOrder.code);
   },
 };
 </script>
diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
index df13458c..c20917af 100644
--- a/src/views/inventory/DeviceReceiveOrderAudit.vue
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -2,12 +2,25 @@
   <div>
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
-        <el-form-item class="query-form-item" label="养护记录号:">
-          <el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号"
+        <el-form-item class="query-form-item" label="领用记录号:">
+          <el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号"
                     clearable="true"></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="仓库:">
-          <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
+        <el-form-item class="query-form-item" label="领用部门:">
+          <el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true"
+                     @change="deptChange"
+          >
+            <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 class="query-form-item" label="领用仓库:">
+          <el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
                      @change="invChange"
           >
             <el-option
@@ -19,8 +32,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item class="query-form-item" label="货位:">
-          <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
+        <el-form-item class="query-form-item" label="领用货位:">
+          <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
           >
             <el-option
               v-for="item in spaceList"
@@ -35,38 +48,33 @@
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
           </el-button-group>
         </el-form-item>
       </el-form>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                @current-change="handleChange"
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="养护记录号" prop="orderId" ></el-table-column>
-        <el-table-column label="仓库" prop="invName" ></el-table-column>
-        <el-table-column label="货位" prop="invSpaceName" ></el-table-column>
-        <el-table-column label="养护日期" prop="createTime" ></el-table-column>
-        <el-table-column label="养护人" prop="createUserName"></el-table-column>
+        <el-table-column label="设备领用记录号" prop="orderId"></el-table-column>
+        <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
+        <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
+        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
+        <el-table-column label="领用日期" prop="createTime"></el-table-column>
+        <el-table-column label="领用人" prop="createUserName"></el-table-column>
+        <el-table-column label="创建人" prop="createUserName"></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="操作" >
+        <el-table-column label="操作">
           <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)"
-            >提交审核
+              @click.native.stop="auditOrder(scope.row)"
+            >审核
             </el-button
             >
             <el-button
@@ -88,59 +96,78 @@
       ></pagination>
     </el-card>
 
-    <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="formVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="85%"
-      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="200" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
+        <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
+        <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
+        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column  label="生产厂家" prop="ylqxzcrbarmc"
+                         show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="detailTotal>0"
+        :total="detailTotal"
+        :limit.sync="detailQuery.limit"
+        :page.sync="detailQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
 
   </div>
 </template>
 
 <script>
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getDeptListByUser} from "@/api/auth/authDept";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
-import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
-import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
+import {
+  getDeviceReceiveOrderDetailList,
+  updateDeviceReceiveOrderStatus,
+  deleteDeviceReceiveOrder,
+  getDeviceReceiveOrderList
+} from "@/api/inventory/deviceReceiveOrder";
 
 export default {
-  name: "InvMAOrderNew",
+  name: "DeviceReceiveOrderAudit",
   data() {
     return {
       filterQuery: {
         orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 1,
         page: 1,
         limit: 20,
       },
       list: [],
       total: 0,
+      deptList: [],
       invList: [],
       spaceList: [],
       loading: false,
-      formVisible: false,
-      codeTableLoading: false,
       statusMap: {
         0: "草稿",
         1: "未审核",
         2: "已完成"
       },
-      formName: null,
-      formMap: {
-        add: "新增养护记录",
-        edit: "编辑养护记录"
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20,
       },
-      maOrder: {},
+      detailList: [],
+      detailLoading: false,
+      detailTotal: 0
     };
   },
   methods: {
@@ -150,9 +177,10 @@ export default {
       });
       this.filterQuery = {
         orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 1,
         page: 1,
         limit: 20,
       };
@@ -165,7 +193,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      getInvMAOrderList(this.filterQuery).then((res) => {
+      getDeviceReceiveOrderList(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.list = res.data.list || [];
@@ -182,16 +210,30 @@ export default {
         this.total = 0;
       })
     },
+    deptChange() {
+      this.invList = [];
+      this.spaceList = [];
+      this.filterQuery.fromInvCode = null;
+      this.filterQuery.fromInvSpaceCode = null;
+      this.getInvList();
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+        this.getInvList();
+        this.getList();
+      });
+    },
     invChange() {
       this.spaceList = [];
+      this.filterQuery.fromInvSpaceCode = null;
       this.getSpaceList();
-      this.getList();
     },
     getInvList() {
-      getInvListByUser()
+      let params = {deptCode: this.filterQuery.fromDeptCode};
+      findInvByUser(params)
         .then((response) => {
           this.invList = response.data || [];
-          this.getSpaceList();
           this.getList();
         })
         .catch(() => {
@@ -201,40 +243,82 @@ export default {
       let params = {invWarehouseCode: this.filterQuery.invCode};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
+        this.getList();
       })
     },
-    addMAOrder() {
-      this.formVisible = true;
-      this.formName = 'add';
-      this.maOrder = {};
+    auditOrder(row) {
+      this.$confirm('请选择审核意见', '提示', {
+        confirmButtonText: '通过',
+        cancelButtonText: '驳回',
+        type: 'warning',
+        center: true,
+        closeOnPressEscape: false,//按下 ESC 键关闭弹窗
+        closeOnClickModal: false,//点击遮罩关闭弹窗
+        distinguishCancelAndClose: true,//区分取消与关闭
+      }).then(() => {
+        let params = {
+          id: row.id,
+          status: 2
+        };
+        updateDeviceReceiveOrderStatus(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((action) => {
+        if (action === "cancel") {
+          let params = {
+            id: row.id,
+            status: 0
+          };
+          updateDeviceReceiveOrderStatus(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);
+          });
+        } else {
+          return;
+        }
+      });
     },
-    editOrder(row) {
-      this.formVisible = true;
-      this.formName = 'edit';
-      this.maOrder = row;
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getDetailList();
     },
-    submitAudit(row) {
-      let params = {id: row.id};
-      submitAudit(params).then((res) => {
+    getDetailList() {
+      getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
         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);
+      }).catch(() => {
+        this.detailList = [];
+        this.detailTotal = 0;
       });
     },
     deleteDialog(rowId) {
-      this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         let params = {id: rowId};
         this.loading = true;
-        deleteInvMAOrder(params).then((res) => {
+        deleteDeviceReceiveOrder(params).then((res) => {
           this.loading = false;
           if (res.code === 20000) {
             this.$message.success("删除成功！");
@@ -252,9 +336,6 @@ export default {
       this.getList();
     },
   },
-  components: {
-    addInvMAOrder
-  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
@@ -262,7 +343,7 @@ export default {
     };
   },
   created() {
-    this.getInvList();
+    this.getDeptList();
   },
 };
 </script>
diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
index df13458c..572c050d 100644
--- a/src/views/inventory/DeviceReceiveOrderCompleted.vue
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -2,12 +2,25 @@
   <div>
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
-        <el-form-item class="query-form-item" label="养护记录号:">
-          <el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号"
+        <el-form-item class="query-form-item" label="领用记录号:">
+          <el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号"
                     clearable="true"></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="仓库:">
-          <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
+        <el-form-item class="query-form-item" label="领用部门:">
+          <el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true"
+                     @change="deptChange"
+          >
+            <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 class="query-form-item" label="领用仓库:">
+          <el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
                      @change="invChange"
           >
             <el-option
@@ -19,8 +32,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item class="query-form-item" label="货位:">
-          <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
+        <el-form-item class="query-form-item" label="领用货位:">
+          <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
           >
             <el-option
               v-for="item in spaceList"
@@ -35,49 +48,26 @@
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
           </el-button-group>
         </el-form-item>
       </el-form>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                @current-change="handleChange"
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="养护记录号" prop="orderId" ></el-table-column>
-        <el-table-column label="仓库" prop="invName" ></el-table-column>
-        <el-table-column label="货位" prop="invSpaceName" ></el-table-column>
-        <el-table-column label="养护日期" prop="createTime" ></el-table-column>
-        <el-table-column label="养护人" prop="createUserName"></el-table-column>
+        <el-table-column label="设备领用记录号" prop="orderId"></el-table-column>
+        <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
+        <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
+        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
+        <el-table-column label="领用日期" prop="createTime"></el-table-column>
+        <el-table-column label="领用人" prop="createUserName"></el-table-column>
+        <el-table-column label="创建人" prop="createUserName"></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="操作" >
-          <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>
       <pagination
         v-show="total>0"
@@ -88,59 +78,76 @@
       ></pagination>
     </el-card>
 
-    <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="formVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="85%"
-      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="200" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
+        <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
+        <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
+        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column  label="生产厂家" prop="ylqxzcrbarmc"
+                          show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="detailTotal>0"
+        :total="detailTotal"
+        :limit.sync="detailQuery.limit"
+        :page.sync="detailQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
 
   </div>
 </template>
 
 <script>
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getDeptListByUser} from "@/api/auth/authDept";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
-import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
-import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
+import {
+  getDeviceReceiveOrderDetailList,
+  getDeviceReceiveOrderList
+} from "@/api/inventory/deviceReceiveOrder";
 
 export default {
-  name: "InvMAOrderNew",
+  name: "DeviceReceiveOrderCompleted",
   data() {
     return {
       filterQuery: {
         orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 2,
         page: 1,
         limit: 20,
       },
       list: [],
       total: 0,
+      deptList: [],
       invList: [],
       spaceList: [],
       loading: false,
-      formVisible: false,
-      codeTableLoading: false,
       statusMap: {
         0: "草稿",
         1: "未审核",
         2: "已完成"
       },
-      formName: null,
-      formMap: {
-        add: "新增养护记录",
-        edit: "编辑养护记录"
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20,
       },
-      maOrder: {},
+      detailList: [],
+      detailLoading: false,
+      detailTotal: 0
     };
   },
   methods: {
@@ -150,9 +157,10 @@ export default {
       });
       this.filterQuery = {
         orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 2,
         page: 1,
         limit: 20,
       };
@@ -165,7 +173,9 @@ export default {
     },
     getList() {
       this.loading = true;
-      getInvMAOrderList(this.filterQuery).then((res) => {
+      this.detailList = [];
+      this.detailTotal = 0;
+      getDeviceReceiveOrderList(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.list = res.data.list || [];
@@ -182,16 +192,30 @@ export default {
         this.total = 0;
       })
     },
+    deptChange() {
+      this.invList = [];
+      this.spaceList = [];
+      this.filterQuery.fromInvCode = null;
+      this.filterQuery.fromInvSpaceCode = null;
+      this.getInvList();
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+        this.getInvList();
+        this.getList();
+      });
+    },
     invChange() {
       this.spaceList = [];
+      this.filterQuery.fromInvSpaceCode = null;
       this.getSpaceList();
-      this.getList();
     },
     getInvList() {
-      getInvListByUser()
+      let params = {deptCode: this.filterQuery.fromDeptCode};
+      findInvByUser(params)
         .then((response) => {
           this.invList = response.data || [];
-          this.getSpaceList();
           this.getList();
         })
         .catch(() => {
@@ -201,50 +225,26 @@ export default {
       let params = {invWarehouseCode: this.filterQuery.invCode};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
+        this.getList();
       })
     },
-    addMAOrder() {
-      this.formVisible = true;
-      this.formName = 'add';
-      this.maOrder = {};
-    },
-    editOrder(row) {
-      this.formVisible = true;
-      this.formName = 'edit';
-      this.maOrder = row;
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getDetailList();
     },
-    submitAudit(row) {
-      let params = {id: row.id};
-      submitAudit(params).then((res) => {
+    getDetailList() {
+      getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
         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(rowId) {
-      this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let params = {id: rowId};
-        this.loading = true;
-        deleteInvMAOrder(params).then((res) => {
-          this.loading = false;
-          if (res.code === 20000) {
-            this.$message.success("删除成功！");
-            this.getList();
-          } else {
-            this.$message.error(res.message);
-          }
-        }).catch(() => {
-          this.loading = false;
-        });
+      }).catch(() => {
+        this.detailList = [];
+        this.detailTotal = 0;
       });
     },
     closeDialog() {
@@ -252,9 +252,6 @@ export default {
       this.getList();
     },
   },
-  components: {
-    addInvMAOrder
-  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
@@ -262,7 +259,7 @@ export default {
     };
   },
   created() {
-    this.getInvList();
+    this.getDeptList();
   },
 };
 </script>
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index df13458c..2a51790c 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -1,272 +1,701 @@
 <template>
   <div>
-    <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
-        <el-form-item class="query-form-item" label="养护记录号:">
-          <el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号"
-                    clearable="true"></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item" label="仓库:">
-          <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
-                     @change="invChange"
-          >
-            <el-option
-              v-for="item in invList"
-              :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 class="query-form-item" label="货位:">
-          <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
-          >
-            <el-option
-              v-for="item in spaceList"
-              :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 style="margin-left: 10px;display:flex;">
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
-          </el-button-group>
-        </el-form-item>
-      </el-form>
+    <el-card style="margin: 5px;margin-top: -20px">
+      <el-form :model="formData" ref="dataForm" label-width="100px" style="margin-bottom: -15px">
+        <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
+          <el-button
+            type="primary"
+            @click.native="saveDeviceReceiveOrder()"
+          >保存
+          </el-button>
+        </el-button-group>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
-                border>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="养护记录号" prop="orderId" ></el-table-column>
-        <el-table-column label="仓库" prop="invName" ></el-table-column>
-        <el-table-column label="货位" prop="invSpaceName" ></el-table-column>
-        <el-table-column label="养护日期" prop="createTime" ></el-table-column>
-        <el-table-column label="养护人" prop="createUserName"></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="操作" >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="editOrder(scope.row)"
-            >编辑
-            </el-button
-            >
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="领用记录号:">
+              <el-input v-model="formData.orderId"
+                        auto-complete="off"
+                        :disabled="true"
+                        style="width: 90%"
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="领用日期:">
+              <el-input v-model="formData.createTime"
+                        auto-complete="off"
+                        :disabled="true"
+                        style="width: 90%"
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="领用部门:">
+              <el-select v-model="formData.fromDeptCode" placeholder="领用部门信息"
+                         :disabled="detailList.length >0 "
+                         @change="deptChange"
+                         style="width: 90%;"
+                         clearable>
+                <el-option
+                  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.parentName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="领用仓库:">
+              <el-select v-model="formData.fromInvCode" placeholder="领用仓库信息"
+                         :disabled="detailList.length >0 "
+                         @change="invChange"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in invList"
+                  :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-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="领用货位:">
+              <el-select v-model="formData.fromInvSpaceCode" placeholder="领用货位信息"
+                         :disabled="detailList.length >0 "
+                         style="width: 90%;"
+                         clearable>
+                <el-option
+                  v-for="item in spaceList"
+                  :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-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="领用人:">
+              <el-select v-model="formData.receiveUser" placeholder="领用人信息"
+                         :disabled="detailList.length >0 "
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in userList"
+                  :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-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="17">
+            <el-form-item class="query-form-item" label="扫码录入:">
+              <el-input
+                id="inputer"
+                @focus="getInputFocus($event)"
+                @keypress.enter.native="enterKey($event)"
+                ref='inputRef'
+                style="ime-mode:disabled"
+                type="tel"
+                v-model="formData.code"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
             <el-button
-              type="text"
-              size="small"
-              @click.native.stop="submitAudit(scope.row)"
-            >提交审核
-            </el-button
-            >
+              type="primary"
+              size="mini"
+              @click.native.stop="addCode()"
+              style="margin-left: 15px"
+            >扫码添加
+            </el-button>
             <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="getList"
-      ></pagination>
+              type="primary"
+              :disabled="this.detailList.length > 0"
+              @click.native="selectInvProduct()"
+            >手动添加
+            </el-button>
+          </el-col>
+        </el-row>
+
+        <el-table v-loading="loading" :data="detailList" style="width: 100%;margin-top: 20px;"
+                  highlight-current-row
+                  border max-height="300" height="300">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
+          <el-table-column width="150"
+                           label="产品通用名"
+                           prop="productName"
+                           show-overflow-tooltip
+          ></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.maStatus"
+                        :label="0">未养护
+              </el-radio>
+              <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maStatus"
+                        :label="1">已养护
+              </el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="设备状态" prop="deviceStatus">
+            <template slot-scope="scope">
+              <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="1">
+                正常
+              </el-radio>
+              <el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="0">
+                异常
+              </el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column width="200" label="养护备注" prop="remark">
+            <template slot-scope="scope">
+              <el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
+          <el-table-column label="失效日期(yyMMdd)" prop="expireDate"
+                           show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                           show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+                           show-overflow-tooltip></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.stop="true"
+                @click.native="editOrderDetail(scope.$index, scope.row)"
+              >编辑
+              </el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click.stop="true"
+                @click.native="updateOrderDetail(scope.row)"
+              >保存
+              </el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click.stop="true"
+                @click.native="deleteOrderDetail(scope.$index, scope.row)"
+              >减一
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-form>
     </el-card>
 
+
     <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="formVisible"
+      title="库存产品录入"
+      :visible.sync="selectInvProductVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       width="85%"
-      v-if="formVisible"
+      v-if="selectInvProductVisible"
+      :append-to-body='true'
     >
-      <addInvMAOrder
-        :maOrder="maOrder"
-        :closeDialog="closeDialog"
-      ></addInvMAOrder>
-    </el-dialog>
+      <el-form :inline="true" :model="filterQuery" size="mini">
+        <el-row>
+          <el-form-item class="query-form-item" label="领用仓库:">
+            <el-select v-model="filterQuery.invCode" placeholder="领用仓库信息"
+                       :disabled="true"
+                       clearable>
+              <el-option
+                v-for="item in invList"
+                :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" prop="invSpaceCode">
+            <el-select v-model="filterQuery.invSpaceCode" placeholder="领用货位信息"
+                       :disabled="true"
+                       clearable>
+              <el-option
+                v-for="item in spaceList"
+                :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 class="query-form-item" label="产品标识DI:">
+            <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item" label="产品名称:">
+            <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item" label="批次号:">
+            <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
+          </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="queryInvProductsList"
+              >查询
+              </el-button
+              >
+              <el-button type="primary" icon="search" @click="combine">确定</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+
+      <el-table v-loading="loading" :data="productList" style="width: 100%"
+                highlight-current-row="false"
+                :row-key="getRowKeys"
+                @selection-change="handleSelectionChange"
+                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>
 
+      <pagination
+        v-show="productTotal>0"
+        :total="productTotal"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getDeptListByUser} from "@/api/auth/authDept";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
-import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
-import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
+import {
+  addDeviceReceiveOrder,
+  addDeviceReceiveOrderDetail,
+  updateDeviceReceiveOrder,
+  updateDeviceReceiveOrderDetail,
+  getDeviceReceiveOrderDetailList,
+  deleteDeviceReceiveOrderDetail,
+  checkCode
+} from "@/api/inventory/deviceReceiveOrder";
+import {getInvMAProducts} from "@/api/inventory/invPorduct";
+import {isBlank} from "@/utils/strUtil";
+import {listDeptUser} from "@/api/system/deptUser";
 
 export default {
-  name: "InvMAOrderNew",
+  props: {
+    deviceReceiveOrder: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+
   data() {
     return {
       filterQuery: {
-        orderId: null,
-        invCode: this.$store.getters.locInvCode,
+        nameCode: null,
+        cpmctymc: null,
+        batchNo: null,
+        invCode: null,
+        cplb: "设备",
         invSpaceCode: null,
-        status: 0,
         page: 1,
-        limit: 20,
+        limit: 10
       },
-      list: [],
-      total: 0,
+      productList: [],
+      productTotal: 0,
+      deptList: [],
       invList: [],
       spaceList: [],
-      loading: false,
-      formVisible: false,
-      codeTableLoading: false,
-      statusMap: {
-        0: "草稿",
-        1: "未审核",
-        2: "已完成"
-      },
-      formName: null,
-      formMap: {
-        add: "新增养护记录",
-        edit: "编辑养护记录"
+      formData: {
+        id: null,
+        orderId: null,
+        createTime: null,
+        fromDeptCode: null,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        receiveUser: null,
+        status: 0,
+        code: null,
       },
-      maOrder: {},
-    };
+      detailList: [],
+      loading: false,
+      scanText: "扫码录入：",
+      currentIndex: -1,
+      selectInvProductVisible: false,
+      multiProduct: [],
+      userList: [],
+      productInvList: [],
+      productSpaceList: []
+    }
   },
   methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
+    getInvList() {
+      let params = {deptCode: this.formData.fromDeptCode};
+      findInvByUser(params).then((res) => {
+        if (res.code === 20000) {
+          this.invList = res.data || [];
+          if (!isBlank(this.deviceReceiveOrder.fromInvSpaceCode)) {
+            this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;
+            this.invChange();
+          }
+        }
       });
-      this.filterQuery = {
-        orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        status: 0,
-        page: 1,
-        limit: 20,
-      };
+    },
+    deptChange() {
+      //查询此部门下的仓库和用户
+      this.formData.fromInvCode = null;
+      this.formData.fromInvSpaceCode = null;
+      this.invList = [];
       this.spaceList = [];
-      this.getList();
+      this.getInvList();
+
+      //拉取部门用户列表
+      this.getDeptUserList();
     },
-    onSubmit() {
-      this.filterQuery.page = 1;
-      this.getList();
+    getDeptUserList() {
+      this.userList = [];
+      let params = {deptId: this.formData.fromDeptCode};
+      listDeptUser(params).then((res) =>{
+        this.userList = res.data.list || [];
+      })
     },
-    getList() {
-      this.loading = true;
-      getInvMAOrderList(this.filterQuery).then((res) => {
-        this.loading = false;
-        if (res.code === 20000) {
-          this.list = res.data.list || [];
-          this.total = res.data.total || 0;
-        } else {
-          this.$message.error(res.message);
-          this.list = [];
-          this.total = 0;
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+        if (!isBlank(this.deviceReceiveOrder.fromInvCode)) {
+          this.formData.fromInvCode = this.deviceReceiveOrder.fromInvCode;
+          this.getInvList();
         }
-      }).catch((error) => {
-        this.loading = false;
-        this.$message.error(error.message);
-        this.list = [];
-        this.total = 0;
-      })
+      });
+
+      if (!isBlank(this.formData.fromDeptCode)) {
+        this.getDeptUserList();
+      }
     },
     invChange() {
+      this.formData.invSpaceCode = null;
       this.spaceList = [];
-      this.getSpaceList();
-      this.getList();
+      let params = {invWarehouseCode: this.formData.invCode};
+      getInvSpaceList(params).then((res) => {
+        if (!isBlank(this.deviceReceiveOrder.fromInvSpaceCode)) {
+          this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;
+        }
+        this.spaceList = res.data.list || [];
+      });
     },
-    getInvList() {
-      getInvListByUser()
-        .then((response) => {
-          this.invList = response.data || [];
-          this.getSpaceList();
-          this.getList();
+    selectInvProduct() {
+      let message = this.verifyOrder();
+      if (!isBlank(message)) {
+        this.$message.warning(message);
+        return;
+      }
+
+      //保存或更新设备领用仓库信息
+      this.saveOrder();
+      this.onReset();
+      this.selectInvProductVisible = true;
+    },
+    saveMAOrder() {
+      this.saveOrder();
+      this.closeDialog();
+    },
+    saveOrder(code) {
+      if (!isBlank(this.formData.orderId)) {
+        //更新单据
+        updateDeviceReceiveOrder(this.formData).then((res) => {
+        }).catch((error) => {
+          this.$message.error("更新单据信息失败！");
         })
-        .catch(() => {
+      } else {
+        addDeviceReceiveOrder(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;
+            if (!isBlank(code)) {
+              //扫码添加设备领用记录详情
+              if (!isBlank(this.formData.code)) {
+                this.addScanCode();
+              }
+            }
+          } else {
+            this.$message.error(res.message);
+          }
         });
+      }
     },
-    getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode};
-      getInvSpaceList(params).then((res) => {
-        this.spaceList = res.data.list || [];
-      })
+
+    saveDeviceReceiveOrder() {
+      let message = this.verifyOrder();
+      if (isBlank(message)) {
+        this.saveOrder();
+        this.closeDialog();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    enterKey(event) {
+      this.addCode();
+      this.$refs.inputRef.focus();
+      this.$refs.inputRef.select();
     },
-    addMAOrder() {
-      this.formVisible = true;
-      this.formName = 'add';
-      this.maOrder = {};
+    addCode() {
+      let message = this.verifyOrder();
+      if (!isBlank(message)) {
+        this.$message.warning(message);
+        return;
+      }
+
+      if (isBlank(this.formData.code)) {
+        this.$message.warning("请扫描或输入UDI码");
+        return;
+      }
+
+      if (isBlank(this.formData.orderId)) {
+        this.saveOrder(this.formData.code);
+      } else {
+        this.addScanCode();
+      }
+
     },
-    editOrder(row) {
-      this.formVisible = true;
-      this.formName = 'edit';
-      this.maOrder = row;
+    verifyOrder() {
+      if (isBlank(this.formData.fromDeptCode)) {
+        return "请选择领用部门！";
+      } else if (isBlank(this.formData.fromInvCode)) {
+        return "请选择领用仓库！";
+      } else if (isBlank(this.formData.fromInvSpaceCode)) {
+        return "请选择领用货位！";
+      } else if (isBlank(this.formData.receiveUser)) {
+        return "请选择领用人！";
+      }
     },
-    submitAudit(row) {
-      let params = {id: row.id};
-      submitAudit(params).then((res) => {
+    addScanCode() {
+      //校验条码是否符合规则
+      let checkParams = {
+        code: this.formData.code
+      };
+      checkCode(checkParams).then((res) => {
         if (res.code === 20000) {
-          this.$message.success("提交成功！");
+          this.addDeviceReceiveOrderDetail();
+        } else {
+          if (res.code === 3) {
+            this.$message.error(res.message);
+          } else if (res.code === 7) {
+            this.$confirm(res.message + "，是否继续添加？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+              this.addDeviceReceiveOrderDetail();
+            }).catch(() => {
+            });
+          }
+        }
+      }).catch((error) => {
+      });
+    },
+    addDeviceReceiveOrderDetail() {
+      //扫码添加库存养护记录详情
+      let params = {
+        orderIdFk: this.formData.orderId,
+        code: this.formData.code
+      }
+      addDeviceReceiveOrderDetail(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(rowId) {
-      this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let params = {id: rowId};
-        this.loading = true;
-        deleteInvMAOrder(params).then((res) => {
-          this.loading = false;
+    deleteOrderDetail(index, row) {
+      if (row.count === 1) {
+        this.$confirm('此产品领用数量为1，减一后将删除此产品领用记录，是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {id: row.id};
+          deleteDeviceReceiveOrderDetail(params).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success("删除成功");
+              this.getList();
+            }
+          })
+        }).catch(() => {
+        });
+      } else {
+        let params = {id: row.id};
+        deleteDeviceReceiveOrderDetail(params).then((res) => {
           if (res.code === 20000) {
-            this.$message.success("删除成功！");
+            this.$message.success("删除成功");
             this.getList();
-          } else {
-            this.$message.error(res.message);
           }
-        }).catch(() => {
-          this.loading = false;
-        });
+        })
+      }
+    },
+    getList() {
+      let params = {orderIdFk: this.formData.orderId};
+      getDeviceReceiveOrderDetailList(params).then((res) => {
+        if (res.code === 20000) {
+          this.detailList = res.data.list || [];
+        }
+      })
+    },
+    updateOrderDetail(row) {
+      updateDeviceReceiveOrderDetail(row).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("保存成功！")
+          this.getList();
+        }
+      })
+    },
+    editOrderDetail(index, row) {
+      this.currentIndex = index;
+    },
+    onReset() {
+      this.filterQuery = {
+        nameCode: null,
+        cpmctymc: null,
+        batchNo: null,
+        invCode: this.formData.fromInvCode,
+        cplb: "设备",
+        invSpaceCode: null,
+        page: 1,
+        limit: 10
+      };
+      this.multiProduct = [];
+      this.queryInvProducts();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.queryInvProducts();
+    },
+    queryInvProductsList() {
+      this.filterQuery.page = 1;
+      this.queryInvProducts();
+    },
+    queryInvProducts() {
+      this.filterQuery.invCode = this.formData.invCode;
+      this.filterQuery.invSpaceCode = this.formData.invSpaceCode;
+      getInvMAProducts(this.filterQuery).then((res) => {
+        if (res.code === 20000) {
+          this.productList = res.data.list || [];
+          this.productTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.productList = [];
+          this.productTotal = 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.productList = [];
+        this.productTotal = 0;
       });
     },
-    closeDialog() {
-      this.formVisible = false;
-      this.getList();
+    combine() {
+      if (this.multiProduct.length === 0) {
+        this.$message.error("请选择养护产品！");
+        return;
+      }
+      let invProductIds = [];
+      this.multiProduct.forEach(item => {
+        invProductIds.push(item.id);
+      });
+      let params = {
+        orderIdFk: this.formData.orderId,
+        invProductIds: invProductIds
+      };
+      addDeviceReceiveOrderDetail(params).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("录入成功！");
+          this.selectInvProductVisible = false;
+          this.getList();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      })
+    },
+    getRowKeys(row) {
+      return row.id;
+    },
+    handleSelectionChange(selectedRows) {
+      this.multiProduct = [];
+      selectedRows.forEach(item => {
+        this.multiProduct.push(item);
+      });
     },
-  },
-  components: {
-    addInvMAOrder
-  },
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
   },
   created() {
-    this.getInvList();
+    this.getDeptList();
+    if (null !== this.deviceReceiveOrder) {
+      this.formData.orderId = this.deviceReceiveOrder.orderId;
+      this.formData.createTime = this.deviceReceiveOrder.createTime;
+      this.formData.fromDeptCode = this.deviceReceiveOrder.fromDeptCode;
+      this.formData.fromInvCode = this.deviceReceiveOrder.fromInvCode;
+      this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;
+      this.formData.receiveUser = this.deviceReceiveOrder.receiveUser;
+      this.getList();
+    }
   },
 };
 </script>
 
-<style type="text/scss" lang="scss">
-</style>
-
diff --git a/src/views/inventory/DeviceReceiveOrderNew.vue b/src/views/inventory/DeviceReceiveOrderNew.vue
index df13458c..4335654a 100644
--- a/src/views/inventory/DeviceReceiveOrderNew.vue
+++ b/src/views/inventory/DeviceReceiveOrderNew.vue
@@ -2,12 +2,25 @@
   <div>
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" :inline="true">
-        <el-form-item class="query-form-item" label="养护记录号:">
-          <el-input v-model="filterQuery.orderId" placeholder="请输入养护记录号"
+        <el-form-item class="query-form-item" label="领用记录号:">
+          <el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号"
                     clearable="true"></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="仓库:">
-          <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
+        <el-form-item class="query-form-item" label="领用部门:">
+          <el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true"
+                     @change="deptChange"
+          >
+            <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 class="query-form-item" label="领用仓库:">
+          <el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
                      @change="invChange"
           >
             <el-option
@@ -19,8 +32,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item class="query-form-item" label="货位:">
-          <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
+        <el-form-item class="query-form-item" label="领用货位:">
+          <el-select v-model="filterQuery.fromInvSpaceCode" placeholder="请选择货位" clearable="true"
           >
             <el-option
               v-for="item in spaceList"
@@ -35,7 +48,7 @@
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addMAOrder">新增养护记录</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="addReceiveOrder">新增领用记录</el-button>
           </el-button-group>
         </el-form-item>
       </el-form>
@@ -43,17 +56,19 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="养护记录号" prop="orderId" ></el-table-column>
-        <el-table-column label="仓库" prop="invName" ></el-table-column>
-        <el-table-column label="货位" prop="invSpaceName" ></el-table-column>
-        <el-table-column label="养护日期" prop="createTime" ></el-table-column>
-        <el-table-column label="养护人" prop="createUserName"></el-table-column>
+        <el-table-column label="设备领用记录号" prop="orderId"></el-table-column>
+        <el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
+        <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
+        <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
+        <el-table-column label="领用日期" prop="createTime"></el-table-column>
+        <el-table-column label="领用人" prop="createUserName"></el-table-column>
+        <el-table-column label="创建人" prop="createUserName"></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="操作" >
+        <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -96,35 +111,38 @@
       width="85%"
       v-if="formVisible"
     >
-      <addInvMAOrder
-        :maOrder="maOrder"
+      <deviceReceiveOrderModify
+        :deviceReceiveOrder="deviceReceiveOrder"
         :closeDialog="closeDialog"
-      ></addInvMAOrder>
+      ></deviceReceiveOrderModify>
     </el-dialog>
 
   </div>
 </template>
 
 <script>
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getDeptListByUser} from "@/api/auth/authDept";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
-import {getInvMAOrderList, deleteInvMAOrder, submitAudit} from "@/api/inventory/invMAOrder";
-import addInvMAOrder from "@/views/inventory/InvMAOrderModify.vue";
+import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue";
+import {submitAudit, deleteDeviceReceiveOrder, getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder";
 
 export default {
-  name: "InvMAOrderNew",
+  name: "DeviceReceiveOrderNew",
   data() {
     return {
       filterQuery: {
         orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
         status: 0,
         page: 1,
         limit: 20,
       },
       list: [],
       total: 0,
+      deptList: [],
       invList: [],
       spaceList: [],
       loading: false,
@@ -137,10 +155,10 @@ export default {
       },
       formName: null,
       formMap: {
-        add: "新增养护记录",
-        edit: "编辑养护记录"
+        add: "新增设备领用记录",
+        edit: "编辑设备领用记录"
       },
-      maOrder: {},
+      deviceReceiveOrder: {},
     };
   },
   methods: {
@@ -150,8 +168,9 @@ export default {
       });
       this.filterQuery = {
         orderId: null,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
         status: 0,
         page: 1,
         limit: 20,
@@ -165,7 +184,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      getInvMAOrderList(this.filterQuery).then((res) => {
+      getDeviceReceiveOrderList(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.list = res.data.list || [];
@@ -182,16 +201,30 @@ export default {
         this.total = 0;
       })
     },
+    deptChange() {
+      this.invList = [];
+      this.spaceList = [];
+      this.filterQuery.fromInvCode = null;
+      this.filterQuery.fromInvSpaceCode = null;
+      this.getInvList();
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+        this.getInvList();
+        this.getList();
+      });
+    },
     invChange() {
       this.spaceList = [];
+      this.filterQuery.fromInvSpaceCode = null;
       this.getSpaceList();
-      this.getList();
     },
     getInvList() {
-      getInvListByUser()
+      let params = {deptCode: this.filterQuery.fromDeptCode};
+      findInvByUser(params)
         .then((response) => {
           this.invList = response.data || [];
-          this.getSpaceList();
           this.getList();
         })
         .catch(() => {
@@ -201,17 +234,18 @@ export default {
       let params = {invWarehouseCode: this.filterQuery.invCode};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
+        this.getList();
       })
     },
-    addMAOrder() {
+    addReceiveOrder() {
       this.formVisible = true;
       this.formName = 'add';
-      this.maOrder = {};
+      this.deviceReceiveOrder = {};
     },
     editOrder(row) {
       this.formVisible = true;
       this.formName = 'edit';
-      this.maOrder = row;
+      this.deviceReceiveOrder = row;
     },
     submitAudit(row) {
       let params = {id: row.id};
@@ -227,14 +261,14 @@ export default {
       });
     },
     deleteDialog(rowId) {
-      this.$confirm('此操作将永久删除该养护记录, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         let params = {id: rowId};
         this.loading = true;
-        deleteInvMAOrder(params).then((res) => {
+        deleteDeviceReceiveOrder(params).then((res) => {
           this.loading = false;
           if (res.code === 20000) {
             this.$message.success("删除成功！");
@@ -253,7 +287,7 @@ export default {
     },
   },
   components: {
-    addInvMAOrder
+    deviceReceiveOrderModify
   },
   mounted() {
     document.body.ondrop = function (event) {
@@ -262,7 +296,7 @@ export default {
     };
   },
   created() {
-    this.getInvList();
+    this.getDeptList();
   },
 };
 </script>
diff --git a/src/views/inventory/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue
index 41dc6d25..e49879d3 100644
--- a/src/views/inventory/InvMAOrderAudit.vue
+++ b/src/views/inventory/InvMAOrderAudit.vue
@@ -162,13 +162,13 @@ export default {
         1: "未审核",
         2: "已完成"
       },
-      detailList: [],
-      detailLoading: false,
       detailQuery: {
         orderIdFk: null,
         page: 1,
         limit: 20,
       },
+      detailList: [],
+      detailLoading: false,
       detailTotal: 0
     };
   },
diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue
index c8c72c20..b8bf9d12 100644
--- a/src/views/inventory/InvMAOrderModify.vue
+++ b/src/views/inventory/InvMAOrderModify.vue
@@ -60,7 +60,7 @@
           </el-col>
 
           <el-col :span="10">
-            <el-form-item class="query-form-item" label="养护货位">
+            <el-form-item class="query-form-item" label="养护货位:">
               <el-select v-model="formData.invSpaceCode" placeholder="养护货位信息"
                          :disabled="detailList.length >0 "
                          style="width: 90%"
@@ -193,13 +193,13 @@
     >
       <el-form :inline="true" :model="filterQuery" size="mini">
         <el-row>
-          <el-form-item class="query-form-item">
+          <el-form-item class="query-form-item" label="产品标识DI:">
             <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
           </el-form-item>
-          <el-form-item class="query-form-item">
+          <el-form-item class="query-form-item" label="产品名称:">
             <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" clearable></el-input>
           </el-form-item>
-          <el-form-item class="query-form-item">
+          <el-form-item class="query-form-item" label="批次号:">
             <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
           </el-form-item>
           <el-form-item>