merge

src/pages/system/library/borrow/bookreturn.vue

@@ -37,10 +37,14 @@
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
         <el-table-column prop="BookName" label="书名"></el-table-column>
         <el-table-column prop="BookTypeName" label="分类"></el-table-column>
-        <el-table-column prop="ReturnDate" label="规定归还日期"></el-table-column>
+        <el-table-column label="规定归还日期">
+          <template slot-scope="scope">
+            <span>{{toolClass.dateFormat(scope.row.EndDate)}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="逾期天数">
           <template slot-scope="scope">
-            <span>{{ diffToday(scope.row.ReturnDate) }}</span>
+            <span>{{ diffToday(scope.row.EndDate) }}</span>
           </template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="150">
@@ -51,7 +55,7 @@
       </el-table>
 
       <div :style="{ paddingTop: '40px' }">
-        <el-button @click="$router.back()">取消</el-button>
+        <el-button @click="cancel()">取消</el-button>
       </div>
     </div>
   </div>
@@ -85,7 +89,8 @@ export default {
     ...mapActions({
       getBorrowHistory: 'getBorrowHistory',
       getList: 'getReturnList',
-      returnBook: 'returnBook'
+      returnBook: 'returnBook',
+      getUserReturn: 'getUserReturn'
     }),
 
     nextStep() {
@@ -109,8 +114,21 @@ export default {
             type: 'error'
           })
         })
+      this.getList()
     },
+    getList () {
+      this.getUserReturn({ customerInfo: this.customerInfo, page: 1, pagesize: 1000 })
+        .then(() => {
 
+        })
+        .catch(err => {
+          this.$message({
+            showClose: true,
+            message: err,
+            type: 'error'
+          })
+        })
+    },
     isBookReturn(book) {
       this.$confirm('确定归还此书?', '提示', {
         confirmButtonText: '确定',
@@ -118,13 +136,16 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          this.returnBook(book)
+          this.returnBook({
+            borrowIds: book.BookBorrowRecordId,
+          })
             .then(() => {
               this.$message({
                 showClose: true,
                 message: '归还成功',
                 type: 'success'
               })
+              this.getList()
             })
             .catch(err => {
               this.$message({
@@ -139,8 +160,12 @@ export default {
 
     diffToday(dt) {
       const days =
-        (new window.Date().getTime() - dt.getTime()) / (1000 * 60 * 60 * 24)
+        (new window.Date().getTime() - (new Date(dt)).getTime()) / (1000 * 60 * 60 * 24)
       return days <= 0 ? 0 : days
+    },
+    cancel() {
+      this.customerInfo = ''
+      this.active = 0
     }
   }
 }

src/store/library/index.js

@@ -140,6 +140,9 @@ export default {
         state.stock.pagenum = 0
       }
     },
+    setUserReturn (state, payload = {}) {
+      state.bookReturn = payload
+    }
   },
   actions: {
     cancelBorrow ({ commit }, payload) { // 取消预约
@@ -332,5 +335,29 @@ export default {
           .catch(({ message }) => reject(message))
       })
     },
+    getUserReturn ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.book.getUserReturn,
+          urlData: { ...payload },
+          queryData: payload,
+        }).then((res) => {
+          commit('setUserReturn', res)
+          resolve(res)
+        })
+          .catch(({ message }) => reject(message))
+      })
+    },
+    returnBook ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.book.returnBook,
+          urlData: { ...payload },
+        }).then((res) => {
+          resolve(res)
+        })
+          .catch(({ message }) => reject(message))
+      })
+    }
   },
 }

src/util/api.js

@@ -1021,6 +1021,14 @@ const $api = {
       method: 'post',
       url: `${baseUrl}${common}/book/change`
     },
+    getUserReturn: {
+      method: 'get',
+      url: `${baseUrl}${common}/book/return/:customerInfo`
+    },
+    returnBook: {
+      method: 'post',
+      url: `${baseUrl}${common}/book/return/:borrowIds`
+    },
   },
 }
 export default $api