bug fix

config/index.js

@@ -13,9 +13,9 @@ module.exports = {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
         // target: 'http://localhost:8080', //wf
-        // target: 'http://127.0.0.1:8080', 
+        target: 'http://127.0.0.1:8080', 
         // target: 'http://192.168.0.11:8080', //ys
-        target: 'http://192.168.0.102:8080', //hyq
+        // target: 'http://192.168.0.102:8080', //hyq
         // target: 'http://dev.ycjcjy.com', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

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

@@ -25,7 +25,7 @@
     </div>
     <div>
       <el-button plain @click="editBook()" size="medium">图书录入</el-button>
-      <el-button plain @click="showDialog = true" size="medium">批量导入</el-button>
+      <el-button plain @click="showBatchInput()" size="medium">批量导入</el-button>
       <div :style="{ margin: '10px 0' }">
         <el-table :data="list" border style="width: 100%">
           <el-table-column label="图片" width="128">
@@ -79,7 +79,7 @@
         <el-pagination
           layout="prev, pager, next"
           :current-page="page"
-          :total="1000"
+          :total="pagenum"
           @current-change="pageChange"
         ></el-pagination>
       </div>
@@ -89,7 +89,7 @@
       :visible.sync="showDialog"
       width="50%">
       <div :style="{ margin: 'auto', width: '80%' }">
-        <div><el-button @click="showBatchInput" :style="{ width: '100%' }">上传文件</el-button></div>
+        <div><el-button @click="inputRef.click()" :style="{ width: '100%' }">上传文件</el-button></div>
         <div><el-button type="text" size="medium" :style="{ float: 'right' }">下载导入模板</el-button></div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -102,6 +102,7 @@
 
 <script>
 import { createNamespacedHelpers, mapState } from 'vuex'
+import { Loading } from 'element-ui'
 
 const { mapState: mapLibSate, mapActions } = createNamespacedHelpers('library')
 
@@ -125,6 +126,7 @@ export default {
     ...mapLibSate({
       list: s => s.list,
       page: s => s.page,
+      pagenum: s => s.pagenum,
       types: s => s.type.list
     })
   },
@@ -148,6 +150,15 @@ export default {
     // 查询过滤
     filterList({ page = 0 } = {}) {
       const caseId = this.caseId || this.defaultCase
+      if (!caseId) {
+        this.$message({
+          showClose: true,
+          message: '请选择案场',
+          type: 'error'
+        })
+        return
+      }
+
       this.getTypeList({ page: 0, pagesize: 1000, caseid: caseId })
 
       this.getList({
@@ -236,24 +247,21 @@ export default {
     // 批量导入
     showBatchInput() {
       if (!this.caseId) {
+        this.showDialog = false
+
         this.$message({
           showClose: true,
           message: '请选择案场',
           type: 'error'
         })
-
         return
       }
 
-      this.$confirm('批量导入将可能有较长的耗时, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => this.inputRef.click())
-        .catch(x => x)
+      this.showDialog = true
     },
     importBatch(e) {
+      this.showDialog = false
+
       // 需要指定案场
       const caseName = this.getCaseName(this.caseId)
       const file = e.target.files[0]
@@ -271,12 +279,19 @@ export default {
         type: 'warning'
       })
         .then(() => {
+          const loadding = Loading.service({
+            lock: true,
+            text: '数据导入中, 可能耗时较长, 请耐心等候...'
+          })
+
           const data = {
             caseId: this.caseId,
             excel: file,
           }
 
           this.batchImport(data).then(() => {
+            loadding.close()
+
             this.$confirm(`数据导入完成, 点击【确定】刷新页面`, '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
@@ -285,19 +300,14 @@ export default {
               window.location.reload()
             })
           }).catch((err) => {
+            loadding.close()
+
             this.$message({
               showClose: true,
               message: err,
               type: 'error'
             })
           })
-
-          // const loading = this.$loading({
-          //   lock: true,
-          //   text: '数据导入中, 可能耗时较长, 请稍后 ...',
-          // })
-
-          // window.setTimeout(() => loading.close(), 2000)
         })
         .catch(x => x)
     },

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

@@ -12,23 +12,25 @@
     </div>
     <div v-else>
       <!-- 用户信息区 -->
-      <el-form label-width="120px" inline :style="{ width: '100%' }">
-        <el-form-item label="姓名">
-          <span>{{ borrowHistory.CustomerName }}</span>
-        </el-form-item>
-        <el-form-item label="手机号">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="在借数量">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="逾期数量">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="历史是否有逾期">
-          <span>{{ borrowHistory.CustomerPhone === 1 ? '是' : '否' }}</span>
-        </el-form-item>
-      </el-form>
+      <div :style="{ marginBottom: '20px', paddingBottom: '20px', borderBottom: '1px solid #eee' }">
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <span>姓名: </span><span>{{ borrowHistory.Name }}</span>
+          </el-col>
+          <el-col :span="4">
+            <span>手机号: </span><span>{{ borrowHistory.Phone }}</span>
+          </el-col>
+          <el-col :span="4">
+            <span>在借数量: </span><span>{{ borrowHistory.BorrowNum }}</span>
+          </el-col>
+          <el-col :span="4">
+            <span>逾期数量: </span><span>{{ borrowHistory.LateNum }}</span>
+          </el-col>
+          <el-col :span="4">
+            <span>历史是否有逾期: </span><span>{{ borrowHistory.IsLate === 'yes' ? '是' : '否' }}</span>
+          </el-col>
+        </el-row>
+      </div>
 
       <!-- 可借阅列表 -->
       <el-table :data="list" border style="width: 100%">
@@ -68,30 +70,6 @@ export default {
       customerInfo: ''
     }
   },
-  created() {
-    const id = this.$route.params.id
-    if (id) {
-      this.active = 1
-
-      this.getBorrowHistory({ customerInfo: this.customerInfo }).catch(err => {
-        this.$message({
-          showClose: true,
-          message: err,
-          type: 'error'
-        })
-      })
-
-      this.getList({ customerInfo: this.customerInfo }).catch(err => {
-        this.$message({
-          showClose: true,
-          message: err,
-          type: 'error'
-        })
-      })
-    } else {
-      this.active = 0
-    }
-  },
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,

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

@@ -13,31 +13,43 @@
     <div v-else>
 
       <!-- 用户信息区 -->
-      <el-form label-width="100px">
-        <el-form-item label="姓名">
-          <span>{{ borrowHistory.CustomerName }}</span>
-        </el-form-item>
-        <el-form-item label="手机号">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="在借数量">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="逾期数量">
-          <span>{{ borrowHistory.CustomerPhone }}</span>
-        </el-form-item>
-        <el-form-item label="历史是否有逾期">
-          <span>{{ borrowHistory.CustomerPhone === 1 ? '是' : '否' }}</span>
-        </el-form-item>
-      </el-form>
+      <div :style="{ marginBottom: '20px', paddingBottom: '20px', borderBottom: '1px solid #eee' }">
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <span>姓名: </span><span>{{ borrowHistory.Name }}</span>
+          </el-col>
+          <el-col :span="4">
+            <span>手机号: </span><span>{{ borrowHistory.Phone }}</span>
+          </el-col>
+          <el-col :span="4">
+            <span>在借数量: </span><span>{{ borrowHistory.BorrowNum }}</span>
+          </el-col>
+          <el-col :span="4">
+            <span>逾期数量: </span><span>{{ borrowHistory.LateNum }}</span>
+          </el-col>
+          <el-col :span="4">
+            <span>历史是否有逾期: </span><span>{{ borrowHistory.IsLate === 'yes' ? '是' : '否' }}</span>
+          </el-col>
+        </el-row>
+      </div>
 
       <!-- 过滤条件 -->
       <el-form inline>
+        <el-form-item label="案场">
+          <el-select v-model="formData.caseid" size="medium" placeholder="请选择案场">
+            <el-option
+              v-for="item in cases"
+              :key="item.CaseId"
+              :label="item.CaseName"
+              :value="item.CaseId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="条形码">
-          <el-input v-model="formData.BookBarcode" :style="{ width: '200px' }" :disabled="true"></el-input>
+          <el-input ref="barcode" v-model="formData.barcode" :style="{ width: '200px' }"></el-input>
         </el-form-item>
-        <el-form-item label="书名" prop="BookName">
-          <el-input v-model="formData.BookName" :style="{ width: '200px' }"></el-input>
+        <el-form-item label="书名">
+          <el-input v-model="formData.bookname" :style="{ width: '200px' }"></el-input>
         </el-form-item>
         <el-form-item :style="{ float: 'right' }">
           <el-button type="primary" @click="search()">搜索</el-button>
@@ -79,29 +91,10 @@ export default {
     return {
       active: 0,
       customerInfo: '',
-      borrowHistory: {},
-      formData: {},
+      formData: { caseid: '', barcode: '', bookname: '' },
       selectList: [],
     }
   },
-  created() {
-    const id = this.$route.params.id
-    if (id) {
-      this.active = 1
-
-      this.getInfo({
-        BookId: id
-      }).catch(err => {
-        this.$message({
-          showClose: true,
-          message: err,
-          type: 'error'
-        })
-      })
-    } else {
-      this.active = 0
-    }
-  },
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
@@ -113,10 +106,17 @@ export default {
       borrowHistory: s => s.borrow.history,
     }),
   },
+  watch: {
+    defaultCase(nv) {
+      if (!this.formData.caseid) {
+        this.formData.caseid = nv
+      }
+    }
+  },
   methods: {
     ...mapActions({
       getBorrowHistory: 'getBorrowHistory',
-      getList: 'getBorrowList',
+      getList: 'getBookList',
       borrowBooks: 'borrowBooks'
     }),
 
@@ -142,7 +142,20 @@ export default {
     },
 
     search() {
-      this.getBorrowList(this.formData).catch(err => {
+      if (!this.formData.caseid) {
+        this.$message({
+          showClose: true,
+          message: '请选择案场',
+          type: 'error'
+        })
+
+        return
+      }
+
+      this.getList({
+        ...this.formData,
+        // customerphone: this.borrowHistory.Phone,
+      }).catch(err => {
         this.$message({
           showClose: true,
           message: err,
@@ -152,13 +165,27 @@ export default {
     },
 
     submit() {
+      if (!this.selectList || this.selectList.length === 0) {
+        this.$message({
+          showClose: true,
+          message: '请选择借阅图书',
+          type: 'error'
+        })
+
+        return
+      }
+
       this.$confirm('确定借阅此书?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
-          this.borrowBooks(this.selectList).then(() => {
+          const bookIds = this.selectList.map(({BookId}) => BookId).join(',')
+          this.borrowBooks({
+            bookIds,
+            customerId: this.borrowHistory.CustomerId,
+          }).then(() => {
             this.$message({
               showClose: true,
               message: '借阅成功',

src/store/library/index.js

@@ -98,6 +98,9 @@ export default {
         state.list = (state.list || []).map(x => x.BookId === payload.BookId ? payload : x)
       }
     },
+    mergeHistory (state, payload) {
+      state.borrow.history = payload
+    },
     setBorrowList (state, payload) { // 更新借阅记录
       state.borrow.list = payload
     },
@@ -210,7 +213,6 @@ export default {
           ...api.book.list,
           queryData: payload,
         }).then((x) => {
-          console.log(x)
           commit('setBookList', x)
           resolve(x)
         })
@@ -271,6 +273,33 @@ export default {
         })
           .catch(({ message }) => reject(message))
       })
-    }
+    },
+    getBorrowHistory({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.book.history,
+          urlData: payload,
+        }).then((res) => {
+          if (!!res) { // eslint-disable-line
+            commit('mergeHistory', res)
+            resolve(res)
+          } else {
+            reject('未检索到数据') // eslint-disable-line
+          }
+        })
+          .catch(({ message }) => reject(message))
+      })
+    },
+    borrowBooks (_, payload) {
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.book.borrow,
+          urlData: payload,
+        }).then(() => {
+          resolve()
+        })
+          .catch(({ message }) => reject(message))
+      })
+    },
   },
 }

src/util/api.js

@@ -1005,6 +1005,14 @@ const $api = {
       method: 'post',
       url: `${baseUrl}${common}/book/excel`
     },
+    history: {
+      method: 'get',
+      url: `${baseUrl}${common}/book/customer/:customerInfo`
+    },
+    borrow: {
+      method: 'put',
+      url: `${baseUrl}${common}/book/borrow/:bookIds/:customerId`
+    },
   },
 }
 export default $api