From 8b4f0f316deed8637e231d287818b6c6df035572 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Mon, 8 Aug 2022 17:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=BE=85=E5=87=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E5=80=9F/3D=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98/?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=AD=98=E6=94=BE=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesList/archivesAnjuan/index.vue        |  5 +++++
 .../outInStorage/inStorage/index.vue             | 16 ++++++++++++++--
 .../outInStorage/outInHistory/index.vue          | 16 ++++++++++++++--
 .../outInStorage/outStorage/index.vue            | 16 ++++++++++++++--
 .../warehouse3D/archivesStorage/index.vue        |  2 +-
 .../warehouse3D/collateRoom/index.vue            |  2 +-
 .../storeManage/warehouse3D/fullView/index.vue   |  2 +-
 src/views/storeManage/warehouse3D/index.vue      |  4 ++++
 .../storeManage/warehouse3D/readRoom/index.vue   |  2 +-
 9 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
index f24c02f..561977e 100644
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@@ -388,10 +388,15 @@ export default {
     handleLending() {
       const index = this.selections.findIndex((item) => item.is_storage === 0 || item.is_storage === '' || item.is_storage === 1)
       const index2 = this.selections.findIndex((item) => item.is_borrow === 3)
+      const index3 = this.selections.findIndex((item) => item.is_storage === 3)
       if (index !== -1) {
         this.$message.error('所选档案还未入库不能借阅')
         return false
       }
+      if (index3 !== -1) {
+        this.$message.error('待出档案不可借阅')
+        return false
+      }
       if (index2 !== -1) {
         this.$message.error('当前档案已借出，还未归还')
         return false
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index 33fa7db..6b5b01c 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -53,9 +53,21 @@
       <el-table-column prop="caseName" align="center" label="盒名称" min-width="150" />
       <el-table-column prop="tid" align="center" label="TID" min-width="250" />
       <el-table-column prop="barcode" align="center" label="条形码" width="200" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="250">
+      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="260">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+          <div v-if="scope.row.folderLocationDetails.includes(',')">
+            <el-tag
+              v-for="(item,index) in scope.row.folderLocationDetails.split(',')"
+              :key="index"
+              :type="item"
+              effect="dark"
+            >
+              {{ item }}
+            </el-tag>
+          </div>
+          <div v-else>
+            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="update_time" label="操作时间" width="200">
diff --git a/src/views/archivesManage/outInStorage/outInHistory/index.vue b/src/views/archivesManage/outInStorage/outInHistory/index.vue
index 54c71ff..211bfe8 100644
--- a/src/views/archivesManage/outInStorage/outInHistory/index.vue
+++ b/src/views/archivesManage/outInStorage/outInHistory/index.vue
@@ -53,9 +53,21 @@
       <el-table-column prop="caseName" label="盒名称" align="center" min-width="200" />
       <el-table-column prop="tid" label="TID" align="center" min-width="200" />
       <el-table-column prop="barcode" label="条形码" align="center" width="100" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="250">
+      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="130">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+          <div v-if="scope.row.folderLocationDetails.includes(',')">
+            <el-tag
+              v-for="(item,index) in scope.row.folderLocationDetails.split(',')"
+              :key="index"
+              :type="item"
+              effect="dark"
+            >
+              {{ item }}
+            </el-tag>
+          </div>
+          <div v-else>
+            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="update_time" label="操作时间" width="200">
diff --git a/src/views/archivesManage/outInStorage/outStorage/index.vue b/src/views/archivesManage/outInStorage/outStorage/index.vue
index e05bdf3..714b8cf 100644
--- a/src/views/archivesManage/outInStorage/outStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/outStorage/index.vue
@@ -29,9 +29,21 @@
       <el-table-column prop="caseName" align="center" label="盒名称" min-width="150" />
       <el-table-column prop="tid" align="center" label="TID" min-width="200" />
       <el-table-column prop="barcode" label="条形码" align="center" min-width="150" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="250">
+      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="260">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+          <div v-if="scope.row.folderLocationDetails.includes(',')">
+            <el-tag
+              v-for="(item,index) in scope.row.folderLocationDetails.split(',')"
+              :key="index"
+              :type="item"
+              effect="dark"
+            >
+              {{ item }}
+            </el-tag>
+          </div>
+          <div v-else>
+            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="update_time" label="操作时间" min-width="200">
diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
index cf40597..60537dd 100644
--- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue
+++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container warehouse">
+  <div class="warehouse">
     <!-- <h1>全景图</h1> -->
     <div class="warehouse-left">
       <div class="left-3d">
diff --git a/src/views/storeManage/warehouse3D/collateRoom/index.vue b/src/views/storeManage/warehouse3D/collateRoom/index.vue
index 7608159..18569d6 100644
--- a/src/views/storeManage/warehouse3D/collateRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/collateRoom/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container warehouse">
+  <div class="warehouse">
     <div class="warehouse-left">
       <div class="left-3d">
         <iframe
diff --git a/src/views/storeManage/warehouse3D/fullView/index.vue b/src/views/storeManage/warehouse3D/fullView/index.vue
index a17efc7..4cd29e4 100644
--- a/src/views/storeManage/warehouse3D/fullView/index.vue
+++ b/src/views/storeManage/warehouse3D/fullView/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container warehouse">
+  <div class="warehouse">
     <div class="warehouse-left">
       <div class="left-3d">
         <h2 class="title-arrow">
diff --git a/src/views/storeManage/warehouse3D/index.vue b/src/views/storeManage/warehouse3D/index.vue
index e0a1b48..ec8db5e 100644
--- a/src/views/storeManage/warehouse3D/index.vue
+++ b/src/views/storeManage/warehouse3D/index.vue
@@ -149,7 +149,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.warehouse-main{
+  height: 100%;
+}
 .warehouse-tab {
+  padding: 20px;
   color: #3298fa;
   .warehouse-nav {
     display: flex;
diff --git a/src/views/storeManage/warehouse3D/readRoom/index.vue b/src/views/storeManage/warehouse3D/readRoom/index.vue
index 71294dd..62c0dbe 100644
--- a/src/views/storeManage/warehouse3D/readRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/readRoom/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container warehouse">
+  <div class="warehouse">
     <!-- <h1>全景图</h1> -->
     <div class="warehouse-left">
       <div class="left-3d">