zjxpcyc 6 lat temu
rodzic
commit
782657229d

+ 8
- 9
src/pages/system/library/books/stockchange.vue Wyświetl plik

@@ -6,7 +6,7 @@
6 6
           <el-input v-model="book.BookName" :style="{ width: '200px' }" :disabled="true"></el-input>
7 7
         </el-form-item>
8 8
         <el-form-item label="总库存" prop="InStockTotal">
9
-          <el-input v-model="book.InStockTotal" :style="{ width: '200px' }" :disabled="true"></el-input>
9
+          <el-input v-model="book.InStock" :style="{ width: '200px' }" :disabled="true"></el-input>
10 10
         </el-form-item>
11 11
         <el-form-item label="剩余库存" prop="InStockAfter">
12 12
           <el-input-number v-model="formData.InStockAfter" :min="0" :style="{ width: '200px' }" ></el-input-number>
@@ -33,7 +33,7 @@
33 33
         <el-pagination
34 34
           layout="prev, pager, next"
35 35
           :current-page="page"
36
-          :total="1000"
36
+          :total="pagenum"
37 37
           @current-change="pageChange">
38 38
         </el-pagination>
39 39
       </div>
@@ -71,12 +71,14 @@ export default {
71 71
       book: s => s.detail,
72 72
       list: s => s.stock.list,
73 73
       page: s => s.stock.page,
74
+      pagenum: s => s.stock.pagenum,
74 75
     })
75 76
   },
76 77
   created() {
77 78
     this.bookId = this.$route.params.id
79
+
78 80
     this.filterList()
79
-    this.getBook({ BookId: this.bookId }).then(() => {
81
+    this.getBook({ id: this.bookId }).then(() => {
80 82
       this.formData = {
81 83
         BookId: this.book.BookId,
82 84
         InStockAfter: this.book.LeftNum,
@@ -84,6 +86,7 @@ export default {
84 86
         OrgId: this.book.OrgId,
85 87
         ChangeReason: '',
86 88
         InStockTotal: this.book.InStock,
89
+        InStockBefore: this.book.LeftNum,
87 90
       }
88 91
     }).catch((err) => {
89 92
       this.$message({
@@ -103,7 +106,7 @@ export default {
103 106
     filterList({ page = 0 } = {}) {
104 107
       this.getList({
105 108
         page,
106
-        BookId: this.bookId
109
+        bookId: this.bookId
107 110
       }).catch(err => {
108 111
         this.$message({
109 112
           showClose: true,
@@ -115,11 +118,7 @@ export default {
115 118
 
116 119
     submit() {
117 120
       this.setChange(this.formData).then(() => {
118
-        this.$message({
119
-          showClose: true,
120
-          message: '库存盘点成功',
121
-          type: 'success'
122
-        })
121
+        this.$alert('库存盘点成功').then(() => window.location.reload())
123 122
       }).catch(err => {
124 123
         this.$message({
125 124
           showClose: true,

+ 1
- 1
src/pages/system/library/borrow/bookreturn.vue Wyświetl plik

@@ -77,7 +77,7 @@ export default {
77 77
       orgid: x => x.app.user.OrgId
78 78
     }),
79 79
     ...mapLibSate({
80
-      list: s => s.bookReturn.list,
80
+      list: s => s.list,
81 81
       borrowHistory: s => s.borrow.history
82 82
     })
83 83
   },

+ 15
- 3
src/pages/system/library/borrow/borrow.vue Wyświetl plik

@@ -49,7 +49,7 @@
49 49
           <el-input ref="barcode" v-model="formData.barcode" :style="{ width: '200px' }"></el-input>
50 50
         </el-form-item>
51 51
         <el-form-item label="书名">
52
-          <el-input v-model="formData.bookname" :style="{ width: '200px' }"></el-input>
52
+          <el-input v-model="formData.name" :style="{ width: '200px' }"></el-input>
53 53
         </el-form-item>
54 54
         <el-form-item :style="{ float: 'right' }">
55 55
           <el-button type="primary" @click="search()">搜索</el-button>
@@ -91,7 +91,7 @@ export default {
91 91
     return {
92 92
       active: 0,
93 93
       customerInfo: '',
94
-      formData: { caseid: '', barcode: '', bookname: '' },
94
+      formData: { caseid: '', barcode: '', name: '' },
95 95
       selectList: [],
96 96
     }
97 97
   },
@@ -102,7 +102,7 @@ export default {
102 102
       orgid: x => x.app.user.OrgId
103 103
     }),
104 104
     ...mapLibSate({
105
-      list: s => s.borrow.list,
105
+      list: s => s.list,
106 106
       borrowHistory: s => s.borrow.history,
107 107
     }),
108 108
   },
@@ -142,6 +142,7 @@ export default {
142 142
     },
143 143
 
144 144
     search() {
145
+      // 必须选案场
145 146
       if (!this.formData.caseid) {
146 147
         this.$message({
147 148
           showClose: true,
@@ -152,6 +153,17 @@ export default {
152 153
         return
153 154
       }
154 155
 
156
+      // 先扫码或者输入图书名称
157
+      if (!this.formData.barcode && !this.formData.name) {
158
+        this.$message({
159
+          showClose: true,
160
+          message: '请先扫码或者输入图书名称',
161
+          type: 'error'
162
+        })
163
+
164
+        return
165
+      }
166
+
155 167
       this.getList({
156 168
         ...this.formData,
157 169
         // customerphone: this.borrowHistory.Phone,

+ 33
- 3
src/store/library/index.js Wyświetl plik

@@ -130,6 +130,16 @@ export default {
130 130
     deleteBookList (state, payload = {}) {
131 131
       state.list = state.list.filter(x => x.BookId !== payload.BookId)
132 132
     },
133
+    setStockList (state, payload = []) {
134
+      const { list, pagenum } = payload || {}
135
+      if (!!list) { // eslint-disable-line
136
+        state.stock.list = list
137
+        state.stock.pagenum = pagenum
138
+      } else {
139
+        state.stock.list = []
140
+        state.stock.pagenum = 0
141
+      }
142
+    },
133 143
   },
134 144
   actions: {
135 145
     cancelBorrow ({ commit }, payload) { // 取消预约
@@ -258,9 +268,30 @@ export default {
258 268
           .catch(({ message }) => reject(message))
259 269
       })
260 270
     },
261
-    getStockList ({ commit }, payload) {
262
-      return new Promise((resolve, reject) => {
271
+    getStockList ({ commit }, payload = {}) {
272
+      const { bookId, ...queryData } = payload
263 273
 
274
+      return new Promise((resolve, reject) => {
275
+        ajax({
276
+          ...api.book.inStock,
277
+          urlData: { bookId },
278
+          queryData,
279
+        }).then((x) => {
280
+          commit('setStockList', x)
281
+          resolve(x)
282
+        })
283
+          .catch(({ message }) => reject(message))
284
+      })
285
+    },
286
+    setStockChange ({ commit }, payload = {}) {
287
+      return new Promise((resolve, reject) => {
288
+        ajax({
289
+          ...api.book.changeStock,
290
+          data: payload,
291
+        }).then(() => {
292
+          resolve()
293
+        })
294
+          .catch(({ message }) => reject(message))
264 295
       })
265 296
     },
266 297
     batchImport(_, payload) {
@@ -295,7 +326,6 @@ export default {
295 326
         ajax({
296 327
           ...api.book.borrow,
297 328
           urlData: payload,
298
-          urlData: { ...payload },
299 329
         }).then(() => {
300 330
           resolve()
301 331
         })

+ 8
- 0
src/util/api.js Wyświetl plik

@@ -1013,6 +1013,14 @@ const $api = {
1013 1013
       method: 'put',
1014 1014
       url: `${baseUrl}${common}/book/borrow/:bookIds/:customerId`
1015 1015
     },
1016
+    inStock: {
1017
+      method: 'get',
1018
+      url: `${baseUrl}${common}/book/instock/:bookId`
1019
+    },
1020
+    changeStock: {
1021
+      method: 'post',
1022
+      url: `${baseUrl}${common}/book/change`
1023
+    },
1016 1024
   },
1017 1025
 }
1018 1026
 export default $api