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/basic/product/udiRelevance.js b/src/api/basic/product/udiRelevance.js
index e74c7e3c..e765ac2f 100644
--- a/src/api/basic/product/udiRelevance.js
+++ b/src/api/basic/product/udiRelevance.js
@@ -8,13 +8,6 @@ export function getUdiInfos(query) {
   });
 }
 
-export function getAllUdiInfos(query) {
-  return axios({
-    url: "/udi/udirel/download",
-    method: "get",
-    params: query
-  });
-}
 
 export function getMutiUdiInfos(query) {
   return axios({
diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js
index 7a9037e9..8521c26d 100644
--- a/src/api/basic/udiRelevance.js
+++ b/src/api/basic/udiRelevance.js
@@ -1,188 +1,177 @@
 import axios from "@/utils/request";
 
 export function getUdiInfos(query) {
-    return axios({
-        url: "/udi/udirel/filterUdi",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udi/udirel/filterUdi",
+    method: "get",
+    params: query
+  });
 }
 
-export function getAllUdiInfos(query) {
-    return axios({
-        url: "/udi/udirel/download",
-        method: "get",
-        params: query
-    });
-}
 export function getMutiUdiInfos(query) {
-    return axios({
-        url: "/udi/udirel/mutil/download",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udi/udirel/mutil/download",
+    method: "get",
+    params: query
+  });
 }
 
 
-
 export function getSmUdiInfos(query) {
-    return axios({
-        url: "/udi/udirel/filterSmUdi",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udi/udirel/filterSmUdi",
+    method: "get",
+    params: query
+  });
 }
 
 export function deletetUdiInfos(query) {
-    return axios({
-        url: "/udi/udirel/deleteById",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/deleteById",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function updatetUdiInfos(query) {
-    return axios({
-        url: "/udi/udirel/update",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/update",
+    method: "post",
+    data: query
+  });
 }
 
 
-
-
 export function checkExitUdi(query) {
-    return axios({
-        url: "/udi/udirel/check/udi",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/check/udi",
+    method: "post",
+    data: query
+  });
 }
 
 
-
 export function combineUdi(query) {
-    return axios({
-        url: "/udi/udirel/revleance",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/revleance",
+    method: "post",
+    data: query
+  });
 }
 
 export function combineAllUdi(query) {
-    return axios({
-        url: "/udi/udirel/combineAll",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udi/udirel/combineAll",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function modifyRel(query) {
-    return axios({
-        url: "/udi/udirel/modifyRel",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/modifyRel",
+    method: "post",
+    data: query
+  });
 }
 
 export function addErp(query) {
-    return axios({
-        url: "/udi/udirel/addErp",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/addErp",
+    method: "post",
+    data: query
+  });
 }
 
 export function addAllErp(query) {
-    return axios({
-        url: "/udi/udirel/addAllErp",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/addAllErp",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function updateErpProduct(query) {
-    return axios({
-        url: "/udi/udirel/updateErp",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udi/udirel/updateErp",
+    method: "get",
+    params: query
+  });
 }
 
 export function uploadSmp(query) {
-    return axios({
-        url: "/udiwms/smp/udirl/upload",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/smp/udirl/upload",
+    method: "post",
+    data: query
+  });
 }
 
 export function disableUdi(query) {
-    return axios({
-        url: "/udi/udirel/disable",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/disable",
+    method: "post",
+    data: query
+  });
 }
 
 export function thirdSysDetail(query) {
-    return axios({
-        url: "/udiwms/udirel/thirdSys/detail",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/udirel/thirdSys/detail",
+    method: "get",
+    params: query
+  });
 }
 
 export function removeRl(query) {
-    return axios({
-        url: "/udiwms/udirl/thirdSys/remove",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/udirl/thirdSys/remove",
+    method: "get",
+    params: query
+  });
 }
 
 export function removeDiRl(query) {
-    return axios({
-        url: "/udiwms/udirl/di/remove",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/udirl/di/remove",
+    method: "get",
+    params: query
+  });
 }
 
 export function sysFilter(query) {
-    return axios({
-        url: "/udiwms/udirel/thirdSys/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/udirel/thirdSys/filter",
+    method: "get",
+    params: query
+  });
 }
 
 export function spcombie(query) {
-    return axios({
-        url: "/udiwms/udiinfo/spcombie",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/udiinfo/spcombie",
+    method: "get",
+    params: query
+  });
 }
 
 export function lockStatus(query) {
-    return axios({
-        url: "/udiwms/udirl/lock/status",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/udirl/lock/status",
+    method: "post",
+    data: query
+  });
 }
 
 export function changeVersion(query) {
-    return axios({
-        url: "/udi/udirel/changeVersion",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udi/udirel/changeVersion",
+    method: "post",
+    data: query
+  });
 }
 
 
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 82260f7f..4c6dbf60 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -41,6 +41,20 @@ export function submitOrderWeb(query) {
     data: query
   });
 }
+export function submitCodes(query) {
+  return axios({
+    url: "/warehouse/inout/submitCodes",
+    method: "post",
+    data: query
+  });
+}
+export function submitBiz(query) {
+  return axios({
+    url: "/warehouse/inout/submitBiz",
+    method: "post",
+    data: query
+  });
+}
 
 
 export function saveOrderWeb(query) {
diff --git a/src/api/inventory/deviceMAOrder.js b/src/api/inventory/deviceMAOrder.js
new file mode 100644
index 00000000..1f70683d
--- /dev/null
+++ b/src/api/inventory/deviceMAOrder.js
@@ -0,0 +1,91 @@
+import axios from "../../utils/request";
+
+export function getDeviceMAOrderList(params) {
+    return axios({
+        url: "/device/MA/order/filterList",
+        method: "get",
+        params: params
+    });
+}
+
+export function addDeviceMAOrder(data) {
+    return axios({
+        url: "/device/MA/order/addMAOrder",
+        method: "post",
+        data: data
+    });
+}
+
+export function updateDeviceMAOrder(data) {
+    return axios({
+        url: "/device/MA/order/updateMAOrder",
+        method: "post",
+        data: data
+    });
+}
+
+export function deleteDeviceMAOrder(data) {
+    return axios({
+        url: "/device/MA/order/deleteMAOrder",
+        method: "post",
+        data: data
+    });
+}
+
+export function getDeviceMAOrderDetailList(params) {
+    return axios({
+        url: "/device/MA/order/detail/filterList",
+        method: "get",
+        params: params
+    });
+}
+
+export function addDeviceMAOrderDetail(data) {
+    return axios({
+        url: "/device/MA/order/detail/addOrderDetail",
+        method: "post",
+        data: data
+    });
+}
+
+export function updateDeviceMAOrderDetail(data) {
+    return axios({
+        url: "/device/MA/order/detail/updateOrderDetail",
+        method: "post",
+        data: data
+    });
+}
+
+export function deleteDeviceMAOrderDetail(data) {
+    return axios({
+        url: "/device/MA/order/detail/deleteOrderDetail",
+        method: "post",
+        data: data
+    });
+}
+
+export function verifyTemplateFile(data) {
+    return axios({
+        url: "/device/MA/order/verifyTemplateFile",
+        method: "post",
+        data: data
+    });
+}
+
+export function printOrder(data) {
+    return axios({
+        url: "/device/MA/order/pintOrder",
+        method: "post",
+        data: data,
+        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+    });
+}
+
+export function filterDetail(params) {
+  return axios({
+    url: "/device/MA/order/detail/filterMAOrderDetail",
+    method: "get",
+    params: params
+  });
+}
diff --git a/src/api/inventory/deviceReceiveOrder.js b/src/api/inventory/deviceReceiveOrder.js
new file mode 100644
index 00000000..4d06aed4
--- /dev/null
+++ b/src/api/inventory/deviceReceiveOrder.js
@@ -0,0 +1,91 @@
+import axios from "../../utils/request";
+
+export function getDeviceReceiveOrderList(params) {
+    return axios({
+        url: "/device/receive/order/filterList",
+        method: "get",
+        params: params
+    });
+}
+
+export function addDeviceReceiveOrder(data) {
+    return axios({
+        url: "/device/receive/order/addOrder",
+        method: "post",
+        data: data
+    });
+}
+
+export function updateDeviceReceiveOrder(data) {
+    return axios({
+        url: "/device/receive/order/update",
+        method: "post",
+        data: data
+    });
+}
+
+export function submitAudit(data) {
+    return axios({
+        url: "/device/receive/order/submitAudit",
+        method: "post",
+        data: data
+    });
+}
+
+export function updateDeviceReceiveOrderStatus(data) {
+    return axios({
+        url: "/device/receive/order/updateStatus",
+        method: "post",
+        data: data
+    });
+}
+
+export function deleteDeviceReceiveOrder(data) {
+    return axios({
+        url: "/device/receive/order/delete",
+        method: "post",
+        data: data
+    });
+}
+
+export function getDeviceReceiveOrderDetailList(params) {
+    return axios({
+        url: "/device/receive/order/detail/filterList",
+        method: "get",
+        params: params
+    });
+}
+
+export function checkCode(params) {
+    return axios({
+        url: "/device/receive/order/detail/checkCode",
+        method: "get",
+        params: params
+    });
+}
+
+export function addDeviceReceiveOrderDetail(data) {
+    return axios({
+        url: "/device/receive/order/detail/addOrderDetail",
+        method: "post",
+        data: data
+    });
+}
+
+export function updateDeviceReceiveOrderDetail(data) {
+    return axios({
+        url: "/device/receive/order/detail/updateOrderDetail",
+        method: "post",
+        data: data
+    })
+}
+
+export function deleteDeviceReceiveOrderDetail(data) {
+    return axios({
+        url: "/device/receive/order/detail/deleteOrderDetail",
+        method: "post",
+        data: data
+    });
+}
+
+
diff --git a/src/api/inventory/invCountCodes.js b/src/api/inventory/invCountCodes.js
new file mode 100644
index 00000000..880f8ff5
--- /dev/null
+++ b/src/api/inventory/invCountCodes.js
@@ -0,0 +1,33 @@
+import axios from "../../utils/request";
+
+export function getCountCodesList(params) {
+    return axios({
+        url: "/inv/count/codes/filter",
+        method: "get",
+        params: params
+    });
+}
+
+export function deleteCode(data) {
+    return axios({
+        url: "/inv/count/codes/deleteCode",
+        method: "post",
+        data: data
+    });
+}
+
+export function addCode(data) {
+    return axios({
+        url: "/inv/count/codes/addCode",
+        method: "post",
+        data: data
+    });
+}
+
+export function getCodesNum(params) {
+    return axios({
+        url: "/inv/count/codes/getCountOrderCodesNum",
+        method: "get",
+        params: params
+    });
+}
diff --git a/src/api/inventory/invCountOrder.js b/src/api/inventory/invCountOrder.js
new file mode 100644
index 00000000..98dd2499
--- /dev/null
+++ b/src/api/inventory/invCountOrder.js
@@ -0,0 +1,83 @@
+import axios from "../../utils/request";
+
+export function getCountOrderList(params) {
+  return axios({
+    url: "/inv/count/order/filter",
+    method: "get",
+    params: params
+  });
+}
+
+export function deleteCountOrder(data) {
+  return axios({
+    url: "/inv/count/order/delete",
+    method: "post",
+    data: data
+  });
+}
+
+export function getCountOrderDetailList(params) {
+  return axios({
+    url: "/inv/count/order/detail/filter",
+    method: "get",
+    params: params
+  });
+}
+
+export function saveCountOrder(data) {
+  return axios({
+    url: "/inv/count/order/saveCountOrder",
+    method: "post",
+    data: data
+  });
+}
+
+export function submitAudit(params) {
+  return axios({
+    url: "/inv/count/order/submitAudit",
+    method: "get",
+    params: params
+  });
+}
+
+export function deleteCountOrderDetail(data) {
+  return axios({
+    url: "/inv/count/order/detail/deleteOrderDetail",
+    method: "post",
+    data: data
+  });
+}
+
+export function addCountOrderDetail(data) {
+  return axios({
+    url: "/inv/count/order/detail/addCountOrderDetail",
+    method: "post",
+    data: data
+  });
+}
+
+export function updateCountOrderStatus(data) {
+  return axios({
+    url: "/inv/count/order/updateCountOrderStatus",
+    method: "post",
+    data: data
+  });
+}
+
+export function verifyTemplateFile(data) {
+  return axios({
+    url: "/inv/count/order/verifyTemplateFile",
+    method: "post",
+    data: data
+  });
+}
+
+export function printOrder(data) {
+  return axios({
+    url: "/inv/count/order/printOrder",
+    method: "post",
+    data: data,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
+}
diff --git a/src/api/inventory/invMAOrder.js b/src/api/inventory/invMAOrder.js
new file mode 100644
index 00000000..2cb82490
--- /dev/null
+++ b/src/api/inventory/invMAOrder.js
@@ -0,0 +1,89 @@
+import axios from "../../utils/request";
+
+export function getInvMAOrderList(params) {
+  return axios({
+    url: "/inv/MA/order/filterList",
+    method: "get",
+    params: params
+  });
+}
+
+export function addInvMAOrder(data) {
+  return axios({
+    url: "/inv/MA/order/addOrder",
+    method: "post",
+    data: data
+  });
+}
+
+export function updateInvMAOrder(data) {
+  return axios({
+    url: "/inv/MA/order/update",
+    method: "post",
+    data: data
+  });
+}
+
+export function submitAudit(data) {
+  return axios({
+    url: "/inv/MA/order/submitAudit",
+    method: "post",
+    data: data
+  });
+}
+
+export function updateStatus(data) {
+  return axios({
+    url: "/inv/MA/order/updateStatus",
+    method: "post",
+    data: data
+  });
+}
+
+export function deleteInvMAOrder(data) {
+  return axios({
+    url: "/inv/MA/order/delete",
+    method: "post",
+    data: data
+  });
+}
+
+export function getInvMAOrderDetailList(params) {
+  return axios({
+    url: "/inv/MA/order/detail/filterList",
+    method: "get",
+    params: params
+  });
+}
+
+export function addInvMAOrderDetail(data) {
+  return axios({
+    url: "/inv/MA/order/detail/addOrderDetail",
+    method: "post",
+    data: data
+  });
+}
+
+export function batchAddDetail(data) {
+  return axios({
+    url: "/inv/MA/order/detail/batchAddDetail",
+    method: "post",
+    data: data
+  });
+}
+
+export function deleteInvMAOrderDetail(data) {
+  return axios({
+    url: "/inv/MA/order/detail/delete",
+    method: "post",
+    data: data
+  });
+}
+
+export function updateInvMAOrderDetail(data) {
+  return axios({
+    url: "/inv/MA/order/detail/update",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/inventory/invPorduct.js b/src/api/inventory/invPorduct.js
index 4ae60bda..9c5c5ec8 100644
--- a/src/api/inventory/invPorduct.js
+++ b/src/api/inventory/invPorduct.js
@@ -31,3 +31,19 @@ export function stockStatistics(params) {
     params: params
   });
 }
+
+export function getInvMAProducts(params) {
+  return axios({
+    url: "/spms/inv/product/getInvMAProducts",
+    method: "get",
+    params: params
+  });
+}
+
+export function getCountInvProductProduct(params) {
+  return axios({
+    url: "spms/inv/products/getCountInvProduct",
+    method: "get",
+    params: params
+  });
+}
diff --git a/src/views/basic/corpMaintain/corpMaintainSelect.vue b/src/views/basic/corpMaintain/corpMaintainSelect.vue
index b83c8b05..ce1fd3ec 100644
--- a/src/views/basic/corpMaintain/corpMaintainSelect.vue
+++ b/src/views/basic/corpMaintain/corpMaintainSelect.vue
@@ -96,8 +96,8 @@ export default {
             getBasicUnitMaintains(this.query)
                 .then((response) => {
                     this.loading = false;
-                    this.list = response.data.page.list || [];
-                    this.total = response.data.page.total || 0;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
                 })
                 .catch(() => {
                     this.loading = false;
@@ -112,7 +112,7 @@ export default {
         },
 
         handleCurrentChange(val) {
-            this.query.page = val;
+            this.query.page = val.page;
             this.getList();
         },
         combine() {
@@ -124,6 +124,7 @@ export default {
         },
     },
     created() {
+      this.getList()
     },
 };
 </script>
diff --git a/src/views/basic/product/UdiinfoSelectVersion.vue b/src/views/basic/product/UdiinfoSelectVersion.vue
index 174a33f9..a268d020 100644
--- a/src/views/basic/product/UdiinfoSelectVersion.vue
+++ b/src/views/basic/product/UdiinfoSelectVersion.vue
@@ -45,7 +45,7 @@
             show-overflow-tooltip
           ></el-table-column>
 
-          <el-table-column label="操作" fixed="right">
+          <el-table-column label="操作" >
             <template slot-scope="scope">
               <el-button
                 type="text"
diff --git a/src/views/basic/product/basicCompanyProductsImport.vue b/src/views/basic/product/basicCompanyProductsImport.vue
index 661c1fd6..1d5a891f 100644
--- a/src/views/basic/product/basicCompanyProductsImport.vue
+++ b/src/views/basic/product/basicCompanyProductsImport.vue
@@ -437,7 +437,9 @@ export default {
             var selectData = this.multipleSelection;
             selectData.forEach((obj) => {
                 this.filterQuery.rlIds.push(obj.id);
+                 this.filterQuery.nameCode=obj.nameCode;
             });
+
             this.filterQuery.unitFk = this.unitFk;
             this.allExport();
 
@@ -610,7 +612,6 @@ export default {
     },
     components: {},
     created() {
-
         this.getList();
         this.selectSysParam();
     },
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 5fd2409c..40af1a38 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -247,7 +247,7 @@
             ></el-table-column>
             <el-table-column
               label="包装层级"
-              prop="bzcj"
+              prop="packUnit"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column label="操作" width="180px">
@@ -1617,9 +1617,11 @@ export default {
       this.selectVersionVisible = false;
     },
     onAddSubmit(relSubmit) {
-      this.relevanceEdit = this.editQuery;
-      this.relevanceEdit.relSubmit = relSubmit;
-      updatetUdiInfos(this.relevanceEdit)
+      // debugger
+      // this.editFormat;
+     // this.relevanceEdit = this.editQuery;
+      this.editFormat.relSubmit = relSubmit;
+      updatetUdiInfos(this.editFormat)
         .then((response) => {
           if (response.code == 20000) {
             this.getList();
diff --git a/src/views/basic/product/udIInfoSelect.vue b/src/views/basic/product/udIInfoSelect.vue
index 34b0c448..3e7ded5f 100644
--- a/src/views/basic/product/udIInfoSelect.vue
+++ b/src/views/basic/product/udIInfoSelect.vue
@@ -262,6 +262,7 @@ import {udiUpload} from "@/api/thrsys/smp"
 import {exportExcel} from "@/api/basic/udiInfoExport"
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {filterByUuid} from "@/api/basic/udiInfo";
+import {sysFilter} from "@/api/basic/product/udiRelevance";
 
 
 export default {
@@ -318,6 +319,18 @@ export default {
     },
 
     methods: {
+      getSysFilter() {
+        sysFilter()
+          .then((response) => {
+            this.loading = false;
+            this.filterList = response.data.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.filterList = [];
+          });
+
+      },
         onReset() {
             this.$router.push({
                 path: "",
@@ -353,6 +366,7 @@ export default {
                     this.list = [];
                     this.total = 0;
                 });
+
         },
 
         getDetailList(detailQuery) {
@@ -557,6 +571,7 @@ export default {
     },
     components: {},
     created() {
+      this.getSysFilter();
         this.getList();
         this.selectSysParam();
     },
diff --git a/src/views/inout/DialogSelectInv.vue b/src/views/inout/DialogSelectInv.vue
new file mode 100644
index 00000000..e747c9a9
--- /dev/null
+++ b/src/views/inout/DialogSelectInv.vue
@@ -0,0 +1,152 @@
+<template>
+    <el-form :model="userInfo">
+        <el-row :gutter="20">
+
+            <el-col :span="6">
+                <div class="ao-text">
+                    <span>当前仓库：</span>
+                </div>
+            </el-col>
+
+            <el-col :span="16">
+                <el-form-item prop="locStorageCode">
+                    <el-select v-model="userInfo.locInvCode" placeholder="当前仓库信息" clearable
+                               @change="locCHange"
+                    >
+                        <el-option
+
+                            v-for="item in storageList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row :gutter="20">
+            <el-col :span="6">
+                <div class="ao-text">
+                    <span>当前分库：</span>
+                </div>
+            </el-col>
+            <el-col :span="16">
+                <el-form-item prop="locInvCode">
+                    <el-select v-model="userInfo.locSubInvCode" placeholder="当前分库信息" clearable
+                    >
+                        <el-option
+
+                            v-for="item in subInvList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+            <el-button type="primary" @click="submitInv">提交</el-button>
+            <el-button type="primary" @click="closeDG">取消</el-button>
+        </div>
+    </el-form>
+
+</template>
+
+<script>
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {updateInv} from "@/api/auth/authAdmin";
+
+export default {
+    name: "DialogSelectInv",
+    props: {
+        billData: {
+            type: Object,
+            required: true,
+        },
+        closeInvDialog: {
+            type: Function,
+            required: true,
+        },
+
+        closeSubmitDialog:{
+            type: Function,
+            required: true,
+        }
+    },
+
+    data() {
+        return {
+            userInfo: {
+                locInvCode: this.$store.getters.locInvCode,
+                locSubInvCode: this.$store.getters.locSubInvCode,
+            },
+            storageList: [],
+            subInvList: [],
+        }
+    },
+    methods: {
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    this.findSubInvByInv();
+                })
+                .catch(() => {
+                });
+        },
+        findSubInvByInv() {
+            this.subInvList = [];
+            let query = {
+                pcode: this.userInfo.locInvCode,
+                filter:3
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.userInfo.locSubInvCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        locCHange() {
+
+            if (this.$isNotBlank(this.userInfo.locSubInvCode)) {
+                this.userInfo.locSubInvCode = "";
+            }
+            this.findSubInvByInv();
+        },
+
+        submitInv() {
+            if (this.$isBlank(this.userInfo.locInvCode)) {
+                this.$message.error("当前仓库不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.userInfo.locSubInvCode)) {
+                this.$message.error("当前分库不能为空！");
+                return;
+            }
+
+            this.billData.locStorageCode = this.userInfo.locInvCode;
+            this.billData.invWarehouseCode = this.userInfo.locSubInvCode;
+            this.closeSubmitDialog();
+        },
+        closeDG() {
+            this.closeInvDialog();
+        },
+    },
+    created() {
+        this.getStorage();
+    },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
new file mode 100644
index 00000000..8481063a
--- /dev/null
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -0,0 +1,391 @@
+<template>
+    <div>
+        <el-card class="el-card" style="margin-top: -15px">
+            <div>
+                <el-form :inline="true" :model="listQuery" style="display: flex;" size="mini">
+                    <el-row>
+                        <el-form-item class="query-form-item">
+                            <el-input
+                                v-model="listQuery.billNo"
+                                placeholder="单据号"
+                                clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input
+                                v-model="listQuery.corpName"
+                                placeholder="往来单位"
+                                clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-select v-model="listQuery.billAction" placeholder="请选择领用类型" clearable="true">
+                                <el-option
+                                    v-for="item in originTypes"
+                                    :key="item.originAction"
+                                    :label="item.originName"
+                                    :value="item.originAction">
+                                    <span style="float: left;font-size: 13px">{{ item.originAction }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                                            item.originName
+                                        }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px"
+                        >单据日期:</span
+                        >
+                            <el-date-picker
+                                :picker-options="pickerOptions"
+                                v-model="actDateRange"
+                                type="daterange"
+                                format="yyyy 年 MM 月 dd 日"
+                                value-format="yyyy-MM-dd"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                        <el-form-item style="display: flex">
+                            <el-button-group>
+                                <el-button
+                                    type="primary"
+                                    icon="el-icon-refresh"
+                                    @click="onReset"
+                                ></el-button>
+                                <el-button type="primary" icon="search" @click="submitFind">查询</el-button>
+                                <el-button type="primary" icon="search" @click="combine"
+                                >确定
+                                </el-button
+                                >
+                            </el-button-group>
+                        </el-form-item>
+                    </el-row>
+                    <el-row>
+
+                    </el-row>
+
+                </el-form>
+                <el-table
+                    :data="dataList"
+                    style="width: 100%"
+                    highlight-current-row="true"
+                    v-loading="loading"
+                    :row-class-name="tableRowClassName"
+                    @current-change="handleChange"
+                >
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column label="单据号" prop="billNo"></el-table-column>
+                    <el-table-column label="往来单位" prop="corpName" width="300"
+                                     show-overflow-tooltip="true"></el-table-column>
+                    <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
+                    <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
+                    <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                </el-table>
+                <el-pagination
+                    :page-size="listQuery.limit"
+                    @current-change="handleErpPageChange"
+                    layout="prev, pager, next"
+                    :total="pageTotal"
+                    :current-page="listQuery.page"
+                ></el-pagination>
+            </div>
+        </el-card>
+
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+                <el-table-column label="序号" type="index" width="120"></el-table-column>
+                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <el-table-column label="单据数量" prop="count"></el-table-column>
+            </el-table>
+        </el-card>
+
+
+        <el-dialog
+            v-if="storageVisible"
+            title="请选择单据所属仓库信息"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            :visible.sync="storageVisible">
+
+            <selectInvDialog
+                :closeInvDialog="closeInvDialog"
+                :billData="currentRow"
+                :closeSubmitDialog="closeSubmitDialog"
+            ></selectInvDialog>
+
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {addReceiveOrder, addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
+import store from "../../store";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+
+import selectInvDialog from "./DialogSelectInv";
+import {getReceiveOrder} from "@/api/inout/receiveOrder";
+import {getBusChange} from "@/api/basic/busTypeChange";
+
+export default {
+    name: "closeDialog",
+    props: {
+        data: {
+            type: Object,
+            required: true,
+        },
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+    },
+
+    data() {
+        return {
+            listQuery: {
+                billNo: "",
+                thirdSysFk: "",
+                billAction: null,
+                originType: null,
+                page: 1,
+                limit: 10,
+                type: 1,
+                editStatus: 2,
+                allocateStatus: 0,
+                customerId: null,
+            },
+            detailList: [],
+            storageVisible: false,
+            dataList: [],
+            pageTotal: 1,
+            total: 1,
+            currentRow: null,
+            curLocInv: null,
+            loading: false,
+            multipleUdiSelection: [],
+            thirdSys: [],
+            thirdSysFk: null,
+            originTypes: [],
+            storageList: [],
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+        };
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.listQuery = {
+                billNo: "",
+                corpName: null,
+                billAction: null,
+                type: 1,
+                editStatus: 2,
+                page: 1,
+                allocateStatus: 0,
+                limit: 10,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
+        tableRowClassName({row}) {
+            if (row.checked) return "warning-row";
+            return "";
+        },
+        checkSelectable(row) {
+            return !row.check;
+        },
+        handleCurrentChange(val) {
+            this.unionQuery.page = val;
+            this.getList();
+        },
+        handleChange(val) {
+            this.currentRow = val;
+            this.detailList = val.subErpOrders;
+        },
+        handleErpPageChange(val) {
+            this.listQuery.page = val;
+            this.getList();
+        },
+        keyup_submit(event) {
+            this.getList();
+            event.target.select();
+        },
+        getList() {
+            this.loading = true;
+            if (this.actDateRange !== null) {
+                this.listQuery.startDate = this.actDateRange[0];
+                this.listQuery.endDate = this.actDateRange[1];
+            } else {
+                this.listQuery.startDate = null;
+                this.listQuery.endDate = null;
+            }
+            this.listQuery.customerId = store.getters.customerId;
+            getReceiveOrder(this.listQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.loading = false;
+                    if (response.code === 20000) {
+                        this.dataList = response.data.list || [];
+                        this.pageTotal = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                        this.dataList = [];
+                        this.pageTotal = 0;
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.dataList = [];
+                    this.pageTotal = 0;
+                });
+        },
+        intentBack() {
+            this.closeDialog();
+        },
+        combine() {
+            if (this.$isBlank(this.currentRow.id)) {
+                return;
+            }
+            this.curLocInv = this.currentRow.locStorageCode;
+            if (this.$isBlank(this.curLocInv)) {
+                this.storageVisible = true;
+            } else {
+                let tQuery = {
+                    id: this.currentRow.id,
+                    locStorageCode: this.curLocInv,
+                    invWarehouseCode: this.currentRow.invWarehouseCode,
+                }
+                addReceiveOrder(tQuery)
+                    .then((response) => {
+                        if (response.code === 20000) {
+                            this.closeDialog();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                    });
+            }
+        },
+        submitFind() {
+            this.listQuery.page = 1;
+            this.getList();
+        },
+        selectStorage(row) {
+            this.curLocInv = row.code;
+            let tQuery = {
+                id: this.currentRow.id,
+                locStorageCode: this.curLocInv,
+            }
+            addStockOrder(tQuery)
+                .then((response) => {
+                    if (response.code === 20000) {
+                        this.storageVisible = false;
+                        this.closeDialog();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        handleSelectionUdiChange(val) {
+            console.log("----" + val);
+            this.multipleUdiSelection = val;
+        },
+        getBusType() {
+            let query = {
+                enabled: false,
+            };
+            getBusChange(query)
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
+        getStorage(event) {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList.length == 1) {
+                        this.curLocInv = this.storageList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+
+        closeInvDialog() {
+            this.storageVisible = false;
+        },
+
+        closeSubmitDialog() {
+            this.storageVisible = false;
+            this.combine();
+        },
+    },
+    created() {
+        this.getBusType();
+        this.getStorage();
+        this.getList();
+    },
+    components: {selectInvDialog}
+
+};
+</script>
+
+<style scoped>
+
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
+</style>
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index f82dde29..c73eb67e 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -489,7 +489,7 @@
 
 <script>
 import {
-  getUdiInfos, getAllUdiInfos,
+  getUdiInfos,
   deletetUdiInfos,
   thirdSysDetail,
   removeRl, sysFilter, getMutiUdiInfos
diff --git a/src/views/inout/DialogSelectThrOrder.vue b/src/views/inout/DialogSelectThrOrder.vue
new file mode 100644
index 00000000..76ab0345
--- /dev/null
+++ b/src/views/inout/DialogSelectThrOrder.vue
@@ -0,0 +1,384 @@
+<template>
+  <div>
+    <el-card class="el-card" style="margin-top: -15px">
+      <div>
+        <el-form :inline="true" :model="listQuery" style="display: flex;" size="mini">
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input
+                v-model="listQuery.billNo"
+                placeholder="单据号"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input
+                v-model="listQuery.corpName"
+                placeholder="往来单位"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
+                <el-option
+                  v-for="item in originTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                      item.thirdSysName
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px"
+                        >单据日期:</span
+                        >
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item style="display: flex">
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  @click="onReset"
+                ></el-button>
+                <el-button type="primary" icon="search" @click="submitFind">查询</el-button>
+                <el-button type="primary" icon="search" @click="combine"
+                >确定
+                </el-button
+                >
+              </el-button-group>
+            </el-form-item>
+          </el-row>
+        </el-form>
+        <el-table
+          :data="dataList"
+          style="width: 100%"
+          highlight-current-row="true"
+          v-loading="loading"
+          border
+          :row-class-name="tableRowClassName"
+          @current-change="handleChange"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="单据号" prop="billNo"></el-table-column>
+          <el-table-column label="往来单位" prop="corpName" width="300"
+                           show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="单据类型" prop="billType"></el-table-column>
+          <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
+          <el-table-column label="单据日期" prop="billdate"></el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="listQuery.limit"
+          @current-change="handleErpPageChange"
+          layout="prev, pager, next"
+          :total="pageTotal"
+          :current-page="listQuery.page"
+        ></el-pagination>
+      </div>
+    </el-card>
+
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="产品编码" prop="productId"></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+      </el-table>
+    </el-card>
+
+
+    <el-dialog
+      v-if="storageVisible"
+      title="请选择单据所属仓库信息"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      :visible.sync="storageVisible">
+
+      <selectInvDialog
+        :closeInvDialog="closeInvDialog"
+        :billData="currentRow"
+        :closeSubmitDialog="closeSubmitDialog"
+      ></selectInvDialog>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
+import store from "../../store";
+import {getOriginBusType} from "@/api/basic/busOriginType";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import selectInvDialog from "./DialogSelectInv";
+
+export default {
+  name: "closeDialog",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      listQuery: {
+        billNo: "",
+        thirdSysFk: "",
+        billAction: null,
+        originType: null,
+        page: 1,
+        limit: 10,
+        allocateStatus: 0,
+        type: 0,
+        customerId: null,
+      },
+      detailList: [],
+      storageVisible: false,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      curLocInv: null,
+      loading: false,
+      multipleUdiSelection: [],
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      originTypes: [],
+      storageList: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.listQuery = {
+        billNo: "",
+        corpName: null,
+        billAction: null,
+        page: 1,
+        limit: 10,
+        allocateStatus: 0,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      this.currentRow = val;
+      this.detailList = val.subErpOrders;
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.getList();
+      event.target.select();
+    },
+    getList() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.listQuery.startDate = this.actDateRange[0];
+        this.listQuery.endDate = this.actDateRange[1];
+      } else {
+        this.listQuery.startDate = null;
+        this.listQuery.endDate = null;
+      }
+      this.listQuery.customerId = store.getters.customerId;
+      getCloudErp(this.listQuery)
+        .then((response) => {
+          console.log(response)
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
+    combine() {
+      if (this.$isBlank(this.currentRow.id)) {
+        return;
+      }
+      this.curLocInv = this.currentRow.locStorageCode;
+      if (this.$isBlank(this.curLocInv)) {
+        this.storageVisible = true;
+      } else {
+        let tQuery = {
+          id: this.currentRow.id,
+          locStorageCode: this.curLocInv,
+          invWarehouseCode: this.currentRow.invWarehouseCode,
+        }
+        addStockOrder(tQuery)
+          .then((response) => {
+            if (response.code === 20000) {
+              this.closeDialog();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
+      }
+    },
+    submitFind() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    selectStorage(row) {
+      this.curLocInv = row.code;
+      let tQuery = {
+        id: this.currentRow.id,
+        locStorageCode: this.curLocInv,
+      }
+      addStockOrder(tQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.storageVisible = false;
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+    handleSelectionUdiChange(val) {
+      console.log("----" + val);
+      this.multipleUdiSelection = val;
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getOriginBusType(query)
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    getStorage(event) {
+      this.storageList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.storageList = response.data || [];
+          if (this.storageList.length == 1) {
+            this.curLocInv = this.storageList[0].code;
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+
+    closeInvDialog() {
+      this.storageVisible = false;
+    },
+
+    closeSubmitDialog() {
+      this.storageVisible = false;
+      this.combine();
+    },
+  },
+  created() {
+    this.getBusType();
+    this.getStorage();
+    this.getList();
+  },
+  components: {selectInvDialog}
+
+};
+</script>
+
+<style scoped>
+
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
+</style>
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 57733a86..177a11fd 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -132,7 +132,6 @@
             >打印
             </el-button
             >
-
             <el-button
               type="text"
               size="small"
@@ -875,6 +874,7 @@ export default {
         }
       }
     });
+    this.getList();
   },
 };
 </script>
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index d12f8669..d5a4e9da 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -1,17 +1,21 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form :model="filterQuery"
+               :rules="rules"
+               ref="form"
+               class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="单号:">
+            <el-form-item class="query-form-item" label="单号:" prop="billNo">
               <el-input v-model="filterQuery.billNo" placeholder="单号"
                         style="width: 90%"
+                        prop="noticeTitle"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="出入库类型:">
+            <el-form-item class="query-form-item" label="出入库类型:" prop="mainAction">
               <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
                 <el-option label="全部" value=""></el-option>
                 <el-option label="入库" value="WareHouseIn"></el-option>
@@ -20,7 +24,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="单据类型:">
+            <el-form-item class="query-form-item" label="单据类型:" prop="action">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%"
                          clearable>
@@ -37,7 +41,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="所属仓库:">
+            <el-form-item class="query-form-item" label="所属仓库:" prop="invCode">
               <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
                          @change="invChange"
@@ -84,6 +88,13 @@
           </el-button
           >
           <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+
+          <el-button type="primary" icon="el-icon-bottom-left" @click="selectThrOrderFunction()"
+                     :loading="loading">选入第三方单据
+          </el-button>
+          <el-button type="primary" icon="el-icon-bottom-left" @click="selectReceive()"
+                     :loading="loading">选入领用单据
+          </el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -164,6 +175,35 @@
           :viewType="viewType"
         ></addOrder>
       </el-dialog>
+
+
+      <el-dialog
+        title="选入第三方单据"
+        :visible.sync="selectThrOrderVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectThrOrderVisible"
+      >
+        <selectThrOrder
+          :closeDialog="closeDialog"
+          :data="thisData"
+        ></selectThrOrder>
+      </el-dialog>
+      <el-dialog
+        title="选入领用单据"
+        :visible.sync="selectReceiveVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectReceiveVisible"
+      >
+        <selectReceiveOrderDialog
+          :closeDialog="closeDialog"
+          :data="thisData"
+        ></selectReceiveOrderDialog>
+      </el-dialog>
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -186,6 +226,10 @@ import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
+import selectThrOrder from "./DialogSelectThrOrder";
+import selectReceiveOrderDialog from "./DialogSelectReceiveOrder";
+
+
 export default {
   name: "IoCreateBusOrder",
   data() {
@@ -202,7 +246,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "newOrder",
+        statusType: "new_biz",
         page: 1,
         limit: 10,
         startTime: null,
@@ -288,12 +332,15 @@ export default {
           },
         ],
       },
-      viewType: 2,
+      viewType: 1,
+      thisData: {},
+      selectThrOrderVisible: false,
+      selectReceiveVisible: false,
     };
   },
 
   components: {
-    addOrder,
+    addOrder, selectThrOrder, selectReceiveOrderDialog
   },
   methods: {
     onReset() {
@@ -302,7 +349,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "newOrder",
+        statusType: "new_biz",
         page: 1,
         limit: 10,
         startTime: null,
@@ -452,6 +499,16 @@ export default {
       return statusMap[status];
     },
 
+
+    selectThrOrderFunction() {
+      this.selectThrOrderVisible = true;
+    },
+
+    selectReceive() {
+      this.selectReceiveVisible = true;
+    },
+
+
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
new file mode 100644
index 00000000..ed379268
--- /dev/null
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -0,0 +1,480 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单号:">
+              <el-input v-model="filterQuery.billNo" placeholder="单号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+                         @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-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <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-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName">
+        </el-table-column>
+        <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源" prop="fromType">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="往来单位" prop="fromCorpName" width="220">
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="校验状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <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="deleteDialog(scope.row.billNo)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status == 1"
+              @click.native.stop="onUpload(scope.row.billNo)"
+            >立即提交
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog
+        :title="titleMap[title]"
+        :visible.sync="addOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addOrderVisible"
+        @close='closeDialog'
+      >
+        <addOrder
+          :closeDialog="closeDialog"
+          :orderQuery="idQuery"
+          :viewType="viewType"
+        ></addOrder>
+      </el-dialog>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  getOrderList, submitCodes
+} from "../../api/inout/order";
+import addOrder from "./IoCreateOrder";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+
+export default {
+  name: "IoCreateScanOrder",
+  data() {
+    return {
+      showSearch: true,
+      titleMap: {
+        add: "新增单据",
+        edit: "编辑单据",
+      },
+      title: "add",
+
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "processedError",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "校验成功",
+        6: "校验异常",
+        7: "审核通过",
+        8: "审核拒绝",
+        9: "正在处理"
+      },
+      curIndex: "",
+      idQuery: {},
+      storageList: [],
+      invList: [],
+      list: [],
+      addOrderVisible: false,
+      total: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点"
+      },
+      deleteData: {
+        billNo: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      deleteLoading: false,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      viewType: 2,
+    };
+  },
+
+  components: {
+    addOrder,
+  },
+  methods: {
+    onReset() {
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "scan_code",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.action = this.busTypes[0].action;
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    addOrders() {
+      this.idQuery = {};
+      this.title = "add";
+      this.addOrderVisible = true;
+    },
+
+    editOrder(row) {
+      this.idQuery = row;
+      this.title = "edit";
+      this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data;
+      deleteByOrderId(this.deleteData)
+        .then((response) => {
+
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(rowId);
+        })
+        .catch(() => {
+        });
+    },
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        billNo: "",
+      };
+      idQuery.billNo = data;
+      submitCodes(idQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    invChange() {
+      this.filterQuery.action = null;
+      this.getBusType();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+    this.getBusType();
+    let query = this.$route.query;
+    this.filterQuery = Object.assign(this.filterQuery, query);
+    this.filterQuery.limit = parseInt(this.filterQuery.limit);
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index fd621bf8..26418bcf 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -161,7 +161,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="viewType!=1">
           <el-col :span="20">
             <el-form-item prop="code" label="扫码录入:">
               <el-input
@@ -191,16 +191,19 @@
     <el-tabs type="border-card" style="margin: 5px">
       <el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible">
         <biz-detail-panel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
+                          :viewType="viewType"
                           v-if="isBizDetailAlive"></biz-detail-panel>
       </el-tab-pane>
       <el-tab-pane label="扫码详情" v-if="viewCodeVisible">
         <codeDetailPanel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel"
+                         :viewType="viewType"
                          v-if="isCodeDetailAlive"></codeDetailPanel>
       </el-tab-pane>
       <el-tab-pane label="扫码明细" v-if="viewCodeDetailVisible">
         <codesPanel :idQuery="orderFormData"
                     :refreshPanel="refreshCodesPanel"
                     v-if="isCodeAlive"
+                    :viewType="viewType"
                     :selectRlTitle="selectRlTitle"
                     :editTitle="editTitle"
                     :selectUnitTitle="selectUnitTitle"></codesPanel>
@@ -211,7 +214,7 @@
 
 <script>
 import {
-  errorCodeList, addOrderWeb, deleteCodesTempById, submitOrderWeb, saveOrderWeb,
+  submitBiz, addOrderWeb, submitCodes, submitOrderWeb, saveOrderWeb,
   updateCodeBindSup, enterCodeWeb
 } from "../../api/inout/order";
 import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
@@ -219,9 +222,9 @@ import {parseTime} from "../../utils/coTools";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
 
 
-import codesPanel from "./IoCreateOrderCodes"
-import codeDetailPanel from "./IoCreateOrderCodeDetail"
-import bizDetailPanel from "./IoCreateOrderBizDetail"
+import codesPanel from "./PanelCreateOrderCodes"
+import codeDetailPanel from "./PanelCreateOrderCodeDetail"
+import bizDetailPanel from "./PanelCreateOrderBizDetail"
 import A from "../../plugins/KeyScaner"
 import {findByInvUser} from "@/api/basic/busType";
 
@@ -240,7 +243,7 @@ export default {
       type: Object,
       required: true,
     },
-    viewType: {      //1.新增扫码单据页面，2、新增业务单据页面，3、正常单据处理页面
+    viewType: {      //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面
       type: Object,
       required: true,
     },
@@ -290,8 +293,17 @@ export default {
       storageList: [],
 
       formRules: {
-        temp: [
-          {required: true, message: "请输入条码", trigger: "blur"}
+        corpOrderId: [
+          {required: true, message: "请输入单据号", trigger: "blur"}
+        ],
+        createTime: [
+          {required: true, message: "请选择创建时间", trigger: "blur"}
+        ],
+        invCode: [
+          {required: true, message: "请选择当前仓库", trigger: "change"}
+        ],
+        action: [
+          {required: true, message: "请选择单据类型", trigger: "change"}
         ],
       },
       isScan: true,
@@ -411,7 +423,7 @@ export default {
     //单据类型改变
     actionChange(item) {
       this.curAction = this.getActionItem(item);
-      if (this.curAction.checkEnable && this.curAction.checkWebNew) {
+      if ((this.curAction.checkEnable && this.curAction.checkWebNew) || this.viewType == 1) {
         this.bizShow = true;
       } else
         this.bizShow = false;
@@ -584,16 +596,36 @@ export default {
     submit() {
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
       tQuery.orderId = this.orderFormData.billNo;
-      submitOrderWeb(tQuery)
-        .then((response) => {
-          if (response.code === 20000) {
-            this.$message.success("提交成功");
-            this.closeDialog();
-          } else {
-            this.$message.error(response.message);
-          }
-          this.loading = false;
-        });
+      if (this.viewType == 2) {
+        submitCodes(tQuery)
+          .then((response) => {
+            if (response.code === 20000) {
+              this.$message.success("提交成功,等待处理，请刷新后查看！");
+              this.closeDialog();
+            } else {
+              this.$message.error(response.message);
+            }
+          });
+      } else if (this.viewType == 1) {
+        submitBiz(tQuery)
+          .then((response) => {
+            if (response.code === 20000) {
+              this.$message.success("提交成功");
+              this.closeDialog();
+            } else {
+              this.$message.error(response.message);
+            }
+          });
+      } else
+        submitOrderWeb(tQuery)
+          .then((response) => {
+            if (response.code === 20000) {
+              this.$message.success("提交成功");
+              this.closeDialog();
+            } else {
+              this.$message.error(response.message);
+            }
+          });
     },
     saveOrder() {
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
@@ -744,17 +776,17 @@ export default {
     this.codeFormData.code = '';
 
     //页面类型
-    if (this.viewType == 1) {//1.新增扫码单据页面，2、新增业务单据页面，3、正常页面
+    if (this.viewType == 2) {//2.新增扫码单据页面，1、新增业务单据页面，3、正常页面
       this.viewCodeVisible = true;
       this.viewCodeDetailVisible = true;
-    } else if (this.viewType == 2) {
+    } else if (this.viewType == 1) {
       this.viewBizVisible = true;
     } else {
       this.viewCodeVisible = true;
       this.viewCodeDetailVisible = true;
       this.viewBizVisible = true;
     }
-
+    this.orderFormData.orderType = this.viewType;
     if (this.$isNotBlank(this.orderQuery.billNo)) {   //编辑页面
       this.corpOrderIdDisabled = true;
       this.orderFormData = this.orderQuery;
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 6322f1d6..03d94023 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -178,8 +178,7 @@
 <script>
 import {
   deleteByOrderId,
-  submitOrderWeb,
-  getOrderList
+  getOrderList, submitCodes
 } from "../../api/inout/order";
 import addOrder from "./IoCreateOrder";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -202,7 +201,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "newOrder",
+        statusType: "scan_code",
         page: 1,
         limit: 10,
         startTime: null,
@@ -288,7 +287,7 @@ export default {
           },
         ],
       },
-      viewType: 1,
+      viewType: 2,
     };
   },
 
@@ -302,7 +301,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "newOrder",
+        statusType: "scan_code",
         page: 1,
         limit: 10,
         startTime: null,
@@ -417,7 +416,7 @@ export default {
         billNo: "",
       };
       idQuery.billNo = data;
-      submitOrderWeb(idQuery)
+      submitCodes(idQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 3963f521..99b1a729 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -161,6 +161,7 @@
         <addOrder
           :closeDialog="closeDialog"
           :orderQuery="idQuery"
+          :viewType="viewType"
         ></addOrder>
       </el-dialog>
       <el-dialog
@@ -219,7 +220,9 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+
       },
+      viewType: 3,
       checkStatus: {
         1: "草稿",
         2: "等待处理",
@@ -303,9 +306,7 @@ export default {
     };
   },
   components: {
-    // codeDetail,
     addOrder,
-    // ioErrorOrder
   },
   methods: {
     onReset() {
@@ -452,7 +453,6 @@ export default {
       getInvListByUser()
         .then((response) => {
           this.invList = response.data || [];
-          this.getList();
         })
         .catch(() => {
         });
@@ -491,7 +491,8 @@ export default {
           this.enableDept = true;
         }
       }
-    })
+    });
+    this.getList();
 
   },
 };
diff --git a/src/views/inout/IoCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
similarity index 96%
rename from src/views/inout/IoCreateOrderBizDetail.vue
rename to src/views/inout/PanelCreateOrderBizDetail.vue
index 4bdb7b6e..ef3c8a61 100644
--- a/src/views/inout/IoCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -73,6 +73,7 @@
       <el-table-column width="80"
                        label="扫码数量"
                        prop="scanCount"
+                       v-if="viewType!=2"
                        show-overflow-tooltip
       ></el-table-column>
       <el-table-column width="150" label="价格">
@@ -90,12 +91,6 @@
                        prop="certCode"
                        show-overflow-tooltip
       >
-        <!--        <template slot-scope="scope">-->
-        <!--          <el-input size="small" v-model="scope.row.certCode"-->
-        <!--                    :disabled="scope.row.index !== selectedIndex"-->
-        <!--                    placeholder="请输入注册/备案凭证号" style="width: 100%"-->
-        <!--          ></el-input>-->
-        <!--        </template>-->
       </el-table-column>
       <el-table-column width="150"
                        label="生产厂家"
@@ -197,6 +192,11 @@ export default {
       type: Function,
       required: true,
     },
+    viewType: {
+      type: Object,
+      required: true,
+    },
+
   },
   data() {
     return {
@@ -251,6 +251,8 @@ export default {
     },
 
     rowStyle({row, rowIndex}) {
+      if (this.viewType == 1)
+        return null;
       let rowBackground = {};
       if (!row.checkSuccess) {
         rowBackground.color = '#f60303';
diff --git a/src/views/inout/IoCreateOrderCodeDetail.vue b/src/views/inout/PanelCreateOrderCodeDetail.vue
similarity index 95%
rename from src/views/inout/IoCreateOrderCodeDetail.vue
rename to src/views/inout/PanelCreateOrderCodeDetail.vue
index 17e79880..2268c754 100644
--- a/src/views/inout/IoCreateOrderCodeDetail.vue
+++ b/src/views/inout/PanelCreateOrderCodeDetail.vue
@@ -2,6 +2,7 @@
   <div>
     <el-table v-loading="loading" :data="detailList" style="width: 100%;" max-height="350" height="350"
               border
+              :row-style="rowStyle"
               ref="multipleTable">
       <el-table-column type="index" label="序号" width="50"></el-table-column>
       <el-table-column label="产品通用名" width="150" prop="coName" show-overflow-tooltip></el-table-column>
@@ -46,6 +47,10 @@ export default {
       type: Object,
       required: true,
     },
+    viewType: {
+      type: Object,
+      required: true,
+    },
   },
   data() {
     return {
@@ -84,11 +89,12 @@ export default {
 
     rowStyle({row, rowIndex}) {
       let rowBackground = {};
-      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
+      if (this.viewType == 3 && !row.checkSuccess) {
         rowBackground.color = '#f60303';
       }
       return rowBackground;
     },
+
   },
   created() {
     if (this.idQuery.billNo != null)
diff --git a/src/views/inout/IoCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue
similarity index 99%
rename from src/views/inout/IoCreateOrderCodes.vue
rename to src/views/inout/PanelCreateOrderCodes.vue
index 0d4d0a90..c3cbef6c 100644
--- a/src/views/inout/IoCreateOrderCodes.vue
+++ b/src/views/inout/PanelCreateOrderCodes.vue
@@ -288,7 +288,7 @@ export default {
 
     rowStyle({row, rowIndex}) {
       let rowBackground = {};
-      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId) ) {
         rowBackground.color = '#f60303';
       }
       return rowBackground;
diff --git a/src/views/inventory/AssetManage.vue b/src/views/inventory/AssetManage.vue
new file mode 100644
index 00000000..ef1e26a0
--- /dev/null
+++ b/src/views/inventory/AssetManage.vue
@@ -0,0 +1,180 @@
+<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="产品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-group>
+        </el-form-item>
+      </el-form>
+
+      <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="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="addMAOrder(scope.row)"
+            >养护
+            </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-dialog
+      title="新增设备养护记录"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="formVisible"
+    >
+      <deviceMAOrderModify
+        :deviceMAOrder="deviceMAOrder"
+        :closeDialog="closeDialog"
+      >
+      </deviceMAOrderModify>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder";
+import deviceMAOrderModify from "@/views/inventory/DeviceMAOrderModify.vue";
+
+export default {
+  name: "AssetManage",
+  data() {
+    return {
+      filterQuery: {
+        code: null,
+        nameCode: null,
+        status: 2,
+        page: 1,
+        limit: 20
+      },
+      list: [],
+      total: 0,
+      loading: false,
+      idQuery: null,
+      formVisible: false,
+      deviceMAOrder: {
+        code: null,
+        deptName: null,
+        createUser: null,
+        createTime: null,
+        collOrderId: null
+      }
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        code: null,
+        nameCode: null,
+        status: 2,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getDeviceReceiveOrderList(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;
+      })
+    },
+    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: {
+    deviceMAOrderModify
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/DeviceMAOrderCompleted.vue b/src/views/inventory/DeviceMAOrderCompleted.vue
new file mode 100644
index 00000000..19117c66
--- /dev/null
+++ b/src/views/inventory/DeviceMAOrderCompleted.vue
@@ -0,0 +1,221 @@
+<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-input v-model="filterQuery.code" placeholder="请输入设备编号"
+                    clearable="true"></el-input>
+        </el-form-item>
+        <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-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="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="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="print(scope.row)"
+            >打印
+            </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-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 {
+  getDeviceMAOrderList,
+  getDeviceMAOrderDetailList,
+  verifyTemplateFile,
+  printOrder
+} from "@/api/inventory/deviceMAOrder";
+
+export default {
+  name: "DeviceMAOrderCompleted",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        code: null,
+        receiveOrderId: null,
+        status: 1,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      loading: false,
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20,
+      },
+      detailList: [],
+      detailLoading: false,
+      detailTotal: 0
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        orderId: null,
+        code: null,
+        receiveOrderId: null,
+        status: 1,
+        page: 1,
+        limit: 20,
+      };
+      this.spaceList = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.detailList = [];
+      this.detailTotal = 0;
+      getDeviceMAOrderList(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;
+      })
+    },
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    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;
+      });
+    },
+    print(row) {
+      let query = {moduleId: 7};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          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);
+      })
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/DeviceMAOrderModify.vue b/src/views/inventory/DeviceMAOrderModify.vue
new file mode 100644
index 00000000..f650ea77
--- /dev/null
+++ b/src/views/inventory/DeviceMAOrderModify.vue
@@ -0,0 +1,196 @@
+<template>
+  <div>
+    <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-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-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 {addDeviceMAOrder, filterDetail} from "@/api/inventory/deviceMAOrder";
+
+export default {
+  props: {
+    deleteInvMAOrder: {
+      type: Object,
+      required: true
+    },
+    closeDialog: {
+      type: Function,
+      required: true
+    }
+  },
+  name: "DeviceMAOrderModify",
+  data() {
+    return {
+      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,
+      },
+      detailList: []
+    };
+  },
+  methods: {
+    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.closeDialog();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      });
+    },
+    getMAOrderDetailList(code) {
+      let params = {code: code};
+      filterDetail(params).then((res) => {
+        this.detailList.push(res.data);
+      })
+    }
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    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>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
new file mode 100644
index 00000000..6eaa3724
--- /dev/null
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -0,0 +1,353 @@
+<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.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
+              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.fromInvSpaceCode" 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-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="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="auditOrder(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-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 {getDeptListByUser} from "@/api/auth/authDept";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+import {
+  getDeviceReceiveOrderDetailList,
+  updateDeviceReceiveOrderStatus,
+  deleteDeviceReceiveOrder,
+  getDeviceReceiveOrderList
+} from "@/api/inventory/deviceReceiveOrder";
+
+export default {
+  name: "DeviceReceiveOrderAudit",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 1,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      deptList: [],
+      invList: [],
+      spaceList: [],
+      loading: false,
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+        2: "已审核"
+      },
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20,
+      },
+      detailList: [],
+      detailLoading: false,
+      detailTotal: 0
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        orderId: null,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 1,
+        page: 1,
+        limit: 20,
+      };
+      this.spaceList = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getDeviceReceiveOrderList(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;
+      })
+    },
+    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();
+    },
+    getInvList() {
+      let params = {deptCode: this.filterQuery.fromDeptCode};
+      findInvByUser(params)
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSpaceList() {
+      let params = {invWarehouseCode: this.filterQuery.invCode};
+      getInvSpaceList(params).then((res) => {
+        this.spaceList = res.data.list || [];
+        this.getList();
+      })
+    },
+    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;
+        }
+      });
+    },
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      getDeviceReceiveOrderDetailList(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;
+      });
+    },
+    deleteDialog(rowId) {
+      this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {id: rowId};
+        this.loading = true;
+        deleteDeviceReceiveOrder(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();
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getDeptList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
new file mode 100644
index 00000000..3595b7a3
--- /dev/null
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -0,0 +1,269 @@
+<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.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
+              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.fromInvSpaceCode" 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-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="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>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <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 {getDeptListByUser} from "@/api/auth/authDept";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+import {
+  getDeviceReceiveOrderDetailList,
+  getDeviceReceiveOrderList
+} from "@/api/inventory/deviceReceiveOrder";
+
+export default {
+  name: "DeviceReceiveOrderCompleted",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 2,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      deptList: [],
+      invList: [],
+      spaceList: [],
+      loading: false,
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+        2: "已审核"
+      },
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20,
+      },
+      detailList: [],
+      detailLoading: false,
+      detailTotal: 0
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        orderId: null,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 2,
+        page: 1,
+        limit: 20,
+      };
+      this.spaceList = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.detailList = [];
+      this.detailTotal = 0;
+      getDeviceReceiveOrderList(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;
+      })
+    },
+    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();
+    },
+    getInvList() {
+      let params = {deptCode: this.filterQuery.fromDeptCode};
+      findInvByUser(params)
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSpaceList() {
+      let params = {invWarehouseCode: this.filterQuery.invCode};
+      getInvSpaceList(params).then((res) => {
+        this.spaceList = res.data.list || [];
+        this.getList();
+      })
+    },
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      getDeviceReceiveOrderDetailList(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;
+      });
+    },
+    closeDialog() {
+      this.formVisible = false;
+      this.getList();
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getDeptList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
new file mode 100644
index 00000000..2a51790c
--- /dev/null
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -0,0 +1,701 @@
+<template>
+  <div>
+    <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-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="primary"
+              size="mini"
+              @click.native.stop="addCode()"
+              style="margin-left: 15px"
+            >扫码添加
+            </el-button>
+            <el-button
+              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="库存产品录入"
+      :visible.sync="selectInvProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectInvProductVisible"
+      :append-to-body='true'
+    >
+      <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 {getDeptListByUser} from "@/api/auth/authDept";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+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 {
+  props: {
+    deviceReceiveOrder: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      filterQuery: {
+        nameCode: null,
+        cpmctymc: null,
+        batchNo: null,
+        invCode: null,
+        cplb: "设备",
+        invSpaceCode: null,
+        page: 1,
+        limit: 10
+      },
+      productList: [],
+      productTotal: 0,
+      deptList: [],
+      invList: [],
+      spaceList: [],
+      formData: {
+        id: null,
+        orderId: null,
+        createTime: null,
+        fromDeptCode: null,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        receiveUser: null,
+        status: 0,
+        code: null,
+      },
+      detailList: [],
+      loading: false,
+      scanText: "扫码录入：",
+      currentIndex: -1,
+      selectInvProductVisible: false,
+      multiProduct: [],
+      userList: [],
+      productInvList: [],
+      productSpaceList: []
+    }
+  },
+  methods: {
+    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();
+          }
+        }
+      });
+    },
+    deptChange() {
+      //查询此部门下的仓库和用户
+      this.formData.fromInvCode = null;
+      this.formData.fromInvSpaceCode = null;
+      this.invList = [];
+      this.spaceList = [];
+      this.getInvList();
+
+      //拉取部门用户列表
+      this.getDeptUserList();
+    },
+    getDeptUserList() {
+      this.userList = [];
+      let params = {deptId: this.formData.fromDeptCode};
+      listDeptUser(params).then((res) =>{
+        this.userList = res.data.list || [];
+      })
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+        if (!isBlank(this.deviceReceiveOrder.fromInvCode)) {
+          this.formData.fromInvCode = this.deviceReceiveOrder.fromInvCode;
+          this.getInvList();
+        }
+      });
+
+      if (!isBlank(this.formData.fromDeptCode)) {
+        this.getDeptUserList();
+      }
+    },
+    invChange() {
+      this.formData.invSpaceCode = null;
+      this.spaceList = [];
+      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 || [];
+      });
+    },
+    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("更新单据信息失败！");
+        })
+      } 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);
+          }
+        });
+      }
+    },
+
+    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();
+    },
+    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();
+      }
+
+    },
+    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 "请选择领用人！";
+      }
+    },
+    addScanCode() {
+      //校验条码是否符合规则
+      let checkParams = {
+        code: this.formData.code
+      };
+      checkCode(checkParams).then((res) => {
+        if (res.code === 20000) {
+          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);
+        }
+      });
+    },
+    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.getList();
+          }
+        })
+      }
+    },
+    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;
+      });
+    },
+    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);
+      });
+    },
+  },
+  created() {
+    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>
+
diff --git a/src/views/inventory/DeviceReceiveOrderNew.vue b/src/views/inventory/DeviceReceiveOrderNew.vue
new file mode 100644
index 00000000..f2ddfab3
--- /dev/null
+++ b/src/views/inventory/DeviceReceiveOrderNew.vue
@@ -0,0 +1,306 @@
+<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.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
+              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.fromInvSpaceCode" 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="addReceiveOrder">新增领用记录</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+
+      <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="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"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></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"
+    >
+      <deviceReceiveOrderModify
+        :deviceReceiveOrder="deviceReceiveOrder"
+        :closeDialog="closeDialog"
+      ></deviceReceiveOrderModify>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getDeptListByUser} from "@/api/auth/authDept";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+import deviceReceiveOrderModify from "@/views/inventory/DeviceReceiveOrderModify.vue";
+import {submitAudit, deleteDeviceReceiveOrder, getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder";
+
+export default {
+  name: "DeviceReceiveOrderNew",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 0,
+        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: "编辑设备领用记录"
+      },
+      deviceReceiveOrder: {},
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        orderId: null,
+        fromDeptCode: this.$store.getters.locDeptCode,
+        fromInvCode: null,
+        fromInvSpaceCode: null,
+        status: 0,
+        page: 1,
+        limit: 20,
+      };
+      this.spaceList = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getDeviceReceiveOrderList(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;
+      })
+    },
+    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();
+    },
+    getInvList() {
+      let params = {deptCode: this.filterQuery.fromDeptCode};
+      findInvByUser(params)
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSpaceList() {
+      let params = {invWarehouseCode: this.filterQuery.invCode};
+      getInvSpaceList(params).then((res) => {
+        this.spaceList = res.data.list || [];
+        this.getList();
+      })
+    },
+    addReceiveOrder() {
+      this.formVisible = true;
+      this.formName = 'add';
+      this.deviceReceiveOrder = {};
+    },
+    editOrder(row) {
+      this.formVisible = true;
+      this.formName = 'edit';
+      this.deviceReceiveOrder = 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;
+        deleteDeviceReceiveOrder(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: {
+    deviceReceiveOrderModify
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getDeptList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/InvCountCodes.vue b/src/views/inventory/InvCountCodes.vue
new file mode 100644
index 00000000..7034e528
--- /dev/null
+++ b/src/views/inventory/InvCountCodes.vue
@@ -0,0 +1,140 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="query" class="query-form" size="mini" :inline="true">
+        <el-form-item class="query-form-item" label="条码:">
+          <el-input v-model="query.code" 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-group>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loading" :data="codeArray" style="width: 100%" highlight-current-row
+                border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="条码" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column label="扫码数量" prop="count"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteCountCode(scope.row.id)"
+            >减一
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="query.limit"
+        :page.sync="query.page"
+        @pagination="getCodeList"
+      ></pagination>
+
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {getCountCodesList, deleteCode} from "@/api/inventory/invCountCodes";
+
+export default {
+  name: "InvCountCodes",
+  props: {
+    countQuery: {
+      type: Object,
+      required: true,
+    },
+    getCountOrderDetail: {
+      type: Function,
+      required: true
+    }
+  },
+
+  data() {
+    return {
+      query: {
+        code: null,
+        productId: null,
+        orderIdFk: null,
+        batchNo: null,
+        page: 1,
+        limit: 20
+      },
+      loading: true,
+      codeArray: [],
+      total: 0,
+    }
+  },
+  methods: {
+    onReset() {
+      this.query = {
+        code: null,
+        productId: null,
+        orderIdFk: null,
+        batchNo: null,
+        page: 1,
+        limit: 20
+      };
+      this.getCodeList();
+    },
+    onSubmit() {
+      this.query.page = 1;
+      this.getCodeList();
+    },
+    getCodeList() {
+      this.loading = true;
+      this.query.relId = this.codeQuery.relId;
+      this.query.orderIdFk = this.codeQuery.orderIdFk;
+      this.query.batchNo = this.codeQuery.batchNo;
+      getCountCodesList(this.query).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.codeArray = res.data.list || [];
+          this.total = res.data.total || 0;
+        } else {
+          this.codeArray = [];
+          this.total = 0;
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.codeArray = [];
+        this.total = 0;
+      })
+    },
+    deleteCountCode(row) {
+      this.$confirm('是否删除此条码?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {
+          orderIdFk: row.orderIdFk,
+          relId: row.relId,
+          code: row.code
+        };
+        deleteCode(params).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("删除成功！");
+            this.getCodeList();
+            this.getCountOrderDetail();
+          } else {
+            this.$message.error(res.data.message);
+          }
+        })
+      }).catch(() => {
+      });
+    },
+  },
+  created() {
+    this.getCodeList();
+  },
+};
+</script>
+
diff --git a/src/views/inventory/InvCountOrderAudit.vue b/src/views/inventory/InvCountOrderAudit.vue
new file mode 100644
index 00000000..c82ebd8a
--- /dev/null
+++ b/src/views/inventory/InvCountOrderAudit.vue
@@ -0,0 +1,401 @@
+<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-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" width="300"></el-table-column>
+        <el-table-column label="仓库" prop="invName" width="300"></el-table-column>
+        <el-table-column label="货位" prop="invSpaceName" width="300"></el-table-column>
+        <el-table-column label="盘点类型" prop="countType" width="150">
+          <template slot-scope="scope">
+            <span>{{ countTypeMap[scope.row.countType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="盘点人" prop="createUserName" width="200"></el-table-column>
+        <el-table-column label="盘点时间" prop="createTime"></el-table-column>
+        <el-table-column label="状态" prop="status" 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="auditCountOrder(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-card>
+      <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" highlight-current-row
+                border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="180"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+        <el-table-column label="盘点数量" prop="countNum" width="150"></el-table-column>
+        <el-table-column label="账面数量" prop="invNum" width="150"></el-table-column>
+        <el-table-column label="盘盈数量" prop="profitNum" width="150"></el-table-column>
+        <el-table-column label="盘亏数量" prop="lossNum" width="150"></el-table-column>
+        <el-table-column label="盈亏状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag>
+              {{ countStatusMap[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="showCode(scope.row)"
+            >详情
+            </el-button
+            >
+          </template>
+        </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>
+
+
+    <el-dialog
+      title="码详情"
+      :visible.sync="codesVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="codesVisible"
+      append-to-body
+    >
+      <invCountCodes
+        :codeQuery="codeQuery"
+      ></invCountCodes>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+import {
+  getCountOrderList,
+  deleteCountOrder,
+  updateCountOrderStatus, getCountOrderDetailList
+} from "@/api/inventory/invCountOrder";
+import invCountCodes from "@/views/inventory/InvCountCodes.vue";
+
+export default {
+  name: "InvCountOrderAudit",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 1,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      invList: [],
+      spaceList: [],
+      loading: false,
+      formVisible: false,
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+        2: "已审核"
+      },
+      countOrder: {},
+      countType: null,
+      countTypeMap: {
+        0: "整库盘点",
+        1: "货位盘点",
+        2: "部分盘点"
+      },
+      countStatusMap: {
+        0: '亏损',
+        1: '盈利',
+        2: "平衡"
+      },
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20
+      },
+      detailList: [],
+      detailTotal: 0,
+      detailLoading: false,
+      codeQuery: {
+        orderIdFk: null,
+        relId: null,
+        batchNo: null,
+        edit: false
+      },
+      codesVisible: false
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 1,
+        page: 1,
+        limit: 20,
+      };
+      this.spaceList = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getCountOrderList(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.filterQuery.fromInvSpaceCode = null;
+      this.getSpaceList();
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSpaceList() {
+      let params = {invWarehouseCode: this.filterQuery.invCode};
+      getInvSpaceList(params).then((res) => {
+        this.spaceList = res.data.list || [];
+        this.getList();
+      })
+    },
+    addCountOrder(type) {
+      this.formVisible = true;
+      this.formName = 'add_' + type;
+      this.countOrder = {};
+      this.countType = type;
+    },
+    deleteDialog(rowId) {
+      this.$confirm('此操作将永久删除该盘点单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {id: rowId};
+        this.loading = true;
+        deleteCountOrder(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;
+        });
+      });
+    },
+    auditCountOrder(row) {
+      let params = {
+        id: row.id,
+        status: null
+      };
+      this.$confirm('请选择审核意见', '提示', {
+        confirmButtonText: '通过',
+        cancelButtonText: '驳回',
+        type: 'warning',
+        center: true,
+        closeOnPressEscape: false,//按下 ESC 键关闭弹窗
+        closeOnClickModal: false,//点击遮罩关闭弹窗
+        distinguishCancelAndClose: true,//区分取消与关闭
+      }).then(() => {
+        params.status = 2; //审核通过
+        updateCountOrderStatus(params).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("审核通过");
+            this.getList();
+            this.onRestDetail();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(() => {
+        });
+      }).catch((action) => {
+        if (action === 'cancel') {
+          //驳回
+          params.status = 0; //驳回到上一个状态
+          updateCountOrderStatus(params).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success("审核通过");
+              this.$message.success("已驳回");
+              this.getList();
+              this.onRestDetail();
+            } else {
+              this.$message.error(res.message);
+            }
+          }).catch(() => {
+          });
+        } else {
+          //关闭弹窗
+          return;
+        }
+      });
+    },
+    onRestDetail() {
+      this.detailQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 20
+      };
+      this.detailList = [];
+      this.detailTotal = 0;
+    },
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getCountOrderDetailList()
+    },
+    getCountOrderDetailList() {
+      this.detailLoading = true;
+      getCountOrderDetailList(this.detailQuery).then((res) => {
+        this.detailLoading = false;
+        if (res.code === 20000) {
+          this.detailList = res.data.list || [];
+          this.detailTotal = res.data.total || 0;
+        } else {
+          this.detailList = [];
+          this.detailTotal = 0;
+        }
+      }).catch(() => {
+        this.detailLoading = false;
+        this.detailList = [];
+        this.detailTotal = 0;
+      });
+    },
+    showCode(row) {
+      this.codeQuery = {
+        orderIdFk: row.orderIdFk,
+        relId: row.relId,
+        batchNo: row.batchNo,
+        edit: false
+      };
+      this.codesVisible = true;
+    },
+  },
+  components: {
+    invCountCodes
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/InvCountOrderCompleted.vue b/src/views/inventory/InvCountOrderCompleted.vue
new file mode 100644
index 00000000..884ddca4
--- /dev/null
+++ b/src/views/inventory/InvCountOrderCompleted.vue
@@ -0,0 +1,315 @@
+<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-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" width="300"></el-table-column>
+        <el-table-column label="仓库" prop="invName" width="300"></el-table-column>
+        <el-table-column label="货位" prop="invSpaceName" width="300"></el-table-column>
+        <el-table-column label="盘点类型" prop="countType" width="150">
+          <template slot-scope="scope">
+            <span>{{ countTypeMap[scope.row.countType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="盘点人" prop="createUserName" width="200"></el-table-column>
+        <el-table-column label="盘点时间" prop="createTime"></el-table-column>
+        <el-table-column label="状态" prop="status" width="120">
+          <template slot-scope="scope">
+            <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
+          </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-card>
+      <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" highlight-current-row
+                border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="180"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+        <el-table-column label="盘点数量" prop="countNum" width="150"></el-table-column>
+        <el-table-column label="账面数量" prop="invNum" width="150"></el-table-column>
+        <el-table-column label="盘盈数量" prop="profitNum" width="150"></el-table-column>
+        <el-table-column label="盘亏数量" prop="lossNum" width="150"></el-table-column>
+        <el-table-column label="盈亏状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag>
+              {{ countStatusMap[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="showCode(scope.row)"
+            >详情
+            </el-button
+            >
+          </template>
+        </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>
+
+
+    <el-dialog
+      title="码详情"
+      :visible.sync="codesVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="codesVisible"
+      append-to-body
+    >
+      <invCountCodes
+        :codeQuery="codeQuery"
+      ></invCountCodes>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+import {
+  getCountOrderList,
+  getCountOrderDetailList
+} from "@/api/inventory/invCountOrder";
+import invCountCodes from "@/views/inventory/InvCountCodes.vue";
+
+export default {
+  name: "InvCountOrderCompleted",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 2,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      invList: [],
+      spaceList: [],
+      loading: false,
+      formVisible: false,
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+        2: "已审核"
+      },
+      countOrder: {},
+      countType: null,
+      countTypeMap: {
+        0: "整库盘点",
+        1: "货位盘点",
+        2: "部分盘点"
+      },
+      countStatusMap: {
+        0: '亏损',
+        1: '盈利',
+        2: "平衡"
+      },
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20
+      },
+      detailList: [],
+      detailTotal: 0,
+      detailLoading: false,
+      codeQuery: {
+        orderIdFk: null,
+        relId: null,
+        batchNo: null,
+        edit: false
+      },
+      codesVisible: false
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 2,
+        page: 1,
+        limit: 20,
+      };
+      this.spaceList = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getCountOrderList(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.filterQuery.fromInvSpaceCode = null;
+      this.getSpaceList();
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSpaceList() {
+      let params = {invWarehouseCode: this.filterQuery.invCode};
+      getInvSpaceList(params).then((res) => {
+        this.spaceList = res.data.list || [];
+        this.getList();
+      })
+    },
+    addCountOrder(type) {
+      this.formVisible = true;
+      this.formName = 'add_' + type;
+      this.countOrder = {};
+      this.countType = type;
+    },
+    onRestDetail() {
+      this.detailQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 20
+      };
+      this.detailList = [];
+      this.detailTotal = 0;
+    },
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getCountOrderDetailList()
+    },
+    getCountOrderDetailList() {
+      this.detailLoading = true;
+      getCountOrderDetailList(this.detailQuery).then((res) => {
+        this.detailLoading = false;
+        if (res.code === 20000) {
+          this.detailList = res.data.list || [];
+          this.detailTotal = res.data.total || 0;
+        } else {
+          this.detailList = [];
+          this.detailTotal = 0;
+        }
+      }).catch(() => {
+        this.detailLoading = false;
+        this.detailList = [];
+        this.detailTotal = 0;
+      });
+    },
+    showCode(row) {
+      this.codeQuery = {
+        orderIdFk: row.orderIdFk,
+        relId: row.relId,
+        batchNo: row.batchNo,
+        edit: false
+      };
+      this.codesVisible = true;
+    },
+  },
+  components: {
+    invCountCodes
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue
new file mode 100644
index 00000000..0b509503
--- /dev/null
+++ b/src/views/inventory/InvCountOrderModify.vue
@@ -0,0 +1,595 @@
+<template>
+  <div>
+    <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
+            v-if="countType != 2"
+            type="primary"
+            :disabled="this.codeArray.length > 0"
+            @click.native="startCount()"
+          >开始盘点
+          </el-button>
+          <el-button
+            v-if="countType != 2"
+            type="primary"
+            :disabled="this.codeArray.length > 0"
+            @click.native="startCount()"
+          >录入产品
+          </el-button>
+          <el-button
+            type="primary"
+            @click.native="saveOrder()"
+          >保存
+          </el-button>
+        </el-button-group>
+
+        <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.invCode" placeholder="盘点仓库信息"
+                         :disabled="codeArray.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-col :span="10">
+            <el-form-item class="query-form-item" label="盘点货位:">
+              <el-select v-model="formData.invSpaceCode" placeholder="盘点货位信息"
+                         :disabled="codeArray.length >0 "
+                         @change="invSpaceChange"
+                         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-row>
+
+        <el-row>
+          <el-col :span="18">
+            <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="2">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="addCode()"
+              style="margin-left: 15px"
+            >添加
+            </el-button>
+          </el-col>
+        </el-row>
+
+        <el-table v-loading="loading" :data="codeArray" 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 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="batchNo"></el-table-column>
+          <el-table-column width="150" label="库存数量" prop="invNum"></el-table-column>
+          <el-table-column width="150" label="盘点数量" prop="countNum"></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="showCodes(scope.$index, 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="库存产品录入"
+      :visible.sync="selectInvProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectInvProductVisible"
+      :append-to-body='true'
+    >
+      <el-form :inline="true" :model="filterQuery" size="mini">
+        <el-row>
+          <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-column label="入库数量" prop="inCount"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount"></el-table-column>
+        <el-table-column label="结余数量" prop="reCount"></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="queryInvProducts"
+      ></pagination>
+    </el-dialog>
+
+    <el-dialog
+      title="码详情"
+      :visible.sync="codesVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="codesVisible"
+      append-to-body
+    >
+      <invCountCodes
+        :codeQuery="codeQuery"
+        :getCountOrderDetail="getList"
+      ></invCountCodes>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+import {
+  saveCountOrder,
+  getCountOrderDetailList,
+  deleteCountOrderDetail,
+  addCountOrderDetail
+} from "@/api/inventory/invCountOrder";
+import {addCode} from "@/api/inventory/invCountCodes";
+import {getCountInvProductProduct} from "@/api/inventory/invPorduct";
+import {isBlank} from "@/utils/strUtil";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import invCountCodes from "@/views/inventory/InvCountCodes.vue";
+
+export default {
+  props: {
+    countOrder: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    countType: {
+      type: Number,
+      required: true
+    },
+    getCountOrderList: {
+      type: Function,
+      required: true
+    }
+  },
+
+  data() {
+    return {
+      formData: {
+        code: null,
+        orderId: null,
+        createTime: null,
+        deptCode: null,
+        invCode: null,
+        invSpaceCode: null,
+        countType: this.countType
+      },
+      codeArray: [],
+      total: 0,
+      loading: false,
+      index: null,
+      selectInvProductVisible: false,
+      invList: [],
+      spaceList: [],
+      filterQuery: {
+        invCode: null,
+        invSpaceCode: null,
+        nameCode: null,
+        cpmctymc: null,
+        batchNo: null,
+        page: 1,
+        limit: 10
+      },
+      productList: [],
+      scanText: "扫码录入：",
+      codesList: [],
+      detailQuery: {
+        orderIdFk: null
+      },
+      detailTotal: 0,
+      countProductList: [],
+      codesNum: 0,
+      codeQuery: {
+        relId: null,
+        orderIdFk: null,
+        batchNo: null,
+        edit: true
+      },
+      codesVisible: false,
+      disableSpace: false,
+      multiProduct: []
+    }
+  },
+  methods: {
+    getInvList() {
+      getInvListByUser().then((res) => {
+        if (res.code === 20000) {
+          this.invList = res.data || [];
+          if (!isBlank(this.countOrder.invSpaceCode)) {
+            this.formData.invCode = this.countOrder.invCode;
+            this.invList.forEach((item) => {
+              if (item.code === this.formData.invCode) {
+                this.formData.deptCode = item.parentId;
+              }
+            })
+            this.invChange();
+          }
+        }
+      });
+    },
+    invChange() {
+      // 切换仓库时同步切换部门ID
+      this.invList.forEach((item) => {
+        if (item.code === this.formData.invCode) {
+          this.formData.deptCode = item.parentId;
+        }
+      });
+      this.formData.invSpaceCode = null;
+      this.spaceList = [];
+      let params = {invWarehouseCode: this.formData.invCode};
+      getInvSpaceList(params).then((res) => {
+        if (!isBlank(this.countOrder.invSpaceCode)) {
+          this.formData.invSpaceCode = this.countOrder.invSpaceCode;
+        }
+        this.spaceList = res.data.list || [];
+      });
+    },
+    invSpaceChange() {
+      this.$forceUpdate();
+    },
+    saveOrder(type) {
+      let orderData = {
+        orderId: this.formData.orderId,
+        createTime: this.formData.billDate,
+        deptCode: this.formData.deptCode,
+        invCode: this.formData.invCode,
+        invSpaceCode: this.formData.invSpaceCode,
+        countType: this.countType
+      };
+
+      saveCountOrder(orderData).then((res) => {
+        if (res.code === 20000) {
+          this.formData.orderId = res.data.orderId;
+          this.formData.createTime = res.data.createTime;
+          this.$message.success("保存成功");
+          if (type != null) {
+            //保存当前单据详情
+            this.countProductList.forEach(product => {
+              let detailData = {
+                orderIdFk: this.formData.orderId,
+                relId: product.relIdFk,
+                nameCode: product.nameCode,
+                batchNo: product.batchNo,
+                produceDate: product.productionDate,
+                expireDate: product.expireDate
+              };
+              addCountOrderDetail(detailData).then((result) => {
+                if (result.code === 20000) {
+                  this.getList();
+                  this.getCountOrderList();
+                }
+              });
+            })
+          } else {
+            this.closeDialog();
+          }
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    enterKey(event) {
+      if (this.codeArray.length === 0) {
+        this.$message.error("请先录入盘点产品！");
+        return;
+      }
+      this.addCode();
+      this.$refs.inputRef.focus();
+      this.$refs.inputRef.select();
+    },
+    addCode() {
+      if (this.countType != 1) {
+        if (isBlank(this.formData.invCode)) {
+          this.$message.error("请先选择盘点仓库信息")
+          return;
+        }
+      } else if (this.countType === 1) {
+        if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) {
+          this.$message.error("请先选择盘点仓库和货位信息");
+          return;
+        }
+      }
+
+      if (this.codeArray.length < 1) {
+        this.$message.error("未选择盘点产品！")
+        return;
+      }
+      this.formData.code.trim();
+      let params = {
+        orderIdFk: this.formData.orderId,
+        code: this.formData.code
+      };
+      addCode(params).then((res) => {
+        if (res.code === 20000) {
+          this.getList()
+        } else {
+          this.$message.error(res.message);
+        }
+      })
+    },
+    deleteOrderDetail(index, row) {
+      this.$confirm('此操作将删除单据详情，是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {id: row.id};
+        deleteCountOrderDetail(params).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("删除成功");
+            this.getList();
+          }
+        })
+      }).catch(() => {
+      });
+    },
+    getList() {
+      let params = {orderIdFk: this.formData.orderId};
+      getCountOrderDetailList(params).then((res) => {
+        if (res.code === 20000) {
+          this.codeArray = res.data.list || [];
+        }
+      });
+    },
+    onReset() {
+      this.filterQuery = {
+        invCode: null,
+        invSpaceCode: null,
+        nameCode: null,
+        cpmctymc: null,
+        batchNo: null,
+        page: 1,
+        limit: 10
+      };
+      this.countProductList = [];
+      this.queryInvProducts();
+    },
+    queryInvProductsList() {
+      this.filterQuery.page = 1;
+      this.queryInvProducts();
+    },
+    queryInvProducts() {
+      this.filterQuery.invCode = this.formData.invCode;
+      this.filterQuery.invSpaceCode = this.formData.invSpaceCode;
+      getCountInvProductProduct(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;
+      });
+    },
+    combine() {
+      if (this.multiProduct.length === 0) {
+        this.$message.warning("请选择产品");
+        return;
+      }
+      this.multiProduct.forEach(product => {
+        this.countProductList.push(product);
+      })
+      if (this.codeArray.length === 0) {
+        //添加第一个产品，先保存单据，再添加单据详情
+        this.saveOrder(1);
+      }
+      this.selectInvProductVisible = false;
+    },
+    getRowKeys(row) {
+      return row.id;
+    },
+    handleSelectionChange(selectedRows) {
+      this.multiProduct = [];
+      selectedRows.forEach(item => {
+        this.multiProduct.push(item);
+      });
+    },
+    startCount() {
+      this.countProductList = [];
+      if (this.countType === 0) {
+        if (isBlank(this.formData.invCode)) {
+          this.$message.warning("请先选择盘点仓库");
+          return;
+        }
+        //拉取整个仓库的数据
+        let params = {
+          invCode: this.formData.invCode,
+          invSpaceCode: this.formData.invSpaceCode
+        };
+        getCountInvProductProduct(params).then((res) => {
+          if (res.data.total !== 0) {
+            let invProductList = res.data.list;
+            for (let product of invProductList) {
+              this.countProductList.push(product);
+            }
+            this.saveOrder(1);
+          }
+        });
+      } else if (this.countType === 1) {
+        if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) {
+          this.$message.warning("请先选择盘点仓库和货位");
+          return;
+        }
+        let params = {
+          invCode: this.formData.invCode,
+          invSpaceCode: this.formData.invSpaceCode
+        };
+        getCountInvProductProduct(params).then((res) => {
+          if (res.data.total !== 0) {
+            let invProductList = res.data.list;
+            for (let product of invProductList) {
+              this.countProductList.push(product);
+            }
+            this.saveOrder(1);
+          }
+        });
+      } else if (this.countType === 2) {
+        if (isBlank(this.formData.invStorageCode) || isBlank(this.formData.invWarehouseCode)) {
+          this.$message.warning("请先选盘点仓库");
+          return;
+        }
+        this.multiProduct = [];
+        this.selectInvProductVisible = true;
+        this.queryInvProducts();
+      }
+    },
+    showCodes(index, row) {
+      this.codesVisible = true;
+      this.codeQuery = {
+        orderIdFk: row.orderIdFk,
+        relId: row.relId,
+        batchNo: row.batchNo,
+        edit: true
+      }
+    },
+  },
+  components: {
+    invCountCodes
+  },
+  created() {
+    this.getInvList();
+    this.formData = this.countOrder;
+    if (!isBlank(this.formData.orderId)) {
+      //拉取单据详情信息
+      let params = {orderIdFk: this.countOrder.orderId};
+      getCountOrderDetailList(params).then((res) => {
+        if (res.code === 20000) {
+          this.codeArray = res.data.list || [];
+          this.total = res.data.total || 0;
+        }
+      })
+    }
+  },
+};
+</script>
+
diff --git a/src/views/inventory/InvCountOrderNew.vue b/src/views/inventory/InvCountOrderNew.vue
new file mode 100644
index 00000000..c054c19e
--- /dev/null
+++ b/src/views/inventory/InvCountOrderNew.vue
@@ -0,0 +1,333 @@
+<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="addCountOrder(0)">新增整库盘点</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(1)">新增货位盘点</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(2)">新增部分盘点</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+
+      <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" width="300"></el-table-column>
+        <el-table-column label="仓库" prop="invName" width="300"></el-table-column>
+        <el-table-column label="货位" prop="invSpaceName" width="300"></el-table-column>
+        <el-table-column label="盘点类型" prop="countType" width="150">
+          <template slot-scope="scope">
+            <span>{{ countTypeMap[scope.row.countType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="盘点人" prop="createUserName" width="200"></el-table-column>
+        <el-table-column label="盘点时间" prop="createTime"></el-table-column>
+        <el-table-column label="状态" prop="status" 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="printOrder(scope.row)"
+            >打印
+            </el-button
+            >
+            <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-dialog
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="formVisible"
+    >
+      <invCountOrderModify
+        :closeDialog="closeDialog"
+        :countOrder="countOrder"
+        :getCountOrderList="getList"
+        :countType="countType"
+      ></invCountOrderModify>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+import {
+  getCountOrderList,
+  deleteCountOrder,
+  submitAudit,
+  verifyTemplateFile,
+  printOrder
+} from "@/api/inventory/invCountOrder";
+import invCountOrderModify from "@/views/inventory/InvCountOrderModify.vue";
+
+export default {
+  name: "InvCountOrderNew",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 0,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      invList: [],
+      spaceList: [],
+      loading: false,
+      formVisible: false,
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+        2: "已审核"
+      },
+      formName: null,
+      formMap: {
+        add_0: "新增整库盘点单",
+        add_1: "新增货位盘点单",
+        add_2: "新增部分盘点单",
+        edit_0: "编辑整库盘点单",
+        edit_1: "编辑货位盘点单",
+        edit_2: "编辑部分盘点单"
+      },
+      countOrder: {},
+      countType: null,
+      countTypeMap: {
+        0: "整库盘点",
+        1: "货位盘点",
+        2: "部分盘点"
+      }
+    };
+  },
+  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;
+      getCountOrderList(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.filterQuery.fromInvSpaceCode = null;
+      this.getSpaceList();
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSpaceList() {
+      let params = {invWarehouseCode: this.filterQuery.invCode};
+      getInvSpaceList(params).then((res) => {
+        this.spaceList = res.data.list || [];
+        this.getList();
+      })
+    },
+    addCountOrder(type) {
+      this.formVisible = true;
+      this.formName = 'add_' + type;
+      this.countOrder = {};
+      this.countType = type;
+    },
+    printOrder(row) {
+      let query = {moduleId: 6};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          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);
+      })
+    },
+    editOrder(row) {
+      this.formVisible = true;
+      this.formName = "edit_" + row.countType;
+      this.deviceReceiveOrder = 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;
+        deleteCountOrder(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: {
+    invCountOrderModify
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue
new file mode 100644
index 00000000..9b61381d
--- /dev/null
+++ b/src/views/inventory/InvMAOrderAudit.vue
@@ -0,0 +1,337 @@
+<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-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="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="auditOrder(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-card>
+      <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
+        <el-table-column label="序号" type="index" width="50"></el-table-column>
+        <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column width="200" label="产品通用名" prop="productName"></el-table-column>
+        <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="养护日期" prop="createTime" width="150"></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="true" v-model="scope.row.maStatus"
+                      :label="0">未养护
+            </el-radio>
+            <el-radio disabled="true" 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 v-model="scope.row.deviceStatus" :label="1" disabled="true">
+              正常
+            </el-radio>
+            <el-radio v-model="scope.row.deviceStatus" :label="0" disabled="true">
+              异常
+            </el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column width="200" label="养护备注" prop="remark">
+        </el-table-column>
+        <el-table-column width="150" label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
+        <el-table-column width="160" label="失效日期(yyMMdd)" prop="expireDate"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
+                         show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <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, getInvMAOrderDetailList, updateStatus} from "@/api/inventory/invMAOrder";
+
+export default {
+  name: "InvMAOrderAudit",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 1,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      invList: [],
+      spaceList: [],
+      loading: false,
+      codeTableLoading: false,
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+        2: "已审核"
+      },
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20,
+      },
+      detailList: [],
+      detailLoading: false,
+      detailTotal: 0
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 1,
+        page: 1,
+        limit: 20,
+      };
+      this.spaceList = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.detailList = [];
+      this.detailTotal = 0;
+      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 || [];
+      })
+    },
+    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
+        };
+        updateStatus(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
+          };
+          updateStatus(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;
+        }
+      });
+    },
+    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;
+        });
+      });
+    },
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      getInvMAOrderDetailList(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;
+      });
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/InvMAOrderCompleted.vue b/src/views/inventory/InvMAOrderCompleted.vue
new file mode 100644
index 00000000..16221a96
--- /dev/null
+++ b/src/views/inventory/InvMAOrderCompleted.vue
@@ -0,0 +1,254 @@
+<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-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="auditUserName"></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>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
+        <el-table-column label="序号" type="index" width="50"></el-table-column>
+        <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column width="200" label="产品通用名" prop="productName"></el-table-column>
+        <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="养护日期" prop="createTime" width="150"></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="true" v-model="scope.row.maStatus"
+                      :label="0">未养护
+            </el-radio>
+            <el-radio disabled="true" 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 v-model="scope.row.deviceStatus" :label="1" disabled="true">
+              正常
+            </el-radio>
+            <el-radio v-model="scope.row.deviceStatus" :label="0" disabled="true">
+              异常
+            </el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column width="200" label="养护备注" prop="remark">
+        </el-table-column>
+        <el-table-column width="150" label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
+        <el-table-column width="160" label="失效日期(yyMMdd)" prop="expireDate"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
+                         show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <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, getInvMAOrderDetailList} from "@/api/inventory/invMAOrder";
+
+export default {
+  name: "InvMAOrderCompleted",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 2,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      invList: [],
+      spaceList: [],
+      loading: false,
+      codeTableLoading: false,
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+        2: "已审核"
+      },
+      detailList: [],
+      detailLoading: false,
+      detailQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 20,
+      },
+      detailTotal: 0
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 2,
+        page: 1,
+        limit: 20,
+      };
+      this.spaceList = [];
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.detailList = [];
+      this.detailTotal = 0;
+      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 || [];
+      })
+    },
+    handleChange(row) {
+      this.detailQuery.orderIdFk = row.orderId;
+      this.detailQuery.page = 1;
+      this.getDetailList();
+    },
+    getDetailList() {
+      getInvMAOrderDetailList(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;
+      });
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue
new file mode 100644
index 00000000..b8bf9d12
--- /dev/null
+++ b/src/views/inventory/InvMAOrderModify.vue
@@ -0,0 +1,562 @@
+<template>
+  <div>
+    <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"
+            :disabled="this.detailList.length > 0"
+            @click.native="selectInvProduct()"
+          >录入产品
+          </el-button>
+          <el-button
+            type="primary"
+            @click.native="saveMAOrder()"
+          >保存
+          </el-button>
+        </el-button-group>
+
+        <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.invCode" placeholder="养护仓库信息"
+                         :disabled="detailList.length >0 "
+                         @change="invChange"
+                         style="width: 90%;"
+                         clearable>
+                <el-option
+                  v-for="item in warehouseList"
+                  :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.invSpaceCode" 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.code }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="18">
+            <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="2">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="addCode()"
+              style="margin-left: 15px"
+            >添加
+            </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="库存产品录入"
+      :visible.sync="selectInvProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectInvProductVisible"
+      :append-to-body='true'
+    >
+      <el-form :inline="true" :model="filterQuery" size="mini">
+        <el-row>
+          <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 {getInvSpaceList} from "@/api/inventory/invSpace";
+import {
+  addInvMAOrder,
+  addInvMAOrderDetail,
+  batchAddDetail,
+  updateInvMAOrderDetail,
+  updateInvMAOrder,
+  deleteInvMAOrderDetail,
+  getInvMAOrderDetailList
+} from "@/api/inventory/invMAOrder";
+import {getInvMAProducts} from "@/api/inventory/invPorduct";
+import {isBlank} from "@/utils/strUtil";
+
+export default {
+  props: {
+    maOrder: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      filterQuery: {
+        nameCode: null,
+        cpmctymc: null,
+        batchNo: null,
+        invCode: null,
+        invSpaceCode: null,
+        page: 1,
+        limit: 10
+      },
+      productList: [],
+      productTotal: 0,
+      warehouseList: [],
+      spaceList: [],
+      formData: {
+        orderId: null,
+        createTime: null,
+        invCode: null,
+        invSpaceCode: null,
+        status: 0,
+        code: null,
+      },
+      detailList: [],
+      loading: false,
+      scanText: "扫码录入：",
+      currentIndex: -1,
+      selectInvProductVisible: false,
+      multiProduct: []
+    }
+  },
+  methods: {
+    getInvList() {
+      getInvListByUser().then((res) => {
+        if (res.code === 20000) {
+          this.warehouseList = res.data || [];
+          if (!isBlank(this.maOrder.invSpaceCode)) {
+            this.invChange();
+            this.formData.invSpaceCode = this.maOrder.invSpaceCode;
+          }
+        }
+      });
+    },
+    invChange() {
+      this.formData.invSpaceCode = null;
+      this.spaceList = [];
+      let params = {invWarehouseCode: this.formData.invCode};
+      getInvSpaceList(params).then((res) => {
+        this.spaceList = res.data.list || [];
+      });
+    },
+    selectInvProduct() {
+      if (isBlank(this.formData.invCode)) {
+        this.$message.error("请选择养护仓库");
+        return;
+      }
+      //保存或更新养护记录仓库信息
+      this.saveOrder();
+      this.onReset();
+      this.selectInvProductVisible = true;
+    },
+    saveMAOrder() {
+      this.saveOrder();
+      this.closeDialog();
+    },
+    saveOrder(code) {
+      if (isBlank(this.formData.invCode)) {
+        this.$message.warning("请选择养护仓库！");
+        return;
+      }
+      if (!isBlank(this.formData.orderId)) {
+        //更新单据
+        updateInvMAOrder(this.formData).then((res) => {
+          if (!isBlank(this.formData.code)) {
+            //扫码添加库存养护记录详情
+            let params = {
+              orderIdFk: this.formData.orderId,
+              code: this.formData.code
+            }
+            addInvMAOrderDetail(params).then((res) => {
+              if (res.code === 20000) {
+                this.$message.success("添加成功！");
+                this.getList();
+              } else {
+                this.$message.error(res.message);
+              }
+            });
+          }
+        }).catch((error) => {
+          this.$message.error("更新单据信息失败！");
+        })
+      } else {
+        addInvMAOrder(this.formData).then((res) => {
+          if (res.code === 20000) {
+            this.formData.orderId = res.data.orderId;
+            this.formData.createTime = res.data.createTime;
+            if (!isBlank(code)) {
+              //扫码添加库存养护记录详情
+              let params = {
+                orderIdFk: this.formData.orderId,
+                code: this.formData.code
+              }
+              addInvMAOrderDetail(params).then((res) => {
+                if (res.code === 20000) {
+                  this.$message.success("添加成功！");
+                  this.getList();
+                } else {
+                  this.$message.error(res.message);
+                }
+              });
+            }
+          } else {
+            this.$message.error(res.message);
+          }
+        });
+      }
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    enterKey(event) {
+      this.addCode();
+      this.$refs.inputRef.focus();
+      this.$refs.inputRef.select();
+    },
+    addCode() {
+      if (isBlank(this.formData.invCode)) {
+        this.$message.warning("请先选择养护仓库！");
+        return;
+      }
+      if (isBlank(this.formData.code)) {
+        this.$message.error("请输入或扫描条码！")
+        return;
+      }
+      if (isBlank(this.formData.orderId)) {
+        this.saveOrder(this.formData.code);
+        return;
+      }
+
+      if (this.detailList.length === 0) {
+        this.saveOrder();
+      } else {
+        //扫码添加库存养护记录详情
+        let params = {
+          orderIdFk: this.formData.orderId,
+          code: this.formData.code
+        };
+        addInvMAOrderDetail(params).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("添加成功！");
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        });
+      }
+    },
+    deleteOrderDetail(index, row) {
+      if (row.count === 1) {
+        this.$confirm('此产品养护数量为1，减一后将删除此产品养护记录，是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {id: row.id};
+          deleteInvMAOrderDetail(params).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success("删除成功");
+              this.getList();
+            }
+          })
+        }).catch(() => {
+        });
+      } else {
+        let params = {id: row.id};
+        deleteInvMAOrderDetail(params).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("删除成功");
+            this.getList();
+          }
+        })
+      }
+    },
+    getList() {
+      let params = {orderIdFk: this.formData.orderId};
+      getInvMAOrderDetailList(params).then((res) => {
+        if (res.code === 20000) {
+          this.detailList = res.data.list || [];
+        }
+      })
+    },
+    updateOrderDetail(row) {
+      updateInvMAOrderDetail(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: null,
+        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;
+      });
+    },
+    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
+      };
+      batchAddDetail(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);
+      });
+    },
+  },
+  created() {
+    this.getInvList();
+    if (null !== this.maOrder) {
+      this.formData.orderId = this.maOrder.orderId;
+      this.formData.createTime = this.maOrder.createTime;
+      this.formData.invCode = this.maOrder.invWarehouseCode;
+      this.getList();
+    }
+  },
+};
+</script>
+
diff --git a/src/views/inventory/InvMAOrderNew.vue b/src/views/inventory/InvMAOrderNew.vue
new file mode 100644
index 00000000..04b2243b
--- /dev/null
+++ b/src/views/inventory/InvMAOrderNew.vue
@@ -0,0 +1,272 @@
+<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-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-dialog
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="formVisible"
+    >
+      <invMAOrderModify
+        :maOrder="maOrder"
+        :closeDialog="closeDialog"
+      ></invMAOrderModify>
+    </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 invMAOrderModify from "@/views/inventory/InvMAOrderModify.vue";
+
+export default {
+  name: "InvMAOrderNew",
+  data() {
+    return {
+      filterQuery: {
+        orderId: null,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        status: 0,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      invList: [],
+      spaceList: [],
+      loading: false,
+      formVisible: false,
+      codeTableLoading: false,
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+        2: "已审核"
+      },
+      formName: null,
+      formMap: {
+        add: "新增养护记录",
+        edit: "编辑养护记录"
+      },
+      maOrder: {},
+    };
+  },
+  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) => {
+        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();
+    },
+  },
+  components: {
+    invMAOrderModify
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 0e8bfd55..62c5e031 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -171,6 +171,7 @@
             :title="formManufacturerMap[formManufacturerName]"
             :visible.sync="addInfoVisible"
             width="80%"
+            :before-close="headClose"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             v-if="addInfoVisible"
@@ -516,6 +517,10 @@ export default {
             this.manufacturerList = [];
             this.getManufacturerList();
         },
+      headClose(){
+        this.addInfoVisible = false;
+        this.getManufacturerList();
+      },
         onManufacturerSubmit() {
             this.manufacturerList = [];
             this.getManufacturerList();
diff --git a/src/views/purchase/cert/supCertSet.vue b/src/views/purchase/cert/supCertSet.vue
index 5282c61d..b930fb4d 100644
--- a/src/views/purchase/cert/supCertSet.vue
+++ b/src/views/purchase/cert/supCertSet.vue
@@ -286,7 +286,7 @@
 
                     <el-row>
                         <el-col :span="11">
-                            <el-form-item label="器械类别：" prop="require">
+                            <el-form-item label="产品类型：" prop="require">
                                 <el-select v-model="currentProduct.cplx" style="width: 90%">
                                     <el-option label="全部"  key="全部" value="全部"></el-option>
                                     <el-option label="器械"  key="器械" value="器械"></el-option>
diff --git a/src/views/purchase/company/supCompanyAdd.vue b/src/views/purchase/company/supCompanyAdd.vue
index 5b6afe8f..248f4348 100644
--- a/src/views/purchase/company/supCompanyAdd.vue
+++ b/src/views/purchase/company/supCompanyAdd.vue
@@ -69,6 +69,7 @@
             @close='closeDialog'
             :close-on-click-modal="false"
             :close-on-press-escape="false"
+            :before-close="handleClose"
         >
             <supCompanyEdit
                 :closeDialog="closeDialog"
@@ -160,6 +161,10 @@ export default {
          hideSearch() {
            this.showSearch = !this.showSearch;
          },
+      handleClose(){
+          this.supCompanyVisible=false;
+          this. getList();
+      },
         getList() {
             this.loading = true;
             getSupComapnys(this.filterQuery)
@@ -231,6 +236,7 @@ export default {
 
         closeDialog() {
             this.supCompanyVisible = false;
+            this.getList();
         },
 
     },
diff --git a/src/views/purchase/company/supCompanyEditDialog.vue b/src/views/purchase/company/supCompanyEditDialog.vue
index 3628449f..44692c09 100644
--- a/src/views/purchase/company/supCompanyEditDialog.vue
+++ b/src/views/purchase/company/supCompanyEditDialog.vue
@@ -126,7 +126,11 @@
                     <el-table-column label="证书编号" prop="code"></el-table-column>
                     <el-table-column label="有效期" prop="vailDate"></el-table-column>
                     <el-table-column label="失效期" prop="expireDate"></el-table-column>
-<!--                    <el-table-column label="证书状态" prop="status"></el-table-column>-->
+                    <el-table-column label="证书状态" >
+                      <template slot-scope="scope">
+                        {{ status=0 ? '有效' : '失效' }}
+                      </template>
+                    </el-table-column>
                     <el-table-column label="审核状态" prop="auditStatus" width="120">
                         <template slot-scope="scope">
                             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index 97168f1f..c16d70fa 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -5,7 +5,7 @@
                     <el-row>
                       <el-col :span="12">
                         <el-form-item label="UDI码:" class="query-form-item">
-                            <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
+                            <el-input v-model="listQuery.nameCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
                         </el-form-item>
                       </el-col>
                      <el-col :span="6">
diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue
index 8842dedd..a74ccf46 100644
--- a/src/views/system/param/busTypeChange.vue
+++ b/src/views/system/param/busTypeChange.vue
@@ -119,6 +119,7 @@ export default {
         targetAction: null,
         name: null,
         enable: null,
+        type: null,
         remark: null
       },
       enableMap: {
@@ -131,6 +132,7 @@ export default {
         1: "耗材领用",
         2: "产品申购",
         3: "采购计划",
+        4: "盘点转单"
       },
       formMap: {
         add: "新增单据生成设置",
@@ -186,11 +188,11 @@ export default {
 
     onAddSubmit() {
       if (isBlank(this.inputQuery.originName)) {
-        this.$message.error("补单类型名称不能为空！")
+        this.$message.error("单据类型名称不能为空！")
         return;
       }
       if (isBlank(this.inputQuery.originAction)) {
-        this.$message.error("补单类型代码不能为空！");
+        this.$message.error("单据类型代码不能为空！");
         return;
       }
       if (isBlank(this.inputQuery.targetAction)) {
@@ -198,7 +200,11 @@ export default {
         return;
       }
       if (isBlank(this.inputQuery.enable)) {
-        this.$message.error("请选择启用状态！")
+        this.$message.error("请选择启用状态！");
+        return;
+      }
+      if (isBlank(this.inputQuery.type)) {
+        this.$message.error("请选择类型！");
         return;
       }
 
@@ -209,10 +215,10 @@ export default {
           this.$message.error("单据类型名称不得为纯数字类型！");
           return;
         }
-        this.inputQuery.type = 1;           //默认类型为耗材领用
 
         addBusTypeChange(this.inputQuery).then((res) => {
           if (res.code === 20000) {
+            this.cancelDialog();
             this.loading = false;
             this.getList();
           }
diff --git a/src/views/system/param/busTypeChangeModify.vue b/src/views/system/param/busTypeChangeModify.vue
index f00ca94e..13719b6e 100644
--- a/src/views/system/param/busTypeChangeModify.vue
+++ b/src/views/system/param/busTypeChangeModify.vue
@@ -15,7 +15,6 @@
         </el-col>
       </el-row>
 
-
       <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="目标单据类型" prop="targetAction">
@@ -48,6 +47,24 @@
         </el-col>
       </el-row>
 
+      <el-row type="flex">
+        <el-col :span="11">
+          <el-form-item label="类型">
+            <el-select v-model="inputQuery.type"
+                       size="small"
+                       placeholder="类型"
+                       style="width: 90%"
+                       clearable
+            >
+              <el-option label="耗材领用" :value="1"></el-option>
+              <el-option label="产品申购" :value="2"></el-option>
+              <el-option label="采购计划" :value="3"></el-option>
+              <el-option label="盘点转单" :value="4"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row type="flex">
         <el-col :span="23" type="flex">
           <el-form-item prop="comments">
@@ -87,14 +104,14 @@ export default {
         originName: [
           {
             required: true,
-            message: "补单类型名称不能为空",
+            message: "单据类型名称不能为空",
             trigger: "blur"
           }
         ],
         originAction: [
           {
             required: true,
-            message: "补单类型代码不能为空",
+            message: "单据类型代码不能为空",
             trigger: "blur"
           }
         ],
@@ -112,6 +129,19 @@ export default {
             trigger: "blur"
           }
         ],
+        type: [
+          {
+            required: true,
+            message: "请选择类型",
+            trigger: "blur"
+          }
+        ],
+      },
+      typeMap: {
+        1: "耗材领用",
+        2: "产品申购",
+        3: "采购计划",
+        4: "盘点转单"
       },
     }
   },