借阅管理-导出btn/档案管理-状态补充

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

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

src/views/archivesManage/archivesList/mixins/archives.js

@@ -2,6 +2,36 @@ import qs from 'qs'
 import { exportFile } from '@/utils/index'
 import { FetchTableDisplayFields, FetchInitArchivesView, FetchFormDisplayFields } from '@/api/archivesManage/archivesList'
 export const archivesCrud = {
+  filters: {
+    archivesborrowStatus(val) {
+      switch (val) {
+        case 1:
+          return '-'
+        case 2:
+          return '待借'
+        case 3:
+          return '已借'
+        case 4:
+          return '在库'
+        case '':
+          return '在库'
+      }
+    },
+    archivesStorageStatus(val) {
+      switch (val) {
+        case 0:
+          return '未入'
+        case 1:
+          return '待入'
+        case 2:
+          return '已入'
+        case 3:
+          return '待出'
+        case '':
+          return '未入'
+      }
+    }
+  },
   // 组件共用属性
   data() {
     return {

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

@@ -4,7 +4,7 @@
       <el-button size="mini" class="iconfont icon-jiechu-fanbai" :disabled="!selections.length" @click="handleLendBtn">借出</el-button>
       <el-button size="mini" class="iconfont icon-dengji-fanbai" :disabled="!selections.length" @click="handelReRecord">重新登记</el-button>
       <el-button size="mini" class="iconfont icon-yichu-fanbai" :disabled="!selections.length" @click="handleRemove">移出</el-button>
-      <el-button size="mini" icon="el-icon-download" :loading="crud.downloadLoading">导出</el-button>
+      <el-button size="mini" icon="el-icon-download" :disabled="!selections.length" :loading="crud.downloadLoading">导出</el-button>
     </div>
     <!--表格渲染-->
     <!-- height="calc(100vh - 355px)" -->
@@ -12,6 +12,7 @@
       ref="table"
       v-loading="crud.loading"
       :data="crud.data"
+      :row-key="getRowKey"
       style="min-width: 100%"
       @select-all="selectAll"
       @selection-change="selectionChangeHandler"
@@ -19,7 +20,7 @@
       @row-dblclick="handleDbClick"
       @select="handleCurrentChange"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" :reserve-selection="true" width="55" />
       <el-table-column type="index" label="序号" align="center" width="55" />
       <el-table-column prop="orderNo" align="center" label="单据号" min-width="100" />
       <el-table-column prop="borrowNum" align="center" label="数量" min-width="50" />

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

@@ -2,7 +2,7 @@
   <div class="lend-query">
     <div class="head-container head-archives clearfix">
       <div class="archives-crud">
-        <el-button :loading="crud.downloadLoading" size="mini" icon="el-icon-download">导出</el-button>
+        <el-button :loading="crud.downloadLoading" :disabled="!selections.length" size="mini" icon="el-icon-download">导出</el-button>
       </div>
       <div class="head-search">
         <el-select
@@ -37,11 +37,12 @@
       style="width: 100%"
       height="calc(100vh - 356px)"
       :data="crud.data"
+      :row-key="getRowKey"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
       @row-dblclick="handleDbClick"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" :reserve-selection="true" width="55" />
       <el-table-column type="index" label="序号" align="center" width="55" />
       <el-table-column prop="borrowType" align="center" label="借阅状态" width="100">
         <template slot-scope="scope">
@@ -110,7 +111,6 @@ export default {
       selections: [],
       lendStateOptions: [
         { value: '全部', label: '全部' },
-        { value: '1', label: '待登记' },
         { value: '2', label: '待借阅' },
         { value: '3', label: '待归还' },
         { value: '5', label: '逾期' },
@@ -146,6 +146,9 @@ export default {
       this.crud.query.caseName = null
       this.crud.query[this.lendSelect] = this.lendQuery[this.lendSelect]
     },
+    selectionChangeHandler(val) {
+      this.selections = val
+    },
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row)
     }

src/views/archivesManage/lendManage/mixins/lending.js

@@ -76,6 +76,9 @@ export const lendingCrud = {
         this.departOptions = data
       })
     },
+    getRowKey(row) {
+      return row.id
+    },
     selectionChangeHandler(val) {
       this.selections = val
     },

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

@@ -3,7 +3,7 @@
     <div class="head-container head-archives clearfix">
       <div class="archives-crud">
         <el-button size="mini" class="iconfont icon-guihuan-fanbai" :disabled="!selections.length" @click="handleReturn">归还</el-button>
-        <el-button :loading="crud.downloadLoading" size="mini" icon="el-icon-download">导出</el-button>
+        <el-button :loading="crud.downloadLoading" :disabled="!selections.length" size="mini" icon="el-icon-download">导出</el-button>
       </div>
       <div class="head-search">
         <el-input v-model="lendQuery[lendSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @clear="crud.toQuery" @keyup.enter.native="crud.toQuery">
@@ -25,11 +25,12 @@
       style="width:100%"
       height="calc(100vh - 355px)"
       :data="crud.data"
+      :row-key="getRowKey"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
       @row-dblclick="handleDbClick"
     >
-      <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" :reserve-selection="true" width="55" />
       <el-table-column type="index" label="序号" align="center" width="55" />
       <el-table-column prop="orderNo" align="center" label="单据号" width="140" />
       <el-table-column prop="categoryName" align="center" label="门类名称" width="120" />

src/views/storeManage/warehouse3D/fullView/index.vue

@@ -90,6 +90,8 @@ export default {
       // left: 50%;
       // top: 0;
       // transform: translateX(-50%);
+      display: block;
+      width: 460px !important;
       color: #fff;
       font-size: 16px;
       text-align: center;