diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index dd2a231..385aca0 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -3,7 +3,7 @@
     <head-slot>
       <el-button size="mini" @click="handleIn">
         <svg-icon icon-class="dengji-fanbai" class-name="svg-style" />入库</el-button>
-      <el-button size="mini">
+      <el-button size="mini" @click="handleManual">
         <svg-icon icon-class="yichu-fanbai" class-name="svg-style" />人工确认</el-button>
       <el-input
         v-model="keyWord"
@@ -56,8 +56,32 @@
     <pagination />
     <!-- 档案盒详情 -->
     <fieldDetail ref="archiveDetailDom" />
-    <!-- 入库操作 -->
+    <!-- 入库对话框 -->
     <inDialog ref="inDialogDom" />
+    <!-- 待入库状态下提示框 -->
+    <el-dialog title="提示" :visible.sync="msgVisible">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <p>当前档案盒正在入库,请勿重复操作</p>
+      </div>
+    </el-dialog>
+    <!-- 人工确认 入库成功 -->
+    <el-dialog title="提示" :visible.sync="msgSuccessVisible">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <p>入库成功</p>
+      </div>
+    </el-dialog>
+    <!-- 人工确认失败提示 -->
+    <el-dialog title="提示" :visible.sync="msgFailVisible">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <p>当前档案盒状态不为“待入”，不可人工确认</p>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -84,6 +108,9 @@ export default {
   },
   data() {
     return {
+      msgVisible: false,
+      msgSuccessVisible: false,
+      msgFailVisible: false,
       tableData: [],
       selections: [],
       keyWord: '',
@@ -126,10 +153,31 @@ export default {
     // 入库
     handleIn() {
       if (this.selections.length > 0) {
-        this.$refs.inDialogDom.dialogVisible = true
+        const bool = this.selections.some(item => item.inState === '待入')
+        if (bool) { // 有'待入'状态弹出提示
+          this.msgVisible = true
+        } else { // 全部是'未入'状态弹出入库操作
+          this.$refs.inDialogDom.dialogVisible = true
+        }
       } else {
         this.$message({
-          message: '请选择要入库的档案',
+          message: '请选择档案',
+          type: 'warning'
+        })
+      }
+    },
+    // 人工确认
+    handleManual() {
+      if (this.selections.length > 0) {
+        const bool = this.selections.every(item => item.inState === '待入')
+        if (bool) { // 全是'待入'状态弹出成功提示
+          this.msgSuccessVisible = true
+        } else { // 否则提示
+          this.msgFailVisible = true
+        }
+      } else {
+        this.$message({
+          message: '请选择档案',
           type: 'warning'
         })
       }
@@ -141,5 +189,8 @@ export default {
 <style lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
 @import '~@/assets/styles/lend-manage.scss';
-
+.setting-dialog{
+  color: #fff;
+  font-size: 16px;
+}
 </style>
diff --git a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
index 549d008..afb7f56 100644
--- a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <!-- 入库状态下 -->
     <el-dialog title="入库" :visible.sync="dialogVisible">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
@@ -10,39 +11,80 @@
         <div class="content">
           <!-- 左侧 -->
           <div class="content-left">
-            <!-- <span class="right-top-line" /> -->
-            <!-- <span class="left-bottom-line" /> -->
             <!-- <el-tree ref="archivesTree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" /> -->
             <el-tree ref="archivesTree" :data="treeData" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
           </div>
           <!-- 右侧 -->
           <div class="content-right">
-            <!-- <span class="right-top-line" /> -->
-            <!-- <span class="left-bottom-line" /> -->
             <!-- 密集架 -->
-            <div class="frame-content head-container">
-              <div class="frame-item">
-                <span>区号</span>
-                <el-input v-model="fieldNum" type="number" class="filter-item" />
-              </div>
-              <div class="frame-item item-line">
-                <span>列</span>
-                <el-input v-model="fieldNum" type="number" class="filter-item" />
-              </div>
-              <div class="frame-item item-line">
-                <span>节</span>
-                <el-input v-model="fieldNum" type="number" class="filter-item" />
-              </div>
-              <div class="frame-item item-line">
-                <span>层</span>
-                <el-input v-model="fieldNum" type="number" class="filter-item" />
-              </div>
-              <div class="frame-item item-line">
-                <span>方向</span>
-                <el-input v-model="fieldNum" type="number" class="filter-item" />
+            <div v-show="cnName==='密集架'" class="box">
+              <div class="frame-content head-container">
+                <div class="frame-item">
+                  <span>区号</span>
+                  <el-input v-model="fieldNum" type="number" class="filter-item" />
+                </div>
+                <div class="frame-item item-line">
+                  <span>列</span>
+                  <el-select v-model="colVal" class="filter-item" style="width: 76px;">
+                    <el-option v-for="item in colOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </div>
+                <div class="frame-item item-line">
+                  <span>节</span>
+                  <el-select v-model="sectionVal" class="filter-item" style="width: 76px;">
+                    <el-option v-for="item in sectionOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </div>
+                <div class="frame-item item-line">
+                  <span>层</span>
+                  <el-select v-model="levelVal" class="filter-item" style="width: 76px;">
+                    <el-option v-for="item in levelOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </div>
+                <div class="frame-item item-line">
+                  <span>方向</span>
+                  <el-select v-model="directionVal" class="filter-item" style="width: 76px;">
+                    <el-option v-for="item in directionOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </div>
+                <div class="frame-item refresh-btn">
+                  <el-button type="primary" class="el-icon-refresh" />
+                </div>
               </div>
+              <p class="success-msg">
+                <span class="el-icon-success" />
+                <span class="success-text">位置已核对成功,层位名称：{{ fieldNum }}区{{ colVal }}列{{ sectionVal }}节{{ levelVal }}层{{ directionVal }}</span>
+              </p>
             </div>
             <!-- 回转柜 -->
+            <div v-show="cnName==='回转柜'" class="box">
+              <div class="frame-content head-container">
+                <div class="frame-item">
+                  <span>柜号</span>
+                  <el-input v-model="cabinetNum" type="number" class="filter-item" />
+                </div>
+                <div class="frame-item item-line">
+                  <span>层</span>
+                  <el-select v-model="cabLevel" class="filter-item" style="width: 76px;">
+                    <el-option v-for="item in cabLevelOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </div>
+                <div class="frame-item item-line">
+                  <span>列</span>
+                  <el-select v-model="cabCol" class="filter-item" style="width: 76px;">
+                    <el-option v-for="item in cabColOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </div>
+                <div class="refresh-btn" style="width:446px">
+                  <el-button type="primary" class="el-icon-refresh" />
+                </div>
+              </div>
+              <p class="success-msg">
+                <span class="el-icon-success" />
+                <span class="success-text">位置已核对成功,层位名称：{{ cabinetNum }}柜{{ colVal }}层{{ sectionVal }}列</span>
+              </p>
+            </div>
+
             <!-- <div>
               回转柜
             </div> -->
@@ -50,7 +92,6 @@
         </div>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -58,23 +99,60 @@
 export default {
   data() {
     return {
-      dialogVisible: true,
+      dialogVisible: false,
+      cnName: '',
       defaultProps: { children: 'children', label: 'cnName' },
       treeData: [{
         cnName: '档案库',
         children: [
-          { cnName: '密集柜' },
+          { cnName: '密集架' },
           { cnName: '回转柜' }
         ]
       }],
-      fieldNum: 0
-
+      // 密集柜
+      fieldNum: 1,
+      fieldOptions: [
+        { value: '选项1', label: '1' },
+        { value: '选项2', label: '2' }
+      ],
+      colVal: 1,
+      colOptions: [
+        { value: '选项1', label: '1' },
+        { value: '选项2', label: '2' }
+      ],
+      sectionVal: 1,
+      sectionOptions: [
+        { value: '选项1', label: '1' },
+        { value: '选项2', label: '2' }
+      ],
+      levelVal: 1,
+      levelOptions: [
+        { value: '选项1', label: '1' },
+        { value: '选项2', label: '2' }
+      ],
+      directionVal: '右边',
+      directionOptions: [
+        { value: '选项1', label: '左边' },
+        { value: '选项2', label: '右边' }
+      ],
+      // 回转柜
+      cabinetNum: 1,
+      cabLevel: 1,
+      cabLevelOptions: [
+        { value: '选项1', label: '1' },
+        { value: '选项2', label: '2' }
+      ],
+      cabCol: 1,
+      cabColOptions: [
+        { value: '选项1', label: '1' },
+        { value: '选项2', label: '2' }
+      ]
     }
   },
   methods: {
-    // 切换菜单
+    // 选中设备出现相应设置
     handleNodeClick(data) {
-      console.log(data)
+      this.cnName = data.cnName
     }
   }
 }
@@ -129,13 +207,14 @@ export default {
   position: relative;
   span{
     width: 33px;
-    height: 32px;
-    line-height: 32px;
+    height: 36px;
+    line-height: 36px;
     text-align: right;
     padding-right: 5px;
   }
   .el-input{
   width: 76px;
+  height: 36px !important;
   }
 }
   .item-line::before{
@@ -149,4 +228,31 @@ export default {
     left: -20px;
   }
 }
+.el-button{
+    background-color: #339CFF;
+    padding: 0;
+    width: 36px;
+    height: 36px;
+  }
+::v-deep .el-icon-refresh:before{
+  font-size: 18px;
+}
+.refresh-btn{
+  display: flex;
+  justify-content: right;
+  padding-right:39px;
+}
+::v-deep .head-container .filter-item .el-input__inner{
+  height: 36px;
+}
+.success-msg{
+  color: #1AAF91 ;
+  display: flex;
+  align-items: center;
+  padding-left: 25px;
+  .el-icon-success{
+    font-size: 20px;
+    margin-right: 7px;
+  }
+}
 </style>