diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 526e104e..ae867cd2 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -293,6 +293,7 @@ export default {
       if (isBlank(this.inputQuery.id)) {
         this.$message.warning("请先保存当前单据类型！");
       } else {
+        console.log(this.inputQuery)
         this.settingDialogVisible = true;
       }
     },
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index 2d11e0be..b65e93b2 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -146,7 +146,7 @@
                   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 label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>
           <el-table-column width="150"
                            label="产品通用名"
                            prop="productName"
@@ -154,44 +154,21 @@
           ></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">
+          <el-table-column width="150" label="序列号" prop="serialNo">
             <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>
+              <el-input :disabled="scope.$index != currentIndex" v-model="scope.row.serialNo"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="生产日期(yyMMdd)" prop="productionDate"></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="失效日期(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"
+                v-if="scope.row.serialNo === null"
                 @click.stop="true"
                 @click.native="editOrderDetail(scope.$index, scope.row)"
               >编辑
@@ -433,7 +410,7 @@ export default {
         }
         this.spaceList = res.data.list || [];
       })
-      this.formData.fromInvSpaceCode="";
+      this.formData.fromInvSpaceCode = "";
     },
     selectInvProduct() {
       let message = this.verifyOrder();
@@ -447,8 +424,8 @@ export default {
       this.saveOrder();
       this.onReset();
       this.selectInvProductVisible = true;
-      this.filterQuery.invCode=this.formData.fromInvCode;
-      this.filterQuery.invSpaceCode=this.formData.fromInvSpaceCode;
+      this.filterQuery.invCode = this.formData.fromInvCode;
+      this.filterQuery.invSpaceCode = this.formData.fromInvSpaceCode;
     },
     saveMAOrder() {
       this.saveOrder();
@@ -636,8 +613,8 @@ export default {
       this.queryInvProducts();
     },
     queryInvProducts() {
-      this.filterQuery.invCode=this.formData.fromInvCode;
-      this.filterQuery.invSpaceCode=this.formData.fromInvSpaceCode;
+      this.filterQuery.invCode = this.formData.fromInvCode;
+      this.filterQuery.invSpaceCode = this.formData.fromInvSpaceCode;
       getInvMAProducts(this.filterQuery).then((res) => {
         if (res.code === 20000) {
           this.productList = res.data.list || [];
@@ -665,6 +642,8 @@ export default {
       let params = {
         orderIdFk: this.formData.orderId,
         invProductIds: invProductIds,
+        invCode: this.formData.fromInvCode,
+        invSpaceCode: this.formData.fromInvSpaceCode
       };
       addDeviceReceiveOrderDetail(params).then((res) => {
         if (res.code === 20000) {
@@ -690,7 +669,7 @@ export default {
   },
   created() {
     this.getDeptList();
-    if (!(isBlank(this.deviceReceiveOrder.orderId)) ) {
+    if (!(isBlank(this.deviceReceiveOrder.orderId))) {
       this.formData.orderId = this.deviceReceiveOrder.orderId;
       this.formData.createTime = this.deviceReceiveOrder.createTime;
       this.formData.fromDeptCode = this.deviceReceiveOrder.fromDeptCode;
diff --git a/src/views/inventory/InvCountCodes.vue b/src/views/inventory/InvCountCodes.vue
index 554200ce..1eb2fe23 100644
--- a/src/views/inventory/InvCountCodes.vue
+++ b/src/views/inventory/InvCountCodes.vue
@@ -22,7 +22,7 @@
             <el-button
               type="text"
               size="small"
-              @click.native.stop="deleteCountCode(scope.row.id)"
+              @click.native.stop="deleteCountCode(scope.row)"
             >减一
             </el-button
             >
diff --git a/src/views/inventory/InvCountOrderAudit.vue b/src/views/inventory/InvCountOrderAudit.vue
index 6704ee0d..57e4d8fa 100644
--- a/src/views/inventory/InvCountOrderAudit.vue
+++ b/src/views/inventory/InvCountOrderAudit.vue
@@ -138,6 +138,7 @@
     >
       <invCountCodes
         :codeQuery="codeQuery"
+        :getCountOrderDetail="getCountOrderDetailList"
       ></invCountCodes>
     </el-dialog>
 
diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue
index 9c0606be..8225b073 100644
--- a/src/views/inventory/InvCountOrderModify.vue
+++ b/src/views/inventory/InvCountOrderModify.vue
@@ -343,8 +343,6 @@ export default {
         }
         this.spaceList = res.data.list || [];
       });
-      this.formData.invSpaceCode=JSON.parse(localStorage.getItem('key'));
-
     },
     invSpaceChange() {
       this.$forceUpdate();
@@ -358,7 +356,6 @@ export default {
         invSpaceCode: this.formData.invSpaceCode,
         countType: this.countType
       };
-      localStorage.setItem('key', JSON.stringify(this.formData.invSpaceCode));
       saveCountOrder(orderData).then((res) => {
         if (res.code === 20000) {
           this.formData.orderId = res.data.orderId;
@@ -373,7 +370,9 @@ export default {
                 nameCode: product.nameCode,
                 batchNo: product.batchNo,
                 produceDate: product.productionDate,
-                expireDate: product.expireDate
+                expireDate: product.expireDate,
+                invCode: this.formData.invCode,
+                invSpaceCode: this.formData.invSpaceCode
               };
               addCountOrderDetail(detailData).then((result) => {
                 if (result.code === 20000) {
@@ -503,7 +502,6 @@ export default {
         //添加第一个产品，先保存单据，再添加单据详情
         this.saveOrder(1);
       }
-      this.formData.invSpaceCode = JSON.parse(localStorage.getItem('key'));
       this.selectInvProductVisible = false;
     },
     getRowKeys(row) {
@@ -516,7 +514,6 @@ export default {
       });
     },
     startCount(val) {
-      localStorage.setItem('key', JSON.stringify(this.formData.invSpaceCode));
       this.countProductList = [];
       if (this.countType === 0) {
         if (isBlank(this.formData.invCode)) {
@@ -537,12 +534,12 @@ export default {
             this.saveOrder(1);
           }
         });
-      } else if (this.countType === 1 ) {
-        if( val === 1) {
-          if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) {
-            this.$message.warning("请先选择盘点仓库和货位");
-            return;
-          }
+      } else if (this.countType === 1) {
+        if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) {
+          this.$message.warning("请先选择盘点仓库和货位");
+          return;
+        }
+        if (val === 1) {
           let params = {
             invCode: this.formData.invCode,
             invSpaceCode: this.formData.invSpaceCode
@@ -551,14 +548,14 @@ export default {
             if (res.data.total !== 0) {
               let invProductList = res.data.list;
               for (let product of invProductList) {
-                this.codeArray.push(product);
+                this.countProductList.push(product);
               }
               this.saveOrder(1);
             }
           });
-        }else{
+        } else {
+          this.productList = [];
           this.selectInvProductVisible = true;
-
         }
       } else if (this.countType === 2) {
         if (isBlank(this.formData.invCode)) {
diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue
index 85c76183..7bc95b31 100644
--- a/src/views/inventory/InvMAOrderModify.vue
+++ b/src/views/inventory/InvMAOrderModify.vue
@@ -444,6 +444,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          this.formData.code = null;
           let params = {id: row.id};
           deleteInvMAOrderDetail(params).then((res) => {
             if (res.code === 20000) {
@@ -454,6 +455,7 @@ export default {
         }).catch(() => {
         });
       } else {
+        this.formData.code = null;
         let params = {id: row.id};
         deleteInvMAOrderDetail(params).then((res) => {
           if (res.code === 20000) {
diff --git a/src/views/inventory/InvPreInSerach.vue b/src/views/inventory/InvPreInSerach.vue
index 157ef1cb..ce876b32 100644
--- a/src/views/inventory/InvPreInSerach.vue
+++ b/src/views/inventory/InvPreInSerach.vue
@@ -57,7 +57,8 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="来源" prop="fromType">
           <template slot-scope="scope">
             <span>{{ fromTypeMap[scope.row.orderFromType] }}</span>
@@ -65,9 +66,9 @@
         </el-table-column>
         <el-table-column label="往来单位" prop="fromCorpName" width="220">
         </el-table-column>
-        <el-table-column label="当前部门" prop="deptName" width="120">
+        <el-table-column label="当前部门" prop="deptName" width="220">
         </el-table-column>
-        <el-table-column label="当前仓库" prop="invName" width="120">
+        <el-table-column label="当前仓库" prop="invName" width="220">
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
index f5c04250..4ac9a963 100644
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@@ -16,7 +16,7 @@
             @click="onUserReset"
           >重置
           </el-button>
-          <el-button type="primary" @click="loadUserList"
+          <el-button type="primary" @click="search"
                      icon="el-icon-search"
           >查询
           </el-button
@@ -207,6 +207,10 @@ export default {
       };
       this.loadUserList();
     },
+    search() {
+      this.userQuery.page = 1;
+      this.loadUserList();
+    },
     loadUserList() {   //获取仓库用户列表
       // if (val != null) {
       //   this.userQuery.page = val;