Skip to content

D
dd_school
Commit d00a32f2 by zhaopanyu
Options

zpy 8.15

parent 69e2973e
Showing with 526 additions and 298 deletions
ruoyi-ui/src/api/smartSchool/schoolProperty/collectionLedger.js 0 → 100644
import request from "@/utils/request";
//查看设备领用列表
export function getReceive(query) {
return request({
url: "/receive/list",
method: "get",
params: query,
});
}
//查看设备领用详细信息
export function queryReceive(id) {
return request({
url: "/receive/" + id,
method: "get",
});
}
//新增设备领用
export function addReceive(data) {
return request({
url: "/receive/add",
method: "post",
data,
});
}
//修改设备领用
export function editReceive(data) {
return request({
url: "/receive/edit",
method: "put",
data: data,
});
}
//删除设备领用
export function deleteReceive(id) {
return request({
url: "/receive/delete/" + id,
method: "post",
});
}
ruoyi-ui/src/api/smartSchool/schoolProperty/outboundLedger.js 0 → 100644
import request from "@/utils/request";
//查看设备出库列表
export function getoutStock(query) {
return request({
url: "/outStock/list",
method: "get",
params: query,
});
}
//查看设备出库详细信息
export function queryoutStock(id) {
return request({
url: "/outStock/" + id,
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/schoolProperty/warehousingLedger.js 0 → 100644
import request from "@/utils/request";
//查看设备入库列表
export function getinStock(query) {
return request({
url: "/inStock/list",
method: "get",
params: query,
});
}
//查看设备出库详细信息
export function queryinStock(id) {
return request({
url: "/inStock/" + id,
method: "get",
});
}
ruoyi-ui/src/views/smartSchool/schoolProperty/collectionLedger/index.vue
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item label="设备名称" prop="studentName">
<el-input v-model="queryParams.xc" placeholder="请输入设备名称" clearable/>
<el-form-item label="设备名称" prop="equipmentName">
<el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable />
</el-form-item>
<el-form-item label="领用人" prop="studentName">
<el-input v-model="queryParams.xc" placeholder="请输入领用人" clearable/>
<el-form-item label="领用人" prop="recipientBy">
<el-input v-model="queryParams.recipientBy" placeholder="请输入领用人" clearable />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
......@@ -14,159 +14,299 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleOption(0)">新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-col>
</el-row>
<!-- 表格 -->
<el-table v-loading="loading" :data="collectionData" stripe>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="55" align="center"/>
<el-table-column label="自编码" align="center" prop="studentName"/>
<el-table-column label="设备名称" align="center" prop="studentNumber"/>
<el-table-column label="型号" align="center" prop="studentNumber"/>
<el-table-column label="领用日期" align="center" prop="studentNumber"/>
<el-table-column label="领用人" align="center" prop="studentNumber"/>
<el-table-column label="退还日期" align="center" prop="studentNumber"/>
<el-table-column label="退还时设备情况" align="center" prop="studentNumber"/>
<el-table-column label="接收人" align="center" prop="studentNumber"/>
<el-table-column label="备注" align="center" prop="studentNumber"/>
<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="equipmentName" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="领用日期" align="center" prop="recipientTime" />
<el-table-column label="领用人" align="center" prop="recipientBy" />
<el-table-column label="退还日期" align="center" prop="returnTime" />
<el-table-column label="退还时设备情况" align="center" prop="returnEquipmentCondition" />
<el-table-column label="接收人" align="center" prop="receivedBy" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" prop="orgname" width="150">
<template slot-scope="{ row }">
<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="handleDelete(row.id)">删除</el-button>
<el-button type="text" size="small" @click="handleUpdate(row)">编辑</el-button>
<el-button type="text" size="small" @click="handleLook(row)">查看</el-button>
<el-button type="text" size="small" @click="handleDelete(row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination ref="pageBlock" v-show="total > 0" :total="total"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
<pagination ref="pageBlock" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 新增、编辑、查看页面 -->
<el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
<el-form :model="collectionForm" :rules="collectionRules" ref="achievementForm"
label-width="110px" label-position="right">
<el-form :model="collectionForm" :rules="collectionRules" ref="achievementForm" label-width="110px"
label-position="right">
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="自编码" prop="idCard">
<el-input v-model="collectionForm" placeholder="请输入自编码"></el-input>
<el-form-item label="自编码" prop="encode">
<el-input v-model="collectionForm.encode" placeholder="请输入自编码" @change="getRencode"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备名称" prop="idCard">
<el-input v-model="collectionForm" placeholder="请输入设备名称"></el-input>
<el-form-item label="设备名称" prop="equipmentName">
<el-input v-model="collectionForm.equipmentName" placeholder="请输入设备名称"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="型号" prop="idCard">
<el-input v-model="collectionForm" placeholder="请输入型号"></el-input>
<el-form-item label="型号" prop="model">
<el-input v-model="collectionForm.model" placeholder="请输入型号"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领用人" prop="idCard">
<el-input v-model="collectionForm" placeholder="请输入领用人"></el-input>
<el-form-item label="领用人" prop="recipientBy">
<el-input v-model="collectionForm.recipientBy" placeholder="请输入领用人"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="领用日期" prop="idCard">
<el-date-picker v-model="collectionForm" type="date" clearable class="selectWidth"
placeholder="请选择领用日期" format="yyyy-MM-dd">
<el-form-item label="领用日期" prop="recipientTime">
<el-date-picker v-model="collectionForm.recipientTime" type="datetime" clearable class="selectWidth"
placeholder="请选择领用日期" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="退还日期" prop="idCard">
<el-date-picker v-model="collectionForm" type="date" clearable class="selectWidth"
placeholder="请选择退还日期" format="yyyy-MM-dd">
<el-form-item label="退还日期" prop="returnTime">
<el-date-picker v-model="collectionForm.returnTime" type="datetime" clearable class="selectWidth"
placeholder="请选择退还日期" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="接收人" prop="idCard">
<el-input v-model="collectionForm" placeholder="请输入接收人"></el-input>
<el-form-item label="接收人" prop="receivedBy">
<el-input v-model="collectionForm.receivedBy" placeholder="请输入接收人"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="退还时设备情况" prop="idCard">
<el-input v-model="collectionForm" placeholder="请输入退还时设备情况"></el-input>
<el-form-item label="退还时设备情况" prop="returnEquipmentCondition">
<el-input v-model="collectionForm.returnEquipmentCondition" placeholder="请输入退还时设备情况"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="预计使用时间" prop="idCard">
<el-date-picker v-model="collectionForm" type="datetime" clearable class="selectWidth"
placeholder="请选择领用日期">
<el-form-item label="预计使用时间" prop="yjuseTime">
<el-date-picker v-model="collectionForm.yjuseTime" type="datetime" clearable class="selectWidth"
placeholder="请选择预计使用时间" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实际使用时间" prop="idCard">
<el-date-picker v-model="collectionForm" type="datetime" clearable class="selectWidth"
placeholder="请选择退还日期">
<el-form-item label="实际使用时间" prop="sjuseTime">
<el-date-picker v-model="collectionForm.sjuseTime" type="datetime" clearable class="selectWidth"
placeholder="请选择实际使用时间" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="24">
<el-form-item label="备注" prop="chemistry">
<el-input type="textarea" v-model="lendReturnForm" placeholder="请输入备注"></el-input>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="collectionForm.remark" placeholder="请输入备注"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</span>
<div style="text-align: center">
<el-button type="primary" v-show="isEditable" @click="submitForm">确 定</el-button>
<el-button @click="cancel">{{ isEditable ? '取 消' : '退 出' }}</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
getReceive,
queryReceive,
addReceive,
editReceive,
deleteReceive,
} from '@/api/smartSchool/schoolProperty/collectionLedger.js'
import {
getRepairencode,//根据自编码获取设备信息
} from '@/api/smartSchool/schoolProperty/repairApplicant.js'
export default {
// dicts: [''],
data() {
return {
queryParams: {
xc: '',
equipmentName: '',
recipientBy: '',
pageNum: 1,
pageSize: 10,
},
loading: false,
total: 0,
collectionData: [],
collectionForm: {},
collectionRules: [],
//新增
collectionForm: {
encode: '',
equipmentName: '',
model: '',
recipientBy: '',
recipientTime: '',
returnTime: '',
receivedBy: '',
returnEquipmentCondition: '',
yjuseTime: '',
sjuseTime: '',
remark: '',
},
collectionRules: {
},
dialogVisible: false,
nowType: 0, // 0新增、1编辑、2查看
isEditable: true,
}
},
methods:{
created() {
this.getList();
},
methods: {
// 获取列表数据
getList(){},
getList() {
getReceive(this.queryParams).then(response => {
this.loading = false;
this.collectionData = response.rows;
console.log('this.collectionData ', this.collectionData);
this.total = response.total;
}).catch(err => {
this.loading = false;
})
},
/** 查看 */
handleLook(row) {
this.collectionForm = row;
const id = row.id || this.ids;
queryReceive(id).then(response => {
this.collectionForm = response.data;
this.dialogVisible = true;
this.isEditable = false;
}).catch(err => {
})
this.title = "查看";
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除"' + ids + '"的数据项？').then(function () {
return deleteReceive(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
},
// 修改按钮操作
handleUpdate(row) {
const id = row.id || this.ids;
this.title = "修改申请";
queryReceive(id).then(response => {
this.collectionForm = response.data;
this.dialogVisible = true;
this.isEditable = true;
}).catch(err => {
})
},
// 重置搜索
resetQuery(){},
resetQuery() {
this.queryParams = {
equipmentName: '',
recipientBy: '',
pageNum: 1,
pageSize: 10,
}
this.getList();
},
// 取消按钮
cancel() {
this.dialogVisible = false;
this.reset();
},
//自编码
async getRencode() {
try {
const response = await getRepairencode(this.collectionForm.encode);
console.log("response", response);
this.collectionForm.equipmentId = response.data.equipmentId;
this.collectionForm.equipmentName = response.data.equipmentName;
this.collectionForm.model = response.data.model;
// 0新增、1编辑、2查看
handleOption(type,item){
this.nowType = type
if(type != 0){
} catch (error) {
}
this.dialogVisible = true
},
//删除
handleDelete(){},
// 新增按钮操作
handleAdd() {
this.reset();
this.dialogVisible = true;
this.title = "添加申请";
},
reset() {
// 这里需要重置对话框表单
this.collectionForm = {
encode: null,
equipmentName: null,
model: null,
recipientBy: null,
recipientTime: null,
returnTime: null,
receivedBy: null,
returnEquipmentCondition: null,
yjuseTime: null,
sjuseTime: null,
remark: null,
};
},
//表单提交
submitForm(){},
submitForm() {
this.$refs["achievementForm"].validate(valid => {
if (valid) {
if (this.collectionForm.id != null) {
editReceive(this.collectionForm).then(response => {
this.$modal.msgSuccess("修改成功");
this.dialogVisible = false;
this.getList();
});
} else {
addReceive(this.collectionForm).then(response => {
this.$modal.msgSuccess("新增成功");
this.dialogVisible = false;
this.getList();
});
}
}
});
},
}
}
</script>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/outboundLedger/index.vue
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item label="设备名称" prop="studentName">
<el-input v-model="queryParams.xc" placeholder="请输入设备名称" clearable/>
<el-form-item label="设备名称">
<el-input v-model="queryParams.equipmentName" clearable placeholder="请输入设备名称"></el-input>
</el-form-item>
<el-form-item label="归属类型" prop="examType">
<el-select v-model="queryParams.xc" placeholder="请选择归属类型" clearable>
<el-option v-for="(item,index) in dict.type.exam_type" :key="index"
:label="item.label" :value="item.value"></el-option>
<el-form-item label="归属类型">
<el-select v-model="queryParams.affiliationType" placeholder="请选择归属类型" clearable>
<el-option v-for="(item, index) in dict.type.affiliation_type" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="分类编码" prop="studentName">
<el-input v-model="queryParams.xc" placeholder="请输入分类编码" clearable/>
<el-form-item label="分类编码">
<el-input v-model="queryParams.classificationCode" clearable placeholder="请输入分类编码"></el-input>
</el-form-item>
<el-form-item label="设备状态" prop="examType">
<el-select v-model="queryParams.xc" placeholder="请选择设备状态" clearable>
<el-option v-for="(item,index) in dict.type.exam_type" :key="index"
:label="item.label" :value="item.value"></el-option>
<el-form-item label="设备状态">
<el-select v-model="queryParams.equipmentState" clearable placeholder="请选择设备状态">
<el-option v-for="(item, index) in dict.type.equipment_state" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -24,118 +24,119 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- -->
<el-table v-loading="loading" :data="outBoundData" stripe>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="55" align="center"/>
<el-table-column label="出库类型" align="center" prop="studentName"/>
<el-table-column label="设备名称" align="center" prop="studentNumber"/>
<el-table-column label="型号" align="center" prop="studentNumber"/>
<el-table-column label="规格" align="center" prop="studentNumber"/>
<el-table-column label="分类编码" align="center" prop="studentNumber"/>
<el-table-column label="单位" align="center" prop="studentNumber"/>
<el-table-column label="归属类型" align="center" prop="studentNumber"/>
<el-table-column label="设备状态" align="center" prop="studentNumber"/>
<el-table-column label="投产日期" align="center" prop="studentNumber"/>
<el-table-column label="价格（元）" align="center" prop="studentNumber"/>
<el-table-column label="效用年限（年）" align="center" prop="studentNumber"/>
<el-table-column label="地点" align="center" prop="studentNumber"/>
<el-table-column label="使用人" align="center" prop="studentNumber"/>
<el-table-column label="备注" align="center" prop="studentNumber"/>
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="出库类型" align="center" prop="outStockType" />
<el-table-column label="设备名称" align="center" prop="equipmentName" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="规格" align="center" prop="specification" />
<el-table-column label="分类编码" align="center" prop="classificationCode" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="归属类型" align="center" prop="affiliationType" />
<el-table-column label="设备状态" align="center" prop="equipmentState" />
<el-table-column label="投产日期" align="center" prop="dateOfProduction" />
<el-table-column label="价格（元）" align="center" prop="price" />
<el-table-column label="效用年限（年）" align="center" prop="lifeOfUtility" />
<el-table-column label="地点" align="center" prop="place" />
<el-table-column label="使用人" align="center" prop="useName" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" prop="orgname" width="150">
<template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleOption(row)">查看</el-button>
<el-button type="text" size="small" @click="handleLook(row)">查看</el-button>
</template>
</el-table-column>
</el-table>
<pagination ref="pageBlock" v-show="total > 0" :total="total"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
<pagination ref="pageBlock" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
<el-form :model="outBoundForm" :rules="outBoundRules" ref="achievementForm"
label-width="110px" label-position="right">
<el-form :model="outBoundForm" :rules="outBoundRules" ref="achievementForm" label-width="110px"
label-position="right">
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="出库类型" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入出库类型" disabled></el-input>
<el-form-item label="出库类型" prop="outStockType">
<el-input v-model="outBoundForm.outStockType" placeholder=" 请输入出库类型" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属类型" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入归属类型" disabled></el-input>
<el-form-item label="归属类型" prop="affiliationType">
<el-input v-model="outBoundForm.affiliationType" placeholder="请输入归属类型" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="设备名称" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入设备名称" disabled></el-input>
<el-form-item label="设备名称" prop="equipmentName">
<el-input v-model="outBoundForm.equipmentName" placeholder="请输入设备名称" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备状态" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入设备状态" disabled></el-input>
<el-form-item label="设备状态" prop="equipmentState">
<el-input v-model="outBoundForm.equipmentState" placeholder="请输入设备状态" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="型号" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入型号" disabled></el-input>
<el-form-item label="型号" prop="model">
<el-input v-model="outBoundForm.model" placeholder="请输入型号" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="投产日期" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入投产日期" disabled></el-input>
<el-form-item label="投产日期" prop="dateOfProduction">
<el-input v-model="outBoundForm.dateOfProduction" placeholder="请输入投产日期" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="规格" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入规格" disabled></el-input>
<el-form-item label="规格" prop="specification">
<el-input v-model="outBoundForm.specification" placeholder="请输入规格" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="价格（元）" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入价格" disabled></el-input>
<el-form-item label="价格（元）" prop="price">
<el-input v-model="outBoundForm.price" placeholder="请输入价格" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="分类编码" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入分类编码" disabled></el-input>
<el-form-item label="分类编码" prop="classificationCode">
<el-input v-model="outBoundForm.classificationCode" placeholder="请输入分类编码" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="效用年限（年）" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入效用年限" disabled></el-input>
<el-form-item label="效用年限（年）" prop="lifeOfUtility">
<el-input v-model="outBoundForm.lifeOfUtility" placeholder="请输入效用年限" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="单位" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入单位" disabled></el-input>
<el-form-item label="单位" prop="affiliationType">
<el-input v-model="outBoundForm.affiliationType" placeholder="请输入单位" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用人" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入使用人" disabled></el-input>
<el-form-item label="使用人" prop="useName">
<el-input v-model="outBoundForm.useName" placeholder="请输入使用人" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="地点" prop="idCard">
<el-input v-model="outBoundForm" placeholder="请输入地点" disabled></el-input>
<el-form-item label="地点" prop="place">
<el-input v-model="outBoundForm.place" placeholder="请输入地点" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="24">
<el-form-item label="备注" prop="chemistry">
<el-input type="textarea" v-model="outBoundForm" placeholder="请输入备注" disabled></el-input>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="outBoundForm.remark" placeholder="请输入备注" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -145,40 +146,98 @@
</template>
<script>
import {
getoutStock,
queryoutStock,
} from '@/api/smartSchool/schoolProperty/outboundLedger.js'
export default {
dicts: ['exam_type'],
dicts: ['equipment_state', 'affiliation_type'],
data() {
return {
queryParams: {
xc: '',
pageNum: 1,
pageSize: 10,
equipmentName: '',
affiliationType: '',
classificationCode: '',
equipmentState: '',
},
loading: false,
total: 0,
outBoundData: [
{studentName:"studentName"}
],
outBoundForm: {},
outBoundRules: [],
outBoundRules: {
},
dialogVisible: false,
}
},
methods:{
// 获取列表数据
getList(){},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
getoutStock(this.queryParams).then((response) => {
this.outBoundData = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.dialogVisible = false;
// 重置搜索
resetQuery(){},
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
equipmentName: '',
affiliationType: '',
classificationCode: '',
equipmentState: '',
// 查看
handleOption(type,item){
this.dialogVisible = true
};
this.getList();
},
/** 查看详情 */
handleLook(row) {
const id = row.id || this.ids;
this.$modal.loading('正在加载数据，请稍等...');
queryoutStock(id).then(response => {
this.$modal.closeLoading();
this.outBoundForm = response.data;
this.dialogVisible = true;
this.isEdit = false;
this.title = "查看入库台帐";
//表单提交
submitForm(){},
}
}).catch(error => {
})
},
},
}
</script>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
......@@ -13,7 +13,7 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="维修状态" prop="disposeState">
<el-form-item label="处理状态" prop="disposeState">
<el-select v-model="queryParams.disposeState" placeholder="维修状态" clearable>
<el-option v-for="(item, index) in dict.type.repair_state" :key="index" :label="item.label"
:value="item.value"></el-option>
......@@ -26,8 +26,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:application:add']">新增
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
</el-button>
</el-col>
</el-row>
......@@ -76,13 +75,11 @@
</el-table>
<!-- 新增/修改/查看对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body @close="cancel">
<el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px" :disabled="!isEditable"
:readonly="!isEditable">
<el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="自编码" prop="encode">
<el-input v-model.lazy="postForm.encode" placeholder="自编码" @change="getRencode"
:readonly="!isEditable"></el-input>
<el-input v-model.lazy="postForm.encode" placeholder="自编码" @change="getRencode"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -97,6 +94,7 @@
<el-input v-model="postForm.equipmentName" placeholder="设备名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="问题" prop="problem">
<el-input v-model="postForm.problem" placeholder="问题"></el-input>
......@@ -122,7 +120,8 @@
<el-col :span="12">
<el-form-item label="投产日期:" prop="dateOfProduction">
<el-date-picker v-model="postForm.dateOfProduction" type="date" placeholder="选择日期"
style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
style="width: 100%;" value-format="yyyy-MM-dd" clearable
:readonly="isReadOnly"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -139,8 +138,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="修理状态" prop="disposeState">
<el-select v-model="postForm.disposeState" placeholder="维修状态" clearable style="width: 100%;">
<el-form-item label="处理状态" prop="disposeState">
<el-select v-model="postForm.disposeState" placeholder="处理状态" clearable style="width: 100%;">
<el-option v-for="(item, index) in dict.type.repair_state" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
......@@ -199,6 +198,7 @@ export default {
dicts: ['dispose_state', 'repair_state'],
data() {
return {
isReadOnly: false,
sbflOptions: [],
repairStatusOptions: {
},
......@@ -382,7 +382,6 @@ export default {
handleUpdate(row) {
const id = row.id || this.ids;
this.title = "修改申请";
queryRepair(id).then(response => {
this.postForm = response.data;
this.open = true;
......@@ -408,12 +407,15 @@ export default {
this.$refs["postForm"].validate(valid => {
if (valid) {
this.$modal.loading('正在上传数据，请稍等...');
if (this.postForm.disposeState === 1 || this.postForm.disposeState === 0) {
this.postForm.repairState = 1;
if (this.postForm.disposeState === "1" || this.postForm.disposeState === "0") {
this.postForm.repairState = "1";
} else if (this.postForm.disposeState === null) {
this.postForm.repairState = "0";
} else {
this.postForm.repairState = 0;
this.postForm.repairState = "0"; // 当 disposeState 不满足上述条件时，默认设置为 0
}
if (this.postForm.id != null) {
editRepair(this.postForm).then(response => {
console.log('this.postForm',);
......@@ -426,11 +428,15 @@ export default {
});
} else {
if (this.postForm.disposeState === 1 || this.postForm.disposeState === 0) {
this.postForm.repairState = 1;
if (this.postForm.disposeState === "1" || this.postForm.disposeState === "0") {
this.postForm.repairState = "1";
} else if (this.postForm.disposeState === null) {
this.postForm.repairState = "0";
} else {
this.postForm.repairState = 0;
this.postForm.repairState = "0"; // 当 disposeState 不满足上述条件时，默认设置为 0
}
addRepair(this.postForm).then(response => {
console.log(this.postForm);
this.$modal.closeLoading();
......
ruoyi-ui/src/views/smartSchool/schoolProperty/warehousingLedger/index.vue
......@@ -2,25 +2,21 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" v-show="showSearch" inline>
<el-form-item label="设备名称">
<el-input v-model="queryParams.equipmentName" @keyup.enter.native="handleQuery" clearable
placeholder="请输入设备名称"></el-input>
<el-input v-model="queryParams.equipmentName" clearable placeholder="请输入设备名称"></el-input>
</el-form-item>
<el-form-item label="归属类型">
<el-select v-model="queryParams.belongType" @keyup.enter.native="handleQuery" clearable
placeholder="请选择归属类型">
<el-option v-for="dict in dict.type.BelongType" :key="dict.value" :label="dict.label"
:value="dict.value" />
<el-select v-model="queryParams.affiliationType" placeholder="请选择归属类型" clearable>
<el-option v-for="(item, index) in dict.type.affiliation_type" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="分类编码">
<el-input v-model="queryParams.equipmentCode" @keyup.enter.native="handleQuery" clearable
placeholder="请输入分类编码"></el-input>
<el-input v-model="queryParams.classificationCode" clearable placeholder="请输入分类编码"></el-input>
</el-form-item>
<el-form-item label="设备状态">
<el-select v-model="queryParams.equipmentStatus" @keyup.enter.native="handleQuery" clearable
placeholder="请选择设备状态">
<el-option v-for="dict in dict.type.EquipmentStatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
<el-select v-model="queryParams.equipmentState" clearable placeholder="请选择设备状态">
<el-option v-for="(item, index) in dict.type.equipment_state" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-button class="ml20" type="primary" icon="el-icon-search" size="mini" @click="getList">搜索
......@@ -29,41 +25,40 @@
</el-form>
<el-table stripe :data="warehousingLedger" width="100%">
<el-table-column header-align="center" align="center" type="index" width="50" />
<el-table-column header-align="center" align="center" prop="equipmentName" label="入库类型" />
<el-table-column header-align="center" align="center" prop="equipmentName" label="入库时间" />
<el-table-column header-align="center" align="center" prop="equipmentCode" label="自编码">
<el-table-column align="center" type="index" width="50" fixed="left" />
<el-table-column align="center" prop="inStockType" label="入库类型" fixed="left" />
<el-table-column align="center" prop="inStockTime" label="入库时间" width="200" fixed="left" />
<el-table-column align="center" prop="encode" label="自编码" width="200" fixed="left">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentName" label="设备名称">
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentModel" label="型号">
<el-table-column align="center" prop="model" label="型号" fixed="left">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentSpec" label="规格">
<el-table-column align="center" prop="specification" label="规格">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentTypeCode" label="分类编码">
<el-table-column align="center" prop="classificationCode" label="分类编码">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentUnit" label="单位">
<el-table-column align="center" prop="unit" label="单位">
</el-table-column>
<el-table-column header-align="center" align="center" prop="belongType" label="归属类型">
<el-table-column align="center" prop="affiliationType" label="归属类型">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentStatus" label="设备状态">
<el-table-column align="center" prop="equipmentState" label="设备状态">
</el-table-column>
<el-table-column header-align="center" align="center" prop="productionDate" label="投产日期">
<el-table-column align="center" prop="dateOfProduction" label="投产日期" width="130">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentPrice" label="价格（元）" width="120">
<el-table-column align="center" prop="price" label="价格（元）" width="100">
</el-table-column>
<el-table-column header-align="center" align="center" prop="usefulLife" label="效用年限（年）" width="150">
<el-table-column align="center" prop="lifeOfUtility" label="效用年限（年）" width="130">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentPlace" label="地点">
<el-table-column align="center" prop="place" label="地点">
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentUser" label="使用人">
<el-table-column align="center" prop="useName" label="使用人">
</el-table-column>
<el-table-column header-align="center" align="center" prop="remark" label="备注">
<el-table-column align="center" prop="remark" label="备注">
</el-table-column>
<el-table-column label="操作" align="center" min-width="200px" fixed="right">
<el-table-column label="操作" width="180" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleLook(scope.row)"
v-hasPermi="['system:grade:edit']">查看
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleLook(scope.row)">查看
</el-button>
</template>
</el-table-column>
......@@ -77,38 +72,37 @@
<el-form ref="form" :model="form" :rules="rules" :disabled="!isEdit" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="入库类型:" prop="teacherName">
<el-input v-model="form.teacherName" placeholder="请输入入库类型" clearable
@click.native="selectTeacher"></el-input>
<el-form-item label="入库类型:" prop="inStockType">
<el-input v-model="form.inStockType" placeholder="请输入入库类型" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="地点:" prop="equipmentName">
<el-input v-model="form.equipmentName" placeholder="请输入地点" clearable></el-input>
<el-form-item label="地点:" prop="place">
<el-input v-model="form.place" placeholder="请输入地点" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="入库时间:" prop="teacherName">
<el-input v-model="form.teacherName" placeholder="请输入库时间" clearable></el-input>
<el-form-item label="入库时间:" prop="inStockTime">
<el-input v-model="form.inStockTime" placeholder="请输入库时间" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属类型:" prop="equipmentName">
<el-input v-model="form.equipmentName" placeholder="请输入归属类型" clearable></el-input>
<el-form-item label="归属类型:" prop="affiliationType">
<el-input v-model="form.affiliationType" placeholder="请输入归属类型" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="设备名称:" prop="equipmentModel">
<el-input v-model="form.equipmentModel" placeholder="请输入设备名称" clearable></el-input>
<el-form-item label="设备名称:" prop="equipmentName">
<el-input v-model="form.equipmentName" placeholder="请输入设备名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备状态:" prop="equipmentStatus">
<el-select v-model="form.equipmentStatus" placeholder="请选择设备状态" style="width: 100%;">
<el-form-item label="设备状态:" prop="equipmentState">
<el-select v-model="form.equipmentState" placeholder="请选择设备状态" style="width: 100%;">
<el-option label="正常" value="0"></el-option>
<el-option label="维修" value="1"></el-option>
<el-option label="报废" value="2"></el-option>
......@@ -119,13 +113,13 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="型号:" prop="equipmentType">
<el-input v-model="form.equipmentType" placeholder="请输入型号" clearable></el-input>
<el-form-item label="型号:" prop="model">
<el-input v-model="form.model" placeholder="请输入型号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="投产日期:" prop="equipmentProductionDate" style="width: 100%;">
<el-date-picker v-model="form.equipmentProductionDate" type="date" placeholder="选择日期"
<el-form-item label="投产日期:" prop="dateOfProduction" style="width: 100%;">
<el-date-picker v-model="form.dateOfProduction" type="date" placeholder="选择日期"
style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item>
......@@ -134,13 +128,13 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="规格:" prop="equipmentBelongType">
<el-input v-model="form.equipmentBelongType" placeholder="请输入规格" clearable></el-input>
<el-form-item label="规格:" prop="specification">
<el-input v-model="form.specification" placeholder="请输入规格" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="价格（元）:" prop="equipmentPrice">
<el-input v-model="form.equipmentPrice" placeholder="请输入价格（元）" clearable></el-input>
<el-form-item label="价格（元）:" prop="price">
<el-input v-model="form.price" placeholder="请输入价格（元）" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -148,25 +142,25 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="分类编码:" prop="equipmentBelongType">
<el-input v-model="form.equipmentBelongType" placeholder="请输入分类编码" clearable></el-input>
<el-form-item label="分类编码:" prop="classificationCode">
<el-input v-model="form.classificationCode" placeholder="请输入分类编码" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="效用年限（年）:" prop="equipmentPrice">
<el-input v-model="form.equipmentPrice" placeholder="请输入效用年限（年)" clearable></el-input>
<el-form-item label="效用年限（年）:" prop="lifeOfUtility">
<el-input v-model="form.lifeOfUtility" placeholder="请输入效用年限（年)" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="单位:" prop="equipmentBelongType">
<el-input v-model="form.equipmentBelongType" placeholder="请输入单位" clearable></el-input>
<el-form-item label="单位:" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用人:" prop="equipmentPrice">
<el-input v-model="form.equipmentPrice" placeholder="请输入使用人" clearable></el-input>
<el-form-item label="使用人:" prop="useName">
<el-input v-model="form.useName" placeholder="请输入使用人" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -193,13 +187,13 @@
<script>
import {
} from "@/api/smartSchool/teachAffairAdministration/affairClassManage/index";
import { getToken } from "@/utils/auth";
getinStock,
queryinStock,
} from '@/api/smartSchool/schoolProperty/warehousingLedger.js'
export default {
dicts: [],
dicts: ['equipment_state', 'affiliation_type'],
name: "index",
data() {
return {
......@@ -216,9 +210,9 @@ export default {
// 总条数
total: 0,
// 入库台帐
warehousingLedger: [{
equipmentName: "电脑",
}],
warehousingLedger: [
],
// 弹出层标题
title: "",
// 查看对话框
......@@ -228,11 +222,16 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
equipmentName: '',
affiliationType: '',
classificationCode: '',
equipmentState: '',
},
isEdit: false,
// 表单参数
form: {},
batchForm: {},
// 表单校验
rules: {
......@@ -240,75 +239,55 @@ export default {
},
// 表单是否可以修改、
isEdit: true,
};
},
created() {
this.getList()
},
methods: {
/** 查询学校班级列表 */
/** 查询列表 */
getList() {
this.loading = true;
// getClassList(this.queryParams).then((response) => {
// this.warehousingLedger = response.rows;
// this.total = response.total;
// this.loading = false;
// });
getinStock(this.queryParams).then((response) => {
this.warehousingLedger = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.dialogVisible = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
};
// this.imageUrl = '';
//表单可编辑
this.isEdit = true;
this.resetForm("form");
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
equipmentName: '',
affiliationType: '',
classificationCode: '',
equipmentState: '',
};
//
this.getList();
},
/** 查看详情 */
handleLook(row) {
this.reset();
// const id = row.id || this.ids;
// this.$modal.loading('正在加载数据，请稍等...');
// getDetailInfo(id).then(response => {
// this.$modal.closeLoading();
// this.form = response.data;
const id = row.id || this.ids;
this.$modal.loading('正在加载数据，请稍等...');
queryinStock(id).then(response => {
this.$modal.closeLoading();
this.form = response.data;
this.dialogVisible = true;
this.isEdit = false;
this.title = "查看入库台帐";
// this.isEdit = false;
// }).catch(error => {
// this.$modal.closeLoading();
// })
}).catch(error => {
})
},
......@@ -329,32 +308,4 @@ export default {
};
</script>
<style>
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
</style>
<style></style>
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