Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/library/books/stockchange.vue

@@ -6,7 +6,7 @@
           <el-input v-model="book.BookName" :style="{ width: '200px' }" :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="总库存" prop="InStockTotal">
-          <el-input v-model="book.InStockTotal" :style="{ width: '200px' }" :disabled="true"></el-input>
+          <el-input v-model="book.InStock" :style="{ width: '200px' }" :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="剩余库存" prop="InStockAfter">
           <el-input-number v-model="formData.InStockAfter" :min="0" :style="{ width: '200px' }" ></el-input-number>
@@ -33,7 +33,7 @@
         <el-pagination
           layout="prev, pager, next"
           :current-page="page"
-          :total="1000"
+          :total="pagenum"
           @current-change="pageChange">
         </el-pagination>
       </div>
@@ -71,12 +71,14 @@ export default {
       book: s => s.detail,
       list: s => s.stock.list,
       page: s => s.stock.page,
+      pagenum: s => s.stock.pagenum,
     })
   },
   created() {
     this.bookId = this.$route.params.id
+
     this.filterList()
-    this.getBook({ BookId: this.bookId }).then(() => {
+    this.getBook({ id: this.bookId }).then(() => {
       this.formData = {
         BookId: this.book.BookId,
         InStockAfter: this.book.LeftNum,
@@ -84,6 +86,7 @@ export default {
         OrgId: this.book.OrgId,
         ChangeReason: '',
         InStockTotal: this.book.InStock,
+        InStockBefore: this.book.LeftNum,
       }
     }).catch((err) => {
       this.$message({
@@ -103,7 +106,7 @@ export default {
     filterList({ page = 0 } = {}) {
       this.getList({
         page,
-        BookId: this.bookId
+        bookId: this.bookId
       }).catch(err => {
         this.$message({
           showClose: true,
@@ -115,11 +118,7 @@ export default {
 
     submit() {
       this.setChange(this.formData).then(() => {
-        this.$message({
-          showClose: true,
-          message: '库存盘点成功',
-          type: 'success'
-        })
+        this.$alert('库存盘点成功').then(() => window.location.reload())
       }).catch(err => {
         this.$message({
           showClose: true,

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

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

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

@@ -49,7 +49,7 @@
           <el-input ref="barcode" v-model="formData.barcode" :style="{ width: '200px' }"></el-input>
         </el-form-item>
         <el-form-item label="书名">
-          <el-input v-model="formData.bookname" :style="{ width: '200px' }"></el-input>
+          <el-input v-model="formData.name" :style="{ width: '200px' }"></el-input>
         </el-form-item>
         <el-form-item :style="{ float: 'right' }">
           <el-button type="primary" @click="search()">搜索</el-button>
@@ -91,7 +91,7 @@ export default {
     return {
       active: 0,
       customerInfo: '',
-      formData: { caseid: '', barcode: '', bookname: '' },
+      formData: { caseid: '', barcode: '', name: '' },
       selectList: [],
     }
   },
@@ -102,7 +102,7 @@ export default {
       orgid: x => x.app.user.OrgId
     }),
     ...mapLibSate({
-      list: s => s.borrow.list,
+      list: s => s.list,
       borrowHistory: s => s.borrow.history,
     }),
   },
@@ -142,6 +142,7 @@ export default {
     },
 
     search() {
+      // 必须选案场
       if (!this.formData.caseid) {
         this.$message({
           showClose: true,
@@ -152,6 +153,17 @@ export default {
         return
       }
 
+      // 先扫码或者输入图书名称
+      if (!this.formData.barcode && !this.formData.name) {
+        this.$message({
+          showClose: true,
+          message: '请先扫码或者输入图书名称',
+          type: 'error'
+        })
+
+        return
+      }
+
       this.getList({
         ...this.formData,
         // customerphone: this.borrowHistory.Phone,

src/store/library/index.js

@@ -130,6 +130,16 @@ export default {
     deleteBookList (state, payload = {}) {
       state.list = state.list.filter(x => x.BookId !== payload.BookId)
     },
+    setStockList (state, payload = []) {
+      const { list, pagenum } = payload || {}
+      if (!!list) { // eslint-disable-line
+        state.stock.list = list
+        state.stock.pagenum = pagenum
+      } else {
+        state.stock.list = []
+        state.stock.pagenum = 0
+      }
+    },
     setUserReturn (state, payload = {}) {
       state.bookReturn = payload
     }
@@ -261,9 +271,30 @@ export default {
           .catch(({ message }) => reject(message))
       })
     },
-    getStockList ({ commit }, payload) {
-      return new Promise((resolve, reject) => {
+    getStockList ({ commit }, payload = {}) {
+      const { bookId, ...queryData } = payload
 
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.book.inStock,
+          urlData: { bookId },
+          queryData,
+        }).then((x) => {
+          commit('setStockList', x)
+          resolve(x)
+        })
+          .catch(({ message }) => reject(message))
+      })
+    },
+    setStockChange ({ commit }, payload = {}) {
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.book.changeStock,
+          data: payload,
+        }).then(() => {
+          resolve()
+        })
+          .catch(({ message }) => reject(message))
       })
     },
     batchImport(_, payload) {
@@ -297,7 +328,7 @@ export default {
       return new Promise((resolve, reject) => {
         ajax({
           ...api.book.borrow,
-          urlData: { ...payload },
+          urlData: payload,
         }).then(() => {
           resolve()
         })

src/util/api.js

@@ -1013,6 +1013,14 @@ const $api = {
       method: 'put',
       url: `${baseUrl}${common}/book/borrow/:bookIds/:customerId`
     },
+    inStock: {
+      method: 'get',
+      url: `${baseUrl}${common}/book/instock/:bookId`
+    },
+    changeStock: {
+      method: 'post',
+      url: `${baseUrl}${common}/book/change`
+    },
     getUserReturn: {
       method: 'get',
       url: `${baseUrl}${common}/book/return/:customerInfo`