From 04ea93ce1458afb44f0d612f695a3f5b6bbe337e Mon Sep 17 00:00:00 2001
From: zhao <2796247050@qq.com>
Date: Wed, 17 Jul 2024 17:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/maku/t_book/add-or-update.vue     | 21 ++++++++++++---------
 src/views/maku/t_book/index.vue             | 23 +++++++++++++++--------
 src/views/maku/t_book_collection/index.vue  | 17 ++++++++++++-----
 src/views/maku/t_book_comment/index.vue     | 16 +++++++++++-----
 src/views/maku/t_purchase_details/index.vue | 15 +++++++++++----
 src/views/maku/t_shopping_trolley/index.vue |  1 -
 src/views/maku/t_user/add-or-update.vue     | 10 +++++++---
 src/views/maku/t_user/index.vue             | 19 ++++++++++++-------
 8 files changed, 80 insertions(+), 42 deletions(-)

diff --git a/src/views/maku/t_book/add-or-update.vue b/src/views/maku/t_book/add-or-update.vue
index 708d1dc..660777f 100644
--- a/src/views/maku/t_book/add-or-update.vue
+++ b/src/views/maku/t_book/add-or-update.vue
@@ -1,31 +1,31 @@
 <template>
 	<el-dialog v-model="visible" :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false">
 		<el-form ref="dataFormRef" :model="dataForm" :rules="dataRules" label-width="100px" @keyup.enter="submitHandle()">
-				<el-form-item label="作者" prop="bookName">
+	    				<el-form-item label="书名" prop="bookName">
 					<el-input v-model="dataForm.bookName" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="价格" prop="author">
+				<el-form-item label="作者" prop="author">
 					<el-input v-model="dataForm.author" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="封面" prop="price">
+				<el-form-item label="价格" prop="price">
 					<el-input v-model="dataForm.price" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="图书介绍" prop="bookCover">
+				<el-form-item label="封面" prop="bookCover">
 					<el-input v-model="dataForm.bookCover" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="图书详情" prop="introduction">
+				<el-form-item label="书籍介绍" prop="introduction">
 					<el-input v-model="dataForm.introduction" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="图书库存" prop="description">
+				<el-form-item label="书籍详情" prop="description">
 					<el-input v-model="dataForm.description" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="创建时间" prop="store">
+				<el-form-item label="库存" prop="store">
 					<el-input v-model="dataForm.store" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="修改时间" prop="createTime">
+				<el-form-item label="创建时间" prop="createTime">
 					<el-input v-model="dataForm.createTime" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="" prop="updateTime">
+				<el-form-item label="修改时间" prop="updateTime">
 					<el-input v-model="dataForm.updateTime" placeholder=""></el-input>
 				</el-form-item>
 		</el-form>
@@ -79,6 +79,9 @@ const getT_book = (id: number) => {
 }
 
 const dataRules = ref({
+	bookName: [{ required: true, message: '必填项不能为空', trigger: 'blur' }],
+	price: [{ required: true, message: '必填项不能为空', trigger: 'blur' }],
+	store: [{ required: true, message: '必填项不能为空', trigger: 'blur' }],
 })
 
 // 表单提交
diff --git a/src/views/maku/t_book/index.vue b/src/views/maku/t_book/index.vue
index 87457c3..bf0a800 100644
--- a/src/views/maku/t_book/index.vue
+++ b/src/views/maku/t_book/index.vue
@@ -1,7 +1,13 @@
 <template>
 	<el-card class="layout-query">
 		<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList()">
-					<el-form-item>
+			<el-form-item prop="bookName">
+			  <el-input v-model="state.queryForm.bookName" placeholder="书名"></el-input>
+			</el-form-item>
+			<el-form-item prop="author">
+			  <el-input v-model="state.queryForm.author" placeholder="作者"></el-input>
+			</el-form-item>
+			<el-form-item>
 				<el-button icon="Search" type="primary" @click="getDataList()">查询</el-button>
 			</el-form-item>
 			<el-form-item>
@@ -21,16 +27,15 @@
 		</el-space>
 		<el-table v-loading="state.dataListLoading" :data="state.dataList" border class="layout-table" @selection-change="selectionChangeHandle">
 			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-			<el-table-column prop="id" label="编号" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="bookName" label="书籍名称" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="bookName" label="书名" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="author" label="作者" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="price" label="价格" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="bookCover" label="图书封面" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="introduction" label="图书介绍" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="description" label="图书详情" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="store" label="图书库存" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="bookCover" label="封面" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="introduction" label="书籍介绍" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="description" label="书籍详情" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="store" label="库存" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="createTime" label="创建时间" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="updateTime" label=" 修改时间" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="updateTime" label="修改时间" header-align="center" align="center"></el-table-column>
 			<el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
 				<template #default="scope">
 					<el-button v-auth="'maku:t_book:update'" type="primary" link @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
@@ -64,6 +69,8 @@
 	dataListUrl: '/maku/t_book/page',
 	deleteUrl: '/maku/t_book',
 	queryForm: {
+		bookName: '', 
+		author: '', 
 	}
 })
 
diff --git a/src/views/maku/t_book_collection/index.vue b/src/views/maku/t_book_collection/index.vue
index b592cc5..6f84351 100644
--- a/src/views/maku/t_book_collection/index.vue
+++ b/src/views/maku/t_book_collection/index.vue
@@ -1,7 +1,13 @@
 <template>
 	<el-card class="layout-query">
 		<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList()">
-					<el-form-item>
+					<el-form-item prop="userId">
+			  <el-input v-model="state.queryForm.userId" placeholder="用户id"></el-input>
+			</el-form-item>
+			<el-form-item prop="bookId">
+			  <el-input v-model="state.queryForm.bookId" placeholder="书本id"></el-input>
+			</el-form-item>
+			<el-form-item>
 				<el-button icon="Search" type="primary" @click="getDataList()">查询</el-button>
 			</el-form-item>
 			<el-form-item>
@@ -21,11 +27,10 @@
 		</el-space>
 		<el-table v-loading="state.dataListLoading" :data="state.dataList" border class="layout-table" @selection-change="selectionChangeHandle">
 			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-			<el-table-column prop="id" label="编号" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="userId" label="用户编号" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="bookId" label="书籍编号" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="createTime" label=" 创建时间" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="updateTime" label=" 修改时间" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="bookId" label="书本编号" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="createTime" label="创建时间" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="updateTime" label="修改时间" header-align="center" align="center"></el-table-column>
 			<el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
 				<template #default="scope">
 					<el-button v-auth="'maku:t_book_collection:update'" type="primary" link @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
@@ -59,6 +64,8 @@
 	dataListUrl: '/maku/t_book_collection/page',
 	deleteUrl: '/maku/t_book_collection',
 	queryForm: {
+		userId: '', 
+		bookId: ''
 	}
 })
 
diff --git a/src/views/maku/t_book_comment/index.vue b/src/views/maku/t_book_comment/index.vue
index b96ec49..21aa984 100644
--- a/src/views/maku/t_book_comment/index.vue
+++ b/src/views/maku/t_book_comment/index.vue
@@ -1,7 +1,13 @@
 <template>
 	<el-card class="layout-query">
 		<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList()">
-					<el-form-item>
+					<el-form-item prop="userId">
+			  <el-input v-model="state.queryForm.userId" placeholder="用户id"></el-input>
+			</el-form-item>
+			<el-form-item prop="bookId">
+			  <el-input v-model="state.queryForm.bookId" placeholder="书本id"></el-input>
+			</el-form-item>
+			<el-form-item>
 				<el-button icon="Search" type="primary" @click="getDataList()">查询</el-button>
 			</el-form-item>
 			<el-form-item>
@@ -21,11 +27,9 @@
 		</el-space>
 		<el-table v-loading="state.dataListLoading" :data="state.dataList" border class="layout-table" @selection-change="selectionChangeHandle">
 			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-			<el-table-column prop="id" label="编号" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="userId" label="用户编号" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="bookId" label="书籍编号" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="comment" label="评论内容" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="parentId" label="父级编号" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="bookId" label="书本编号" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="comment" label="评价" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="createTime" label="创建时间" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="updateTime" label="修改时间" header-align="center" align="center"></el-table-column>
 			<el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
@@ -61,6 +65,8 @@
 	dataListUrl: '/maku/t_book_comment/page',
 	deleteUrl: '/maku/t_book_comment',
 	queryForm: {
+		userId: '', 
+		bookId: ''
 	}
 })
 
diff --git a/src/views/maku/t_purchase_details/index.vue b/src/views/maku/t_purchase_details/index.vue
index b3fd9c4..bb53e2f 100644
--- a/src/views/maku/t_purchase_details/index.vue
+++ b/src/views/maku/t_purchase_details/index.vue
@@ -1,7 +1,13 @@
 <template>
 	<el-card class="layout-query">
 		<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList()">
-					<el-form-item>
+					<el-form-item prop="purchaseId">
+			  <el-input v-model="state.queryForm.purchaseId" placeholder="订单编号"></el-input>
+			</el-form-item>
+			<el-form-item prop="bookId">
+			  <el-input v-model="state.queryForm.bookId" placeholder="书本编号"></el-input>
+			</el-form-item>
+			<el-form-item>
 				<el-button icon="Search" type="primary" @click="getDataList()">查询</el-button>
 			</el-form-item>
 			<el-form-item>
@@ -21,10 +27,9 @@
 		</el-space>
 		<el-table v-loading="state.dataListLoading" :data="state.dataList" border class="layout-table" @selection-change="selectionChangeHandle">
 			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-			<el-table-column prop="id" label="编号" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="purchaseId" label="订单编号" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="bookId" label="书籍编号" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="price" label="书本价格" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="bookId" label="书本编号" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="price" label="价格" header-align="center" align="center"></el-table-column>
 			<el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
 				<template #default="scope">
 					<el-button v-auth="'maku:t_purchase_details:update'" type="primary" link @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
@@ -58,6 +63,8 @@
 	dataListUrl: '/maku/t_purchase_details/page',
 	deleteUrl: '/maku/t_purchase_details',
 	queryForm: {
+		purchaseId: '', 
+		bookId: ''
 	}
 })
 
diff --git a/src/views/maku/t_shopping_trolley/index.vue b/src/views/maku/t_shopping_trolley/index.vue
index a61a90f..d0b44a9 100644
--- a/src/views/maku/t_shopping_trolley/index.vue
+++ b/src/views/maku/t_shopping_trolley/index.vue
@@ -9,7 +9,6 @@
 			</el-form-item>
 		</el-form>
 	</el-card>
-
 	<el-card>
 		<el-space>
 			<el-space>
diff --git a/src/views/maku/t_user/add-or-update.vue b/src/views/maku/t_user/add-or-update.vue
index e09b2b2..0997027 100644
--- a/src/views/maku/t_user/add-or-update.vue
+++ b/src/views/maku/t_user/add-or-update.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-dialog v-model="visible" :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false">
 		<el-form ref="dataFormRef" :model="dataForm" :rules="dataRules" label-width="100px" @keyup.enter="submitHandle()">
-				<el-form-item label="用户名" prop="username">
+	    				<el-form-item label="用户名" prop="username">
 					<el-input v-model="dataForm.username" placeholder=""></el-input>
 				</el-form-item>
 				<el-form-item label="密码" prop="password">
@@ -10,10 +10,10 @@
 				<el-form-item label="头像" prop="avatar">
 					<el-input v-model="dataForm.avatar" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="书本币余额" prop="balance">
+				<el-form-item label="书本币" prop="balance">
 					<el-input v-model="dataForm.balance" placeholder=""></el-input>
 				</el-form-item>
-				<el-form-item label="用户状态" prop="status">
+				<el-form-item label="禁用状态" prop="status">
 					<el-input v-model="dataForm.status" placeholder=""></el-input>
 				</el-form-item>
 				<el-form-item label="创建时间" prop="createTime">
@@ -71,6 +71,10 @@ const getT_user = (id: number) => {
 }
 
 const dataRules = ref({
+	username: [{ required: true, message: '必填项不能为空', trigger: 'blur' }],
+	password: [{ required: true, message: '必填项不能为空', trigger: 'blur' }],
+	balance: [{ required: true, message: '必填项不能为空', trigger: 'blur' }],
+	status: [{ required: true, message: '必填项不能为空', trigger: 'blur' }],
 })
 
 // 表单提交
diff --git a/src/views/maku/t_user/index.vue b/src/views/maku/t_user/index.vue
index a617751..593a090 100644
--- a/src/views/maku/t_user/index.vue
+++ b/src/views/maku/t_user/index.vue
@@ -1,7 +1,13 @@
 <template>
 	<el-card class="layout-query">
 		<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList()">
-					<el-form-item>
+			<el-form-item prop="username">
+			  <el-input v-model="state.queryForm.username" placeholder="用户名"></el-input>
+			</el-form-item>
+			<el-form-item prop="status">
+			  <el-input v-model="state.queryForm.status" placeholder="禁用状态"></el-input>
+			</el-form-item>
+			<el-form-item>
 				<el-button icon="Search" type="primary" @click="getDataList()">查询</el-button>
 			</el-form-item>
 			<el-form-item>
@@ -9,7 +15,6 @@
 			</el-form-item>
 		</el-form>
 	</el-card>
-
 	<el-card>
 		<el-space>
 			<el-space>
@@ -21,12 +26,10 @@
 		</el-space>
 		<el-table v-loading="state.dataListLoading" :data="state.dataList" border class="layout-table" @selection-change="selectionChangeHandle">
 			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-			<el-table-column prop="id" label="编号" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="username" label="用户名" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="password" label="密码" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="avatar" label="头像" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="balance" label="书本币余额" header-align="center" align="center"></el-table-column>
-			<el-table-column prop="status" label="用户状态" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="balance" label="书本币" header-align="center" align="center"></el-table-column>
+			<el-table-column prop="status" label="禁用状态" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="createTime" label="创建时间" header-align="center" align="center"></el-table-column>
 			<el-table-column prop="updateTime" label="修改时间" header-align="center" align="center"></el-table-column>
 			<el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
@@ -62,6 +65,8 @@
 	dataListUrl: '/maku/t_user/page',
 	deleteUrl: '/maku/t_user',
 	queryForm: {
+		username: '', 
+		status: ''
 	}
 })
 
@@ -72,4 +77,4 @@ const addOrUpdateHandle = (id?: number) => {
 }
 
 const { getDataList, selectionChangeHandle, sizeChangeHandle, currentChangeHandle, deleteBatchHandle, reset } = useCrud(state)
-</script>
+</script>
\ No newline at end of file