Skip to content

D
dd_school
Commit 9963963b by zhaopanyu
Options

zpy 8.16

parent 132415c8
Showing with 122 additions and 122 deletions
ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item label="设备名称" prop="studentName"> <el-form-item label="设备名称" prop="studentName">
<el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable/> <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable />
</el-form-item> </el-form-item>
<el-form-item label="借用日期" prop="studentName"> <el-form-item label="借用日期" prop="studentName">
<el-date-picker v-model="queryParams.borrowTime" type="date" clearable <el-date-picker v-model="queryParams.borrowTime" type="date" clearable placeholder="请选择借用日期" format="yyyy-MM-dd">
placeholder="请选择借用日期" format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -20,48 +19,47 @@ ...@@ -20,48 +19,47 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="lendReturnData" stripe> <el-table v-loading="loading" :data="lendReturnData" stripe>
<el-table-column label="序号" type="index" width="55" align="center"/> <el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="自编码" align="center" prop="encode"/> <el-table-column label="自编码" align="center" prop="encode" />
<el-table-column label="设备名称" align="center" prop="equipmentName"/> <el-table-column label="设备名称" align="center" prop="equipmentName" />
<el-table-column label="型号" align="center" prop="model"/> <el-table-column label="型号" align="center" prop="model" />
<el-table-column label="借用日期" align="center" prop="borrowTime"/> <el-table-column label="借用日期" align="center" prop="borrowTime" />
<el-table-column label="借用人" align="center" prop="borrowBy"/> <el-table-column label="借用人" align="center" prop="borrowBy" />
<el-table-column label="用途" align="center" prop="purpose"/> <el-table-column label="用途" align="center" prop="purpose" />
<el-table-column label="借用期限（天）" align="center" prop="deadline"/> <el-table-column label="借用期限（天）" align="center" prop="deadline" />
<el-table-column label="归还日期" align="center" prop="returnTime"/> <el-table-column label="归还日期" align="center" prop="returnTime" />
<el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition"/> <el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition" />
<el-table-column label="接收人" align="center" prop="receivedBy"/> <el-table-column label="接收人" align="center" prop="receivedBy" />
<el-table-column label="预计使用时间" align="center" prop="yjuseTime"/> <el-table-column label="预计使用时间" align="center" prop="yjuseTime" />
<el-table-column label="实际使用时间" align="center" prop="sjuseTime"/> <el-table-column label="实际使用时间" align="center" prop="sjuseTime" />
<el-table-column label="备注" align="center" prop="remark"/> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right"> <el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleOption(1,row)">编辑</el-button> <el-button type="text" size="small" @click="handleOption(1, row)">编辑</el-button>
<el-button type="text" size="small" @click="handleOption(2,row)">查看</el-button> <el-button type="text" size="small" @click="handleOption(2, row)">查看</el-button>
<el-button type="text" size="small" @click="handleDelete(row.id)">删除</el-button> <el-button type="text" size="small" @click="handleDelete(row.id)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination ref="pageBlock" v-show="total > 0" :total="total" <pagination ref="pageBlock" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/> :limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 新增、编辑、查看页面 --> <!-- 新增、编辑、查看页面 -->
<el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%"> <el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
<el-form :model="lendReturnForm" :rules="lendReturnRules" ref="lendReturnForm" <el-form :model="lendReturnForm" :rules="lendReturnRules" ref="lendReturnForm" label-width="120px"
label-width="120px" label-position="right"> label-position="right">
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="自编码" prop="encode"> <el-form-item label="自编码" prop="encode">
<el-input v-model="lendReturnForm.encode" placeholder="请输入自编码" <el-input v-model="lendReturnForm.encode" placeholder="请输入自编码" :disabled="nowType != 0 ? true : false"
:disabled="nowType != 0?true:false" @change="getOtherInfoByCode"></el-input> @change="getOtherInfoByCode"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="借用人" prop="borrowById"> <el-form-item label="借用人" prop="borrowById">
<el-select v-model="lendReturnForm.borrowById" filterable placeholder="请选择借用人" <el-select v-model="lendReturnForm.borrowById" filterable placeholder="请选择借用人"
:disabled="nowType == 2?true:false" clearable> :disabled="nowType == 2 ? true : false" clearable>
<el-option v-for="(item,index) in userList" :key="index" <el-option v-for="(item, index) in userList" :key="index" :label="item.userName" :value="item.userId">
:label="item.userName" :value="item.userId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -70,12 +68,14 @@ ...@@ -70,12 +68,14 @@
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备名称" prop="equipmentName"> <el-form-item label="设备名称" prop="equipmentName">
<el-input v-model="lendReturnForm.equipmentName" placeholder="请输入设备名称" :disabled="nowType == 2?true:false"></el-input> <el-input v-model="lendReturnForm.equipmentName" placeholder="请输入设备名称"
:disabled="nowType == 2 ? true : false"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="型号" prop="model"> <el-form-item label="型号" prop="model">
<el-input v-model="lendReturnForm.model" placeholder="请输入型号" :disabled="nowType == 2?true:false"></el-input> <el-input v-model="lendReturnForm.model" placeholder="请输入型号"
:disabled="nowType == 2 ? true : false"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -83,14 +83,14 @@ ...@@ -83,14 +83,14 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="借用日期" prop="borrowTime"> <el-form-item label="借用日期" prop="borrowTime">
<el-date-picker v-model="lendReturnForm.borrowTime" type="datetime" clearable class="selectWidth" <el-date-picker v-model="lendReturnForm.borrowTime" type="datetime" clearable class="selectWidth"
placeholder="请选择借用日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2?true:false"> placeholder="请选择借用日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="归还日期" prop="returnTime"> <el-form-item label="归还日期" prop="returnTime">
<el-date-picker v-model="lendReturnForm.returnTime" type="datetime" clearable class="selectWidth" <el-date-picker v-model="lendReturnForm.returnTime" type="datetime" clearable class="selectWidth"
placeholder="请选择归还日期" value-format="yyyy-MM-dd HH:mm:ss":disabled="nowType == 2?true:false"> placeholder="请选择归还日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -98,15 +98,15 @@ ...@@ -98,15 +98,15 @@
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="借用期限（天）" prop="deadline"> <el-form-item label="借用期限（天）" prop="deadline">
<el-input v-model="lendReturnForm.deadline" placeholder="请输入借用期限" :disabled="nowType == 2?true:false"></el-input> <el-input v-model="lendReturnForm.deadline" placeholder="请输入借用期限"
:disabled="nowType == 2 ? true : false"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="归还时设备情况" prop="returnEquipmentCondition"> <el-form-item label="归还时设备情况" prop="returnEquipmentCondition">
<el-select v-model="lendReturnForm.returnEquipmentCondition" clearable <el-select v-model="lendReturnForm.returnEquipmentCondition" clearable placeholder="请选择归还时设备情况">
placeholder="请选择归还时设备情况">
<el-option v-for="(item, index) in dict.type.equipment_state" :key="index" :label="item.label" <el-option v-for="(item, index) in dict.type.equipment_state" :key="index" :label="item.label"
:value="item.value" :disabled="nowType == 2?true:false"></el-option> :value="item.value" :disabled="nowType == 2 ? true : false"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -114,15 +114,15 @@ ...@@ -114,15 +114,15 @@
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用途" prop="purpose"> <el-form-item label="用途" prop="purpose">
<el-input v-model="lendReturnForm.purpose" placeholder="请输入用途" :disabled="nowType == 2?true:false"></el-input> <el-input v-model="lendReturnForm.purpose" placeholder="请输入用途"
:disabled="nowType == 2 ? true : false"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="接收人" prop="receivedById"> <el-form-item label="接收人" prop="receivedById">
<el-select v-model="lendReturnForm.receivedById" filterable placeholder="请选择接收人" <el-select v-model="lendReturnForm.receivedById" filterable placeholder="请选择接收人"
:disabled="nowType == 2?true:false" clearable> :disabled="nowType == 2 ? true : false" clearable>
<el-option v-for="(item,index) in adminUserList" :key="index" <el-option v-for="(item, index) in adminUserList" :key="index" :label="item.admin" :value="item.adminId">
:label="item.admin" :value="item.adminId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -132,14 +132,14 @@ ...@@ -132,14 +132,14 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="预计使用时间" prop="yjuseTime"> <el-form-item label="预计使用时间" prop="yjuseTime">
<el-date-picker v-model="lendReturnForm.yjuseTime" type="datetime" clearable class="selectWidth" <el-date-picker v-model="lendReturnForm.yjuseTime" type="datetime" clearable class="selectWidth"
placeholder="请选择预计使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2?true:false"> placeholder="请选择预计使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实际使用时间" prop="sjuseTime"> <el-form-item label="实际使用时间" prop="sjuseTime">
<el-date-picker v-model="lendReturnForm.sjuseTime" type="datetime" clearable class="selectWidth" <el-date-picker v-model="lendReturnForm.sjuseTime" type="datetime" clearable class="selectWidth"
placeholder="请选择实际使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2?true:false"> placeholder="请选择实际使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="lendReturnForm.remark" placeholder="请输入备注" <el-input type="textarea" v-model="lendReturnForm.remark" placeholder="请输入备注"
:disabled="nowType == 2?true:false"></el-input> :disabled="nowType == 2 ? true : false"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -184,63 +184,63 @@ export default { ...@@ -184,63 +184,63 @@ export default {
}, },
loading: false, loading: false,
total: 0, total: 0,
lendReturnData:[], lendReturnData: [],
lendReturnForm:{ lendReturnForm: {
id:'', id: '',
encode:'', encode: '',
equipmentId:'', equipmentId: '',
equipmentName:'', equipmentName: '',
model:'', model: '',
borrowTime:'', borrowTime: '',
borrowById:'', borrowById: '',
borrowBy:'', borrowBy: '',
purpose:'', purpose: '',
deadline:'', deadline: '',
returnTime:'', returnTime: '',
returnEquipmentCondition:'', returnEquipmentCondition: '',
receivedById:'', receivedById: '',
yjuseTime:'', yjuseTime: '',
sjuseTime:'', sjuseTime: '',
remark:'', remark: '',
}, },
lendReturnRules:{ lendReturnRules: {
encode:[ encode: [
{ required: true, message: '请输入自编码', trigger: 'blur' }, { required: true, message: '请输入自编码', trigger: 'blur' },
], ],
equipmentName:[ equipmentName: [
{ required: true, message: '请输入设备名称', trigger: 'blur' }, { required: true, message: '请输入设备名称', trigger: 'blur' },
], ],
model:[ model: [
{ required: true, message: '请输入型号', trigger: 'blur' }, { required: true, message: '请输入型号', trigger: 'blur' },
], ],
borrowById:[ borrowById: [
{ required: true, message: '请输入借用人', trigger: 'blur' }, { required: true, message: '请输入借用人', trigger: 'blur' },
], ],
borrowTime:[ borrowTime: [
{ required: true, message: '请输入借用日期', trigger: 'change' }, { required: true, message: '请输入借用日期', trigger: 'change' },
], ],
deadline:[ deadline: [
{ required: true, message: '请输入借用期限', trigger: 'change' }, { required: true, message: '请输入借用期限', trigger: 'change' },
], ],
purpose:[ purpose: [
{ required: true, message: '请输入用途', trigger: 'change' }, { required: true, message: '请输入用途', trigger: 'change' },
], ],
}, },
dialogVisible:false, dialogVisible: false,
nowType:0, // 0新增、1编辑、2查看 nowType: 0, // 0新增、1编辑、2查看
userList:[], //用户列表 userList: [], //用户列表
adminUserList:[] //管理员用户列表 adminUserList: [] //管理员用户列表
} }
}, },
mounted() { mounted() {
this.getList() this.getList()
}, },
methods:{ methods: {
// 获取列表数据 // 获取列表数据
getList(){ getList() {
this.loading = true this.loading = true
getLendingReturn({...this.queryParams}).then(res=>{ getLendingReturn({ ...this.queryParams }).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.total = res.total this.total = res.total
this.lendReturnData = res.rows this.lendReturnData = res.rows
this.loading = false this.loading = false
...@@ -249,21 +249,21 @@ export default { ...@@ -249,21 +249,21 @@ export default {
}, },
// 重置搜索 // 重置搜索
resetQuery(){ resetQuery() {
this.queryParams = { this.queryParams = {
equipmentName: '', equipmentName: '',
borrowTime: '', borrowTime: '',
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
} }
this.getList() this.getList()
}, },
//根据自编码获取信息 //根据自编码获取信息
getOtherInfoByCode(){ getOtherInfoByCode() {
const code = this.lendReturnForm.encode const code = this.lendReturnForm.encode
getRepairencode(code).then(res=>{ getRepairencode(code).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.lendReturnForm.equipmentId = res.data.equipmentId this.lendReturnForm.equipmentId = res.data.equipmentId
this.lendReturnForm.model = res.data.model this.lendReturnForm.model = res.data.model
this.lendReturnForm.equipmentName = res.data.equipmentName this.lendReturnForm.equipmentName = res.data.equipmentName
...@@ -272,32 +272,32 @@ export default { ...@@ -272,32 +272,32 @@ export default {
}, },
// 0新增、1编辑、2查看 // 0新增、1编辑、2查看
handleOption(type,item){ handleOption(type, item) {
this.lendReturnForm = { this.lendReturnForm = {
id:'', id: '',
encode:'', encode: '',
equipmentId:'', equipmentId: '',
equipmentName:'', equipmentName: '',
model:'', model: '',
borrowTime:'', borrowTime: '',
borrowById:'', borrowById: '',
borrowBy:'', borrowBy: '',
purpose:'', purpose: '',
deadline:'', deadline: '',
returnTime:'', returnTime: '',
returnEquipmentCondition:'', returnEquipmentCondition: '',
receivedById:'', receivedById: '',
yjuseTime:'', yjuseTime: '',
sjuseTime:'', sjuseTime: '',
remark:'', remark: '',
} }
this.nowType = type this.nowType = type
this.getSelectUser() this.getSelectUser()
this.getAdminUserList() this.getAdminUserList()
if(type != 0){ if (type != 0) {
const id = item.id const id = item.id
getLRDetailByID(id).then(res=>{ getLRDetailByID(id).then(res => {
if(res.code == 200){ if (res.code == 200) {
Object.keys(this.lendReturnForm).forEach(key => { Object.keys(this.lendReturnForm).forEach(key => {
if (res.data[key]) { if (res.data[key]) {
this.$set(this.lendReturnForm, key, res.data[key]); this.$set(this.lendReturnForm, key, res.data[key]);
...@@ -310,32 +310,32 @@ export default { ...@@ -310,32 +310,32 @@ export default {
}, },
//获取用户列表数据 //获取用户列表数据
getSelectUser(){ getSelectUser() {
getUserList().then(res=>{ getUserList().then(res => {
if(res.code == 200){ if (res.code == 200) {
this.userList = res.rows this.userList = res.rows
} }
}) })
}, },
//获取管理员用户列表 //获取管理员用户列表
getAdminUserList(){ getAdminUserList() {
getAdmin().then(res=>{ getAdmin().then(res => {
if(res.code == 200){ if (res.code == 200) {
this.adminUserList = res.data this.adminUserList = res.data
} }
}) })
}, },
//删除 //删除
handleDelete(id){ handleDelete(id) {
this.$confirm("此操作将永久删除该数据，是否继续？", '提示', { this.$confirm("此操作将永久删除该数据，是否继续？", '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteLendingReturn(id).then(res=>{ deleteLendingReturn(id).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.$message.success("删除成功！") this.$message.success("删除成功！")
} }
this.getList() this.getList()
...@@ -350,26 +350,26 @@ export default { ...@@ -350,26 +350,26 @@ export default {
}, },
//表单提交 //表单提交
submitForm(){ submitForm() {
const borrowById = this.lendReturnForm.borrowById const borrowById = this.lendReturnForm.borrowById
this.lendReturnForm.borrowBy = borrowById == ''?'':this.userList.find(item=>item.userId == borrowById).userName this.lendReturnForm.borrowBy = borrowById == '' ? '' : this.userList.find(item => item.userId == borrowById).userName
const receivedById = this.lendReturnForm.receivedById const receivedById = this.lendReturnForm.receivedById
this.lendReturnForm.receivedBy = receivedById == ''?'':this.adminUserList.find(item=>item.adminId == receivedById).admin this.lendReturnForm.receivedBy = receivedById == '' ? '' : this.adminUserList.find(item => item.adminId == receivedById).admin
this.$refs['lendReturnForm'].validate((valid) => { this.$refs['lendReturnForm'].validate((valid) => {
if (valid) { if (valid) {
if(this.nowType == 1){ if (this.nowType == 1) {
//1编辑 //1编辑
editLendingReturn({...this.lendReturnForm}).then(res=>{ editLendingReturn({ ...this.lendReturnForm }).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.$message.success("编辑成功！") this.$message.success("编辑成功！")
this.dialogVisible = false this.dialogVisible = false
this.getList() this.getList()
} }
}) })
}else if(this.nowType == 0){ } else if (this.nowType == 0) {
//0新增 //0新增
addLendingReturn({...this.lendReturnForm}).then(res=>{ addLendingReturn({ ...this.lendReturnForm }).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.$message.success("新增成功！") this.$message.success("新增成功！")
this.dialogVisible = false this.dialogVisible = false
this.getList() this.getList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment