diff --git a/src/views/inventory/DeptDeviceDetail.vue b/src/views/inventory/DeptDeviceDetail.vue
index b0514a71..99734195 100644
--- a/src/views/inventory/DeptDeviceDetail.vue
+++ b/src/views/inventory/DeptDeviceDetail.vue
@@ -2,18 +2,30 @@
   <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="18">
+            <el-form-item class="query-form-item" label="扫码查询:">
+              <el-input v-model="filterQuery.udiCode"
+                        style="width: 97%"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="部门:">
-              <el-select v-model="filterQuery.deptCode" placeholder="请选择部门" clearable="true"
+            <el-form-item class="query-form-item" label="登记部门:">
+              <el-select v-model="filterQuery.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">
+                    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>
@@ -21,86 +33,88 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="仓库:">
-              <el-select v-model="filterQuery.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 class="query-form-item" label="负责人:">
+              <el-input v-model="filterQuery.manager" placeholder="请输入负责人" style="width: 90%" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="设备状态:">
+                <el-select v-model="filterQuery.status"
+                           style="width: 90%"
+                           placeholder="请选择设备状态"
+                           clearable
+                >
+                  <el-option
+                      v-for="item in statusMap"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+                  >
+                    {{ item.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="DI/物资编码:">
+              <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码" style="width: 90%"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="产品通用名称:">
+              <el-input v-model="filterQuery.deviceName" placeholder="请输入产品通用名称" style="width: 90%"
+                        clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="设备名称:">
-              <el-input v-model="filterQuery.deviceName" placeholder="请输入设备名称" style="width: 90%"
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号" style="width: 90%"
                         clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="资产编码:">
-              <el-input v-model="filterQuery.code" placeholder="请输入资产编码" style="width: 90%"
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.manufactory" placeholder="请输入生产企业" style="width: 90%"
                         clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="批次号:">
-              <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%"
+            <el-form-item class="query-form-item" label="注册/备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号" style="width: 90%"
                         clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号" style="width: 90%"
+            <el-form-item class="query-form-item" label="供应商:">
+              <el-input v-model="filterQuery.supName" placeholder="请输入供应商" style="width: 90%"
                         clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="设备状态:">
-              <el-select v-model="filterQuery.status"
-                         style="width: 90%"
-                         placeholder="请选择设备状态"
-                         clearable
-              >
-                <el-option
-                  v-for="item in statusMap"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                >
-                  {{ item.label }}
-                </el-option>
-              </el-select>
+            <el-form-item class="query-form-item" label="资产编码:">
+              <el-input v-model="filterQuery.code" placeholder="请输入资产编码" style="width: 90%" clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="添加方式:">
-              <el-select v-model="filterQuery.addType"
-                         style="width: 90%"
-                         placeholder="请选择添加方式"
-                         clearable
-              >
-                <el-option
-                  v-for="item in addTypeMap"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                >
-                  {{ item.label }}
-                </el-option>
-              </el-select>
+            <el-form-item class="query-form-item" label="批次号:">
+              <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%"
+                        clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -110,7 +124,6 @@
           <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="addDevice">添加设备</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -118,72 +131,48 @@
                 @row-click="listClick" @current-change="handInvChange"
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="部门" prop="deptName" width="180"></el-table-column>
-        <el-table-column label="仓库" prop="invName" width="180"></el-table-column>
-        <el-table-column label="设备名称" prop="deviceName" width="200"></el-table-column>
-        <el-table-column label="物资编码" prop="code" width="180"></el-table-column>
+        <el-table-column label="产品通用名称" prop="deviceName" width="200"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资编码" prop="code" width="180"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="200" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="状态" prop="status" width="150">
+        <el-table-column label="设备状态" prop="status" width="150">
           <template slot-scope="scope">
             <el-tag>{{ status[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="批准文号" prop="zczbhhzbapzbh" show-overflow-tooltip width="200"></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip width="200"></el-table-column>
-        <el-table-column label="计量单位" prop="measname" width="100"></el-table-column>
-        <el-table-column label="供应商" prop="supName"></el-table-column>
+        <el-table-column label="登记部门" prop="deptName" width="180"></el-table-column>
         <el-table-column label="负责人" prop="managerName" show-overflow-tooltip width="200"></el-table-column>
-        <el-table-column label="操作" width="180" fixed="right">
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip width="200"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="300"></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="300"></el-table-column>
+        <el-table-column label="操作" width="120" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="editDialog(scope.row)"
-            >编辑
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteDevice(scope.row.id)"
-            >删除
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="inspectSet(scope.row.code)"
-            >巡检设置
-            </el-button
-            >
             <el-button type="text" size="small" @click.native.stop="printOrder(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"
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="getList"
       ></pagination>
     </el-card>
 
     <el-tabs type="border-card" style="margin: 15px">
-      <el-tab-pane label="基本信息" >
+      <el-tab-pane label="基本信息">
       </el-tab-pane>
-      <el-tab-pane label="设备资质" >
+      <el-tab-pane label="设备资质">
         <checkResultPanel
-          :idQuery="filterQuery"
-          :rowData="selectedRowData"
+            :idQuery="filterQuery"
+            :rowData="selectedRowData"
         ></checkResultPanel>
       </el-tab-pane>
-      <el-tab-pane label="技术资料" >
-
-
+      <el-tab-pane label="技术资料">
 
 
       </el-tab-pane>
@@ -191,30 +180,30 @@
       </el-tab-pane>
     </el-tabs>
     <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="deviceDialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="60%"
-      v-if="deviceDialogVisible"
+        :title="formMap[formName]"
+        :visible.sync="deviceDialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="60%"
+        v-if="deviceDialogVisible"
     >
       <deptDeviceModifyDialog
-        :formData="formData"
-        :closeDialog="closeDialog"
+          :formData="formData"
+          :closeDialog="closeDialog"
       ></deptDeviceModifyDialog>
     </el-dialog>
 
     <el-dialog
-      title="设备巡检设置"
-      :visible.sync="inspectSetVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="60%"
-      v-if="inspectSetVisible"
+        title="设备巡检设置"
+        :visible.sync="inspectSetVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="60%"
+        v-if="inspectSetVisible"
     >
       <inspectSetModifyDialog
-        :code="deviceCode"
-        :closeDialog="closeInspectSetDialog"
+          :code="deviceCode"
+          :closeDialog="closeInspectSetDialog"
       ></inspectSetModifyDialog>
     </el-dialog>
   </div>
@@ -223,7 +212,7 @@
 <script>
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getDeptListByUser} from "@/api/auth/authDept";
-import {getDeptDeviceList, deleteDeptDevice ,printOrder, verifyTemplateFile} from "@/api/inventory/deptDevice";
+import {getDeptDeviceList, deleteDeptDevice, printOrder, verifyTemplateFile} from "@/api/inventory/deptDevice";
 import deptDeviceModifyDialog from "@/views/inventory/deptDeviceModifyDialog.vue";
 import inspectSetModifyDialog from "@/views/inventory/InspectSetModifyDialog.vue";
 import checkResultPanel from "@/views/inventory/invDeviceEditDialog.vue";
@@ -236,7 +225,6 @@ export default {
       selectedRowData: {},
       filterQuery: {
         deptCode: this.$store.getters.locDeptCode,
-        invCode: this.$store.getters.locInvCode,
         deviceName: null,
         code: null,
         ggxh: null,
@@ -244,7 +232,7 @@ export default {
         status: 1,
         addType: 1,
         page: 1,
-        limit: 20,
+        limit: 10,
       },
       list: [],
       total: 0,
@@ -344,10 +332,16 @@ export default {
       // this.selectedRowData = null
       // // 处理行点击事件  异步操作，nexgtTick是先让selectedRow更新完在做的执行操作
       // this.$nextTick(res=>{
-        this.selectedRowData = row // 将选中的行数据保存到 selectedRow 变量中
+      this.selectedRowData = row // 将选中的行数据保存到 selectedRow 变量中
       //
       // })
     },
+    keyup_submit(event) {
+      this.filterQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -357,7 +351,6 @@ export default {
       });
       this.filterQuery = {
         deptCode: this.$store.getters.locDeptCode,
-        invCode: this.$store.getters.locInvCode,
         deviceName: null,
         code: null,
         ggxh: null,
@@ -365,9 +358,9 @@ export default {
         status: 1,
         addType: 1,
         page: 1,
-        limit: 20,
+        limit: 10,
       };
-     this.getDeptList();
+      this.getDeptList();
     },
     onSubmit() {
       this.filterQuery.page = 1;
@@ -410,12 +403,12 @@ export default {
     getInvList() {
       let params = {deptCode: this.filterQuery.deptCode};
       getInvListByUser(params)
-        .then((response) => {
-          this.invList = response.data || [];
-          this.getList();
-        })
-        .catch(() => {
-        });
+          .then((response) => {
+            this.invList = response.data || [];
+            this.getList();
+          })
+          .catch(() => {
+          });
     },
     addDevice() {
       this.formName = 'add';
diff --git a/src/views/inventory/DeviceReceiveOrderAuditMoify.vue b/src/views/inventory/DeviceReceiveOrderAuditMoify.vue
index d93c2129..d602cd02 100644
--- a/src/views/inventory/DeviceReceiveOrderAuditMoify.vue
+++ b/src/views/inventory/DeviceReceiveOrderAuditMoify.vue
@@ -1,7 +1,7 @@
 <template>
   <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" v-if="formData == 'audit'">
+      <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px" v-if="formName == 'audit'">
         <el-button type="primary" @click.native="AuditSubmit(2)">审核通过</el-button>
         <el-button type="primary" @click.native="AuditSubmit(3)">审核拒绝</el-button>
       </el-button-group>
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index 37b165e1..d0c62686 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -79,7 +79,7 @@
 
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex;margin-right: 10px">
-            <el-button type="primary" @click.native.stop="selectInvProduct()" :loading="loading">选入设备
+            <el-button type="primary" @click.native.stop="selectInvProduct(true)" :loading="loading">选入设备
             </el-button>
           </el-button-group>
         </el-row>
@@ -465,9 +465,9 @@ export default {
       })
       this.formData.fromInvSpaceCode = "";
     },
-    selectInvProduct() {
+    selectInvProduct(obj) {
       if (this.paramValue == 0) {
-        let message = this.verifyOrder();
+        let message = this.verifyOrder(obj);
         if (!isBlank(message)) {
           this.$message.warning(message);
           return;
@@ -546,12 +546,12 @@ export default {
       this.queryInvProductsList()
       this.queryProductsList()
     },
-    verifyOrder() {
+    verifyOrder(obj) {
       if (isBlank(this.formData.fromDeptCode)) {
         return "请选择登记部门！";
       } else if (isBlank(this.formData.fromInvCode)) {
         return "请选择出库仓库！";
-      } else if (this.detailList == null || this.detailList.length == 0) {
+      } else if (isBlank(obj) && (this.detailList == null || this.detailList.length == 0 )) {
         return "请选择设备！";
       }
     },