From d236c5271af3bb66b886ec4f372c1cb81bf866f7 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Thu, 19 Oct 2023 16:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BD=92?=
 =?UTF-8?q?=E8=BF=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/borrow/apply/index.vue  | 13 +++++++------
 src/views/borrow/record/index.vue | 30 +++++++++++-------------------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/views/borrow/apply/index.vue b/src/views/borrow/apply/index.vue
index 5f9dd072..9e7a31ce 100644
--- a/src/views/borrow/apply/index.vue
+++ b/src/views/borrow/apply/index.vue
@@ -393,6 +393,7 @@ export default {
         company: null,
         remark: null,
         createTime: [],
+        historyOrList: "List",
       },
       optType: null,
       // 表单参数
@@ -432,27 +433,27 @@ export default {
     },
     //获取字典数据
     handleInitList() {
-      // 获取借阅申请类型
+      // 获取借阅申请状态
       listData({
         pageNo: 1,
         pageSize: 100,
-        dictType: "borrow_apply",
+        dictType: "borrow_state",
       }).then((res) => {
         this.borrowStateOptions = res.data.list || [];
       });
-      // 获取借阅申请类型
+      // 获取借阅申请方式
       listData({
         pageNo: 1,
         pageSize: 100,
-        dictType: "archives_way",
+        dictType: "way_type",
       }).then((res) => {
         this.wayOptions = res.data.list || [];
       });
-      // 获取借阅申请类型
+      // 获取借阅申请介质类型
       listData({
         pageNo: 1,
         pageSize: 100,
-        dictType: "archives_media",
+        dictType: "media_type",
       }).then((res) => {
         this.mediaOptions = res.data.list || [];
       });
diff --git a/src/views/borrow/record/index.vue b/src/views/borrow/record/index.vue
index 016d1ed0..5aed91a0 100644
--- a/src/views/borrow/record/index.vue
+++ b/src/views/borrow/record/index.vue
@@ -124,7 +124,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -133,21 +133,14 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-refresh-left"
+            v-if="scope.row.borrowState == 0"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['archives:borrowAapply:update']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['archives:borrowAapply:delete']"
-            >删除</el-button
+            >归还</el-button
           >
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <!-- 分页组件 -->
     <pagination
@@ -327,6 +320,7 @@ export default {
         company: null,
         remark: null,
         createTime: [],
+        historyOrList: "history",
       },
       // 表单参数
       form: {},
@@ -421,14 +415,12 @@ export default {
       this.open = true;
       this.title = "添加档案借阅申请";
     },
-    /** 修改按钮操作 */
+    /** 归还按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const borrowId = row.borrowId;
-      getBorrowApply(borrowId).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改档案借阅申请";
+      const data = { id: row.id, borrowState: "2", recordId: row.recordId };
+      updateBorrowApply(data).then((response) => {
+        this.getList();
+        this.$modal.msgSuccess("归还成功");
       });
     },
     /** 提交按钮 */