Merge remote-tracking branch 'origin/master'

src/views/archivesManage/archivesList/archivesAnjuan/index.vue

@@ -117,13 +117,13 @@
         <el-table-column v-if="!recycleMain.isRecycle" label="入库" width="100" align="center" :fixed="fixedStatusBar ? false : 'right' ">
           <template slot-scope="scope">
             <!-- is_storage 为空的情况下即没装盒 / 0 未入 / 1 待入 / 2 已入 / 3 待出-->
-            <span class="row-state row-warehousing">{{ storageTxt[scope.$index] }}</span>
+            <span :class="['row-state', 'row-warehousing', (storageTxt[scope.$index] === '已入' )? 'state-active' : '' ]">{{ storageTxt[scope.$index] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="!recycleMain.isRecycle" label="借阅" width="100" align="center" :fixed="fixedStatusBar ? false : 'right' ">
           <template slot-scope="scope">
             <!-- is_borrow 4 已归还 / 为空 - 未加入待借列表 - 在库 / 2 待借阅（在待借列表/借出确认列表） - 待借 / 1待登记 - 不可借-用“—” 表示 / 3 待归还 - 已借 -->
-            <span class="row-state row-lending">{{ borrowTxt[scope.$index] }}</span>
+            <span :class="['row-state', 'row-lending', (borrowTxt[scope.$index] === '已借' )? 'state-active' : '' ]">{{ borrowTxt[scope.$index] }}</span>
           </template>
         </el-table-column>