From 0c9de873fba113950fbcf23e5298ab03bb4496c0 Mon Sep 17 00:00:00 2001
From: guanxiaohan <guanxiaohan@et.com>
Date: Fri, 27 Sep 2024 11:12:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=88=97=E8=A1=A8=E9=9D=99?=
 =?UTF-8?q?=E6=80=81=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8A=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/itemManagement/applicationExamine.js  |   23 +
 src/api/itemManagement/itemList.js            |   44 +
 .../applicationExamine/index.vue              |  916 ++++++++++++++
 src/page/itemManagement/itemList/index.vue    | 1099 +++++++++++++++++
 src/router/views/index.js                     |   27 +-
 5 files changed, 2108 insertions(+), 1 deletion(-)
 create mode 100644 src/api/itemManagement/applicationExamine.js
 create mode 100644 src/api/itemManagement/itemList.js
 create mode 100644 src/page/itemManagement/applicationExamine/index.vue
 create mode 100644 src/page/itemManagement/itemList/index.vue

diff --git a/src/api/itemManagement/applicationExamine.js b/src/api/itemManagement/applicationExamine.js
new file mode 100644
index 0000000..35c9ee8
--- /dev/null
+++ b/src/api/itemManagement/applicationExamine.js
@@ -0,0 +1,23 @@
+import request from '@/router/axios';
+
+export const findPage = (params) => {
+  return request({
+    url: '/api/blade-desk/goodsApply/findPage',
+    method: 'get',
+    params
+  })
+}
+export const detail = (params) => {
+    return request({
+      url: '/api/blade-desk/goodsApply/detail',
+      method: 'get',
+      params: params
+    })
+}
+export const remove = (params) => {
+    return request({
+      url: '/api/blade-desk/goodsApply/remove',
+      method: 'get',
+      params
+    })
+}
\ No newline at end of file
diff --git a/src/api/itemManagement/itemList.js b/src/api/itemManagement/itemList.js
new file mode 100644
index 0000000..45d4469
--- /dev/null
+++ b/src/api/itemManagement/itemList.js
@@ -0,0 +1,44 @@
+import request from '@/router/axios';
+
+export const findPage = (params) => {
+  return request({
+    url: '/api/blade-desk/goods/findPage',
+    method: 'get',
+    params: params
+  })
+}
+export const detail = (params) => {
+    return request({
+      url: '/api/blade-desk/goods/detail',
+      method: 'get',
+      params: params
+    })
+}
+export const save = (data) => {
+    return request({
+      url: '/api/blade-desk/goods/save',
+      method: 'post',
+      data
+    })
+}
+export const goodsApplySave = (data) => {
+    return request({
+      url: '/api/blade-desk/goodsApply/save',
+      method: 'post',
+      data
+    })
+}
+export const remove = (params) => {
+    return request({
+      url: '/api/blade-desk/goods/remove',
+      method: 'get',
+      params
+    })
+}
+export const historyDetail = (params) => {
+  return request({
+    url: '/api/blade-desk/goods/historyDetail',
+    method: 'get',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/page/itemManagement/applicationExamine/index.vue b/src/page/itemManagement/applicationExamine/index.vue
new file mode 100644
index 0000000..31d3272
--- /dev/null
+++ b/src/page/itemManagement/applicationExamine/index.vue
@@ -0,0 +1,916 @@
+<template>
+	<basic-container class="content">
+		<div class="content-top">
+			<el-form
+				:inline="true"
+				:model="queryForm"
+				class="serch_form"
+			>
+				<el-form-item label="物品大类">
+					<el-select
+						class="search_select"
+						v-model="queryForm.type"
+						placeholder="请选择物品大类"
+						clearable
+						filterable
+					>
+						<el-option
+							v-for="item in typeList"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="物品品牌">
+					<el-select
+						class="search_select"
+						v-model="queryForm.brand"
+						placeholder="请选择物品品牌"
+						clearable
+						filterable
+					>
+						<el-option
+							v-for="item in brandList"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item
+					class="search_input"
+					label="物品名称"
+				>
+					<el-input
+						v-model="queryForm.name"
+						placeholder="请输入物品名称"
+					/>
+				</el-form-item>
+				<el-form-item>
+					<el-button class="search_button" @click="handleSearch">
+            <i class="el-icon-search"></i>
+          </el-button>
+				</el-form-item>
+			</el-form>
+			<div>
+				<el-button v-if="multipleSelection.length != 0" class="register" @click="batchDeletion">批量删除</el-button>
+			</div>
+		</div>
+		<div class="content-main">
+			<el-table
+				:data="tableData"
+				stripe
+				border
+				style="width: 100%"
+				:header-cell-style="{'text-align':'center'}"
+				:cell-style="{'text-align':'center'}"
+				@selection-change="handleSelectionChange">
+				<el-table-column
+					type="selection"
+					width="55">
+				</el-table-column>
+				<el-table-column
+					type="index"
+					label="序号"
+      				width="70">
+				</el-table-column>
+				<el-table-column
+					prop="bigClass"
+					label="物品大类">
+				</el-table-column>
+				<el-table-column
+					prop="name"
+					label="物品名称">
+				</el-table-column>
+				<el-table-column
+					prop="code"
+					label="物品编号">
+				</el-table-column>
+				<el-table-column
+					prop="brand"
+					label="品牌">
+				</el-table-column>
+				<el-table-column
+					prop="model"
+					label="型号">
+				</el-table-column>
+				<el-table-column
+					prop="standard"
+					label="规格">
+				</el-table-column>
+				<el-table-column
+					prop="applyName"
+					label="申领人">
+				</el-table-column>
+				<el-table-column
+					prop="applyTime"
+					label="申领时间"
+					width="150">
+				</el-table-column>
+				<el-table-column
+					prop="applyNum"
+					label="申领数量">
+				</el-table-column>
+				<el-table-column
+					prop="unit"
+					label="单位">
+				</el-table-column>
+				<el-table-column
+					prop="status"
+					label="状态">
+					<template slot-scope="scope">
+						<div class="status-box-wrapper">
+							<div
+								class="status-box"
+								:class="scope.row.status == '0' ? 'blue' : (scope.row.status == '1' ? 'green' : (scope.row.status == '2' ? 'red' : 'grey'))"
+							>
+								{{ scope.row.status == '0' ? '待审核' : (scope.row.status == '1' ? '待领取' : (scope.row.status == '2' ? '已驳回' : '已领取')) }}
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column
+					prop="remarks"
+					label="备注">
+				</el-table-column>
+				<el-table-column
+					prop="address"
+					label="操作"
+					width="150"
+					align="center"
+				>
+					<template slot-scope="scope">
+						<el-popover
+							placement="bottom"
+							width="150"
+							trigger="hover">
+							<div class="more-box">
+								<div
+									class="item"
+									@click="handleOperation('view', scope.row)">查看</div>
+								<div
+									class="item"
+									@click="handleOperation('delete', scope.row)">删除</div>
+								<div
+									v-if="scope.row.status == '0'"
+									class="item"
+									@click="handleOperation('examine', scope.row)">审核</div>
+								<div
+									v-if="scope.row.status == '1'"
+									class="item"
+									@click="handleOperation('receive', scope.row)">领取</div>
+							</div>
+							<div class="more" slot="reference">更多</div>
+						</el-popover>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="el_pagination">
+				<!-- <div
+					style="
+						width: 100%;
+						height: 100%;
+						position: absolute;
+						background: rgba(255,255,255,.9);
+						z-index: 9;
+						position: absolute;
+						top: 0;
+						left: 0;
+					"
+					v-show="loading"
+				></div> -->
+				<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page="currentPage"
+					:page-sizes="[6, 10, 20, 50, 100]"
+					:page-size="pageSize"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="total"
+				>
+				</el-pagination>
+			</div>
+		</div>
+		<el-dialog
+			:title="registerTitle"
+			:append-to-body="true"
+			:visible.sync="registerDialogVisible"
+			width="50%"
+			:before-close="registerHandleClose">
+			<el-form
+				class="registerForm"
+				:model="registerForm"
+				label-width="80px"
+				ref="registerForm"
+			>
+				<el-col :span="8" v-if="dialogFormType == 'examine'">
+					<el-form-item label="物品大类" prop="type">
+						<el-select
+							v-model="registerForm.type"
+							placeholder="请选择物品大类"
+							disabled
+						>
+							<el-option
+								v-for="item in typeList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="物品名称" prop="name">
+						<el-input
+							v-model="registerForm.name"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="物品编号"
+						prop="code"
+					>
+						<el-input
+							v-model="registerForm.code"
+							placeholder="请输入物品编号"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="品牌"
+						prop="brand"
+					>
+						<el-input
+							v-model="registerForm.brand"
+							placeholder="请输入品牌"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="型号"
+						prop="model"
+					>
+						<el-input
+							v-model="registerForm.model"
+							placeholder="请输入型号"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="规格" prop="standard">
+						<el-input
+							v-model="registerForm.standard"
+							placeholder="请输入规格"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8" v-if="dialogFormType == 'examine'">
+					<el-form-item
+						label="货位"
+						prop="allocation"
+					>
+						<el-select
+							v-model="registerForm.allocation"
+							placeholder="请选择货位"
+							disabled
+						>
+							<el-option
+								v-for="item in goodsAllocationList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value">
+							</el-option>
+						</el-select>
+					</el-form-item>	
+				</el-col>
+				<el-col :span="8" v-if="dialogFormType == 'examine'">
+					<el-form-item label="库存" prop="num">
+						<el-input v-model="registerForm.num"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="申领数量" prop="applyNum">
+						<el-input v-model="registerForm.applyNum"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="单位" prop="unit">
+						<el-input v-model="registerForm.unit"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="申请时间" prop="applyTime">
+						<el-date-picker
+							v-model="registerForm.applyTime"
+							type="datetime"
+							placeholder="选择日期时间"
+							disabled>
+						</el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="备注" prop="name">
+						<el-input v-model="registerForm.name"
+							disabled
+						/>
+					</el-form-item>
+				</el-col>
+                <div
+					v-if="dialogFormType != 'view'"
+					style="width: 100%; display: flex; flex-direction: column;"
+				>
+					<el-col :span="24">
+						<div class="form-title">{{ dialogFormType == 'examine' ? '审核结果' : '申领结果' }}</div>
+					</el-col>
+					<el-form
+						class="registerForm"
+						:model="applyForm"
+						label-width="80px"
+						:rules="rules"
+						ref="applyForm"
+					>
+						<el-col :span="8" v-if="dialogFormType == 'examine'">
+							<el-form-item label="审核意见" prop="status">
+								<el-select
+									v-model="applyForm.status"
+									placeholder="请选择审核意见"
+								>
+									<el-option
+										v-for="item in examineTypeList"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value">
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8" v-if="dialogFormType == 'receive'">
+							<el-form-item label="实际领取" prop="actNum">
+								<el-input
+									v-model="applyForm.actNum"
+									placeholder="请输入实际领取"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="16">
+							<el-form-item label="备注" prop="approveRemarks">
+								<el-input
+									v-model="applyForm.approveRemarks"
+									placeholder="请输入备注"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8" v-if="dialogFormType == 'receive'">
+							<el-form-item label="领取时间" prop="actTime">
+								<el-date-picker
+									v-model="applyForm.actTime"
+									value-format="yyyy-MM-dd HH:mm:ss"
+									type="datetime"
+									placeholder="选择日期时间">
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+					</el-form>
+				</div>
+			</el-form>
+			<div class="dialog-footer">
+				<el-button v-if="dialogFormType != 'view'" @click="registerHandleClick('cancel')">取 消</el-button>
+				<el-button type="primary" @click="registerHandleClick('confirm')">确 定</el-button>
+			</div>
+		</el-dialog>
+		
+	</basic-container>
+</template>
+
+<script>
+	import { findPage, detail, remove } from "@/api/itemManagement/applicationExamine";
+	import { goodsApplySave } from "@/api/itemManagement/itemList";
+	export default {
+		data() {
+			return {
+				queryForm: {
+					type: '',
+					brand: '',
+					name: ''
+				},
+				typeList: [
+					{
+						value: '1',
+						label: '类型1'
+					},
+					{
+						value: '2',
+						label: '类型2'
+					},
+					{
+						value: '3',
+						label: '类型3'
+					}
+				],
+				brandList: [
+					{
+						value: '1',
+						label: '品牌1'
+					},
+					{
+						value: '2',
+						label: '品牌2'
+					},
+					{
+						value: '3',
+						label: '品牌3'
+					}
+				],
+                examineTypeList: [
+                    {
+						value: '1',
+						label: '通过'
+					},
+					{
+						value: '2',
+						label: '不通过'
+					}
+                ],
+				goodsAllocationList: [
+					{
+						label: '货位1',
+						value: '1',
+					},
+					{
+						label: '货位2',
+						value: '2',
+					},
+					{
+						label: '货位3',
+						value: '3',
+					},
+				],
+				tableData: [],
+				multipleSelection: [],
+				currentPage: 1,
+				pageSize: 10,
+				total: 0,
+				registerDialogVisible: false,
+				dialogFormType: '',
+				dialogFormDisabled: false,
+				registerForm: {
+					bigClass: '',
+					name: '',
+					code: '',
+					brand: '',
+					model: '',
+					standard: '',
+					price: '',
+					allocation: '',
+					num: '',
+					inNum: '',
+					unit: '',
+					useTo: '',
+					inDate: '',
+					applyNum: '',
+					remarks: '',
+				},
+				applyForm: {
+					status: '',
+					approveRemarks: '',
+					actNum: '',
+					actTime: '',
+				},
+				rules: {
+					status: [
+						{ required: true, message: '请选择状态', trigger: 'blur' },
+					],
+					actTime: [
+						{ required: true, message: '请选择状态', trigger: 'blur' },
+					],
+					actNum: [
+						{ 
+							validator: (rule, value, callback) => {
+								if (!value) {
+									return callback(new Error('请输入申请数量'));
+								}
+								if (!/^\d+$/.test(value)) {
+									return callback(new Error('请输入有效的整数'));
+								}
+								callback();
+							},
+							required: true, 
+							trigger: 'blur'
+						}
+					],
+				},
+				drawer: false,
+				activeNames: []
+			}
+		},
+		computed: {
+			registerTitle() {
+				if(this.dialogFormType == 'view') {
+					return '查看详情'
+				} else if(this.dialogFormType == 'examine') {
+					return '申领审核'
+				} else if(this.dialogFormType == 'receive') {
+					return '领取确认'
+                }
+			}
+		},
+		mounted() {
+			this.init()
+		},
+		methods: {
+			// init
+			init() {
+				this.findPage()
+			},
+			// 查询列表数据
+			findPage() {
+				let params = {
+					...this.queryForm,
+					current: this.currentPage,
+					size: this.pageSize
+				}
+				findPage(params).then(res => {
+					this.tableData = res.data.data.records
+					this.total = res.data.data.total
+				})
+			},
+			// 点击搜索按钮
+			handleSearch() {
+				this.currentPage = 1
+				this.findPage()
+			},
+			// 表格选择变化
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			// 批量删除
+			batchDeletion() {
+				this.$confirm('确认批量删除删除所选数据?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					let ids = []
+					this.multipleSelection.forEach(item => {
+						ids.push(item.id)
+					})
+					remove({ids: ids.join(',')}).then(res => {
+						this.$message({
+							message: '删除成功',
+							type: 'success'
+						})
+						this.findPage()
+					}).catch(err => {
+						this.$message({
+							type: 'error',
+							message: '删除失败!'
+						})
+					})
+				}).catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消删除'
+					})
+				})
+			},
+			// 查看弹窗表单详情
+			detail(id) {
+				detail({id}).then(res => {
+					console.log(res)
+					this.registerForm = res.data.data
+				})
+			},
+			// 表格更多选项点击
+			handleOperation(type, row) {
+				this.dialogFormType = type
+				if(type == 'view') {
+					this.registerDialogVisible = true
+					this.dialogFormDisabled = true
+					this.detail(row.id)
+				} else if(type == 'examine') {
+					this.registerDialogVisible = true
+					this.detail(row.id)
+				} else if(type == 'receive') {
+					this.registerDialogVisible = true
+					this.detail(row.id)
+				} else if(type == 'delete') {
+					this.$confirm('确认删除该条数据?', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(() => {
+						remove({ids: row.id}).then(res => {
+							this.$message({
+								message: '删除成功',
+								type: 'success'
+							})
+							this.findPage()
+						}).catch(err => {
+							this.$message({
+								type: 'error',
+								message: '删除失败!'
+							})
+						})
+					}).catch(() => {
+						this.$message({
+							type: 'info',
+							message: '已取消删除'
+						})
+					})
+				}
+			},
+			registerHandleClick(type) {
+				if(type == 'confirm') {
+					if(this.dialogFormType == 'examine') {
+						const fieldsToValidate = ['status']
+						this.$refs.applyForm.validate((valid) => {
+							if (valid) {
+								let params = {
+									id: this.registerForm.id,
+									status: this.applyForm.status,
+									approveRemarks: this.applyForm.approveRemarks,
+								}
+								if(this.applyForm.status == 2) {
+									params.code = this.registerForm.code
+									params.applyNum = this.registerForm.applyNum
+								}
+								goodsApplySave(params).then(res => {
+									this.$message({
+										message: this.applyForm.status == 1 ? '审核通过' : '审核不通过',
+										type: 'success'
+									});
+									this.registerHandleClose()
+									this.currentPage = 1
+									this.pageSize = 10
+									this.findPage()
+								}).catch(error => {
+									this.$message({
+										message: '审核失败',
+										type: 'error'
+									});
+								})
+							} else {
+								return false;
+							}
+						}, fieldsToValidate);
+					} else if(this.dialogFormType == 'receive') {
+						const fieldsToValidate = ['actNum', 'actTime']
+						this.$refs.applyForm.validate((valid) => {
+							if (valid) {
+								let params = {
+									id: this.registerForm.id,
+									actNum: this.applyForm.actNum,
+									actTime: this.applyForm.actTime,
+									status: '3',
+									approveRemarks: this.applyForm.approveRemarks,
+								}
+								goodsApplySave(params).then(res => {
+									this.$message({
+										message: '领取成功',
+										type: 'success'
+									});
+									this.registerHandleClose()
+									this.currentPage = 1
+									this.pageSize = 10
+									this.findPage()
+								}).catch(error => {
+									this.$message({
+										message: '审核失败',
+										type: 'error'
+									});
+								})
+							} else {
+								return false;
+							}
+						}, fieldsToValidate);
+					}
+				} else {
+					this.registerHandleClose()
+				}
+			},
+			// 弹窗关闭
+			registerHandleClose() {
+				this.registerDialogVisible = false
+				this.resetForm()
+				this.dialogFormDisabled = false
+				this.applyForm = {
+					status: '',
+					approveRemarks: '',
+					actNum: '',
+					actTime: '',
+				}
+			},
+			// 重置表单
+			resetForm() {
+				this.$refs['applyForm'].resetFields();
+			},
+			// 分页
+			handleSizeChange(val) {
+				this.currentPage = 1
+				this.pageSize = val
+				this.findPage()
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val
+				this.findPage()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		height: 100%;
+    background-color: white;
+		padding: 20px !important;
+		.content-top{
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-start;
+			.register{
+				height: 40px;
+			}
+			.serch_form {
+				// display: flex;
+				// margin-bottom: 30px;
+				.el-form-item{
+					// padding: 0 10px;
+					margin-right: 20px !important;
+				}
+				.search_select {
+					// width: 138px;
+					height: 40px;
+				}
+				.search_input {
+					// width: 238px;
+					height: 40px;
+				}
+				/deep/.el-input__inner {
+					border-radius: 0;
+				}
+				.search_button {
+					width: 50px;
+					height: 40px;
+					border-radius: 0;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-left: 6px;
+					.el-icon-search {
+						font-size: 19px;
+						color: #c9c9c9;
+					}
+				}
+			}
+		}
+		.content-main{
+			.more{
+				cursor: pointer;
+			}
+			.el_pagination {
+				display: flex;
+				justify-content: end;
+				margin-top: 20px;
+			}
+		}
+	}
+	.more-box{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.item{
+			width: 100%;
+			padding: 5px 0;
+			text-align: center;
+			cursor: pointer;
+		}
+	}
+	.registerForm{
+		display: flex;
+		flex-wrap: wrap;
+		.el-select{
+			width: 100%;
+		}
+	}
+	.dialog-footer{
+		height: 40px;
+		display: flex;
+		justify-content: flex-end;
+	}
+	.message{
+		// padding: 0 20px;
+		margin: 0 20px 0px 20px;
+		display: flex;
+		flex-direction: column;
+		border: 1px solid #D1D1D1;
+		.box{
+			margin: 0 20px 0px 20px;
+		}
+		.title{
+			height: 40px;
+			background: #FFFFFF;
+			border-radius: 0px 0px 0px 0px;
+			display: flex;
+			align-items: center;
+			margin: 0 20px 0px 20px;
+		}
+		.item{
+			display: flex;
+			align-items: center;
+			margin-bottom: 10px;
+			.label{
+				width: 80px;
+				text-align: end;
+				margin-right: 10px;
+			}
+		}
+	}
+	.history{
+		// padding: 0 20px;
+		margin: 0 20px 20px 20px;
+		display: flex;
+		flex-direction: column;
+		border: 1px solid #D1D1D1;
+		border-top: none;
+		.title{
+			height: 40px;
+			background: #FFFFFF;
+			border-radius: 0px 0px 0px 0px;
+			display: flex;
+			align-items: center;
+			margin: 0 20px 0px 20px;
+		}
+		.el-collapse{
+			margin: 0 20px;
+			border: none !important;
+			margin-bottom: 20px;
+		}
+	}
+	.title-text{
+		margin: 0 20px;
+	}
+	.name-time{
+		// width: 327px;
+		height: 40px;
+		background: #F9F9F9;
+		display: flex;
+		align-items: center;
+		padding: 0 20px;
+		.time{
+			margin-left: 30px;
+		}
+	}
+    .form-title{
+        // width: 100%;
+        height: 40px;
+        background: #F9F9F9;
+        border-radius: 0px 0px 0px 0px;
+        border: 1px solid #D1D1D1;
+        display: flex;
+        align-items: center;
+        padding: 0 20px;
+        margin-bottom: 20px;
+    }
+	.status-box-wrapper{
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.status-box{
+		width: 62px;
+		height: 25px;
+	}
+	.blue{
+		background: rgba(43, 142, 229, 0.2);
+		color: #2B8EE5;
+	}
+	.green{
+		background: rgba(30, 185, 76, 0.2);
+		color: #1EB94C;
+	}
+	.red{
+		background: rgba(225, 75, 51, 0.2);
+		color: #E14B33;
+	}
+	.grey{
+		background: rgba(151, 151, 151, 0.2);
+		color: #333333;
+	}
+</style>
\ No newline at end of file
diff --git a/src/page/itemManagement/itemList/index.vue b/src/page/itemManagement/itemList/index.vue
new file mode 100644
index 0000000..c795ffa
--- /dev/null
+++ b/src/page/itemManagement/itemList/index.vue
@@ -0,0 +1,1099 @@
+<template>
+	<basic-container class="content">
+		<div class="content-top">
+			<el-form
+				:inline="true"
+				:model="queryForm"
+				class="serch_form"
+			>
+				<el-form-item label="物品大类">
+					<el-select
+						class="search_select"
+						v-model="queryForm.bigClass"
+						placeholder="请选择物品大类"
+						clearable
+						filterable
+					>
+						<el-option
+							v-for="item in typeList"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="物品品牌">
+					<el-select
+						class="search_select"
+						v-model="queryForm.brand"
+						placeholder="请选择物品品牌"
+						clearable
+						filterable
+					>
+						<el-option
+							v-for="item in brandList"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item
+					class="search_input"
+					label="物品名称"
+				>
+					<el-input
+						v-model="queryForm.name"
+						placeholder="请输入物品名称"
+					/>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						class="search_button"
+						@click="handleSearch"
+					>
+						<i class="el-icon-search"></i>
+					</el-button>
+				</el-form-item>
+			</el-form>
+			<div>
+				<el-button class="register" @click="handleAdd">登记入库</el-button>
+				<el-button v-if="multipleSelection.length != 0" class="register" @click="batchDeletion">批量删除</el-button>
+			</div>
+		</div>
+		<div class="content-main">
+			<el-table
+				:data="tableData"
+				stripe
+				border
+				style="width: 100%"
+				:header-cell-style="{'text-align':'center'}"
+				:cell-style="{'text-align':'center'}"
+				@selection-change="handleSelectionChange">
+				<el-table-column
+					type="selection"
+					width="55">
+				</el-table-column>
+				<el-table-column
+					type="index"
+					label="序号"
+      				width="70">
+				</el-table-column>
+				<el-table-column
+					prop="bigClass"
+					label="物品大类">
+				</el-table-column>
+				<el-table-column
+					prop="name"
+					label="物品名称">
+				</el-table-column>
+				<el-table-column
+					prop="code"
+					label="物品编号">
+				</el-table-column>
+				<el-table-column
+					prop="brand"
+					label="品牌">
+				</el-table-column>
+				<el-table-column
+					prop="model"
+					label="型号">
+				</el-table-column>
+				<el-table-column
+					prop="standard"
+					label="规格">
+				</el-table-column>
+				<el-table-column
+					prop="allocation"
+					label="货位">
+				</el-table-column>
+				<el-table-column
+					prop="inDate"
+					label="入库日期"
+					width="100">
+				</el-table-column>
+				<el-table-column
+					prop="num"
+					label="库存">
+				</el-table-column>
+				<el-table-column
+					prop="unit"
+					label="单位">
+				</el-table-column>
+				<el-table-column
+					prop="price"
+					label="单价（元）">
+				</el-table-column>
+				<el-table-column
+					prop="useTo"
+					label="用途">
+				</el-table-column>
+				<el-table-column
+					prop="remarks"
+					label="备注">
+				</el-table-column>
+				<el-table-column
+					label="操作"
+					width="150"
+					align="center"
+				>
+					<template slot-scope="scope">
+						<el-popover
+							placement="bottom"
+							width="150"
+							trigger="hover">
+							<div class="more-box">
+								<div class="item" @click="handleOperation('view', scope.row)">查看</div>
+								<div class="item" @click="handleOperation('edit', scope.row)">编辑</div>
+								<div class="item" @click="handleOperation('change', scope.row)">库存变更</div>
+								<div class="item" @click="handleOperation('detail', scope.row)">操作明细</div>
+								<div class="item" @click="handleOperation('delete', scope.row)">删除</div>
+								<div class="item" @click="handleOperation('apply', scope.row)">申领</div>
+							</div>
+							<div class="more" slot="reference">更多</div>
+						</el-popover>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="el_pagination">
+				<!-- <div
+					style="
+						width: 100%;
+						height: 100%;
+						position: absolute;
+						background: rgba(255,255,255,.9);
+						z-index: 9;
+						position: absolute;
+						top: 0;
+						left: 0;
+					"
+					v-show="loading"
+				></div> -->
+				<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page="currentPage"
+					:page-sizes="[5, 10, 20, 50, 100]"
+					:page-size="pageSize"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="total"
+				>
+				</el-pagination>
+			</div>
+		</div>
+		<el-dialog
+			:title="registerTitle"
+			:append-to-body="true"
+			:visible.sync="registerDialogVisible"
+			width="50%"
+			:before-close="registerHandleClose">
+			<el-form
+				class="registerForm"
+				:model="registerForm"
+				label-width="90px"
+				:rules="rules"
+				ref="registerForm"
+			>
+				<el-col
+					:span="8"
+					v-if="dialogFormType != 'apply'"
+				>
+					<el-form-item
+						label="物品大类"
+						prop="bigClass"
+					>
+						<el-select
+							v-model="registerForm.bigClass"
+							placeholder="请选择物品大类"
+							:disabled="dialogFormDisabled"
+						>
+							<el-option
+								v-for="item in typeList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="物品名称"
+						prop="name"
+					>
+						<el-input
+							v-model="registerForm.name"
+							placeholder="请输入物品名称"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col
+					:span="8"
+					v-if="dialogFormType != 'apply'"
+				>
+					<el-form-item
+						label="物品编号"
+						prop="code"
+					>
+						<el-input
+							v-model="registerForm.code"
+							placeholder="请输入物品编号"
+							:disabled="dialogFormDisabled || dialogFormType == 'edit'"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="品牌"
+						prop="brand"
+					>
+						<el-input
+							v-model="registerForm.brand"
+							placeholder="请输入品牌"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item
+						label="型号"
+						prop="model"
+					>
+						<el-input
+							v-model="registerForm.model"
+							placeholder="请输入型号"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="规格" prop="standard">
+						<el-input
+							v-model="registerForm.standard"
+							placeholder="请输入规格"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="单价" prop="price">
+						<el-input
+							v-model="registerForm.price"
+							placeholder="请输入单价"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col
+					:span="8"
+					v-if="dialogFormType != 'apply'"
+				>
+					<el-form-item
+						label="货位"
+						prop="allocation"
+					>
+						<el-select
+							v-model="registerForm.allocation"
+							placeholder="请选择货位"
+							:disabled="dialogFormDisabled"
+						>
+							<el-option
+								v-for="item in goodsAllocationList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col
+					:span="8"
+					v-if="dialogFormType != 'add'"
+				>
+					<el-form-item
+						label="库存"
+						prop="num"
+					>
+						<el-input
+							v-model="registerForm.num"
+							placeholder="请输入库存"
+							:disabled="true"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col
+					:span="8"
+					v-if="dialogFormType != 'apply' && dialogFormType != 'view' && dialogFormType != 'edit'"
+				>
+					<el-form-item
+						label="入库数量"
+						prop="inNum"
+					>
+						<el-input
+							v-model="registerForm.inNum"
+							placeholder="请输入入库数量"
+							:disabled="dialogFormDisabled && dialogFormType != 'change'"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col
+					:span="8"
+					v-if="dialogFormType != 'apply'"
+				>
+					<el-form-item
+						label="单位"
+						prop="unit"
+					>
+						<el-input
+							v-model="registerForm.unit"
+							placeholder="请输入单位"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col
+					:span="8"
+					v-if="dialogFormType != 'apply'"
+				>
+					<el-form-item
+						label="用途"
+						prop="useTo"
+					>
+						<el-input
+							v-model="registerForm.useTo"
+							placeholder="请输入用途"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col
+					:span="8"
+					v-if="dialogFormType != 'apply'"
+				>
+					<el-form-item
+						label="入库时间"
+						prop="inDate"
+					>
+						<el-date-picker
+							v-model="registerForm.inDate"
+							value-format="yyyy-MM-dd"
+							type="date"
+							placeholder="选择日期时间"
+							:disabled="dialogFormDisabled">
+						</el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col
+					:span="8"
+					v-if="dialogFormType == 'apply'"
+				>
+					<el-form-item
+						label="申请数量"
+						prop="applyNum"
+					>
+						<el-input
+							v-model="registerForm.applyNum"
+							placeholder="请输入申请数量"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item
+						label="备注"
+						prop="remarks"
+					>
+						<el-input
+							v-model="registerForm.remarks"
+							placeholder="请输入备注"
+							:disabled="dialogFormDisabled"
+						/>
+					</el-form-item>
+				</el-col>
+			</el-form>
+			<div class="dialog-footer">
+				<el-button
+					v-if="dialogFormType != 'view'"
+					@click="registerHandleClick('cancel')"
+				>取 消</el-button>
+				<el-button
+					type="primary"
+					@click="registerHandleClick('confirm')"
+				>确 定</el-button>
+			</div>
+		</el-dialog>
+		<el-drawer
+			title="操作明细"
+			:visible.sync="drawer"
+			direction="rtl"
+			append-to-body
+			size="35%"
+			:before-close="handleClose">
+			<!-- <span>我来啦!</span> -->
+			<div class="message">
+				<div class="title">物品信息</div>
+				<el-divider></el-divider>
+				<div class="box">
+					<div class="item">
+						<div class="label">物品大类：</div>
+						<div class="value">{{ registerForm.bigClass }}</div>
+					</div>
+					<div class="item">
+						<div class="label">物品名称：</div>
+						<div class="value">{{ registerForm.name }}</div>
+					</div>
+					<div class="item">
+						<div class="label">物品编号：</div>
+						<div class="value">{{ registerForm.code }}</div>
+					</div>
+					<div class="item">
+						<div class="label">品牌：</div>
+						<div class="value">{{ registerForm.brand }}</div>
+					</div>
+					<div class="item">
+						<div class="label">型号：</div>
+						<div class="value">{{ registerForm.model }}</div>
+					</div>
+					<div class="item">
+						<div class="label">规格：</div>
+						<div class="value">{{ registerForm.standard }}</div>
+					</div>
+				</div>
+			</div>
+			<div class="history">
+				<div class="title">历史记录</div>
+				<el-divider></el-divider>
+				<el-collapse
+					v-model="activeNames"
+					@change="handleChange"
+				>
+					<el-collapse-item
+						v-for="(item, index) in historyDetailList"
+						:key="index"
+						:name="index"
+					>
+						<template slot="title">
+							<div class="title-time">{{ item.createTime }}</div>
+							<div class="title-text">{{ item.type }}</div>
+							<div class="title-num" :class="item.type == '申领出库' ? 'red' : 'green'">（{{ item.type == '申领出库' ? '-' : '+' }}{{ item.num }}）</div>
+						</template>
+						<div class="name-time" v-if="item.type == '申领出库'">
+							<div class="name">申领提交人：{{ item.applyName }}</div>
+							<div class="time">提交时间：{{ item.applyTime }}</div>
+							<div class="dept">所属部门：{{ item.deptName }}</div>
+						</div>
+						<div class="name-time">
+							<div class="name">{{ item.type == '申领出库' ? '申领审核人' : '登记入库人' }}：{{ item.type == '申领出库' ? item.approveName : item.inName }}</div>
+							<div class="time">提交时间：{{ item.type == '申领出库' ? item.approveTime : item.inTime }}</div>
+						</div>
+					</el-collapse-item>
+				</el-collapse>
+			</div>
+		</el-drawer>
+	</basic-container>
+</template>
+
+<script>
+	import { findPage, detail, save, goodsApplySave, remove, historyDetail } from "@/api/itemManagement/itemList";
+	export default {
+		data() {
+			return {
+				queryForm: {
+					bigClass: '',
+					brand: '',
+					name: '',
+				},
+				typeList: [
+					{
+						value: '1',
+						label: '类型1'
+					},
+					{
+						value: '2',
+						label: '类型2'
+					},
+					{
+						value: '3',
+						label: '类型3'
+					}
+				],
+				brandList: [
+					{
+						value: '1',
+						label: '品牌1'
+					},
+					{
+						value: '2',
+						label: '品牌2'
+					},
+					{
+						value: '3',
+						label: '品牌3'
+					}
+				],
+				tableData: [],
+				multipleSelection: [],
+				currentPage: 1,
+				pageSize: 10,
+				total: 0,
+				registerDialogVisible: false,
+				dialogFormType: '',
+				dialogFormDisabled: false,
+				goodsAllocationList: [
+					{
+						label: '货位1',
+						value: '1',
+					},
+					{
+						label: '货位2',
+						value: '2',
+					},
+					{
+						label: '货位3',
+						value: '3',
+					},
+				],
+				registerForm: {
+					bigClass: '',
+					name: '',
+					code: '',
+					brand: '',
+					model: '',
+					standard: '',
+					price: '',
+					allocation: '',
+					num: '',
+					inNum: '',
+					unit: '',
+					useTo: '',
+					inDate: '',
+					applyNum: '',
+					remarks: '',
+				},
+				rules: {
+					bigClass: [
+						{ required: true, message: '请选择物品大类', trigger: 'blur' },
+					],
+					name: [
+						{ required: true, message: '请输入物品名称', trigger: 'blur' },
+					],
+					code: [
+						{ required: true, message: '请输入物品编号', trigger: 'blur' },
+					],
+					brand: [
+						{ required: true, message: '请输入品牌', trigger: 'blur' },
+					],
+					model: [
+						{ required: true, message: '请输入型号', trigger: 'blur' },
+					],
+					standard: [
+						{ required: true, message: '请输入规格', trigger: 'blur' },
+					],
+					price: [
+						{ 
+							validator: (rule, value, callback) => {
+								if (!value) {
+									return callback(new Error('请输入单价'));
+								}
+								if (!/^\d+(\.\d+)?$/.test(value)) {
+									return callback(new Error('请输入有效的数字'));
+								}
+								callback();
+							},
+							required: true,
+							trigger: 'blur' },
+					],
+					allocation: [
+						{ required: true, message: '请输入选择货位', trigger: 'blur' },
+					],
+					inNum: [
+						{ 
+							validator: (rule, value, callback) => {
+								if (!value) {
+									return callback(new Error('请输入入库数量'));
+								}
+								if (!/^\d+$/.test(value)) {
+									return callback(new Error('请输入有效的整数'));
+								}
+								callback();
+							},
+							required: true, 
+							trigger: 'blur' 
+						},
+					],
+					unit: [
+						{ required: true, message: '请输入单位', trigger: 'blur' },
+					],
+					useTo: [
+						{ required: true, message: '请输入用途', trigger: 'blur' },
+					],
+					inDate: [
+						{ required: true, message: '请选择入库时间', trigger: 'blur' },
+					],
+					applyNum: [
+						{ 
+							validator: (rule, value, callback) => {
+								if (!value) {
+									return callback(new Error('请输入申请数量'));
+								}
+								if (!/^\d+$/.test(value)) {
+									return callback(new Error('请输入有效的整数'));
+								}
+								callback();
+							},
+							required: true, 
+							trigger: 'blur'
+						}
+					],
+				},
+				drawer: false,
+				activeNames: [],
+				historyDetailList: []
+			}
+		},
+		computed: {
+			registerTitle() {
+				if(this.dialogFormType == 'add') {
+					return '登记入库'
+				} else if(this.dialogFormType == 'view') {
+					return '查看详情'
+				} else if(this.dialogFormType == 'edit') {
+					return '编辑'
+				} else if(this.dialogFormType == 'change') {
+					return '库存变更'
+				} else if(this.dialogFormType == 'apply') {
+					return '物品申领'
+				}
+			}
+		},
+		mounted() {
+			this.init()
+		},
+		methods: {
+			// init
+			init() {
+				this.findPage()
+			},
+			// 查询列表数据
+			findPage() {
+				let params = {
+					...this.queryForm,
+					current: this.currentPage,
+					size: this.pageSize
+				}
+				findPage(params).then(res => {
+					this.tableData = res.data.data.records
+					this.total = res.data.data.total
+				})
+			},
+			// 点击搜索按钮
+			handleSearch() {
+				this.currentPage = 1
+				this.findPage()
+			},
+			// 表格选择变化
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			// 入库
+			handleAdd() {
+				this.dialogFormType = 'add'
+				this.registerDialogVisible = true
+				console.log(this.registerForm)
+			},
+			// 批量删除
+			batchDeletion() {
+				this.$confirm('确认批量删除删除所选数据?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					// console.log(this.multipleSelection)
+					let ids = []
+					this.multipleSelection.forEach(item => {
+						ids.push(item.id)
+					})
+					remove({ids: ids.join(',')}).then(res => {
+						this.$message({
+							message: '删除成功',
+							type: 'success'
+						})
+						this.findPage()
+					}).catch(err => {
+						this.$message({
+							type: 'error',
+							message: '删除失败!'
+						})
+					})
+				}).catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消删除'
+					})
+				})
+			},
+			// 表格更多选项点击
+			handleOperation(type, row) {
+				this.dialogFormType = type
+				if(type == 'view') {
+					this.registerDialogVisible = true
+					this.dialogFormDisabled = true
+					this.detail(row.id)
+				} else if(type == 'edit') {
+					this.registerDialogVisible = true
+					this.detail(row.id)
+				} else if(type == 'change') {
+					this.registerDialogVisible = true
+					this.dialogFormDisabled = true
+					this.detail(row.id)
+				} else if(type == 'detail') {
+					this.drawer = true
+					this.detail(row.id)
+					historyDetail({code: row.code}).then(res => {
+						// console.log(res)
+						this.historyDetailList = res.data.data
+					})
+				} else if(type == 'delete') {
+					this.$confirm('确认删除该条数据?', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(() => {
+						remove({ids: row.id}).then(res => {
+							this.$message({
+								message: '删除成功',
+								type: 'success'
+							})
+							this.findPage()
+						}).catch(err => {
+							this.$message({
+								type: 'error',
+								message: '删除失败!'
+							})
+						})
+					}).catch(() => {
+						this.$message({
+							type: 'info',
+							message: '已取消删除'
+						})
+					})
+				} else if(type == 'apply') {
+					this.dialogFormType = 'apply'
+					this.registerDialogVisible = true
+					this.dialogFormDisabled = true
+					this.detail(row.id)	
+				}
+			},
+			// 查看弹窗表单详情
+			detail(id) {
+				detail({id}).then(res => {
+					console.log(res)
+					this.registerForm = res.data.data
+				})
+			},
+			// 弹窗按钮点击
+			registerHandleClick(type) {
+				if(type == 'confirm') {
+					if(this.dialogFormType == 'add') {
+						const fieldsToValidate = ['bigClass','name','code','brand','model','standard','price','allocation','inNum','unit','useTo','inDate','remarks']
+						this.$refs.registerForm.validate((valid) => {
+							if (valid) {
+								this.registerForm.num = 0
+								save(this.registerForm).then(res => {
+									this.$message({
+										message: '入库成功',
+										type: 'success'
+									});
+									this.registerHandleClose()
+									this.currentPage = 1
+									this.pageSize = 10
+									this.findPage()
+								}).catch(error => {
+									this.$message({
+										message: '入库失败',
+										type: 'error'
+									});
+								})
+							} else {
+								return false;
+							}
+						}, fieldsToValidate);
+					} else if(this.dialogFormType == 'edit') {
+						const fieldsToValidate = ['bigClass','name','brand','model','standard','price','allocation','unit','useTo','inDate','remarks']
+						this.$refs.registerForm.validate((valid) => {
+							if (valid) {
+								this.registerForm.num = this.registerForm.inNum
+								save(this.registerForm).then(res => {
+									this.$message({
+										message: '入库成功',
+										type: 'success'
+									});
+									this.registerHandleClose()
+									this.currentPage = 1
+									this.pageSize = 10
+									this.findPage()
+								}).catch(error => {
+									this.$message({
+										message: '入库失败',
+										type: 'error'
+									});
+								})
+							} else {
+								return false;
+							}
+						}, fieldsToValidate);
+					} else if(this.dialogFormType == 'change') {
+						const fieldsToValidate = ['inNum']
+						this.$refs.registerForm.validate((valid) => {
+							if (valid) {
+								save(this.registerForm).then(res => {
+									this.$message({
+										message: '变更成功',
+										type: 'success'
+									});
+									this.registerHandleClose()
+									this.currentPage = 1
+									this.pageSize = 10
+									this.findPage()
+								}).catch(error => {
+									this.$message({
+										message: '变更失败',
+										type: 'error'
+									});
+								})
+							} else {
+								return false;
+							}
+						}, fieldsToValidate);
+					} else if(this.dialogFormType == 'apply') {
+						const fieldsToValidate = ['applyNum']
+						this.$refs.registerForm.validate((valid) => {
+							if (valid) {
+								let params = {
+									name: this.registerForm.name,
+									code: this.registerForm.code,
+									applyNum: this.registerForm.applyNum,
+									remarks: this.registerForm.remarks,
+									status: 0
+								}
+								goodsApplySave(params).then(res => {
+									this.$message({
+										message: '申领成功',
+										type: 'success'
+									});
+									this.registerHandleClose()
+									this.currentPage = 1
+									this.pageSize = 10
+									this.findPage()
+								}).catch(error => {
+									this.$message({
+										message: '申领失败',
+										type: 'error'
+									});
+								})
+							} else {
+								return false;
+							}
+						}, fieldsToValidate);
+					} else {
+						this.registerHandleClose()
+					}
+				} else {
+					this.registerHandleClose()
+				}
+			},
+			// 弹窗关闭
+			registerHandleClose() {
+				this.registerDialogVisible = false
+				this.resetForm()
+				this.dialogFormDisabled = false
+				this.registerForm = {
+					bigClass: '',
+					name: '',
+					code: '',
+					brand: '',
+					model: '',
+					standard: '',
+					price: '',
+					allocation: '',
+					num: '',
+					inNum: '',
+					unit: '',
+					useTo: '',
+					inDate: '',
+					applyNum: '',
+					remarks: '',
+				}
+			},
+			// 重置表单
+			resetForm() {
+				this.$refs['registerForm'].resetFields();
+			},
+			// 分页
+			handleSizeChange(val) {
+				console.log(`每页 ${val} 条`);
+				this.currentPage = 1
+				this.pageSize = val
+				this.findPage()
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val
+				this.findPage()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		height: 100%;
+    background-color: white;
+		padding: 20px !important;
+		.content-top{
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-start;
+			.register{
+				height: 40px;
+			}
+			.serch_form {
+				// display: flex;
+				// margin-bottom: 30px;
+				.el-form-item{
+					// padding: 0 10px;
+					margin-right: 20px !important;
+				}
+				.search_select {
+					// width: 138px;
+					height: 40px;
+				}
+				.search_input {
+					// width: 238px;
+					height: 40px;
+				}
+				/deep/.el-input__inner {
+					border-radius: 0;
+				}
+				.search_button {
+					width: 50px;
+					height: 40px;
+					border-radius: 0;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-left: 6px;
+					.el-icon-search {
+						font-size: 19px;
+						color: #c9c9c9;
+					}
+				}
+			}
+		}
+		.content-main{
+			.more{
+				cursor: pointer;
+			}
+			.el_pagination {
+				display: flex;
+				justify-content: end;
+				margin-top: 20px;
+			}
+		}
+	}
+	.more-box{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.item{
+			width: 100%;
+			padding: 5px 0;
+			text-align: center;
+			cursor: pointer;
+		}
+	}
+	.registerForm{
+		display: flex;
+		flex-wrap: wrap;
+		.el-select{
+			width: 100%;
+		}
+		.el-input-number{
+			width: 100%;
+		}
+	}
+	.dialog-footer{
+		height: 40px;
+		display: flex;
+		justify-content: flex-end;
+	}
+	.message{
+		// padding: 0 20px;
+		margin: 0 20px 0px 20px;
+		display: flex;
+		flex-direction: column;
+		border: 1px solid #D1D1D1;
+		.box{
+			margin: 0 20px 0px 20px;
+		}
+		.title{
+			height: 40px;
+			background: #FFFFFF;
+			border-radius: 0px 0px 0px 0px;
+			display: flex;
+			align-items: center;
+			margin: 0 20px 0px 20px;
+		}
+		.item{
+			display: flex;
+			align-items: center;
+			margin-bottom: 10px;
+			.label{
+				width: 80px;
+				text-align: end;
+				margin-right: 10px;
+			}
+		}
+	}
+	.history{
+		// padding: 0 20px;
+		margin: 0 20px 20px 20px;
+		display: flex;
+		flex-direction: column;
+		border: 1px solid #D1D1D1;
+		border-top: none;
+		.title{
+			height: 40px;
+			background: #FFFFFF;
+			border-radius: 0px 0px 0px 0px;
+			display: flex;
+			align-items: center;
+			margin: 0 20px 0px 20px;
+		}
+		.el-collapse{
+			margin: 0 20px;
+			border: none !important;
+			margin-bottom: 20px;
+		}
+	}
+	.title-text{
+		margin: 0 20px;
+	}
+	.name-time{
+		// width: 327px;
+		height: 40px;
+		background: #F9F9F9;
+		display: flex;
+		align-items: center;
+		padding: 0 20px;
+		.time{
+			margin: 0 30px;
+		}
+	}
+	.green{
+		color: #1EB94C;
+	}
+	.red{
+		color: #E14B33;
+	}
+</style>
\ No newline at end of file
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 6f9f9a6..8c4d804 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -243,5 +243,30 @@ export default [{
 		component: () =>
 			import( /* webpackChunkName: "views" */ '@/views/system/systemSetting')
 	}]
-}
+},
+	{
+		path: '/itemManagement',
+		component: Layout,
+		redirect: '/itemManagement/itemList',
+		children: [
+			{
+				path: 'itemList',
+				name: '物品列表',
+				meta: {
+					i18n: 'dashboard'
+				},
+				component: () =>
+					import( /* webpackChunkName: "views" */ '@/page/itemManagement/itemList')
+			},
+			{
+				path: 'applicationExamine',
+				name: '申领审核',
+				meta: {
+					i18n: 'dashboard'
+				},
+				component: () =>
+					import( /* webpackChunkName: "views" */ '@/page/itemManagement/applicationExamine')
+			},
+		]
+	}
 ]