From 15da9eaea0b3291b30ffcdb6195cc49c8b588dd5 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 22 Jul 2022 17:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E7=AE=A1=E7=90=86=20=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  1 +
 src/assets/styles/lend-manage.scss            |  1 -
 .../archivesList/archivesAnjuan/index.vue     | 30 ++++++++++++++-
 .../lendArchivesList.vue                      | 23 ++++++------
 src/views/archivesManage/lendManage/index.vue |  6 ++-
 .../lendManage/lendConfirm/index.vue          |  5 +--
 .../lendManage/mixins/lending.js              | 27 ++++++++++++++
 .../lendManage/toLend/index.vue               | 37 +++++++------------
 8 files changed, 88 insertions(+), 42 deletions(-)
 rename src/views/archivesManage/lendManage/{lendConfirm/module => components}/lendArchivesList.vue (74%)
 create mode 100644 src/views/archivesManage/lendManage/mixins/lending.js

diff --git a/README.md b/README.md
index ccf2578..d97ac9f 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@
 │   │   ├── archivesConfig        # 档案配置
 │   │   ├── archivesManage        # 档案管理
 │   │   ├── category              # 门类管理
+│   │   ├── environmentalScreen   # 环境监测大屏
 │   │   ├── components            # views内页面组件
 │   │   │   ├── field                 # 字段管理组件
 │   │   │   ├── category              # 门类管理
diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss
index 3dc268c..8da91e2 100644
--- a/src/assets/styles/lend-manage.scss
+++ b/src/assets/styles/lend-manage.scss
@@ -62,7 +62,6 @@
   border: 1px solid #1AAE93;
 }
 
-
 .clear {
   border-radius: 13px;
   width: 80px;
diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
index e1e1a0c..1d79384 100644
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@@ -45,7 +45,7 @@
         <el-button v-if="selectedCategory.isType === 3 || selectedCategory.isType === 2" class="part-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="handlePacking(selections,1)"><svg-icon icon-class="partzhuanghe" class="svg-arc-style" />分卷装盒</el-button>
         <!-- <el-button class="warehousing-btn iconfont" type="primary">入库</el-button> -->
         <!-- 借阅btn 多选 -->
-        <el-button class="lending-btn iconfont" :disabled="selections.length === 0" type="primary" @click="lengingVisible=true"><svg-icon icon-class="jieyue" class="svg-arc-style" />借阅</el-button>
+        <el-button class="lending-btn iconfont" :disabled="selections.length === 0" type="primary" @click="handleLending"><svg-icon icon-class="jieyue" class="svg-arc-style" />借阅</el-button>
         <!-- 绑定标签btn 单选 -->
         <el-button class="binding-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="bindingTag(crud.selections)"><svg-icon icon-class="bindbiaoqian" class="svg-arc-style" />绑定标签</el-button>
       </div>
@@ -168,7 +168,7 @@
           <p><span>确定将当前档案加入借阅列表？</span></p>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click.native="lengingVisible=false">确定</el-button>
+          <el-button type="primary" @click.native="handleLendingConfirm">确定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -179,6 +179,7 @@
 import { header, form } from '@crud/crud'
 import { mapGetters } from 'vuex'
 import { archivesCrud } from '../mixins/archives'
+import { FetchIsExistBorrow, FetchAddArchivesWaitRegister } from '@/api/archivesManage/lendManage'
 import PreviewForm from '@/views/components/category/PreviewForm'
 import ArchivesInfo from '../module/archivesInfo/index'
 import Packing from '../module/packing/index'
@@ -364,6 +365,31 @@ export default {
         this.$refs.packing.archivesTable = JSON.parse(JSON.stringify(this.recycleMain.$refs.file.junneiData))
       }
       this.getTotalSumAll()
+    },
+    // 借阅
+    handleLending() {
+      const params = this.selections.map(item => {
+        return item.id
+      })
+      FetchIsExistBorrow(params).then(data => {
+        if (data.length === 0) {
+          this.lengingVisible = true
+        } else {
+          this.$message.error('部分档案不可借阅')
+        }
+      })
+    },
+    // 确认借阅
+    handleLendingConfirm() {
+      const params = this.selections.map(item => {
+        return item.id
+      })
+      FetchAddArchivesWaitRegister(params).then(data => {
+        if (data.length !== 0) {
+          this.$message.success('借阅成功')
+          this.lengingVisible = false
+        }
+      })
     }
   }
 }
diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue b/src/views/archivesManage/lendManage/components/lendArchivesList.vue
similarity index 74%
rename from src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue
rename to src/views/archivesManage/lendManage/components/lendArchivesList.vue
index 8a8232c..453e70b 100644
--- a/src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue
+++ b/src/views/archivesManage/lendManage/components/lendArchivesList.vue
@@ -1,5 +1,7 @@
 <template>
-  <div>
+  <div class="container-wrap">
+    <span class="right-top-line" />
+    <span class="left-bottom-line" />
     <!--表格渲染-->
     <!-- height="calc(100vh - 355px)" -->
     <el-table
@@ -11,15 +13,11 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column type="index" label="序号" align="center" width="55" />
-      <el-table-column prop="docNum" align="center" label="单据号" min-width="85" />
-      <el-table-column prop="archiveNum" align="center" label="数量" min-width="50" />
-      <el-table-column prop="borrowerName" align="center" label="借阅人" min-width="60" />
-      <el-table-column prop="borrowerDepartment" align="center" label="所属部门" min-width="85" />
-      <el-table-column prop="borrowerIdType" align="center" label="证件类型" min-width="85" />
-      <el-table-column prop="borrowerIdNum" align="center" label="证件号码" min-width="120" />
-      <el-table-column prop="borrowerTel" align="center" label="电话号码" min-width="85" />
-      <el-table-column prop="borrowDays" align="center" label="借阅时间" min-width="150" />
-      <el-table-column prop="borrowGoal" align="center" label="借阅目的" min-width="70" />
+      <el-table-column prop="docNum" align="center" label="门类名称" min-width="85" />
+      <el-table-column prop="archiveNum" align="center" label="档号" min-width="85" />
+      <el-table-column prop="borrowerName" align="center" label="题名" min-width="60" />
+      <el-table-column prop="borrowerDepartment" align="center" label="盒名称" min-width="85" />
+      <el-table-column prop="borrowerIdType" align="center" label="存放位置" min-width="100" />
       <el-table-column prop="noLendStatus" align="center" label="借阅状态" min-width="70">
         <template slot-scope="scope">
           <!-- 待借阅 -->
@@ -36,7 +34,6 @@
 <script>
 import pagination from '@crud/Pagination'
 import CRUD, { presenter } from '@crud/crud'
-// import crudOperation from '@crud/CRUD.operation'
 export default {
   components: { pagination },
   mixins: [presenter()],
@@ -75,4 +72,8 @@ export default {
 
 <style lang="scss" scoped>
 @import '~@/assets/styles/lend-manage.scss';
+.container-wrap{
+  min-height: auto;
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/archivesManage/lendManage/index.vue b/src/views/archivesManage/lendManage/index.vue
index a85b204..7fc9a4d 100644
--- a/src/views/archivesManage/lendManage/index.vue
+++ b/src/views/archivesManage/lendManage/index.vue
@@ -17,6 +17,8 @@
       </ul>
       <component :is="comName" @callBack="callBack" />
     </div>
+    <!-- 借阅档案list -->
+    <lendArchivesList v-if="activeIndex === 1" />
   </div>
 </template>
 
@@ -27,6 +29,7 @@ import returnArchives from './returnArchives/index.vue'
 import lendQuery from './lendQuery/index.vue'
 import borrowerManage from './borrowerManage/index.vue'
 import lendProcess from './lendProcess/index.vue'
+import lendArchivesList from './components/lendArchivesList'
 
 export default {
   name: 'BorrowManage',
@@ -36,7 +39,8 @@ export default {
     returnArchives,
     lendQuery,
     borrowerManage,
-    lendProcess
+    lendProcess,
+    lendArchivesList
   },
   data() {
     return {
diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue
index 52ca14b..d81eaf9 100644
--- a/src/views/archivesManage/lendManage/lendConfirm/index.vue
+++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="lendConfirm-box">
     <div class="head-container">
       <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>
@@ -37,8 +37,6 @@
     </el-table>
     <!-- 分页 -->
     <pagination />
-    <!-- 借阅档案list -->
-    <!-- <lendArchivesList /> -->
     <!--借出弹框-->
     <lendDialog ref="lendDialogDom" />
     <!-- 移出确认弹框 -->
@@ -55,7 +53,6 @@ import CRUD, { presenter } from '@crud/crud'
 import delConfirm from '../components/delConfirm'
 import archiveDetail from '../components/archiveDetail'
 import lendDialog from './module/lendDialog'
-// import lendArchivesList from './module/lendArchivesList'
 import data1 from '../data1.json'
 export default {
   components: { pagination, archiveDetail, delConfirm, lendDialog },
diff --git a/src/views/archivesManage/lendManage/mixins/lending.js b/src/views/archivesManage/lendManage/mixins/lending.js
new file mode 100644
index 0000000..842a761
--- /dev/null
+++ b/src/views/archivesManage/lendManage/mixins/lending.js
@@ -0,0 +1,27 @@
+export const lendingCrud = {
+  filters: {
+    borrowStatus(val) {
+      switch (val) {
+        case 1:
+          return '待登记'
+        case 2:
+          return '待借阅'
+        case 3:
+          return '待归还'
+        case 4:
+          return '已归还'
+      }
+    }
+  },
+  // 组件共用属性
+  data() {
+    return {
+    }
+  },
+  // 组件共用方法
+  methods: {
+  },
+  // 组件挂载时的共用方法
+  mounted() {
+  }
+}
diff --git a/src/views/archivesManage/lendManage/toLend/index.vue b/src/views/archivesManage/lendManage/toLend/index.vue
index d9ab430..969bfa5 100644
--- a/src/views/archivesManage/lendManage/toLend/index.vue
+++ b/src/views/archivesManage/lendManage/toLend/index.vue
@@ -9,7 +9,7 @@
       ref="table"
       style="min-width: 100%"
       height="calc(100vh - 355px)"
-      :data="tableData"
+      :data="crud.data"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
       @row-dblclick="handleDbClick"
@@ -17,14 +17,14 @@
       <el-table-column type="selection" width="55" />
       <el-table-column type="index" label="序号" align="center" width="55" />
       <el-table-column prop="categoryName" label="门类名称" align="center" min-width="85" />
-      <el-table-column prop="archivesID" label="档号" align="center" min-width="120" />
-      <el-table-column prop="titleName" align="center" label="题名" min-width="120" />
-      <el-table-column prop="fieldName" align="center" label="盒名称" min-width="85" />
-      <el-table-column prop="storagePath" align="center" label="存放位置" min-width="120" />
+      <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="lendStatus" align="center" label="借阅状态" min-width="60">
         <template slot-scope="scope">
-          <!-- 待登记 -->
-          <span class="cell-lend no-lend" style="width:80px">{{ scope.row.lendStatus }}</span>
+          <span class="cell-lend no-lend" style="width:80px">{{ scope.row.borrowType | borrowStatus }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="operationTime" align="center" label="操作时间" min-width="85" />
@@ -41,23 +41,20 @@
 </template>
 
 <script>
-// import crudUser from '@/api/system/user'
-
-import pagination from '@crud/Pagination'
-// import crudOperation from '@crud/CRUD.operation'
 import CRUD, { presenter, crud } from '@crud/crud'
+import { lendingCrud } from '../mixins/lending'
+import pagination from '@crud/Pagination'
 import delConfirm from '../components/delConfirm.vue'
 import archiveDetail from './module/archiveDetail.vue'
 import lendRecord from './module/lendRecord.vue'
-import data2 from '../data2.json'
 export default {
   components: { pagination, delConfirm, archiveDetail, lendRecord },
-  mixins: [presenter(), crud()],
+
+  mixins: [presenter(), crud(), lendingCrud],
   cruds() {
     return CRUD({
-      url: 'api/case/initCaseList',
-      // crudMethod: caseCrudMethod,
-      title: '档案盒',
+      url: 'api/borrow/initWaitRegisterList',
+      title: '待借档案',
       optShow: {
         add: false,
         edit: false,
@@ -69,19 +66,13 @@ export default {
   },
   data() {
     return {
-      tableData: [],
-      selections: [], // 选中列表
+      selections: [],
       listName: '待借列表'
     }
   },
   created() {
-    this.getData()
   },
   methods: {
-    // 获取数据
-    getData() {
-      this.tableData = data2.rows
-    },
     handleRecord() {
       this.$refs.lendRecordDom.recordFormVisible = true
     },