From 7abaa37df114f40710868b4e41830fbc5f3eb2ba Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Thu, 30 Jun 2022 16:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=85=A5=E5=BA=93=E5=8E=9F=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outInStorage/inStorage/index.vue          |  1 +
 .../inStorage/module/inDialog.vue             | 43 ++++++++++---------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index b29ec4d..dc1a7a9 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -72,6 +72,7 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <p>入库成功</p>
+        <p style="color:#f00;margin:10px 0">提示：如果当前设备不在线或者未勾选联动操作，请人工完成上架操作</p>
       </div>
     </el-dialog>
     <!-- 人工确认失败提示 -->
diff --git a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
index 81d0a83..47cc59a 100644
--- a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
@@ -25,30 +25,31 @@
                 </div>
                 <div class="frame-item item-line">
                   <span>列</span>
-                  <el-select v-model="colVal" class="filter-item" style="width: 76px;">
+                  <el-select v-model="colVal" class="filter-item" style="width: 86px;">
                     <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-select v-model="sectionVal" class="filter-item" style="width: 86px;">
                     <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-select v-model="levelVal" class="filter-item" style="width: 86px;">
                     <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-select v-model="directionVal" class="filter-item" style="width: 86px;">
                     <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 class="frame-item state-btn">
+                  <el-button v-show="true" type="primary" class="el-icon-refresh icon-style" />
+                  <el-button v-show="false" type="success" style="background:#1AAF91;border:none" class="el-icon-check icon-style" />
                 </div>
               </div>
               <p class="success-msg">
@@ -65,18 +66,20 @@
                 </div>
                 <div class="frame-item item-line">
                   <span>层</span>
-                  <el-select v-model="cabLevel" class="filter-item" style="width: 76px;">
+                  <el-select v-model="cabLevel" class="filter-item" style="width: 86px;">
                     <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-select v-model="cabCol" class="filter-item" style="width: 86px;">
                     <el-option v-for="item in cabColOptions" :key="item.value" :label="item.label" :value="item.value" />
                   </el-select>
                 </div>
-                <div class="refresh-btn" style="padding-right:42px;margin-bottom:30px">
-                  <el-button type="primary" class="el-icon-refresh" />
+                <div class="state-btn" style="padding-right:32px;margin-bottom:30px">
+                  <el-button v-show="true" type="primary" class="el-icon-refresh icon-style" />
+                  <el-button v-show="false" type="success" style="background:#1AAF91;border:none" class="el-icon-check icon-style" />
+                  <el-button v-show="false" type="success" style="background:#F65163;border:none" class="el-icon-close icon-style" />
                 </div>
               </div>
               <p class="success-msg">
@@ -115,34 +118,34 @@ export default {
         { value: '选项1', label: '1' },
         { value: '选项2', label: '2' }
       ],
-      colVal: 1,
+      colVal: null,
       colOptions: [
         { value: '选项1', label: '1' },
         { value: '选项2', label: '2' }
       ],
-      sectionVal: 1,
+      sectionVal: null,
       sectionOptions: [
         { value: '选项1', label: '1' },
         { value: '选项2', label: '2' }
       ],
-      levelVal: 1,
+      levelVal: null,
       levelOptions: [
         { value: '选项1', label: '1' },
         { value: '选项2', label: '2' }
       ],
-      directionVal: '右边',
+      directionVal: '',
       directionOptions: [
         { value: '选项1', label: '左边' },
         { value: '选项2', label: '右边' }
       ],
       // 回转柜
       cabinetNum: 1,
-      cabLevel: 1,
+      cabLevel: null,
       cabLevelOptions: [
         { value: '选项1', label: '1' },
         { value: '选项2', label: '2' }
       ],
-      cabCol: 1,
+      cabCol: null,
       cabColOptions: [
         { value: '选项1', label: '1' },
         { value: '选项2', label: '2' }
@@ -213,7 +216,7 @@ export default {
     padding-right: 5px;
   }
   .el-input{
-  width: 76px;
+  width: 86px;
   height: 36px !important;
   }
 }
@@ -234,13 +237,13 @@ export default {
     width: 36px;
     height: 36px;
   }
-::v-deep .el-icon-refresh:before{
+::v-deep .icon-style:before{
   font-size: 18px;
 }
-.refresh-btn{
+.state-btn{
   display: flex;
   justify-content: right;
-  padding-right:40px;
+  padding-right:30px;
   width: 100%;
 }
 ::v-deep .head-container .filter-item .el-input__inner{