From 182d2a704bc4a78fac4781e2ec156cfea186e8f4 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Tue, 12 Jul 2022 16:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=20=E6=8C=89=E9=92=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  8 +-
 .../outInStorage/inStorage/index.vue          | 76 +++++++++++++------
 2 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/.env.development b/.env.development
index ab4490f..d4767b0 100644
--- a/.env.development
+++ b/.env.development
@@ -3,16 +3,16 @@ ENV = 'development'
 # 接口地址
 
 #内网服务地址
-VUE_APP_BASE_API  = 'http://192.168.99.207:7070'
-VUE_APP_WS_API = 'ws://192.168.99.207:7070'
+#VUE_APP_BASE_API  = 'http://192.168.99.207:7070'
+#VUE_APP_WS_API = 'ws://192.168.99.207:7070'
 
 # 刘力-本地服地址
 #VUE_APP_BASE_API  = 'http://192.168.99.65:7070'
 #VUE_APP_WS_API = 'ws://192.168.99.65:7070'
 
 # 许镇-本地服地址
-#VUE_APP_BASE_API  = 'http://192.168.99.84:7070'
-#VUE_APP_WS_API = 'ws://192.168.99.84:7070'
+VUE_APP_BASE_API  = 'http://192.168.99.84:7070'
+VUE_APP_WS_API = 'ws://192.168.99.84:7070'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index ff28b46..0292381 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -1,29 +1,31 @@
 <template>
   <div>
-    <div class="head-container">
-      <el-button size="mini" @click="handleIn">
-        <svg-icon icon-class="dengji-fanbai" class-name="svg-style" />入库</el-button>
-      <el-button size="mini" @click="handleManual">
-        <svg-icon icon-class="yichu-fanbai" class-name="svg-style" />人工确认</el-button>
-      <el-input
-        v-model="keyWord"
-        size="small"
-        clearable
-        placeholder="请输入关键词"
-        style="width: 300px;margin-right:10px;padding-left:10px"
-        class="input-prepend filter-item"
-        @keyup.enter.native="crud.toQuery"
-      >
-        <el-select slot="prepend" v-model="optionVal" style="width: 90px">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-input>
-      <rrOperation />
+    <div class="head-container dpflex">
+      <div class="div">
+        <el-input
+          v-model="keyWord"
+          size="small"
+          clearable
+          placeholder="请输入关键词"
+          style="width: 300px;margin-right:10px;"
+          class="input-prepend filter-item"
+          @keyup.enter.native="crud.toQuery"
+        >
+          <el-select slot="prepend" v-model="optionVal" style="width: 88px">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-input>
+        <rrOperation />
+      </div>
+      <div class="div">
+        <el-button size="mini" class="in-btn iconfont icon-ruku-fanbai" :disabled="!(selections.length===1)" @click="handleIn">入库</el-button>
+        <el-button size="mini" class="opr-btn iconfont icon-ruku-fanbai" :disabled="!selections.length" @click="handleManual">人工确认</el-button>
+      </div>
       <!-- <button @click="getTableData">测试按钮</button> -->
     </div>
     <!--表格渲染-->
@@ -92,7 +94,7 @@ import CRUD, { presenter, crud } from '@crud/crud'
 import pagination from '@crud/Pagination'
 import fieldDetail from './module/fieldDetail.vue'
 import inDialog from './module/inDialog.vue'
-import data1 from '../data1.json'
+import data1 from './data1.json'
 export default {
   name: 'InStorage',
   components: { rrOperation, pagination, fieldDetail, inDialog },
@@ -192,4 +194,28 @@ export default {
   color: #fff;
   font-size: 16px;
 }
+.dpflex{
+  display: flex;
+  justify-content: space-between;
+}
+.in-btn{
+  width: 76px;
+  height: 30px;
+  background-color: #FD8042;
+  border: none;
+  &.el-button.is-disabled, &.el-button.is-disabled:hover{
+    background-color: #69351b;
+    color: #777;
+  }
+}
+.opr-btn{
+  width: 106px;
+  height: 30px;
+  background-color: #1AAE93;
+  border: none;
+  &.el-button.is-disabled, &.el-button.is-disabled:hover{
+    background-color: #0e584b;
+    color: #777;
+  }
+}
 </style>