借阅管理/出入库管理 - 存在位置样式修改

src/assets/styles/yxk-admin.scss

@@ -1189,4 +1189,10 @@ input[type='number'] {
       width: 100%;
     }
   }
+}
+
+.el-tag--small{
+  margin: 2px 0;
+  border: 1px solid #339cff;
+  background-color: #02255f;
 }

src/views/archivesManage/lendManage/components/archiveDetail.vue

@@ -22,8 +22,24 @@
           <el-table-column prop="maintitle" label="题名" align="center" min-width="140" />
           <el-table-column prop="archiveNo" label="档号" align="center" min-width="130" />
           <el-table-column prop="caseName" label="盒名称" align="center" min-width="80" />
-          <el-table-column prop="folderLocationDetails" label="存放位置" align="center" min-width="140" />
-          <el-table-column prop="borrowType" label="借阅状态" align="center" min-width="140">
+          <el-table-column prop="folderLocationDetails" label="存放位置" align="center" min-width="200">
+            <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-column prop="borrowType" label="借阅状态" align="center" min-width="100">
             <template slot-scope="scope">
               <!-- 待借阅 / 逾期 have-lend / 待归还 / 已归还 has-return -->
               <span class="cell-lend no-lend" style="width:76px">{{ scope.row.borrowType | borrowStatus }}</span>

src/views/archivesManage/lendManage/components/lendArchivesList.vue

@@ -14,7 +14,23 @@
       <el-table-column prop="archiveNo" align="center" label="档号" min-width="85" />
       <el-table-column prop="maintitle" align="center" label="题名" min-width="60" />
       <el-table-column prop="caseName" align="center" label="盒名称" min-width="85" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="100" />
+      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="100">
+        <template 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-column prop="borrowType" align="center" label="借阅状态" min-width="70">
         <template slot-scope="scope">
           <!-- 待借阅 -->

src/views/archivesManage/lendManage/lendQuery/index.vue

@@ -34,6 +34,7 @@
     <!--表格渲染-->
     <el-table
       ref="table"
+      v-loading="crud.loading"
       style="width: 100%"
       height="calc(100vh - 356px)"
       :data="crud.data"
@@ -54,7 +55,23 @@
       <el-table-column prop="archiveNo" align="center" label="档号" width="100" />
       <el-table-column prop="maintitle" align="center" label="题名" width="140" />
       <el-table-column prop="caseName" align="center" label="盒名称" width="140" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="160" />
+      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="300">
+        <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-column prop="borrowerName" align="center" label="借阅人" width="100" />
       <el-table-column prop="borrowDays" align="center" label="借阅时间" width="200">
         <template slot-scope="scope">

src/views/archivesManage/lendManage/returnArchives/index.vue

@@ -37,7 +37,23 @@
       <el-table-column prop="archiveNo" align="center" label="档号" width="100" />
       <el-table-column prop="maintitle" align="center" label="题名" width="140" />
       <el-table-column prop="caseName" align="center" label="盒名称" width="140" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="160" />
+      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="300">
+        <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-column prop="borrowerName" align="center" label="借阅人" width="100" />
       <el-table-column prop="borrowDays" align="center" label="借阅时间" width="200">
         <template slot-scope="scope">

src/views/archivesManage/lendManage/toLend/index.vue

@@ -21,7 +21,23 @@
       <el-table-column prop="archiveNo" label="档号" align="center" min-width="120" />
       <el-table-column prop="maintitle" align="center" label="题名" min-width="120" />
       <el-table-column prop="caseName" align="center" label="盒名称" min-width="85" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="120" />
+      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="160">
+        <template 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-column prop="borrowType" align="center" label="借阅状态" min-width="60">
         <template slot-scope="scope">
           <span class="cell-lend no-lend" style="width:80px">{{ scope.row.borrowType | borrowStatus }}
@@ -95,8 +111,10 @@ export default {
     // 档案详情
     handleLendDbClick(row) {
       // this.$refs.table.clearSelection()
-      this.$refs.archiveDetailDom.detailVisible = true
-      this.$refs.archiveDetailDom.rowData = row
+      this.$nextTick(() => {
+        this.$refs.archiveDetailDom.detailVisible = true
+        this.$refs.archiveDetailDom.rowData = row
+      })
     },
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row) // 单击选中

src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue

@@ -3,13 +3,29 @@
     <el-dialog title="档案详情" :visible.sync="detailVisible">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
-      <div class="setting-dialog">
+      <div v-if="rowData" class="setting-dialog">
         <p><span class="color-blue">所属门类:</span><span class="color-white">{{ rowData.categoryName }}</span></p>
         <p><span class="color-blue">档号:</span><span class="color-white">{{ rowData.archiveNo }}</span></p>
         <p><span class="color-blue">题名:</span><span class="color-white">{{ rowData.maintitle }}</span></p>
         <p><span class="color-blue">盒名称:</span><span class="color-white">{{ rowData.caseName }}</span></p>
         <p><span class="color-blue">借阅状态:</span><span class="cell-lend no-lend">{{ rowData.borrowType | borrowStatus }}</span></p>
-        <p><span class="color-blue">存放位置:</span><span class="color-white">{{ rowData.folderLocationDetails }}</span></p>
+        <p><span class="color-blue">存放位置:</span>
+          <span class="color-white">
+            <div v-if="rowData.folderLocationDetails.indexOf(',')">
+              <el-tag
+                v-for="(item,index) in rowData.folderLocationDetails.split(',')"
+                :key="index"
+                :type="item"
+                effect="dark"
+              >
+                {{ item }}
+              </el-tag>
+            </div>
+            <div v-else>
+              <el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
+            </div>
+          </span>
+        </p>
         <p><span class="color-blue">操作时间:</span><span class="color-white">{{ rowData.createTime | parseTime }}</span></p>
       </div>
     </el-dialog>
@@ -24,7 +40,7 @@ export default {
   data() {
     return {
       detailVisible: false,
-      rowData: {}
+      rowData: null
     }
   }
 }
@@ -40,15 +56,17 @@ export default {
 }
 p{
   display: flex;
+  justify-content: flex-start;
   height: 50px;
   align-items: center;
   .color-blue{
     color: #3A99FD;
-    width: 70px;
+    width: 80px;
     height: 19px;
     text-align: right;
   }
   .color-white{
+    flex: 1;
     color: white;
     margin: 0 0 0 20px;
   }

src/views/archivesManage/outInStorage/inStorage/index.vue

@@ -54,9 +54,9 @@
       <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">
-        <!-- <template slot-scope="scope">
-          <div>{{ scope.row.update_time | parseTime }}</div>
-        </template> -->
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="update_time" label="操作时间" width="200">
         <template slot-scope="scope">

src/views/archivesManage/outInStorage/module/detailDialog.vue

@@ -36,9 +36,9 @@
           <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" />
-          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="150">
-            <template>
-              <div>{{ rowData.folderLocationDetails }}</div>
+          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="300">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="update_time" align="center" label="创建时间" width="180">

src/views/archivesManage/outInStorage/outInHistory/index.vue

@@ -53,7 +53,11 @@
       <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="存放位置" width="250">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="update_time" label="操作时间" width="200">
         <template slot-scope="scope">
           <div>{{ scope.row.update_time | parseTime }}</div>

src/views/archivesManage/outInStorage/outStorage/index.vue

@@ -29,7 +29,11 @@
       <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="250">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="update_time" label="操作时间" min-width="200">
         <template slot-scope="scope">
           <div>{{ scope.row.update_time | parseTime }}</div>