From d5f14431363afa4f00804599e8c9492cf23e232f Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 2 Sep 2022 09:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inStorage/module/handDialog.vue           |  22 +++-
 .../outInStorage/module/detailDialog.vue      |  10 +-
 src/views/storeManage/warehouse3D/data1.json  | 100 ------------------
 3 files changed, 24 insertions(+), 108 deletions(-)
 delete mode 100644 src/views/storeManage/warehouse3D/data1.json

diff --git a/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
index 9fe5c8f..94dd3f0 100644
--- a/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
@@ -7,13 +7,29 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <p class="msg">该案卷存在多个档案盒，请确认全部入库！</p>
-        <el-table ref="table" :data="tableData" height="325px" @row-click="clickRowHandler" @selection-change="selectionChangeHandler">
+        <el-table ref="table" :data="tableData" style="width: 100%" height="325px" @row-click="clickRowHandler" @selection-change="selectionChangeHandler">
           <el-table-column type="selection" align="center" width="55" />
-          <el-table-column type="index" align="center" label="序号" width="80" />
+          <el-table-column type="index" align="center" label="序号" width="60" />
           <el-table-column prop="caseName" align="center" label="盒名称" width="100" />
           <el-table-column prop="tid" align="center" label="TID" width="180" />
           <el-table-column prop="barcode" align="center" label="条形码" width="140" />
-          <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="180" />
+          <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="260">
+            <template v-if="scope.row.folderLocationDetails !== null" slot-scope="scope">
+              <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>
         <div slot="footer" class="dialog-footer">
           <el-button class="btn-save" :disabled="!(selections.length === tableData.length)" @click="handleConfirm">确定</el-button>
diff --git a/src/views/archivesManage/outInStorage/module/detailDialog.vue b/src/views/archivesManage/outInStorage/module/detailDialog.vue
index d6f44b1..d4e5eee 100644
--- a/src/views/archivesManage/outInStorage/module/detailDialog.vue
+++ b/src/views/archivesManage/outInStorage/module/detailDialog.vue
@@ -25,7 +25,7 @@
           </div>
         </div>
         <el-table :data="tableData" height="348px">
-          <el-table-column type="index" label="序号" align="center" width="90" />
+          <el-table-column type="index" label="序号" align="center" width="60" />
           <el-table-column prop="child" align="center" label="子条数目" width="100" />
           <el-table-column prop="categoryType" align="center" label="门类级别" width="140">
             <template slot-scope="scope">
@@ -35,11 +35,11 @@
               <span v-if="scope.row.categoryType === 3" style="width:56px">案卷级</span>
             </template>
           </el-table-column>
-          <el-table-column prop="categoryName" align="center" label="门类名称" width="130" />
+          <el-table-column prop="categoryName" align="center" label="门类名称" width="140" show-overflow-tooltip />
           <el-table-column prop="fondsNo" align="center" label="全宗号" width="80" />
-          <el-table-column prop="archiveNo" align="center" label="档号" width="140" />
-          <el-table-column prop="archiveYear" align="center" label="归档年度" width="140" />
-          <el-table-column prop="maintitle" align="center" label="题名" width="140" />
+          <el-table-column prop="archiveNo" align="center" label="档号" width="160" />
+          <el-table-column prop="archiveYear" align="center" label="归档年度" width="100" />
+          <el-table-column prop="maintitle" align="center" label="题名" width="140" show-overflow-tooltip />
           <el-table-column prop="securityClass" align="center" label="保密程度" width="140" />
           <el-table-column prop="department" align="center" label="部门" width="100" />
           <el-table-column prop="caseName" align="center" label="盒名称" width="140" />
diff --git a/src/views/storeManage/warehouse3D/data1.json b/src/views/storeManage/warehouse3D/data1.json
deleted file mode 100644
index 60af9c6..0000000
--- a/src/views/storeManage/warehouse3D/data1.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "rows":[
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"4温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"3温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"2温度温度温度温度温度温度"
-    },
-    {
-      "time":"2022-6-30 13:00",
-      "warehouse":"文书档案库房",
-      "warning":"1温度温度温度温度温度温度"
-    }
-
-  ]
-}
\ No newline at end of file