wangfei 6 年前
父节点
当前提交
e47ae9b8a6
共有 2 个文件被更改,包括 7 次插入5 次删除
  1. 4
    5
      src/pages/system/library/borrow/bookreturn.vue
  2. 3
    0
      src/util/util.js

+ 4
- 5
src/pages/system/library/borrow/bookreturn.vue 查看文件

81
       orgid: x => x.app.user.OrgId
81
       orgid: x => x.app.user.OrgId
82
     }),
82
     }),
83
     ...mapLibSate({
83
     ...mapLibSate({
84
-      list: s => s.list,
84
+      list: s => s.bookReturn.list,
85
       borrowHistory: s => s.borrow.history
85
       borrowHistory: s => s.borrow.history
86
     })
86
     })
87
   },
87
   },
102
         })
102
         })
103
         return
103
         return
104
       }
104
       }
105
-
105
+      this.getList()
106
+    },
107
+    getList () {
106
       this.getBorrowHistory({ customerInfo: this.customerInfo })
108
       this.getBorrowHistory({ customerInfo: this.customerInfo })
107
         .then(() => {
109
         .then(() => {
108
           this.active = 1
110
           this.active = 1
114
             type: 'error'
116
             type: 'error'
115
           })
117
           })
116
         })
118
         })
117
-      this.getList()
118
-    },
119
-    getList () {
120
       this.getUserReturn({ customerInfo: this.customerInfo, page: 1, pagesize: 1000 })
119
       this.getUserReturn({ customerInfo: this.customerInfo, page: 1, pagesize: 1000 })
121
         .then(() => {
120
         .then(() => {
122
 
121
 

+ 3
- 0
src/util/util.js 查看文件

4
 // import store from '../store'
4
 // import store from '../store'
5
 const toolClass = {
5
 const toolClass = {
6
   dateFormat: (timestamp, fmt) => {
6
   dateFormat: (timestamp, fmt) => {
7
+    if (timestamp === '0001-01-01T00:00:00Z') {
8
+      return ''
9
+    }
7
     if (!fmt) {
10
     if (!fmt) {
8
       fmt = 'yyyy-MM-dd hh:mm'
11
       fmt = 'yyyy-MM-dd hh:mm'
9
     }
12
     }