瀏覽代碼

bug修改

wangfei 6 年之前
父節點
當前提交
6b7240618a

+ 4
- 3
src/pages/system/library/books/list.vue 查看文件

45
         <el-table :data="list" border style="width: 100%">
45
         <el-table :data="list" border style="width: 100%">
46
           <el-table-column label="图片" width="128">
46
           <el-table-column label="图片" width="128">
47
             <template slot-scope="scope">
47
             <template slot-scope="scope">
48
-              <img width="64" :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" alt>
48
+              <img width="64" :src="scope.row.BookImg || defaultbookimg + '?x-oss-process=style/compress-rotate'" alt>
49
             </template>
49
             </template>
50
           </el-table-column>
50
           </el-table-column>
51
           <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
51
           <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
101
       width="50%">
101
       width="50%">
102
       <div :style="{ margin: 'auto', width: '80%' }">
102
       <div :style="{ margin: 'auto', width: '80%' }">
103
         <div><el-button @click="inputRef.click()" :style="{ width: '100%' }">上传文件</el-button></div>
103
         <div><el-button @click="inputRef.click()" :style="{ width: '100%' }">上传文件</el-button></div>
104
-        <div :style="{ textAlign: 'right', paddingTop: '20px' }"><a href="https://jinchengjiaye.oss-cn-beijing.aliyuncs.com/excel/books-batch-import.xlsx" download="书籍导入模板" :style="{ color: '#409EFF' }">下载导入模板</a></div>
104
+        <div :style="{ textAlign: 'right', paddingTop: '20px' }"><a href="https://jinchengjiaye.oss-cn-beijing.aliyuncs.com/excel/%E5%9B%BE%E4%B9%A6%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx" download="书籍导入模板" :style="{ color: '#409EFF' }">下载导入模板</a></div>
105
       </div>
105
       </div>
106
       <span slot="footer" class="dialog-footer">
106
       <span slot="footer" class="dialog-footer">
107
         <el-button type="primary" @click="showDialog = false">确 定</el-button>
107
         <el-button type="primary" @click="showDialog = false">确 定</el-button>
142
       list: s => s.list,
142
       list: s => s.list,
143
       page: s => s.page,
143
       page: s => s.page,
144
       pagenum: s => s.pagenum,
144
       pagenum: s => s.pagenum,
145
-      types: s => s.type.list
145
+      types: s => s.type.list,
146
+      defaultbookimg: s => s.defaultbookimg,
146
     }),
147
     }),
147
     caseId: {
148
     caseId: {
148
       get() {
149
       get() {

+ 3
- 2
src/pages/system/library/borrow/appointmentList.vue 查看文件

39
         </el-table-column>
39
         </el-table-column>
40
         <el-table-column label="图片" width="128">
40
         <el-table-column label="图片" width="128">
41
           <template slot-scope="scope">
41
           <template slot-scope="scope">
42
-            <img :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" style="height: 64px;">
42
+            <img :src="scope.row.BookImg || defaultbookimg + '?x-oss-process=style/compress-rotate'" style="height: 64px;">
43
           </template>
43
           </template>
44
         </el-table-column>
44
         </el-table-column>
45
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
45
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
110
       orgid: x => x.app.user.OrgId
110
       orgid: x => x.app.user.OrgId
111
     }),
111
     }),
112
     ...mapLibSate({
112
     ...mapLibSate({
113
-      list: x => x.borrow.list
113
+      list: x => x.borrow.list,
114
+      defaultbookimg: s => s.defaultbookimg,
114
     }),
115
     }),
115
     // CaseId: {
116
     // CaseId: {
116
     //   get () {
117
     //   get () {

+ 45
- 7
src/pages/system/library/borrow/bookreturn.vue 查看文件

21
             <span>手机号: </span><span>{{ borrowHistory.Phone }}</span>
21
             <span>手机号: </span><span>{{ borrowHistory.Phone }}</span>
22
           </el-col>
22
           </el-col>
23
           <el-col :span="4">
23
           <el-col :span="4">
24
-            <span>在借数量: </span><span>{{ borrowHistory.BorrowNum }}</span>
24
+            <span>在借图书数量: </span><span>{{ borrowHistory.BorrowNum }}</span>
25
           </el-col>
25
           </el-col>
26
           <el-col :span="4">
26
           <el-col :span="4">
27
-            <span>逾期数量: </span><span>{{ borrowHistory.LateNum }}</span>
27
+            <span>逾期图书数量: </span><span>{{ borrowHistory.LateNum }}</span>
28
           </el-col>
28
           </el-col>
29
           <el-col :span="4">
29
           <el-col :span="4">
30
             <span>历史是否有逾期: </span><span>{{ borrowHistory.IsLate === 'yes' ? '是' : '否' }}</span>
30
             <span>历史是否有逾期: </span><span>{{ borrowHistory.IsLate === 'yes' ? '是' : '否' }}</span>
31
           </el-col>
31
           </el-col>
32
         </el-row>
32
         </el-row>
33
       </div>
33
       </div>
34
-
34
+      <div class="system-table-search">
35
+      <div class="flex-h" style="align-items: flex-start;">
36
+        <div class="flex-item flex-h"></div>
37
+        <ul style="white-space: normal;">
38
+          <li style="margin-bottom: 15px;">
39
+            <el-select v-model="caseid" placeholder="请选择案场">
40
+              <el-option key="all" label="所有案场" value=""></el-option>
41
+              <el-option
42
+                v-for="item in cases"
43
+                :key="item.CaseId"
44
+                :label="item.CaseName"
45
+                :value="item.CaseId"
46
+              ></el-option>
47
+            </el-select>
48
+          </li>
49
+          </ul>
50
+        <el-button type="primary" @click="search">搜索</el-button>
51
+      </div>
52
+      <div class="moreFilter"></div>
53
+    </div>
35
       <!-- 可借阅列表 -->
54
       <!-- 可借阅列表 -->
36
       <el-table :data="list" border style="width: 100%">
55
       <el-table :data="list" border style="width: 100%">
56
+        <el-table-column label="案场">
57
+          <template slot-scope="scope">
58
+            <span>{{(cases.filter(x => x.CaseId === scope.row.CaseId)[0] || {}).CaseName}}</span>
59
+          </template>
60
+        </el-table-column>
37
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
61
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
38
-        <el-table-column prop="BookName" label="书名"></el-table-column>
62
+        <el-table-column prop="BookName" label="书名"></el-table-column>
39
         <el-table-column prop="BookTypeName" label="分类"></el-table-column>
63
         <el-table-column prop="BookTypeName" label="分类"></el-table-column>
40
         <el-table-column label="规定归还日期">
64
         <el-table-column label="规定归还日期">
41
           <template slot-scope="scope">
65
           <template slot-scope="scope">
71
   data() {
95
   data() {
72
     return {
96
     return {
73
       active: 0,
97
       active: 0,
74
-      customerInfo: ''
98
+      customerInfo: '',
99
+      caseid: '',
75
     }
100
     }
76
   },
101
   },
77
   computed: {
102
   computed: {
92
       returnBook: 'returnBook',
117
       returnBook: 'returnBook',
93
       getUserReturn: 'getUserReturn'
118
       getUserReturn: 'getUserReturn'
94
     }),
119
     }),
120
+    search () {
121
+      this.getUserReturn({ customerInfo: this.customerInfo, caseid: this.caseid, page: 1, pagesize: 1000 })
122
+        .then(() => {
95
 
123
 
124
+        })
125
+        .catch(err => {
126
+          this.$message({
127
+            showClose: true,
128
+            message: err,
129
+            type: 'error'
130
+          })
131
+        })
132
+    },
96
     nextStep() {
133
     nextStep() {
97
       if (!this.customerInfo) {
134
       if (!this.customerInfo) {
98
         this.$message({
135
         this.$message({
105
       this.getList()
142
       this.getList()
106
     },
143
     },
107
     getList () {
144
     getList () {
108
-      this.getBorrowHistory({ customerInfo: this.customerInfo })
145
+      this.getBorrowHistory({ customerInfo: this.customerInfo
146
+      })
109
         .then(() => {
147
         .then(() => {
110
           this.active = 1
148
           this.active = 1
111
         })
149
         })
116
             type: 'error'
154
             type: 'error'
117
           })
155
           })
118
         })
156
         })
119
-      this.getUserReturn({ customerInfo: this.customerInfo, page: 1, pagesize: 1000 })
157
+      this.getUserReturn({ customerInfo: this.customerInfo, caseid: this.caseid, page: 1, pagesize: 1000 })
120
         .then(() => {
158
         .then(() => {
121
 
159
 
122
         })
160
         })

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

22
             <span>手机号: </span><span>{{ borrowHistory.Phone }}</span>
22
             <span>手机号: </span><span>{{ borrowHistory.Phone }}</span>
23
           </el-col>
23
           </el-col>
24
           <el-col :span="4">
24
           <el-col :span="4">
25
-            <span>在借数量: </span><span>{{ borrowHistory.BorrowNum }}</span>
25
+            <span>在借图书数量: </span><span>{{ borrowHistory.BorrowNum }}</span>
26
           </el-col>
26
           </el-col>
27
           <el-col :span="4">
27
           <el-col :span="4">
28
-            <span>逾期数量: </span><span>{{ borrowHistory.LateNum }}</span>
28
+            <span>逾期图书数量: </span><span>{{ borrowHistory.LateNum }}</span>
29
           </el-col>
29
           </el-col>
30
           <el-col :span="4">
30
           <el-col :span="4">
31
             <span>历史是否有逾期: </span><span>{{ borrowHistory.IsLate === 'yes' ? '是' : '否' }}</span>
31
             <span>历史是否有逾期: </span><span>{{ borrowHistory.IsLate === 'yes' ? '是' : '否' }}</span>
48
         <el-form-item label="条形码">
48
         <el-form-item label="条形码">
49
           <el-input ref="barcode" v-model="formData.barcode" :style="{ width: '200px' }"></el-input>
49
           <el-input ref="barcode" v-model="formData.barcode" :style="{ width: '200px' }"></el-input>
50
         </el-form-item>
50
         </el-form-item>
51
-        <el-form-item label="书名">
51
+        <el-form-item label="书名">
52
           <el-input v-model="formData.name" :style="{ width: '200px' }"></el-input>
52
           <el-input v-model="formData.name" :style="{ width: '200px' }"></el-input>
53
         </el-form-item>
53
         </el-form-item>
54
         <el-form-item :style="{ float: 'right' }">
54
         <el-form-item :style="{ float: 'right' }">
63
           width="55">
63
           width="55">
64
         </el-table-column>
64
         </el-table-column>
65
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
65
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
66
-        <el-table-column prop="BookName" label="书名"></el-table-column>
66
+        <el-table-column prop="BookName" label="书名"></el-table-column>
67
         <el-table-column label="分类">
67
         <el-table-column label="分类">
68
           <template slot-scope="scope">
68
           <template slot-scope="scope">
69
             <span>{{ getTypeName(scope.row.BookTypeId) }}</span>
69
             <span>{{ getTypeName(scope.row.BookTypeId) }}</span>

+ 3
- 2
src/pages/system/library/borrow/borrowList.vue 查看文件

49
         </el-table-column>
49
         </el-table-column>
50
         <el-table-column label="图片" width="128">
50
         <el-table-column label="图片" width="128">
51
           <template slot-scope="scope">
51
           <template slot-scope="scope">
52
-            <img :src="scope.row.BookImg + '?x-oss-process=style/compress-rotate'" style="height: 64px;">
52
+            <img :src="scope.row.BookImg || defaultbookimg + '?x-oss-process=style/compress-rotate'" style="height: 64px;">
53
           </template>
53
           </template>
54
         </el-table-column>
54
         </el-table-column>
55
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
55
         <el-table-column prop="BookBarcode" label="条形码"></el-table-column>
129
       orgid: x => x.app.user.OrgId
129
       orgid: x => x.app.user.OrgId
130
     }),
130
     }),
131
     ...mapLibSate({
131
     ...mapLibSate({
132
-      list: x => x.borrow.list
132
+      list: x => x.borrow.list,
133
+      defaultbookimg: s => s.defaultbookimg,
133
     }),
134
     }),
134
     // CaseId: {
135
     // CaseId: {
135
     //   get () {
136
     //   get () {

+ 1
- 0
src/store/library/index.js 查看文件

28
     bookReturn: {
28
     bookReturn: {
29
       list: [],
29
       list: [],
30
     },
30
     },
31
+    defaultbookimg: 'https://spaceofcheng.oss-cn-beijing.aliyuncs.com/book_default.png',
31
   },
32
   },
32
   mutations: {
33
   mutations: {
33
     clearData(state, key = '') {
34
     clearData(state, key = '') {