diff --git a/src/api/inventory/deviceRepairOrder.js b/src/api/inventory/deviceRepairOrder.js
index 6c9271be..f0d29ecb 100644
--- a/src/api/inventory/deviceRepairOrder.js
+++ b/src/api/inventory/deviceRepairOrder.js
@@ -9,18 +9,9 @@ export function getRepairList(params) {
   });
 }
 
-export function addDeviceRepairOrder(params) {
+export function saveDeviceRepairOrder(params, formName) {
   return axios({
-    url: "/udiwms/inv/device/repair/order/addDeviceRepairOrder",
-    method: "post",
-    data: params
-  });
-}
-
-
-export function updateDeviceRepairOrder(params) {
-  return axios({
-    url: "/udiwms/inv/device/repair/order/updateDeviceRepairOrder",
+    url: formName === "add" ? "/udiwms/inv/device/repair/order/addDeviceRepairOrder" : "/udiwms/inv/device/repair/order/updateDeviceRepairOrder",
     method: "post",
     data: params
   });
@@ -34,7 +25,6 @@ export function submitAudit(params) {
   });
 }
 
-
 export function updateStatus(params) {
   return axios({
     url: "/udiwms/inv/device/repair/order/updateStatus",
@@ -43,8 +33,6 @@ export function updateStatus(params) {
   });
 }
 
-
-
 export function deleteRepairOrder(params) {
   return axios({
     url: "/udiwms/inv/device/repair/order/deleteRepairOrder",
diff --git a/src/views/inventory/DeviceInspectPlanAudit.vue b/src/views/inventory/DeviceInspectPlanAudit.vue
index e5937727..23b1f0f2 100644
--- a/src/views/inventory/DeviceInspectPlanAudit.vue
+++ b/src/views/inventory/DeviceInspectPlanAudit.vue
@@ -236,7 +236,7 @@ export default {
         distinguishCancelAndClose: true,//区分取消与关闭
       }).then(() => {
         let params = {
-          id: row.id,
+          orderId: row.orderId,
           status: 2
         };
         updateStatus(params).then((res) => {
@@ -252,7 +252,7 @@ export default {
       }).catch((action) => {
         if (action === "cancel") {
           let params = {
-            id: row.id,
+            orderId: row.orderId,
             status: 0
           };
           updateStatus(params).then((res) => {
diff --git a/src/views/inventory/DeviceInspectPlanModify.vue b/src/views/inventory/DeviceInspectPlanModify.vue
index 946c0f11..57996884 100644
--- a/src/views/inventory/DeviceInspectPlanModify.vue
+++ b/src/views/inventory/DeviceInspectPlanModify.vue
@@ -279,6 +279,8 @@ export default {
   },
   created() {
     this.getDeptList();
+    if (!isBlank(this.inspectPlan.id)) {
+    }
   },
 }
 </script>
diff --git a/src/views/inventory/DeviceRepairOrderAudit.vue b/src/views/inventory/DeviceRepairOrderAudit.vue
index 4e441f60..73caafd3 100644
--- a/src/views/inventory/DeviceRepairOrderAudit.vue
+++ b/src/views/inventory/DeviceRepairOrderAudit.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" label-width="100px" >
+      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
 
         <el-row>
-          <el-col :span="10">
+          <el-col :span="8">
             <el-form-item class="query-form-item" label="报修记录号:">
-              <el-input v-model="filterQuery.orderId"  style="width: 90%" placeholder="请输入报修记录号"
+              <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="10">
-            <el-form-item class="query-form-item" label="领用部门:">
-              <el-select v-model="filterQuery.deptCode"   style="width: 90%"  placeholder="请选择部门" clearable="true"
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="部门:">
+              <el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
                          @change="deptChange"
               >
                 <el-option
@@ -26,12 +26,10 @@
               </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="filterQuery.fromInvCode"   style="width: 90%" placeholder="请选择仓库" clearable="true"
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="仓库:">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
               >
                 <el-option
                   v-for="item in invList"
@@ -43,11 +41,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
 
-
-          <el-col :span="10">
+        <el-row>
+          <el-col :span="8">
             <el-form-item class="query-form-item" label="资产编码:">
-              <el-input v-model="filterQuery.code"  style="width: 90%" placeholder="请输入资产编码"
+              <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -55,27 +54,32 @@
       </el-form>
       <div class="top-right-btn">
         <el-button-group style="margin-left: 10px;display:flex;">
+          <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 label="序号" type="index"></el-table-column>
         <el-table-column label="设备报修记录号" prop="orderId"></el-table-column>
+        <el-table-column label="部门" prop="deptName"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="设备名称" prop="deviceName"></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="code"></el-table-column>
-        <el-table-column label="部门" prop="deptName"></el-table-column>
-        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="创建日期" prop="createTime"></el-table-column>
-        <el-table-column label="审核日期" prop="auditTime"></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-column label="报修说明" prop="msg"></el-table-column>
-        <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -103,70 +107,63 @@
         @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";
-import {getRepairList} from "@/api/inventory/deviceRepairOrder";
+import {getRepairList, updateStatus, deleteRepairOrder} from "@/api/inventory/deviceRepairOrder";
 
 export default {
-  name: "DeviceReceiveOrderAudit",
+  name: "DeviceRepairOrderAudit",
   data() {
     return {
       filterQuery: {
         orderId: null,
-        fromDeptCode: this.$store.getters.locDeptCode,
-        fromInvCode: null,
-        fromInvSpaceCode: null,
+        deptCode: this.$store.getters.locDeptCode,
+        invCode: null,
         status: 1,
         page: 1,
-        limit: 20,
+        limit: 20
       },
       list: [],
       total: 0,
       deptList: [],
       invList: [],
-      spaceList: [],
       loading: false,
+      formVisible: false,
+      codeTableLoading: false,
       statusMap: {
         0: "草稿",
         1: "未审核",
         2: "已审核"
       },
-      detailQuery: {
-        orderIdFk: null,
-        page: 1,
-        limit: 20,
+      formName: null,
+      formMap: {
+        add: "新增设备报修单",
+        edit: "编辑设备报修单"
       },
-      detailList: [],
-      detailLoading: false,
-      detailTotal: 0
+      showSearch: true
     };
   },
   methods: {
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     onReset() {
       this.$router.push({
         path: "",
       });
       this.filterQuery = {
         orderId: null,
-        fromDeptCode: this.$store.getters.locDeptCode,
-        fromInvCode: null,
-        fromInvSpaceCode: null,
+        deptCode: this.$store.getters.locDeptCode,
+        invCode: null,
         status: 1,
         page: 1,
-        limit: 20,
+        limit: 20
       };
-      this.spaceList = [];
       this.getList();
     },
     onSubmit() {
@@ -194,9 +191,7 @@ export default {
     },
     deptChange() {
       this.invList = [];
-      this.spaceList = [];
-      this.filterQuery.fromInvCode = null;
-      this.filterQuery.fromInvSpaceCode = null;
+      this.filterQuery.invCode = null;
       this.getInvList();
     },
     getDeptList() {
@@ -207,12 +202,10 @@ export default {
       });
     },
     invChange() {
-      this.spaceList = [];
-      this.filterQuery.fromInvSpaceCode = null;
-      this.getSpaceList();
+      this.getList();
     },
     getInvList() {
-      let params = {deptCode: this.filterQuery.fromDeptCode};
+      let params = {deptCode: this.filterQuery.deptCode};
       findInvByUser(params)
         .then((response) => {
           this.invList = response.data || [];
@@ -221,12 +214,26 @@ export default {
         .catch(() => {
         });
     },
-    getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.fromDeptCode, status: 1};
-      getInvSpaceList(params).then((res) => {
-        this.spaceList = res.data.list || [];
-        this.getList();
-      })
+    deleteDialog(rowId) {
+      this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let params = {id: rowId};
+        this.loading = true;
+        deleteRepairOrder(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;
+        });
+      });
     },
     auditOrder(row) {
       this.$confirm('请选择审核意见', '提示', {
@@ -239,10 +246,10 @@ export default {
         distinguishCancelAndClose: true,//区分取消与关闭
       }).then(() => {
         let params = {
-          id: row.id,
+          orderId: row.orderId,
           status: 2
         };
-        updateDeviceReceiveOrderStatus(params).then((res) => {
+        updateStatus(params).then((res) => {
           if (res.code === 20000) {
             this.$message.success("审核通过！");
             this.getList();
@@ -255,10 +262,10 @@ export default {
       }).catch((action) => {
         if (action === "cancel") {
           let params = {
-            id: row.id,
+            orderId: row.orderId,
             status: 0
           };
-          updateDeviceReceiveOrderStatus(params).then((res) => {
+          updateStatus(params).then((res) => {
             if (res.code === 20000) {
               this.$message.success("已驳回！")
               this.getList();
@@ -273,32 +280,8 @@ export default {
         }
       });
     },
-    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: {},
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
diff --git a/src/views/inventory/DeviceRepairOrderCompleted.vue b/src/views/inventory/DeviceRepairOrderCompleted.vue
index 21a60c1a..f87e50a7 100644
--- a/src/views/inventory/DeviceRepairOrderCompleted.vue
+++ b/src/views/inventory/DeviceRepairOrderCompleted.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" label-width="100px" >
+      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
 
         <el-row>
-          <el-col :span="10">
+          <el-col :span="8">
             <el-form-item class="query-form-item" label="报修记录号:">
-              <el-input v-model="filterQuery.orderId"  style="width: 90%" placeholder="请输入报修记录号"
+              <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="10">
-            <el-form-item class="query-form-item" label="领用部门:">
-              <el-select v-model="filterQuery.deptCode"   style="width: 90%"  placeholder="请选择部门" clearable="true"
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="部门:">
+              <el-select v-model="filterQuery.deptCode" style="width: 90%" placeholder="请选择部门" clearable="true"
                          @change="deptChange"
               >
                 <el-option
@@ -26,12 +26,10 @@
               </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="filterQuery.fromInvCode"   style="width: 90%" placeholder="请选择仓库" clearable="true"
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="仓库:">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
               >
                 <el-option
                   v-for="item in invList"
@@ -43,11 +41,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
 
-
-          <el-col :span="10">
+        <el-row>
+          <el-col :span="8">
             <el-form-item class="query-form-item" label="资产编码:">
-              <el-input v-model="filterQuery.code"  style="width: 90%" placeholder="请输入资产编码"
+              <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -55,27 +54,34 @@
       </el-form>
       <div class="top-right-btn">
         <el-button-group style="margin-left: 10px;display:flex;">
+          <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 label="序号" type="index"></el-table-column>
         <el-table-column label="设备报修记录号" prop="orderId"></el-table-column>
+        <el-table-column label="部门" prop="deptName"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="设备名称" prop="deviceName"></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="code"></el-table-column>
-        <el-table-column label="部门" prop="deptName"></el-table-column>
-        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="创建日期" prop="createTime"></el-table-column>
-        <el-table-column label="审核日期" prop="auditTime"></el-table-column>
         <el-table-column label="创建人" prop="createUserName"></el-table-column>
+        <el-table-column label="审核日期" prop="auditTime"></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-column label="报修说明" prop="msg"></el-table-column>
-        <el-table-column label="备注" prop="remark"></el-table-column>
       </el-table>
       <pagination
         v-show="total>0"
@@ -86,69 +92,58 @@
       ></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";
-import {getRepairList} from "@/api/inventory/deviceRepairOrder";
+import {getRepairList, updateStatus, deleteRepairOrder} from "@/api/inventory/deviceRepairOrder";
 
 export default {
-  name: "DeviceReceiveOrderCompleted",
+  name: "DeviceRepairOrderAudit",
   data() {
     return {
       filterQuery: {
         orderId: null,
-        fromDeptCode: this.$store.getters.locDeptCode,
-        fromInvCode: null,
-        fromInvSpaceCode: null,
+        deptCode: this.$store.getters.locDeptCode,
+        invCode: null,
         status: 2,
         page: 1,
-        limit: 20,
+        limit: 20
       },
       list: [],
       total: 0,
       deptList: [],
       invList: [],
-      spaceList: [],
       loading: false,
+      formVisible: false,
+      codeTableLoading: false,
       statusMap: {
         0: "草稿",
         1: "未审核",
         2: "已审核"
       },
-      detailQuery: {
-        orderIdFk: null,
-        page: 1,
-        limit: 20,
-      },
-      detailList: [],
-      detailLoading: false,
-      detailTotal: 0
+      formName: null,
+      showSearch: true
     };
   },
   methods: {
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     onReset() {
       this.$router.push({
         path: "",
       });
       this.filterQuery = {
         orderId: null,
-        fromDeptCode: this.$store.getters.locDeptCode,
-        fromInvCode: null,
-        fromInvSpaceCode: null,
+        deptCode: this.$store.getters.locDeptCode,
+        invCode: null,
         status: 2,
         page: 1,
-        limit: 20,
+        limit: 20
       };
-      this.spaceList = [];
       this.getList();
     },
     onSubmit() {
@@ -157,8 +152,6 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.detailList = [];
-      this.detailTotal = 0;
       getRepairList(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
@@ -178,9 +171,7 @@ export default {
     },
     deptChange() {
       this.invList = [];
-      this.spaceList = [];
-      this.filterQuery.fromInvCode = null;
-      this.filterQuery.fromInvSpaceCode = null;
+      this.filterQuery.invCode = null;
       this.getInvList();
     },
     getDeptList() {
@@ -191,12 +182,10 @@ export default {
       });
     },
     invChange() {
-      this.spaceList = [];
-      this.filterQuery.fromInvSpaceCode = null;
-      this.getSpaceList();
+      this.getList();
     },
     getInvList() {
-      let params = {deptCode: this.filterQuery.fromDeptCode};
+      let params = {deptCode: this.filterQuery.deptCode};
       findInvByUser(params)
         .then((response) => {
           this.invList = response.data || [];
@@ -205,22 +194,8 @@ export default {
         .catch(() => {
         });
     },
-    getSpaceList() {
-      let params = {
-        invWarehouseCode: this.filterQuery.fromInvCode,
-        invStorageCode: this.filterQuery.fromInvCode.fromDeptCode,
-        status: 1
-      };
-      getInvSpaceList(params).then((res) => {
-        this.spaceList = res.data.list || [];
-        this.getList();
-      })
-    },
-    closeDialog() {
-      this.formVisible = false;
-      this.getList();
-    },
   },
+  components: {},
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
diff --git a/src/views/inventory/DeviceRepairOrderModify.vue b/src/views/inventory/DeviceRepairOrderModify.vue
new file mode 100644
index 00000000..f686d6bd
--- /dev/null
+++ b/src/views/inventory/DeviceRepairOrderModify.vue
@@ -0,0 +1,298 @@
+<template>
+  <div>
+    <el-card style="margin: 5px;margin-top: -20px">
+      <el-form :model="repairOrder" 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="selectDevice()"
+          >选择设备
+          </el-button>
+          <el-button
+            type="primary"
+            @click.native="submit()"
+          >保存
+          </el-button>
+        </el-button-group>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="部门:">
+              <el-select v-model="repairOrder.deptCode"
+                         placeholder="请选择部门"
+                         clearable="true"
+                         @change="deptChange"
+                         style="width: 90%"
+              >
+                <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-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="仓库:">
+              <el-select v-model="repairOrder.invCode"
+                         placeholder="请选择仓库"
+                         clearable="true"
+                         style="width: 90%"
+              >
+                <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-row>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="设备名称:">
+              <el-input v-model="repairOrder.deviceName" placeholder="请输入设备名称" style="width: 90%"
+                        disabled
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="物资编码:">
+              <el-input v-model="repairOrder.code" placeholder="请输入编码" style="width: 90%" clearable
+                        disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="报修说明:">
+              <el-input v-model="repairOrder.msg" placeholder="请输入报修信息" style="width: 90%"
+                        type="textarea"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+
+    <el-dialog
+      title="选择巡检设备"
+      :visible.sync="deviceDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="65%"
+      v-if="deviceDialogVisible"
+      append-to-body
+    >
+      <el-form class="query-form" :model="filterQuery" :inline="true" label-width="100px">
+        <el-form-item class="query-form-item" label="部门:">
+          <el-input v-model="deptName" disabled></el-input>
+        </el-form-item>
+        <el-form-item class="query-form-item" label="仓库:">
+          <el-input v-model="invName" disabled></el-input>
+        </el-form-item>
+        <el-form-item class="query-form-item" label="资产编码:">
+          <el-input v-model="filterQuery.code" 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="queryDevice"
+            >查询
+            </el-button
+            >
+            <el-button type="primary" icon="search" @click="combine">确定</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="deviceLoading" :data="deviceList" style="width: 100%"
+                highlight-current-row
+                @current-change="handleCurrentChange"
+              >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="设备名称" prop="deviceName" width="200"></el-table-column>
+        <el-table-column label="资产编码" prop="code" width="200"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="120"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="120"></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="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="deviceTotal>0"
+        :total="deviceTotal"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getDeviceList"
+      ></pagination>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+import {isBlank} from "@/utils/strUtil";
+import {getDeptListByUser} from "@/api/auth/authDept";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {saveDeviceRepairOrder} from "@/api/inventory/deviceRepairOrder";
+import {getDeptDeviceList} from "@/api/inventory/deptDevice";
+
+
+export default {
+  props: {
+    repairOrder: {
+      type: Object,
+      required: true
+    },
+    closeDialog: {
+      type: Function,
+      required: true
+    }
+  },
+  name: "DeviceRepairOrderModify",
+  data() {
+    return {
+      deptList: [],
+      invList: [],
+      deviceDialogVisible: false,
+      deviceLoading: false,
+      filterQuery: {
+        code: null,
+        deptCode: null,
+        invCode: null,
+        page: 1,
+        limit: 10
+      },
+      deviceList: [],
+      deviceTotal: 0,
+      deptName: null,
+      invName: null,
+      selectRow: null
+    };
+  },
+  methods: {
+    deptChange() {
+      this.repairOrder.invCode = null;
+      this.invList = [];
+      this.getInvList();
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+        this.getInvList();
+      });
+    },
+    getInvList() {
+      let params = {deptCode: this.repairOrder.deptCode};
+      getInvListByUser(params)
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    submit() {
+      if (isBlank(this.repairOrder.deptCode) || isBlank(this.repairOrder.invCode) || isBlank(this.repairOrder.code)) {
+        this.$message.error("请设备相关信息")
+        return;
+      }
+      let formName = isBlank(this.repairOrder.id) ? "add" : "edit";
+      saveDeviceRepairOrder(this.repairOrder, formName).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("添加成功");
+          this.closeDialog();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      });
+    },
+    selectDevice() {
+      if (isBlank(this.repairOrder.deptCode) || isBlank(this.repairOrder.invCode)) {
+        this.$message.warning("请先选择报修设备所属部门和仓库");
+        return;
+      }
+      this.setDeptAnInvName();
+      this.deviceDialogVisible = true;
+      this.filterQuery = {
+        code: null,
+        deptCode: this.repairOrder.deptCode,
+        invCode: this.repairOrder.invCode,
+        page: 1,
+        limit: 10
+      }
+      this.getDeviceList();
+    },
+    getDeviceList() {
+      this.deviceLoading = true;
+      this.deviceList = [];
+      getDeptDeviceList(this.filterQuery).then((res) => {
+        this.deviceLoading = false;
+        if (res.code === 20000) {
+          this.deviceList = res.data.list || [];
+          this.deviceTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.deviceList = [];
+          this.deviceTotal = 0;
+        }
+      }).catch((error) => {
+        this.deviceLoading = false;
+        this.deviceList = [];
+        this.deviceTotal = 0;
+      });
+    },
+    setDeptAnInvName() {
+      this.deptList.forEach((item) => {
+        if (item.code === this.repairOrder.deptCode) {
+          this.deptName = item.name;
+        }
+      });
+
+      this.invList.forEach((item) => {
+        if (item.code === this.repairOrder.invCode) {
+          this.invName = item.name;
+        }
+      })
+    },
+    onReset() {
+      this.filterQuery.code = null;
+      this.filterQuery.page = 1;
+      this.getDeviceList();
+    },
+    queryDevice() {
+      this.filterQuery.page = 1;
+      this.getDeviceList();
+    },
+    handleCurrentChange(row) {
+      this.selectRow = row;
+    },
+    combine() {
+      this.deviceDialogVisible = false;
+      this.repairOrder.code = this.selectRow.code;
+      this.repairOrder.deviceName = this.selectRow.deviceName;
+    },
+  },
+  created() {
+    this.getDeptList();
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inventory/DeviceRepairOrderNew.vue b/src/views/inventory/DeviceRepairOrderNew.vue
index b5b210bc..a26110f5 100644
--- a/src/views/inventory/DeviceRepairOrderNew.vue
+++ b/src/views/inventory/DeviceRepairOrderNew.vue
@@ -1,89 +1,86 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" label-width="100px" >
+      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
 
         <el-row>
-          <el-col :span="10">
-        <el-form-item class="query-form-item" label="报修记录号:">
-          <el-input v-model="filterQuery.orderId"  style="width: 90%" placeholder="请输入报修记录号"
-                    clearable="true"></el-input>
-        </el-form-item>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="报修记录号:">
+              <el-input v-model="filterQuery.orderId" style="width: 90%" placeholder="请输入报修记录号"
+                        clearable="true"></el-input>
+            </el-form-item>
           </el-col>
 
-          <el-col :span="10">
-        <el-form-item class="query-form-item" label="领用部门:">
-          <el-select v-model="filterQuery.deptCode"   style="width: 90%"  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-col :span="8">
+            <el-form-item class="query-form-item" label="部门:">
+              <el-select v-model="filterQuery.deptCode" style="width: 90%" 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-col>
-        </el-row>
 
-        <el-row>
-          <el-col :span="10">
-        <el-form-item class="query-form-item" label="出库仓库:">
-          <el-select v-model="filterQuery.fromInvCode"   style="width: 90%" placeholder="请选择仓库" clearable="true"
-          >
-            <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 :span="8">
+            <el-form-item class="query-form-item" label="仓库:">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择仓库" clearable="true"
+              >
+                <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-row>
 
-
-          <el-col :span="10">
+        <el-row>
+          <el-col :span="8">
             <el-form-item class="query-form-item" label="资产编码:">
-              <el-input v-model="filterQuery.code"  style="width: 90%" placeholder="请输入资产编码"
+              <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入资产编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div class="top-right-btn">
-          <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-button-group style="margin-left: 10px;display:flex;">
+          <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 type="primary" icon="el-icon-plus" @click="addRepairOrder">新增报修单</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 label="序号" type="index"></el-table-column>
         <el-table-column label="设备报修记录号" prop="orderId"></el-table-column>
+        <el-table-column label="部门" prop="deptName"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="设备名称" prop="deviceName"></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="code"></el-table-column>
-        <el-table-column label="部门" prop="deptName"></el-table-column>
-        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="创建日期" prop="createTime"></el-table-column>
-        <el-table-column label="审核日期" prop="auditTime"></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-column label="报修说明" prop="msg"></el-table-column>
-        <el-table-column label="备注" prop="remark"></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
@@ -124,13 +121,13 @@
       :visible.sync="formVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="85%"
+      width="65%"
       v-if="formVisible"
     >
-      <deviceReceiveOrderModify
-        :deviceReceiveOrder="deviceReceiveOrder"
+      <deviceRepairOrderModify
+        :repairOrder="deviceRepairOrder"
         :closeDialog="closeDialog"
-      ></deviceReceiveOrderModify>
+      ></deviceRepairOrderModify>
     </el-dialog>
 
   </div>
@@ -139,28 +136,25 @@
 <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 {getRepairList,submitAudit,deleteRepairOrder } from "@/api/inventory/deviceRepairOrder";
+import {getRepairList, submitAudit, deleteRepairOrder} from "@/api/inventory/deviceRepairOrder";
+import deviceRepairOrderModify from "@/views/inventory/DeviceRepairOrderModify.vue";
 
 export default {
-  name: "DeviceReceiveOrderNew",
+  name: "DeviceRepairOrderNew",
   data() {
     return {
       filterQuery: {
         orderId: null,
-        fromDeptCode: this.$store.getters.locDeptCode,
-        fromInvCode: null,
-        fromInvSpaceCode: null,
+        deptCode: this.$store.getters.locDeptCode,
+        invCode: null,
         status: 0,
         page: 1,
-        limit: 20,
+        limit: 20
       },
       list: [],
       total: 0,
       deptList: [],
       invList: [],
-      spaceList: [],
       loading: false,
       formVisible: false,
       codeTableLoading: false,
@@ -171,27 +165,36 @@ export default {
       },
       formName: null,
       formMap: {
-        add: "新增设备报修记录",
-        edit: "编辑设备报修记录"
+        add: "新增设备报修单",
+        edit: "编辑设备报修单"
       },
-      deviceReceiveOrder: {},
+      deviceRepairOrder: {
+        id: null,
+        orderId: null,
+        deptCode: null,
+        invCode: null,
+        code: null,
+        msg: null
+      },
+      showSearch: true
     };
   },
   methods: {
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     onReset() {
       this.$router.push({
         path: "",
       });
       this.filterQuery = {
         orderId: null,
-        fromDeptCode: this.$store.getters.locDeptCode,
-        fromInvCode: null,
-        fromInvSpaceCode: null,
+        deptCode: this.$store.getters.locDeptCode,
+        invCode: null,
         status: 0,
         page: 1,
-        limit: 20,
+        limit: 20
       };
-      this.spaceList = [];
       this.getList();
     },
     onSubmit() {
@@ -219,9 +222,7 @@ export default {
     },
     deptChange() {
       this.invList = [];
-      this.spaceList = [];
-      this.filterQuery.fromInvCode = null;
-      this.filterQuery.fromInvSpaceCode = null;
+      this.filterQuery.invCode = null;
       this.getInvList();
     },
     getDeptList() {
@@ -232,12 +233,10 @@ export default {
       });
     },
     invChange() {
-      this.spaceList = [];
-      this.filterQuery.fromInvSpaceCode = null;
-      this.getSpaceList();
+      this.getList();
     },
     getInvList() {
-      let params = {deptCode: this.filterQuery.fromDeptCode};
+      let params = {deptCode: this.filterQuery.deptCode};
       findInvByUser(params)
         .then((response) => {
           this.invList = response.data || [];
@@ -246,25 +245,25 @@ export default {
         .catch(() => {
         });
     },
-    getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.fromDeptCode, status: 1};
-      getInvSpaceList(params).then((res) => {
-        this.spaceList = res.data.list || [];
-        this.getList();
-      })
-    },
-    addReceiveOrder() {
+    addRepairOrder() {
       this.formVisible = true;
       this.formName = 'add';
-      this.deviceReceiveOrder = {};
+      this.deviceRepairOrder = {
+        id: null,
+        orderId: null,
+        deptCode: null,
+        invCode: null,
+        code: null,
+        msg: null
+      };
     },
     editOrder(row) {
       this.formVisible = true;
       this.formName = 'edit';
-      this.deviceReceiveOrder = row;
+      this.deviceRepairOrder = row;
     },
     submitAudit(row) {
-      let params = {id: row.id};
+      let params = {orderId: row.orderId};
       submitAudit(params).then((res) => {
         if (res.code === 20000) {
           this.$message.success("提交成功！");
@@ -303,7 +302,7 @@ export default {
     },
   },
   components: {
-    deviceReceiveOrderModify
+    deviceRepairOrderModify
   },
   mounted() {
     document.body.ondrop = function (event) {