xcx

config/index.js

@@ -12,10 +12,10 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        target: 'http://localhost:8080', //wf
+        // target: 'http://localhost:8080', //wf
         // 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/borrow/appointmentList.vue

@@ -0,0 +1,126 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h" style="align-items: flex-start;">
+        <div class="flex-item flex-h"></div>
+        <ul style="white-space: normal;">
+          <li style="margin-bottom: 15px;">
+            <el-input placeholder="请输入条形码" v-model="postData.BarCode"></el-input>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-input placeholder="请输入图书名" v-model="postData.BookName"></el-input>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-input placeholder="请输入用户名" v-model="postData.UserName"></el-input>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-input placeholder="请输入手机号" v-model="postData.Tel"></el-input>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-select v-model="CaseId" placeholder="请选择案场">
+              <el-option key="all" label="所有案场" value="all"></el-option>
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId"
+              ></el-option>
+            </el-select>
+          </li>
+        </ul>
+        <el-button type="primary" @click="search">搜索</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="system-table-box">
+      <el-table :data="list" stripe style="width: 100%">
+        <el-table-column prop="GoodsName" label="案场"></el-table-column>
+        <el-table-column label="图片" width="300">
+          <template slot-scope="scope">
+            <img :src="((scope.row.Images || [])[0] || {}).ImgUrl" style="width:200px;">
+          </template>
+        </el-table-column>
+        <el-table-column prop="BarCode" label="条形码"></el-table-column>
+        <el-table-column prop="BookName" label="图书名"></el-table-column>
+        <el-table-column prop="UserName" label="用户名"></el-table-column>
+        <el-table-column prop="Tel" label="手机号"></el-table-column>
+        <el-table-column prop="xxDate" label="预约时间"></el-table-column>
+        <el-table-column prop="xxDate" label="保留时间"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button size="mini" type="warning">取消预约</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page.sync="postData.page"
+        :page-size="postData.pagesize"
+        layout="prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers, mapState } from 'vuex'
+const { mapState: mapLibSate, mapActions: mapLibActions } = createNamespacedHelpers('library')
+export default {
+  name: 'borrowList',
+  data () {
+    return {
+      total: 1000,
+      postData: {
+        BarCode: '',
+        BookName: '',
+        UserName: '',
+        Tel: '',
+        Status: '',
+        CaseId: '',
+        page: 1,
+        pagesize: 10
+      },
+      statusList: [{
+        id: '',
+        value: ''
+      }],
+      list: []
+    }
+  },
+  created () {
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      orgid: x => x.app.user.OrgId
+    }),
+    ...mapLibSate({
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
+      }
+    }
+  },
+  methods: {
+    ...mapLibActions([]),
+    search () {
+
+    },
+    handleSizeChange (val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange (val) {
+    },
+  }
+}
+</script>
+
+<style lang="scss">
+</style>

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

@@ -0,0 +1,142 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h" style="align-items: flex-start;">
+        <div class="flex-item flex-h"></div>
+        <ul style="white-space: normal;">
+          <li style="margin-bottom: 15px;">
+            <el-input placeholder="请输入条形码" v-model="postData.barcode"></el-input>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-input placeholder="请输入图书名" v-model="postData.bookname"></el-input>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-input placeholder="请输入借阅人" v-model="postData.borrowername"></el-input>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-input placeholder="请输入手机号" v-model="postData.tel"></el-input>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-select v-model="CaseId" placeholder="请选择案场">
+              <el-option key="all" label="所有案场" value="all"></el-option>
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId"
+              ></el-option>
+            </el-select>
+          </li>
+          <li style="margin-bottom: 15px;">
+            <el-select v-model="postData.borrowstatus" placeholder="请选择状态">
+              <el-option
+                v-for="item in statusList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </li>
+        </ul>
+        <el-button type="primary" @click="search">搜索</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="system-table-box">
+      <el-table :data="list" stripe style="width: 100%">
+        <el-table-column prop="GoodsName" label="案场"></el-table-column>
+        <el-table-column label="图片" width="300">
+          <template slot-scope="scope">
+            <img :src="((scope.row.Images || [])[0] || {}).ImgUrl" style="width:200px;">
+          </template>
+        </el-table-column>
+        <el-table-column prop="BarCode" label="条形码"></el-table-column>
+        <el-table-column prop="BookName" label="图书名"></el-table-column>
+        <el-table-column prop="BorrowerName" label="借阅人"></el-table-column>
+        <el-table-column prop="Tel" label="手机号"></el-table-column>
+        <el-table-column prop="CreateDate" label="借阅时间"></el-table-column>
+        <el-table-column prop="xxDate" label="规定归还时间"></el-table-column>
+        <el-table-column prop="xxDate" label="实际归还时间"></el-table-column>
+        <el-table-column prop="Status" label="状态"></el-table-column>
+      </el-table>
+      <el-pagination
+        @current-change="handleCurrentChange"
+        :current-page.sync="postData.page"
+        :page-size="postData.pagesize"
+        layout="prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers, mapState } from 'vuex'
+const { mapState: mapLibSate, mapActions: mapLibActions } = createNamespacedHelpers('library')
+export default {
+  name: 'borrowList',
+  data () {
+    return {
+      total: 1000,
+      postData: {
+        barcode: '',
+        bookname: '',
+        borrowername: '',
+        tel: '',
+        borrowstatus: '',
+        caseid: '',
+        page: 1,
+        pagesize: 10
+      },
+      statusList: [{
+        id: '',
+        value: ''
+      }]
+    }
+  },
+  created () {
+    this.getBorrowList({ ...this.postData }).then((res) => {
+      this.page = res.page
+      this.total = res.pagenum
+    })
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      orgid: x => x.app.user.OrgId
+    }),
+    ...mapLibSate({
+      list: x => x.borrow.list
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  methods: {
+    ...mapLibActions(['getBorrowList']),
+    search () {
+      this.page = 1
+      this.getBorrowList({ ...this.postData }).then((res) => {
+        this.page = res.page
+        this.total = res.pagenum
+      })
+    },
+    handleCurrentChange (val) {
+      this.postData.page = val
+      this.getBorrowList({ ...this.postData }).then((res) => {
+        this.page = res.page
+        this.total = res.pagenum
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss">
+</style>

src/pages/system/page.js

@@ -144,6 +144,8 @@ import StockChange from './library/books/stockchange' // 图书编辑
 
 import BorrowManager from './library/borrow' // 借阅管理
 import BorrowBooks from './library/borrow/borrow' // 借阅管理
+import borrowList from './library/borrow/borrowList' // 借阅记录
+import appointmentList from './library/borrow/appointmentList' // 预约记录
 
 export default {
   router: [
@@ -709,7 +711,7 @@ export default {
           path: 'calendarList',
           name: 'calendarList',
           component: calendarList,
-          children:[]
+          children: []
         }]
       }, { // 健康管理
         path: 'healthManager',
@@ -755,18 +757,18 @@ export default {
           name: 'libraryList',
           component: LibraryList,
           children: []
-        },{ // 图书编辑
+        }, { // 图书编辑
           path: 'book/:id?',
           name: 'libraryEdit',
           component: LibraryEdit,
           children: []
-        },{ // 库存盘点
+        }, { // 库存盘点
           path: 'stock/:id',
           name: 'stockChange',
           component: StockChange,
           children: []
         }],
-      },{ // 借阅管理
+      }, { // 借阅管理
         path: 'borrow',
         name: 'borrow',
         component: BorrowManager,
@@ -775,6 +777,16 @@ export default {
           name: 'borrowBooks',
           component: BorrowBooks,
           children: []
+        }, { // 借阅记录
+          path: 'borrowList',
+          name: 'borrowList',
+          component: borrowList,
+          children: []
+        }, { // 预约记录
+          path: 'appointmentList',
+          name: 'appointmentList',
+          component: appointmentList,
+          children: []
         }]
       }]
     },

src/store/library/index.js

@@ -1,5 +1,5 @@
-// import ajax from '../../util/ajax'
-// import api from '../../util/api'
+import ajax from '../../util/ajax'
+import api from '../../util/api'
 
 export default {
   namespaced: true,
@@ -50,7 +50,8 @@ export default {
         CaseId: '',
         OrgId: '1',
         Status: 1,
-        CreateDate: new Date()},
+        CreateDate: new Date()
+      },
     },
     stock: {
       list: [
@@ -79,68 +80,84 @@ export default {
     },
   },
   mutations: {
-    mergeTypeDetail(state, payload) {
+    mergeTypeDetail (state, payload) {
       state.type.detail = payload || {}
 
       if (payload && payload.BookTypeId) {
         state.type.list = (state.type.list || []).map(x => x.BookTypeId === payload.BookTypeId ? payload : x)
       }
     },
-    mergeBookDetail(state, payload) {
+    mergeBookDetail (state, payload) {
       state.detail = payload || {}
 
       if (payload && payload.BookId) {
         state.list = (state.list || []).map(x => x.BookId === payload.BookId ? payload : x)
       }
     },
+    setBorrowList (state, payload) { // 更新借阅记录
+      state.borrow.list = payload
+    }
   },
   actions: {
-    getTypeList({ commit }, payload) {
+    getBorrowList ({ commit }, payload) { // 获取借阅记录
+      return new Promise((resolve, reject) => {
+        ajax(api.borrow.getBorrowList.url, {
+          method: api.borrow.getBorrowList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('setBorrowList', res.list)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getTypeList ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    getTypeDetail({ commit }, payload) {
+    getTypeDetail ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    updateTypeDetail({ commit }, payload) {
+    updateTypeDetail ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    deleteType({ commit }, payload) {
+    deleteType ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    getBookList({ commit }, payload) {
+    getBookList ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    getBookDetail({ commit }, payload) {
+    getBookDetail ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    updateBookDetail({ commit }, payload) {
+    updateBookDetail ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    deleteBook({ commit }, payload) {
+    deleteBook ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    setBookRecommend({ commit }, payload) {
+    setBookRecommend ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })
     },
-    getStockList({ commit }, payload) {
+    getStockList ({ commit }, payload) {
       return new Promise((resolve, reject) => {
 
       })

src/util/api.js

@@ -947,6 +947,12 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/record`
     }
+  },
+  borrow: {
+    getBorrowList: {
+      method: 'get',
+      url: `${baseUrl}${common}/book/record`
+    }
   }
 }
 export default $api