5/15

VCCICCV · May 15, 2023 · 0e74a99 · 0e74a99
1 parent 17efd76
commit 0e74a99
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 104 deletions.
diff --git a/src/views/admin/List.vue b/src/views/admin/List.vue
@@ -9,7 +9,7 @@
       <el-button style="margin-left: 1%" type="warning" @click="reset"><i class="el-icon-refresh"></i>重置</el-button>
     </div>
     <!-- 列表 -->
-    <el-table :data="tableData" stripe>
+    <el-table :data="tableData" stripe style="height:500px; overflow-y: scroll;">
       <el-table-column prop="id" label="编号" width="80"></el-table-column>
       <el-table-column prop="username" label="用户名"></el-table-column>
       <el-table-column prop="phone" label="联系方式"></el-table-column>

diff --git a/src/views/book/Add.vue b/src/views/book/Add.vue
@@ -26,6 +26,12 @@
             <el-form-item label="标准码" prop="bookNo">
                 <el-input v-model="form.bookNo" placeholder="标准码"></el-input>
             </el-form-item>
+            <el-form-item label="借书积分" prop="score">
+                <el-input-number v-model="form.score" :min="10" :max="30" :step="2">所需积分</el-input-number>
+            </el-form-item>
+            <el-form-item label="数量" prop="nums">
+                <el-input v-model="form.nums" placeholder="请输入数量"></el-input>
+            </el-form-item>
             <el-form-item label="封面" prop="cover">
                 <el-input v-model="form.cover" placeholder="请选择封面"></el-input>
             </el-form-item>
@@ -76,11 +82,11 @@ export default {
     },
     methods: {
         handleCoverSuccess(res) {
-      if (res.code === '200') {
-        console.log(res.data)
-        this.form.cover = res.data
-      }
-    },
+            if (res.code === '200') {
+                console.log(res.data)
+                this.form.cover = res.data
+            }
+        },
         save() {
             this.$refs["ruleForm"].validate((valid) => {
                 if (valid) {

diff --git a/src/views/book/List.vue b/src/views/book/List.vue
@@ -8,35 +8,40 @@
       <el-button style="margin-left: 1%" type="warning" @click="reset"><i class="el-icon-refresh"></i>重置</el-button>
     </div>
     <!-- 列表 -->
-    <!-- 表格prop写驼峰 -->
-    <el-table :data="tableData" stripe row-key="id" default-expand-all>
-      <el-table-column prop="id" label="编号" width="80"></el-table-column>
-      <el-table-column prop="name" label="图书名称"></el-table-column>
-      <el-table-column prop="description" label="描述" width="250"></el-table-column>
-      <el-table-column prop="publishDate" label="出版日期"></el-table-column>
-      <el-table-column prop="author" label="作者"></el-table-column>
-      <el-table-column prop="publisher" label="出版社"></el-table-column>
-      <el-table-column prop="category" label="分类"></el-table-column>
-      <el-table-column prop="bookNo" label="标准码"></el-table-column>
-      <el-table-column prop="cover" label="封面">
-        <template v-slot="scope">
-          <el-image :src="scope.row.cover" :preview-src-list="[scope.row.cover]"></el-image>
-        </template>
-      </el-table-column>
-      <el-table-column prop="createtime" label="创建时间"></el-table-column>
-      <el-table-column prop="updatetime" label="更新时间"></el-table-column>
+    <div>
+      <el-table :data="tableData" stripe row-key="id" default-expand-all style="height:500px; overflow-y: scroll;">
+        <el-table-column prop="id" label="编号" width="80"></el-table-column>
+        <el-table-column prop="name" label="图书名称"></el-table-column>
+        <el-table-column prop="description" label="描述" width="250"></el-table-column>
+        <el-table-column prop="publishDate" label="出版日期"></el-table-column>
+        <el-table-column prop="author" label="作者"></el-table-column>
+        <el-table-column prop="publisher" label="出版社"></el-table-column>
+        <el-table-column prop="category" label="分类"></el-table-column>
+        <el-table-column prop="bookNo" label="标准码"></el-table-column>
+        <el-table-column prop="score" label="借书积分"></el-table-column>
+        <el-table-column prop="nums" label="数量"></el-table-column>
+        <el-table-column prop="cover" label="封面">
+          <template v-slot="scope">
+            <el-image :src="scope.row.cover" :preview-src-list="[scope.row.cover]"></el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createtime" label="创建时间"></el-table-column>
+        <el-table-column prop="updatetime" label="更新时间"></el-table-column>
+
+        <!-- 状态 -->
+        <el-table-column label="操作" width="280">
+          <template v-slot="scope">
 
-      <!-- 状态 -->
-      <el-table-column label="操作" width="280">
-        <template v-slot="scope">
+            <el-button type="primary" @click="$router.push('/editBorrow?id=' + scope.row.id)" size="mini">编辑</el-button>
+            <el-popconfirm title="确定删除？" @confirm="del(scope.row.id)">
+              <el-button type="danger" slot="reference" size="mini">删除</el-button>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 表格prop写驼峰 -->
 
-          <el-button type="primary" @click="$router.push('/editBorrow?id=' + scope.row.id)" size="mini">编辑</el-button>
-          <el-popconfirm title="确定删除？" @confirm="del(scope.row.id)">
-            <el-button type="danger" slot="reference" size="mini">删除</el-button>
-          </el-popconfirm>
-        </template>
-      </el-table-column>
-    </el-table>
     <!-- 分页 -->
     <div style="margin-top: 2%">
       <el-pagination background :page-size="params.pageSize" :current-page="params.pageNum"

diff --git a/src/views/borrow/Add.vue b/src/views/borrow/Add.vue
@@ -2,32 +2,36 @@
     <div style="width: 80%">
         <div style="margin-bottom: 30px">新增借书记录</div>
         <el-form :inline="true" :model="form" :rules="rules" ref="ruleForm" label-width="100px">
-            <el-form-item label="标准码" prop="name">
-                <el-select v-model="bookNo" filterable placeholder="请选择">
-                    <el-option v-for="book in books" :key="item.value" :label="item.label" :value="item.value">
+            <el-form-item label="图书标准码" prop="bookNo">
+                <el-select v-model="form.bookNo" clearable filterable placeholder="请选择" @select="selBook">
+                    <el-option v-for="item in books" :key="item.id" :label="item.bookNo" :value="item.bookNo">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="图书名称" prop="bookNmae">
-                <el-input v-model="form.bookNmae" placeholder="请输入图书名称"></el-input>
+            <el-form-item label="图书名称" prop="name">
+                <el-input v-model="form.bookName" placeholder="图书名称" disabled></el-input>
             </el-form-item>
             <el-form-item label="所需积分" prop="score">
-                <el-input v-model="form.score"></el-input>
+                <el-input v-model="form.score" disabled></el-input>
             </el-form-item>
-            <el-form-item label="用户No" prop="userNo">
+            <el-form-item label="会员码" prop="userNo">
+                <el-select v-mode="form.userNo" filterable placeholder="请选择" @change="selUser">
+                    <el-option v-for="item in users" :key="item.id" :label="item.username"
+                        :value="item.username"></el-option>
+                </el-select>
             </el-form-item>
-            <el-form-item label="用户名" prop="userName">
-                <el-input v-model="form.userName" placeholder="请输入用户名"></el-input>
+            <el-form-item label="用户名" prop="username">
+                <el-input v-model="form.userName" placeholder="请输入用户名" disabled></el-input>
             </el-form-item>
             <el-form-item label="用户联系方式" prop="userPhone">
-                <el-input v-model="form.userPhone"></el-input>
-            </el-form-item>
-            <el-form-item label="标准码" prop="bookNo">
-                <el-input v-model="form.bookNo" placeholder="标准码"></el-input>
-            </el-form-item>
-            <el-form-item label="封面" prop="cover">
-                <el-input v-model="form.cover" placeholder="请选择封面"></el-input>
+                <el-input v-model="form.userPhone" disabled></el-input>
             </el-form-item>
+            <!-- <el-form-item label="用户账户积分" prop="account">
+                <el-input disabled v-model="form.account"></el-input>
+            </el-form-item> -->
+            <!-- <el-form-item label="借出的天数" prop="days">
+                <el-input-number v-model="form.days" :min="1" :max="30" label="借出的天数"></el-input-number>
+            </el-form-item> -->
         </el-form>
         <div style="margin-top: 30px; text-align: right">
             <el-button type="primary" @click="save">提交</el-button>
@@ -40,13 +44,6 @@ import Cookies from "js-cookie";
 export default {
     name: "AddBorrow",
     data() {
-        const checkNums = (rule, value, callback) => {
-            value = parseInt(value)
-            if (value < 0 || value >= 1000) {
-                callback(new Error('请输入大于等于0小于1000的整数'));
-            }
-            callback()
-        };
         return {
             admin: Cookies.get('admin') ? JSON.parse(Cookies.get('admin')) : {},
             form: { days: 1 },
@@ -63,9 +60,12 @@ export default {
         };
     },
     created() {
-        request.get('/book').then(res => {
+        request.get('/book/list').then(res => {
             this.books = res.data
         })
+        request.get('/user/list').then(res => {
+            this.users = res.data.filter(v => v.status)
+        })
     },
     methods: {
         handleCoverSuccess(res) {
@@ -91,6 +91,23 @@ export default {
                 }
             });
         },
+        selBook() {
+            const book = this.books.find(v => v.bookNo === this.form.bookNo)
+            request.get('/book/' + book.id).then(res => {
+                this.$set(this.form, 'bookName', res.data.name)
+                this.form.score = res.data.score
+                this.form.nums = res.data.nums
+            })
+        },
+        selUser() {
+            const user = this.users.find(v => v.username === this.form.userNo)
+            request.get('/user/' + user.id).then(res => {
+                this.$set(this.form, 'username', res.data.name)
+                this.form.userName = res.data.name
+                this.form.userPhone = res.data.phone
+                // this.form.account = res.data.account
+            })
+        },
 
     },
 };

diff --git a/src/views/borrow/Edit.vue b/src/views/borrow/Edit.vue
@@ -1,37 +1,46 @@
 <template>
-    <div style="width:80%;">
-        <div style='margin-bottom:30px'>编辑分类</div>
-        <el-form :inline="true" :model="form" :rules="rules" ref="ruleForm" label-width="100px">
-            <el-form-item label="名称" prop="name">
-                <el-input v-model="form.name" placeholder="请输入名称"></el-input>
+    <div style="width: 80%">
+        <div style="margin-bottom: 30px">编辑图书</div>
+        <el-form :inline="true" :rules="rules" ref="ruleForm" :model="form" label-width="100px">
+            <el-form-item label="图书标准码" prop="bookNo">
+                <el-select v-model="form.bookNo" clearable filterable placeholder="请选择" @change="selBook">
+                    <el-option v-for="item in books" :key="item.id" :label="item.bookNo" :value="item.bookNo">
+                    </el-option>
+                </el-select>
             </el-form-item>
-            <el-form-item label="描述" prop="description">
-                <el-input type="textarea" v-model="form.description" placeholder="请输入描述" style="width:400px;"></el-input>
+            <el-form-item label="图书名称" prop="bookName">
+                <el-input v-model="form.bookName" disabled></el-input>
             </el-form-item>
-            <el-form-item label="出版日期" prop="publish_date">
-                <el-date-picker style="width: 85%;" v-model="form.publishDate" type="date" value-format="yyyy-MM-dd"
-                    placeholder="请选择出版日期">
-                </el-date-picker>
+            <el-form-item label="所需积分" prop="score">
+                <el-input v-model="form.score" disabled></el-input>
             </el-form-item>
-            <el-form-item label="作者" prop="author">
-                <el-input v-model="form.author" placeholder="请输入作者"></el-input>
+            <el-form-item label="图书数量" prop="nums">
+                <el-input v-model="form.nums" disabled></el-input>
             </el-form-item>
-            <el-form-item label="出版社" prop="publisher">
-                <el-input v-model="form.publisher" placeholder="请输入出版社"></el-input>
+
+            <br />
+            <el-form-item label="会员码" prop="userNo">
+                <el-select v-model="form.userNo" filterable placeholder="请选择" @change="selUser">
+                    <el-option v-for="item in users" :key="item.id" :label="item.username" :value="item.username">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="用户名称" prop="userName">
+                <el-input disabled v-model="form.userName"></el-input>
             </el-form-item>
-            <el-form-item label="分类" prop="category">
-                <el-cascader :props="{ value: 'name', label: 'name' }" v-model="form.categories"
-                    :options="categories"></el-cascader>
+            <el-form-item label="用户联系方式" prop="userPhone">
+                <el-input disabled v-model="form.userPhone"></el-input>
             </el-form-item>
-            <el-form-item label="标准码" prop="bookNo">
-                <el-input v-model="form.bookNo" placeholder="标准码"></el-input>
+            <el-form-item label="用户账户积分" prop="account">
+                <el-input disabled v-model="form.account"></el-input>
             </el-form-item>
-            <el-form-item label="封面" prop="cover">
-                <el-input v-model="form.cover" placeholder="请选择封面"></el-input>
+            <el-form-item label="借出的天数" prop="days">
+                <el-input-number v-model="form.days" :min="1" :max="30" label="借出的天数"></el-input-number>
             </el-form-item>
         </el-form>
-        <div style="margin-top: 30px; text-align: right;">
-            <el-button type="primary" @click="save">提交</el-button>
+
+        <div style="text-align: center; margin-top: 30px">
+            <el-button type="primary" @click="save" size="medium">提交</el-button>
         </div>
     </div>
 </template>
@@ -44,49 +53,57 @@ export default {
         return {
             admin: Cookies.get('admin') ? JSON.parse(Cookies.get('admin')) : {},
             form: {},
-            categories: [],
+            books: [],
             rules: {
-                name: [
-                    { required: true, message: '请输入图书名称', trigger: 'blur' }
-                ],
                 bookNo: [
                     { required: true, message: '请输入图书标准码', trigger: 'blur' }
                 ],
-                score: [
-                    { required: true, message: '请输入借书积分', trigger: 'blur' }
+                userNo: [
+                    { required: true, message: '请输入会员码', trigger: 'blur' }
                 ]
-            },
+            }
         }
     },
     created() {
-        request.get('/category/tree').then(res => {
-            this.categories = res.data
+        request.get('/book/list').then(res => {
+            this.books = res.data
+        })
+
+        request.get('/user/list').then(res => {
+            this.users = res.data.filter(v => v.status)
         })
 
         const id = this.$route.query.id
-        request.get("/book/" + id).then(res => {
+        request.get("/borrow/" + id).then(res => {
             this.form = res.data
-            if (this.form.category) {
-                this.form.categories = this.form.category.split(' > ')
-                console.log(this.form.categories)
-            }
         })
     },
     methods: {
-        handleCoverSuccess(res) {
-            if (res.code === '200') {
-                this.form.cover = res.data
-            }
-        },
         save() {
-            request.put('/book/update', this.form).then(res => {
+            request.put('/borrow/update', this.form).then(res => {
                 if (res.code === '200') {
                     this.$notify.success('更新成功')
                     this.$router.push("/bookList")
                 } else {
                     this.$notify.error(res.msg)
                 }
             })
+        },
+        selBook() {
+            const book = this.books.find(v => v.bookNo === this.form.bookNo)
+            request.get('/book/' + book.id).then(res => {
+                this.form.bookName = res.data.name
+                this.form.score = res.data.score
+                this.form.nums = res.data.nums
+            })
+        },
+        selUser() {
+            const user = this.users.find(v => v.username === this.form.userNo)
+            request.get('/user/' + user.id).then(res => {
+                this.form.userName = res.data.name
+                this.form.userPhone = res.data.phone
+                this.form.account = res.data.account
+            })
         }
     }
 }

diff --git a/src/views/borrow/List.vue b/src/views/borrow/List.vue
@@ -9,7 +9,7 @@
     </div>
     <!-- 列表 -->
     <!-- 表格prop写驼峰 -->
-    <el-table :data="tableData" stripe row-key="id" default-expand-all>
+    <el-table :data="tableData" stripe row-key="id" default-expand-all style="height:550px; overflow-y: scroll;">
       <el-table-column prop="id" label="编号" width="80"></el-table-column>
       <el-table-column prop="bookName" label="图书名称"></el-table-column>
       <el-table-column prop="bookNo" label="标准码" width="250"></el-table-column>

diff --git a/src/views/category/List.vue b/src/views/category/List.vue
@@ -8,7 +8,7 @@
     </div>
     <!-- 列表 -->
     <!-- 表格prop写驼峰 -->
-    <el-table :data="tableData" stripe row-key="id" default-expand-all>
+    <el-table :data="tableData" stripe row-key="id" default-expand-all style="height:500px; overflow-y: scroll;">
       <el-table-column prop="id" label="编号" width="80"></el-table-column>
       <el-table-column prop="name" label="名称"></el-table-column>
       <el-table-column prop="remark" label="备注"></el-table-column>

diff --git a/src/views/user/User.vue b/src/views/user/User.vue
@@ -7,7 +7,7 @@
       <el-button style="margin-left: 1%" type="primary" @click="load"><i class="el-icon-search"></i>搜索</el-button>
       <el-button style="margin-left: 1%" type="warning" @click="reset"><i class="el-icon-refresh"></i>重置</el-button>
     </div>
-    <el-table :data="tableData" stripe>
+    <el-table :data="tableData" stripe style="height:500px; overflow-y: scroll;">
       <el-table-column prop="id" label="编号" width="80"></el-table-column>
       <el-table-column prop="username" label="会员号"></el-table-column>
       <el-table-column prop="name" label="姓名"></el-table-column>